Convert odroid to use distro_bootcmd.

Gbp-Pq: Topic odroid
Gbp-Pq: Name 0001-Convert-odroid-to-use-distro_bootcmd.patch

diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
index 04a5e2cc3a83df0c86dee81a55e904f410a6b8ab..b713582cc87f74c9eacb3beaff49518db3213a64 100644 (file)
--- a/configs/odroid_defconfig
+++ b/configs/odroid_defconfig
@@ -9,7 +9,7 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_USE_BOOTARGS=y
-CONFIG_BOOTARGS="Please use defined boot"
+# CONFIG_BOOTARGS is not set
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y

diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index 92811cfc54889e75de41a773825b8b93645a3b7d..4f75f82e0fd4a33783d326e59fad7cec0c426c0f 100644 (file)
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -41,8 +41,7 @@
 
 /* Console configuration */
 
-#define CONFIG_BOOTCOMMAND             "run autoboot"
-#define CONFIG_DEFAULT_CONSOLE         "ttySAC1,115200n8"
+#define CONFIG_DEFAULT_CONSOLE         "ttySAC1,115200n8\0"
 
 #define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_LOAD_ADDR \
                                        - GENERATED_GBL_DATA_SIZE)
@@ -83,6 +82,20 @@
        "bl2 raw 0x1f 0x1d;" \
        "tzsw raw 0x83f 0x138\0"
 
+#define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 1) \
+       func(MMC, mmc, 0)
+
+#include <config_distro_bootcmd.h>
+
+#define MEM_LAYOUT_ENV_SETTINGS \
+       "bootm_size=0x10000000\0" \
+       "kernel_addr_r=0x42000000\0" \
+       "fdt_addr_r=0x43000000\0" \
+       "ramdisk_addr_r=0x43300000\0" \
+       "scriptaddr=0x50000000\0" \
+       "pxefile_addr_r=0x51000000\0"
+
 /*
  * Bootable media layout:
  * dev:    SD   eMMC(part boot)
@@ -98,78 +111,8 @@
  * 2.  ROOT:  -
 */
 #define CONFIG_EXTRA_ENV_SETTINGS \
-       "loadbootscript=load mmc ${mmcbootdev}:${mmcbootpart} ${scriptaddr} " \
-               "boot.scr\0" \
-       "loadkernel=load mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} " \
-               "${kernelname}\0" \
-       "loadinitrd=load mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} " \
-               "${initrdname}\0" \
-       "loaddtb=load 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_script=" \
-               "run loadbootscript;" \
-               "source ${scriptaddr}\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 boot.scr; then; " \
-                       "run boot_script; " \
-               "elif 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 "\0" \
-       "mmcbootdev=0\0" \
-       "mmcbootpart=1\0" \
-       "mmcrootdev=0\0" \
-       "mmcrootpart=2\0" \
-       "bootdelay=0\0" \
-       "dfu_alt_system="CONFIG_DFU_ALT \
-       "dfu_alt_info=Please reset the board\0" \
-       "consoleon=set console console=ttySAC1,115200n8; save; reset\0" \
-       "consoleoff=set console console=ram; save; reset\0" \
-       "initrdname=uInitrd\0" \
-       "initrdaddr=42000000\0" \
-       "scriptaddr=0x42000000\0" \
-       "fdtaddr=40800000\0"
+       MEM_LAYOUT_ENV_SETTINGS \
+       BOOTENV
 
 /* GPT */