Tom Rini
6b29a395b6
Merge git://git.denx.de/u-boot-mpc85xx
2016-11-29 19:42:48 -05:00
Alexander Graf
8b82dd9add
bcm2835 video: Map frame buffer as 32bpp
...
To enable working efifb support, let's map the frame buffer as 32bpp
instead of 16bpp.
Signed-off-by: Alexander Graf <agraf@suse.de >
Acked-by: Stephen Warren <swarren@wwwdotorg.org >
2016-11-28 20:15:20 -05:00
Fabian Vogt
d8396a3272
board: rpi: move uart deactivation to board_init
...
When using OF_CONTROL, the disabled value of the mini UART platdata
gets reset after board_early_init_f. So move detection and disabling
to board_init and remove board_early_init_f.
This uses the first device using the mini uart driver, as this method
works reliably with different device trees or even no device tree at all.
Signed-off-by: Fabian Vogt <fvogt@suse.com >
Reviewed-by: Simon Glass <sjg@chromium.org >
2016-11-28 20:09:51 -05:00
Stefan Agner
5991703e88
spl: dfu: move DFU Kconfig to SPL Kconfig
...
The DFU Kconfig menu entries should be part of the SPL
Kconfig file. Also avoid using the top level Makefile by
moving the config dependent build artifacts to the driver/
and driver/usb/gadget/ Makfiles.
With that, DFU can be built again in SPL if
CONFIG_SPL_DFU_SUPPORT is enabled.
Fixes: 6ad6102246 ("usb:gadget: Disallow DFU in SPL for now")
Signed-off-by: Stefan Agner <stefan.agner@toradex.com >
Reviewed-by: Simon Glass <sjg@chromium.org >
Acked-by: Lukasz Majewski <l.majewski@samsung.com >
2016-11-28 19:49:49 -05:00
Andrew F. Davis
979a1f8b21
ti_armv7_keystone2: env: Add NFS loading support for PMMC and MON
...
NFS loading support has been added to the default environment for
most boot components, as PMMC and MON loading were added later they
did not originally get the NFS commands added, add these now.
Signed-off-by: Andrew F. Davis <afd@ti.com >
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com >
2016-11-28 15:10:35 -05:00
Andrew F. Davis
ac34286647
keystone2: Move target selection to Kconfig
...
The config option TARGET_K2x_EVM is set by the k2x defconfigs to pick
a board target, but the header configs also set K2x_EVM. This config
is redundant, remove it and use TARGET_K2x_EVM everywhere in its place.
Signed-off-by: Andrew F. Davis <afd@ti.com >
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com >
2016-11-28 15:10:34 -05:00
Max Krummenacher
877ea607a8
colibri_vf: usb gadget: toradex pid is now set generically
...
remove now unused CONFIG_TRDX_PID_XXX
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com >
Acked-by: Stefan Agner <stefan.agner@toradex.com >
Acked-by: Max Krummenacher <max.krummenacher@toradex.com >
2016-11-28 15:10:33 -05:00
Marcel Ziswiler
74b19ad1c1
apalis/colibri_t30: move environment location
...
Now with the config block handling in place move the U-Boot environment
location before the config block at the end of 1st "boot sector" as
deployed during production using our downstream BSP.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com >
Acked-by: Max Krummenacher <max.krummenacher@toradex.com >
2016-11-28 15:10:33 -05:00
Marcel Ziswiler
b891d01038
apalis/colibri_imx7/pxa270/t20/t30/vf: integrate config block handling
...
With our common code in place actually make use of it across all our
modules.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com >
Acked-by: Max Krummenacher <max.krummenacher@toradex.com >
2016-11-28 15:10:33 -05:00
Emmanuel Vadot
ae042beb74
sunxi: mmc: Set CONFIG_SYS_MMC_MAX_DEVICE
...
Set CONFIG_SYS_MMC_MAX_DEVICE to 4 for sunxi SoC.
This define is needed in the API code.
Signed-off-by: Emmanuel Vadot <manu@bidouilliste.com >
Reviewed-by: Hans de Goede <hdegoede@redhat.com >
Signed-off-by: Hans de Goede <hdegoede@redhat.com >
2016-11-28 15:10:29 -05:00
Tom Rini
8d0898544e
Merge git://git.denx.de/u-boot-rockchip
2016-11-26 09:26:27 -05:00
Jacob Chen
6b388f0bed
rockchip: configs: correct partitions 'boot' size
...
It should be 112M, to make rootfs start at 0x40000
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com >
Acked-by: Simon Glass <sjg@chromium.org >
2016-11-25 17:59:32 -07:00
Simon Glass
5e9b15034b
rockchip: Rename jerry files to veyron
...
At present we have a single rk3288-based Chromebook: chromebook_jerry. But
all such Chromebooks can use the same binary with only device-tree
differences. The family name is 'veyron', so rename the files accordingly.
Also update the device-tree filename since this currently differs from
Linux.
Signed-off-by: Simon Glass <sjg@chromium.org >
2016-11-25 17:59:31 -07:00
Kever Yang
1e352124b9
config: rk3036: enable configs for USB HOST
...
rk3036 using dwc2 usb controller, need enable relate configs for it.
Signed-off-by: Kever Yang <kever.yang@rock-chips.com >
Acked-by: Simon Glass <sjg@chromium.org >
2016-11-25 17:59:29 -07:00
Tom Rini
ed77ccd014
Merge git://git.denx.de/u-boot-fsl-qoriq
...
Signed-off-by: Tom Rini <trini@konsulko.com >
Conflicts:
arch/arm/Kconfig
2016-11-25 17:39:54 -05:00
York Sun
37376ae0dc
powerpc: MPC8641HPCN: Remove macro CONFIG_MPC8641HPCN
...
Use TARGET_MPC8641HPCN from Kconfig instead.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:16 -08:00
York Sun
4f5554c6e5
powerpc: MPC8641: Remove macro CONFIG_MPC8641
...
Replace CONFIG_MPC8641 with ARCH_MPC8641 in Kconfig and clean up
existing macros.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:16 -08:00
York Sun
51f05ff914
powerpc: MPC8610HPCD: Remove macro CONFIG_MPC8610HPCD
...
Use TARGET_MPC8610HPCD from Kconfig instead.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:16 -08:00
York Sun
1425a87b14
powerpc: MPC8610: Remove macro CONFIG_MPC8610
...
Replace CONFIG_MPC8610 with ARCH_MPC8610 in Kconfig and clean up
existing macros.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:16 -08:00
York Sun
26bc57da0a
powerpc: T4240: Remove macro CONFIG_PPC_T4240
...
Use CONFIG_ARCH_T4240 from Kconfig instead.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:15 -08:00
York Sun
49ec8aa840
powerpc: T4240RDB: Remove macro CONFIG_T4240RDB
...
Use CONFIG_TARGET_T4240RDB instead.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:15 -08:00
York Sun
673c01c708
powerpc: T4240QDS: Remove macro CONFIG_T4240QDS
...
Use CONFIG_TARGET_T4240QDS instead.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:15 -08:00
York Sun
0f3d80e993
powerpc: T2080, T2081: Remove macro CONFIG_PPC_T2080 and CONFIG_PPC_T2081
...
Use CONFIG_ARCH_T2080 and CONFIG_ARCH_T2081 instead.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:15 -08:00
York Sun
78e5699523
powerpc: T104xRDB: Remove macro CONFIG_T104xRDB and T104xD4RDB
...
CONFIG_T104xRDB is defined in T104xRDB.h, so it is always enabled for
all T1040RDB, T1040D4RDB, T1042RDB, T1042D4RDB, T1042RDB_PI.
CONFIG_T104XD4RDB is defined for all T1040D4RDB, T1042D4RDB.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:14 -08:00
York Sun
0167369cff
powerpc: T1042RDB: Remove macro CONFIG_T1042RDB
...
Use TARGET_T1042RDB instead.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:14 -08:00
York Sun
319ed24a8a
powerpc: T1042D4RDB: Separate from T1042RDB in Kconfig
...
Use TARGET_T1042D4RDB in Kconfig to simplify config options.
Remove macro CONFIG_T1042D4RDB.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:14 -08:00
York Sun
55ed8ae367
powerpc: T1042RDB_PI: Split from T1042RDB in Kconfig
...
Use separated TARGET_T1042RDB_PI to simplify config options.
Remove macro CONFIG_T1042RDB_PI.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:14 -08:00
York Sun
6fcddd0985
powerpc: T1040RDB: Remove macro CONFIG_T1040RDB
...
Use CONFIG_TARGET_T1040RDB instead.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:13 -08:00
York Sun
a016735c79
powerpc: T1040D4RDB: Separate from T1040RDB in Kconfig
...
Use TARGET_T1040D4RDB in Kconfig to simplify config macros. Replace
CONFIG_T1040D4RDB with TARGET_T1040D4RDB and clean up existing macros.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:13 -08:00
York Sun
5d73701073
powerpc: T1040: Remove macro CONFIG_PPC_T1040
...
Replace CONFIG_PPC_T1040 with ARCH_T1040 in Kconfig and clean up
existing macros.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:13 -08:00
York Sun
e5d5f5a8be
powerpc: T1024: Remove macro CONFIG_PPC_T1024
...
Replace CONFIG_PPC_T1024 with ARCH_T1024 in Kconfig and clean up
existing macros.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:13 -08:00
York Sun
10343403af
powerpc: QEMU_E500: Remove macro CONFIG_QEMU_E500
...
Replace CONFIG_QEMU_E500 with ARCH_QEMU_E500 in Kconfig and
clean up existing macros.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:12 -08:00
York Sun
b41f192b67
powerpc: B4420: Remove macro CONFIG_PPC_B4420
...
Replace CONFIG_PPC_B4420 with ARCH_B4420 in Kconfig and clean up
existing macros.
2016-11-23 23:42:12 -08:00
York Sun
d46a4a1378
powerpc: B4860QDS: Remove macro CONFIG_B4860QDS
...
Use CONFIG_TARGET_B4860QDS instead.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:12 -08:00
York Sun
3006ebc37e
powerpc: B4860: Remove macro CONFIG_PPC_B4860
...
Replace CONFIG_PPC_B4860 with ARCH_B4860 in Kconfig and clean up
existing macros.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:12 -08:00
York Sun
161b472482
powerpc: P5040DS: Remove macro CONFIG_P5040DS
...
Use CONFIG_TARGET_P5040DS instead.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:11 -08:00
York Sun
9539036012
powerpc: P5040: Remove macro CONFIG_P5040
...
Replace CONFIG_P5040 with ARCH_P5040 in Kconfig and clean up
existing macros.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:11 -08:00
York Sun
3b83649d53
powerpc: P5020DS: Remove macro CONFIG_P5020DS
...
Use CONFIG_TARGET_P5020DS instead.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:11 -08:00
York Sun
cefe11cdb2
powerpc: P5020: Remove macro CONFIG_PPC_P5020
...
Replace CONFIG_PPC_P5020 with ARCH_P5020 in Kconfig and clean up
existing macros.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:11 -08:00
York Sun
529fb06208
powerpc: P4080DS: Remove macro CONFIG_P4080DS
...
Use CONFIG_TARGET_P4080DS instead.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:11 -08:00
York Sun
e71372cb63
powerpc: P4080: Remove macro CONFIG_PPC_P4080
...
Replace CONFIG_PPC_P4080 with ARCH_P4080 in Kconfig and clean up
existing macros.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:11 -08:00
York Sun
850af2c7a9
powerpc: P3041DS: Remove macro CONFIG_P3041DS
...
Use CONFIG_TARGET_P3041DS instead.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:11 -08:00
York Sun
5e5fdd2d00
powerpc: P3041: Remove macro CONFIG_PPC_P3041
...
Replace CONFIG_PPC_P3041 with ARCH_P3041 in Kconfig and clean up
existing macros.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:10 -08:00
York Sun
37107facbc
powerpc: P2041RDB: Remove macro CONFIG_P2041RDB
...
Use CONFIG_TARGET_P2041RDB instead.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:10 -08:00
York Sun
ce040c83f1
powerpc: P2041: Remove macro CONFIG_PPC_P2041
...
Replace CONFIG_PPC_P2041 with ARCH_P2041 in Kconfig and clean up
existing macros.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:10 -08:00
York Sun
4593637b13
powerpc: P2020: Remove macro CONFIG_P2020
...
Replace CONFIG_P2020 with ARCH_P2020 in Kconfig and clean up
existing macros.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:10 -08:00
York Sun
4167a67d5d
powerpc: P1025: Remove macro CONFIG_P1025
...
Replace CONFIG_P1025 with ARCH_P1025 in Kconfig and clean up
existing macros.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:10 -08:00
York Sun
52b6f13d2c
powerpc: P1024: Remove CONFIG_P1024
...
Replace CONFIG_P1024 with ARCH_P1024 in Kconfig and clean up
existing macros.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:10 -08:00
York Sun
a990799d52
powerpc: P1021: Remove macro CONFIG_P1021
...
Replace CONFIG_P1021 with ARCH_P1021 in Kconfig and clean up
existing macros.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:09 -08:00
York Sun
484fff6478
powerpc: P1020: Remove macro CONFIG_P1020
...
Replace CONFIG_P1020 with ARCH_P1020 in Kconfig and clean up
existing macros.
Signed-off-by: York Sun <york.sun@nxp.com >
2016-11-23 23:42:09 -08:00