summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-01-28 21:10:32 -0500
committerTom Rini <trini@konsulko.com>2020-01-28 21:10:32 -0500
commit3e12744a90241b08788ab7f20b5437381dbc9f68 (patch)
treecd06563bd79c890e6221aaa330fd145133e57e64 /include
parentb00c3c995bf2293e32cd2be3cb4be7eb39c4ac26 (diff)
parent51521e43603d37e6be2ffd1ad2607361650500e9 (diff)
downloadu-boot-3e12744a90241b08788ab7f20b5437381dbc9f68.tar.gz
u-boot-3e12744a90241b08788ab7f20b5437381dbc9f68.tar.xz
u-boot-3e12744a90241b08788ab7f20b5437381dbc9f68.zip
Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-samsung
- Various exynos fixes
Diffstat (limited to 'include')
-rw-r--r--include/configs/odroid.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index 77fca32fca..a7e2a3d9a2 100644
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -80,7 +80,7 @@
"tzsw raw 0x83f 0x138\0"
#define BOOT_TARGET_DEVICES(func) \
- func(MMC, mmc, 1) \
+ func(MMC, mmc, 2) \
func(MMC, mmc, 0)
#include <config_distro_bootcmd.h>
@@ -146,13 +146,13 @@
"run kernel_args;" \
"bootz ${kernel_addr_r} ${initrd_addr} ${fdt_addr};\0" \
"autoboot=" \
- "if test -e mmc 0 boot.scr; then; " \
+ "if test -e mmc ${mmcbootdev} boot.scr; then; " \
"run boot_script; " \
- "elif test -e mmc 0 Image.itb; then; " \
+ "elif test -e mmc ${mmcbootdev} Image.itb; then; " \
"run boot_fit;" \
- "elif test -e mmc 0 zImage; then; " \
+ "elif test -e mmc ${mmcbootdev} zImage; then; " \
"run boot_zimg;" \
- "elif test -e mmc 0 uImage; then; " \
+ "elif test -e mmc ${mmcbootdev} uImage; then; " \
"run boot_uimg;" \
"fi;\0" \
"console=" CONFIG_DEFAULT_CONSOLE \