Merge branch 'next-dev' into thunder-boot

UPSTREAM: usb: gadget: Make g_dnl USB settings common

The g_dnl USB settings for the vendor ID, product ID and manufacturer are
actually common settings that can and should be shared by all the gadg

UPSTREAM: usb: gadget: Make g_dnl USB settings common

The g_dnl USB settings for the vendor ID, product ID and manufacturer are
actually common settings that can and should be shared by all the gadgets.

Make them common by renaming them, and convert all the users.

Conflicts:
configs/cgtqmx6eval_defconfig
configs/dms-ba16-1g_defconfig
configs/evb-rk3036_defconfig
configs/evb-rk3229_defconfig
configs/evb-rv1108_defconfig
configs/fennec-rk3288_defconfig
configs/stih410-b2260_defconfig

Change-Id: Ib855d37af9f539ef794a2519c75c027e67bd091c
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit a95aee6af70d8815547b81329125f2800c8ee37c)

show more ...

UPSTREAM: configs: Move CONFIG_SPI_FLASH into defconfigs

Completely move CONFIG_SPI_FLASH from remaining board header files to
defconfigs

Signed-off-by: Vignesh R <vigneshr@ti.com>
Reviewed-by: Jag

UPSTREAM: configs: Move CONFIG_SPI_FLASH into defconfigs

Completely move CONFIG_SPI_FLASH from remaining board header files to
defconfigs

Signed-off-by: Vignesh R <vigneshr@ti.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>
Tested-by: Jagan Teki <jagan@amarulasolutions.com> #zynq-microzed
Change-Id: Iab125975d8e45a953666dcc04c989da9ae9b7f93
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
(cherry picked from commit ea4805d6b26282451eee9c701a456225bcf7db85)

show more ...

rockchip: evb-rk3288: disable SPL_BACKTO_BROM

We get TPL and no need back to bootrom in SPL.

Change-Id: I27b9793acc1a8d311dc9b518e73150c3af711808
Signed-off-by: Kever Yang <kever.yang@rock-chips.co

rockchip: evb-rk3288: disable SPL_BACKTO_BROM

We get TPL and no need back to bootrom in SPL.

Change-Id: I27b9793acc1a8d311dc9b518e73150c3af711808
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

show more ...

config: rk3288: disable CONFIG_SILENT_CONSOLE

For more log.

Change-Id: Ic26085aad82d8106a4458048ea1663a8df6b5b65
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>

configs: rockchip: enable edp display for evb-rk3288

Change-Id: I57bf828e287b7a1cd64fa87472ca46171c8046fd
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>

config: rk3288: add adc-key support

Change-Id: I9f6f2723db5c84bebac1d84dfd43b10dd5a9c947
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>

config: rk3288: support android boot image

The boot.img will instead of the kernel.img and resource.img on linux
platform, so need to support android boot image in rk3288 uboot.

Change-Id: I6d7d42d

config: rk3288: support android boot image

The boot.img will instead of the kernel.img and resource.img on linux
platform, so need to support android boot image in rk3288 uboot.

Change-Id: I6d7d42d80026cad594e720e279b7213dd4adcadd
Signed-off-by: Lin Huang <hl@rock-chips.com>

show more ...

rockchip/rk3288: delete unused CONFIG_RKPARM_PARTITION

Change-Id: I8702d405c8d9d1f91294c6753a6f229706f44243
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>

rockchip/rk3288: update the evb config to support the RK bootloader

Change-Id: Ibc066439830c70905adc4ebb49fe64e0df08b1c6
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>

rockchip: configs: Enable CONFIG_NET_RANDOM_ETHADDR for rk3288-evb

If the Ethernet address is not set, the network can't work,
enable the random address config for default use.

Change-Id: If639e0bc

rockchip: configs: Enable CONFIG_NET_RANDOM_ETHADDR for rk3288-evb

If the Ethernet address is not set, the network can't work,
enable the random address config for default use.

Change-Id: If639e0bc19f3b9dc749cbedc436a2d661f42d724
Signed-off-by: David Wu <david.wu@rock-chips.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

show more ...

defconfig: rockchip: Clean the unused pinctrl config

If we used the pinctrl-rockchip driver, these config is not needed,
so remove them.

Change-Id: I606b706dd7d45a947a9aeb32c0ca61d44cef0651
Signed-

defconfig: rockchip: Clean the unused pinctrl config

If we used the pinctrl-rockchip driver, these config is not needed,
so remove them.

Change-Id: I606b706dd7d45a947a9aeb32c0ca61d44cef0651
Signed-off-by: David Wu <david.wu@rock-chips.com>

show more ...

rockchip: configs: enable DM_RESET config by default

Change-Id: Iff8e5ff45a1acc6255ca1ca41892c837891a9ac0
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Signed-off-by: Kever Yang <kever.yang

rockchip: configs: enable DM_RESET config by default

Change-Id: Iff8e5ff45a1acc6255ca1ca41892c837891a9ac0
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

show more ...

Kconfig: Migrate all of cmd/fastboot/Kconfig to defconfigs

- Move ANDROID_IMAGE_SUPPORT to top level Kconfig under images as it's
not strictly part of fastboot.
- Add some defaults for the fastboo

Kconfig: Migrate all of cmd/fastboot/Kconfig to defconfigs

- Move ANDROID_IMAGE_SUPPORT to top level Kconfig under images as it's
not strictly part of fastboot.
- Add some defaults for the fastboot buffer location and size
- Migrate all options listed in cmd/fastboot/Kconfig
- Cleanup the README

Signed-off-by: Tom Rini <trini@konsulko.com>

show more ...

configs: Migrate all of the existing USB symbols, except fastboot

This syncs all of the currently Kconfig'd symbols out of the headers and
into the defconfig files. This has two exceptions, first a

configs: Migrate all of the existing USB symbols, except fastboot

This syncs all of the currently Kconfig'd symbols out of the headers and
into the defconfig files. This has two exceptions, first am335x_evm
needs to be converted to DM in SPL and then it can stop undef'ing
CONFIG_DM_USB. Leaving this as-is results in a build failure, and
without work, run time failure. The other case is am43xx_evm.h and in
turn am43xx_evm_usbhost_boot. The problem here is that we need DWC3 USB
host mode in SPL, but still desire to have gadget mode in U-Boot proper.

Signed-off-by: Tom Rini <trini@konsulko.com>

show more ...

configs: Resync with savedefconfig

Rsync all defconfig files using moveconfig.py

Signed-off-by: Tom Rini <trini@konsulko.com>

configs: Resync with savedefconfig

Rsync all defconfig files using moveconfig.py

Signed-off-by: Tom Rini <trini@konsulko.com>

Merge branch 'master' of git://git.denx.de/u-boot-rockchip

rockchip: back-to-bootrom: split BACK_TO_BOOTROM for TPL/SPL

The back-to-bootrom option is rather unfortunately named
CONFIG_ROCKCHIP_SPL_BACK_TO_BOOTROM
instead of
CONFIG_SPL_ROCKCHIP_BACK_TO_B

rockchip: back-to-bootrom: split BACK_TO_BOOTROM for TPL/SPL

The back-to-bootrom option is rather unfortunately named
CONFIG_ROCKCHIP_SPL_BACK_TO_BOOTROM
instead of
CONFIG_SPL_ROCKCHIP_BACK_TO_BOOTROM

To make is selectable through CONFIG_IS_ENABLED(ROCKCHIP_BACK_TO_BOOTROM),
we need to rename it. At the same time, we introduce a TPL_ variant of
the option to give us finer-grained control over when it should be used.

This change is motivated by our RK3368 boot process, which returns to
the boot ROM only from the TPL stage, but not from the SPL stage.

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
[added fix-up for evb-rk3229_defconfig and phycore-rk3288_defconfig:]
[fixed inverted CONFIG_IS_ENABLED test for rk3288:]
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

include/configs/rock.h: undef

show more ...

configs: Resync with savedefconfig

Rsync all defconfig files using moveconfig.py

Signed-off-by: Tom Rini <trini@konsulko.com>

rockchip: video: defconfig: Add mipi dsi support for evb-rk3288

Add support for rk3288 mipi dsi.

Signed-off-by: Eric Gao <eric.gao@rock-chips.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Acked-

rockchip: video: defconfig: Add mipi dsi support for evb-rk3288

Add support for rk3288 mipi dsi.

Signed-off-by: Eric Gao <eric.gao@rock-chips.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

show more ...

Convert CONFIG_ENV_IS_IN_MMC/NAND/UBI and NOWHERE to Kconfig

This converts the following to Kconfig:
CONFIG_ENV_IS_IN_MMC
CONFIG_ENV_IS_IN_NAND
CONFIG_ENV_IS_IN_UBI
CONFIG_ENV_IS_NOWHERE

Convert CONFIG_ENV_IS_IN_MMC/NAND/UBI and NOWHERE to Kconfig

This converts the following to Kconfig:
CONFIG_ENV_IS_IN_MMC
CONFIG_ENV_IS_IN_NAND
CONFIG_ENV_IS_IN_UBI
CONFIG_ENV_IS_NOWHERE

In fact this already exists for sunxi as a 'choice' config. However not
all the choices are available in Kconfig yet so we cannot use that. It
would lead to more than one option being set.

In addition, one purpose of this series is to allow the environment to be
stored in more than one place. So the existing choice is converted to a
normal config allowing each option to be set independently.

There are not many opportunities for Kconfig updates to reduce the size of
this patch. This was tested with

./tools/moveconfig.py -i CONFIG_ENV_IS_IN_MMC

And then manual updates. This is because for CHAIN_OF_TRUST boards they
can only have ENV_IS_NOWHERE set, so we enforce that via Kconfig logic
now.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>

show more ...

configs: Resync defconfigs

Signed-off-by: Tom Rini <trini@konsulko.com>

Merge branch 'master' of git://git.denx.de/u-boot

Signed-off-by: Stefano Babic <sbabic@denx.de>

configs: Re-sync

Signed-off-by: Tom Rini <trini@konsulko.com>