Merge git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Mon, 27 Nov 2017 12:22:11 +0000 (07:22 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 27 Nov 2017 12:22:11 +0000 (07:22 -0500)
Signed-off-by: Tom Rini <trini@konsulko.com>
1  2 
README
configs/mx6cuboxi_defconfig
configs/wandboard_defconfig

diff --cc README
Simple merge
index bd7917e51e432179923304d5f2ea4a493c754458,e729def89afa123a61023ccab783f282d060174d..37a2f2abd3a1fdc87f5d5b7b11469915534fd55a
@@@ -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_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL"
 +CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
+ 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
index d053db743ed83b2b394eb8db70ff6ce97c667a8e,a4518fcce0defa6dbcdde65d332df3bff1153b41..4b6b9d9aaee7a5dc11144787bec158f28f9ebb12
@@@ -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