Remove the override of the boot environment, this causes the board to
use the distro_bootcmd setup for booting as included by exynos5-common.h.
Signed-off-by: Sjoerd Simons <sjoerd.sim...@collabora.co.uk>
---
include/configs/odroid_xu3.h | 72 --------------------------------------------
1 file changed, 72 deletions(-)
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index 1d53653..a60d4e5 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -45,80 +45,8 @@
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000)
-#define CONFIG_BOOTCOMMAND "run autoboot"
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"
-/*
- * For details, refer the documentation: doc/README.odroid
-*/
-#ifdef CONFIG_EXTRA_ENV_SETTINGS
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#endif
-#define CONFIG_EXTRA_ENV_SETTINGS \
- "loadkernel=fatload mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} " \
- "${kernelname}\0" \
- "loadinitrd=fatload mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} " \
- "${initrdname}\0" \
- "loaddtb=fatload mmc ${mmcbootdev}:${mmcbootpart} ${fdtaddr} " \
- "${fdtfile}\0" \
- "check_ramdisk=" \
- "if run loadinitrd; then " \
- "setenv initrd_addr ${initrdaddr};" \
- "else " \
- "setenv initrd_addr -;" \
- "fi;\0" \
- "check_dtb=" \
- "if run loaddtb; then " \
- "setenv fdt_addr ${fdtaddr};" \
- "else " \
- "setenv fdt_addr;" \
- "fi;\0" \
- "kernel_args=" \
- "setenv bootargs root=/dev/mmcblk${mmcrootdev}p${mmcrootpart}" \
- " rootwait ${console} ${opts}\0" \
- "boot_fit=" \
- "setenv kerneladdr 0x42000000;" \
- "setenv kernelname Image.itb;" \
- "run loadkernel;" \
- "run kernel_args;" \
- "bootm ${kerneladdr}#${boardname}\0" \
- "boot_uimg=" \
- "setenv kerneladdr 0x40007FC0;" \
- "setenv kernelname uImage;" \
- "run check_dtb;" \
- "run check_ramdisk;" \
- "run loadkernel;" \
- "run kernel_args;" \
- "bootm ${kerneladdr} ${initrd_addr} ${fdt_addr};\0" \
- "boot_zimg=" \
- "setenv kerneladdr 0x40007FC0;" \
- "setenv kernelname zImage;" \
- "run check_dtb;" \
- "run check_ramdisk;" \
- "run loadkernel;" \
- "run kernel_args;" \
- "bootz ${kerneladdr} ${initrd_addr} ${fdt_addr};\0" \
- "autoboot=" \
- "if test -e mmc 0 Image.itb; then; " \
- "run boot_fit;" \
- "elif test -e mmc 0 zImage; then; " \
- "run boot_zimg;" \
- "elif test -e mmc 0 uImage; then; " \
- "run boot_uimg;" \
- "fi;\0" \
- "console=" CONFIG_DEFAULT_CONSOLE \
- "mmcbootdev=0\0" \
- "mmcbootpart=1\0" \
- "mmcrootdev=0\0" \
- "mmcrootpart=2\0" \
- "bootdelay=0\0" \
- "dfu_alt_info=Please reset the board\0" \
- "consoleon=set console console=ttySAC2,115200n8; save; reset\0" \
- "consoleoff=set console console=ram; save; reset\0" \
- "initrdname=uInitrd\0" \
- "initrdaddr=42000000\0" \
- "fdtaddr=40800000\0"
-
/* FIXME: MUST BE REMOVED AFTER TMU IS TURNED ON */
#undef CONFIG_EXYNOS_TMU
#undef CONFIG_TMU_CMD_DTT
--
2.1.3
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
