From: Tom Rini Date: Mon, 27 Nov 2017 12:22:11 +0000 (-0500) Subject: Merge git://www.denx.de/git/u-boot-imx X-Git-Tag: v2018.01-rc1~66 X-Git-Url: https://git.librecmc.org/?p=oweals%2Fu-boot.git;a=commitdiff_plain;h=6e6cf015e7cdd7ca83a933320a81201972bd5e5e Merge git://www.denx.de/git/u-boot-imx Signed-off-by: Tom Rini --- 6e6cf015e7cdd7ca83a933320a81201972bd5e5e diff --cc configs/mx6cuboxi_defconfig index bd7917e51e,e729def89a..37a2f2abd3 --- a/configs/mx6cuboxi_defconfig +++ b/configs/mx6cuboxi_defconfig @@@ -11,8 -11,7 +11,8 @@@ CONFIG_SPL_WATCHDOG_SUPPORT= # CONFIG_CMD_BMODE is not set CONFIG_CMD_HDMIDETECT=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" - CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL" + CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" # CONFIG_SYS_STDIO_DEREGISTER is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL=y diff --cc configs/wandboard_defconfig index d053db743e,a4518fcce0..4b6b9d9aae --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@@ -10,8 -10,7 +10,7 @@@ CONFIG_SPL_LIBDISK_SUPPORT= CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_CMD_HDMIDETECT=y CONFIG_DISTRO_DEFAULTS=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" +CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" - CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y