imx6: centralise common boot options in mx6_common.h

Define common LOADADDR and BOOTDELAY to ensure a consistent experience
across mx6 boards

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>

diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index 89bb08576a19069c0c664ee90d896306c907bbc6..7d3499a2f2025e54de9fd4884158bbf3710c1bdb 100644 (file)
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -75,11 +75,6 @@
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_CMD_SETEXPR
 
-#define CONFIG_BOOTDELAY               3
-
-#define CONFIG_LOADADDR                        0x12000000
-#define CONFIG_SYS_TEXT_BASE           0x17800000
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=u-boot.scr\0" \
        "fit_file=/boot/system.itb\0" \
@@ -196,8 +191,6 @@
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + 0x100000)
 #define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_STACKSIZE               (128 * 1024)
 

diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index ced4d6c84a1058378360dc344072dd4e512c47b0..db454a503ad69395a246f69bfe85775d3748017b 100644 (file)
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -49,11 +49,6 @@
 
 /* Command definition */
 
-#define CONFIG_BOOTDELAY              3
-
-#define CONFIG_LOADADDR                               0x12000000
-#define CONFIG_SYS_TEXT_BASE          0x17800000
-
 #define CONFIG_DEFAULT_FDT_FILE "imx6q-congatec.dtb"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
@@ -125,8 +120,6 @@
 #define CONFIG_SYS_MEMTEST_END        0x10010000
 #define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000
 
-#define CONFIG_SYS_LOAD_ADDR          CONFIG_LOADADDR
-
 #define CONFIG_CMDLINE_EDITING
 
 /* Physical Memory Map */

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 5ef7ba726dd1c5842819267316c54a1b19c8769b..2a152e19bed476f63dadb60f663f21e6c6ac8866 100644 (file)
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -247,9 +247,6 @@
 #define CONFIG_DWC_AHSATA_BASE_ADDR    SATA_ARB_BASE_ADDR
 
 /* Boot */
-#define CONFIG_ZERO_BOOTDELAY_CHECK
-#define CONFIG_LOADADDR                        0x10800000
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)
 #define CONFIG_SERIAL_TAG
 

diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index f6c2a623abefea2141bdcb3404a79a2605eb1772..b480afc6518006e98f0fa366d16caa0b7294ae9b 100644 (file)
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -97,136 +97,6 @@
 #define CONFIG_CMD_BMODE
 #define CONFIG_CMD_SETEXPR
 
-#define CONFIG_LOADADDR                        0x12000000
-#define CONFIG_SYS_TEXT_BASE           0x17800000
-
-#ifdef CONFIG_SUPPORT_EMMC_BOOT
-#define EMMC_ENV \
-       "emmcdev=2\0" \
-       "update_emmc_firmware=" \
-               "if test ${ip_dyn} = yes; then " \
-                       "setenv get_cmd dhcp; " \
-               "else " \
-                       "setenv get_cmd tftp; " \
-               "fi; " \
-               "if ${get_cmd} ${update_sd_firmware_filename}; then " \
-                       "if mmc dev ${emmcdev}; then "  \
-                               "setexpr fw_sz ${filesize} / 0x200; " \
-                               "setexpr fw_sz ${fw_sz} + 1; "  \
-                               "mmc write ${loadaddr} 0x2 ${fw_sz}; " \
-                       "fi; "  \
-               "fi\0"
-#else
-#define EMMC_ENV ""
-#endif
-
-#ifdef CONFIG_CMD_SF
-#define SF_ENV \
-       "update_spi_firmware=" \
-               "if test ${ip_dyn} = yes; then " \
-                       "setenv get_cmd dhcp; " \
-               "else " \
-                       "setenv get_cmd tftp; " \
-               "fi; " \
-               "if ${get_cmd} ${update_spi_firmware_filename}; then " \
-                       "if sf probe; then "    \
-                               "sf erase 0 0xc0000; " \
-                               "sf write ${loadaddr} 0x400 ${filesize}; " \
-                       "fi; "  \
-               "fi\0"
-#else
-#define SF_ENV ""
-#endif
-
-#define CONFIG_EXTRA_ENV_SETTINGS \
-       "script=boot.scr\0" \
-       "image=zImage\0" \
-       "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
-       "fdt_addr=0x18000000\0" \
-       "boot_fdt=try\0" \
-       "ip_dyn=yes\0" \
-       "console=" CONFIG_CONSOLE_DEV "\0" \
-       "fdt_high=0xffffffff\0"   \
-       "initrd_high=0xffffffff\0" \
-       "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
-       "mmcpart=1\0" \
-       "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
-       "update_sd_firmware=" \
-               "if test ${ip_dyn} = yes; then " \
-                       "setenv get_cmd dhcp; " \
-               "else " \
-                       "setenv get_cmd tftp; " \
-               "fi; " \
-               "if mmc dev ${mmcdev}; then "   \
-                       "if ${get_cmd} ${update_sd_firmware_filename}; then " \
-                               "setexpr fw_sz ${filesize} / 0x200; " \
-                               "setexpr fw_sz ${fw_sz} + 1; "  \
-                               "mmc write ${loadaddr} 0x2 ${fw_sz}; " \
-                       "fi; "  \
-               "fi\0" \
-       EMMC_ENV          \
-       SF_ENV    \
-       "mmcargs=setenv bootargs console=${console},${baudrate} " \
-               "root=${mmcroot}\0" \
-       "loadbootscript=" \
-               "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
-       "bootscript=echo Running bootscript from mmc ...; " \
-               "source\0" \
-       "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
-       "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
-       "mmcboot=echo Booting from mmc ...; " \
-               "run mmcargs; " \
-               "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-                       "if run loadfdt; then " \
-                               "bootz ${loadaddr} - ${fdt_addr}; " \
-                       "else " \
-                               "if test ${boot_fdt} = try; then " \
-                                       "bootz; " \
-                               "else " \
-                                       "echo WARN: Cannot load the DT; " \
-                               "fi; " \
-                       "fi; " \
-               "else " \
-                       "bootz; " \
-               "fi;\0" \
-       "netargs=setenv bootargs console=${console},${baudrate} " \
-               "root=/dev/nfs " \
-               "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
-       "netboot=echo Booting from net ...; " \
-               "run netargs; " \
-               "if test ${ip_dyn} = yes; then " \
-                       "setenv get_cmd dhcp; " \
-               "else " \
-                       "setenv get_cmd tftp; " \
-               "fi; " \
-               "${get_cmd} ${image}; " \
-               "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-                       "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
-                               "bootz ${loadaddr} - ${fdt_addr}; " \
-                       "else " \
-                               "if test ${boot_fdt} = try; then " \
-                                       "bootz; " \
-                               "else " \
-                                       "echo WARN: Cannot load the DT; " \
-                               "fi; " \
-                       "fi; " \
-               "else " \
-                       "bootz; " \
-               "fi;\0"
-
-#define CONFIG_BOOTCOMMAND \
-       "mmc dev ${mmcdev};" \
-       "if mmc rescan; then " \
-               "if run loadbootscript; then " \
-               "run bootscript; " \
-               "else " \
-                       "if run loadimage; then " \
-                               "run mmcboot; " \
-                       "else run netboot; " \
-                       "fi; " \
-               "fi; " \
-       "else run netboot; fi"
-
 #define CONFIG_ARP_TIMEOUT     200UL
 
 /* Miscellaneous configurable options */
@@ -242,8 +112,6 @@
 #define CONFIG_SYS_MEMTEST_END         0x10010000
 #define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
 #define CONFIG_STACKSIZE               (128 * 1024)
 
 /* Physical Memory Map */

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 89c9c844d67ed7bdc2a6f4726682ca4ee68a5d06..0db9e50d2633e64d457334c6ac913c3d6b6528de 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -270,8 +270,6 @@
 #define CONFIG_SYS_MEMTEST_START       0x10000000
 #define CONFIG_SYS_MEMTEST_END        0x10010000
 #define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000
-#define CONFIG_SYS_TEXT_BASE            0x17800000
-#define CONFIG_SYS_LOAD_ADDR           0x12000000
 
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS           1
@@ -329,8 +327,6 @@
 #endif
 
 /* Environment */
-#define CONFIG_BOOTDELAY          3
-#define CONFIG_LOADADDR           CONFIG_SYS_LOAD_ADDR
 #define CONFIG_IPADDR             192.168.1.1
 #define CONFIG_SERVERIP           192.168.1.146
 #define HWCONFIG_DEFAULT \

diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index 0bbd28941036a0dc3ceb9cac03b6303a0edfde87..777d005cf7e90c6b8a80f5744eafbb48b68c4c27 100644 (file)
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -54,6 +54,16 @@
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG
 
+/* Boot options */
+#define CONFIG_LOADADDR                0x12000000
+#define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
+#ifndef CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_TEXT_BASE   0x17800000
+#endif
+#ifndef CONFIG_BOOTDELAY
+#define CONFIG_BOOTDELAY       3
+#endif
+
 /* GPIO */
 #define CONFIG_MXC_GPIO
 #define CONFIG_CMD_GPIO

diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index f42db854720d359d96508ae349d9dcb7032faa9b..2e90b836648ef12c68a747bd68d7bcf91e7a7d2f 100644 (file)
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -99,11 +99,6 @@
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_CMD_SETEXPR
 
-#define CONFIG_BOOTDELAY               1
-
-#define CONFIG_LOADADDR                        0x12000000
-#define CONFIG_SYS_TEXT_BASE           0x17800000
-
 #define CONFIG_MXC_UART_BASE   UART1_BASE
 #define CONFIG_CONSOLE_DEV     "ttymxc0"
 #define CONFIG_MMCROOT         "/dev/mmcblk0p2"
@@ -217,8 +212,6 @@
 #define CONFIG_SYS_MAXARGS             16
 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
 #define CONFIG_CMDLINE_EDITING
 
 /* Physical Memory Map */

diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
index 999e8f77cb8773dac23823eb15ed2c9e3d03c6b1..4c8666affd3d5311a66537b8097c5f2c1c1bbf7d 100644 (file)
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -49,11 +49,6 @@
 
 /* Command definition */
 
-#define CONFIG_BOOTDELAY               3
-
-#define CONFIG_LOADADDR                        0x12000000
-#define CONFIG_SYS_TEXT_BASE           0x17800000
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
        "image=zImage\0" \
@@ -142,8 +137,6 @@
 #define CONFIG_SYS_MEMTEST_START       0x10000000
 #define CONFIG_SYS_MEMTEST_END         0x10010000
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
 #define CONFIG_CMDLINE_EDITING
 
 /* Physical Memory Map */

diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 10a8e8803652ee65c1c1769a71011f1f183be02a..d374abfa8570ff26d21e14e216df61845c7ca91d 100644 (file)
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -76,11 +76,6 @@
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_CMD_SETEXPR
 
-#define CONFIG_BOOTDELAY               1
-
-#define CONFIG_LOADADDR                        0x12000000
-#define CONFIG_SYS_TEXT_BASE           0x17800000
-
 #ifdef CONFIG_SUPPORT_EMMC_BOOT
 #define EMMC_ENV \
        "emmcdev=2\0" \
@@ -227,8 +222,6 @@
 #define CONFIG_SYS_MEMTEST_END         0x10010000
 #define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_STACKSIZE               (128 * 1024)
 

diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index d17c6d9970f480e6d10396718bf2542f3a119d5e..663d6a6fc4b76ab7875f851b77efb597b5c1d32d 100644 (file)
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -67,11 +67,6 @@
 
 /* Command definition */
 
-#define CONFIG_BOOTDELAY               3
-
-#define CONFIG_LOADADDR                        0x82000000
-#define CONFIG_SYS_TEXT_BASE           0x87800000
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
        "image=zImage\0" \
@@ -158,8 +153,6 @@
 #define CONFIG_SYS_MEMTEST_START       0x80000000
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + SZ_512M)
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_STACKSIZE               SZ_128K
 

diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 1dba142791bcc73c9f54533541bf219bc0fb598f..e32b4c7de7a1de728abac4e9c6e638ba0b994c21 100644 (file)
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -33,11 +33,6 @@
 
 /* Command definition */
 
-#define CONFIG_BOOTDELAY               3
-
-#define CONFIG_LOADADDR                        0x80800000
-#define CONFIG_SYS_TEXT_BASE           0x87800000
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
        "image=zImage\0" \
@@ -124,8 +119,6 @@
 #define CONFIG_SYS_MEMTEST_START       0x80000000
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + 0x10000)
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_STACKSIZE               SZ_128K
 

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 6c35e167dc4bf6a95fa550f9abfddb13cfff74a4..1304687c3ed2ad714f0b0438c5e2dbdf0af91b88 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -145,13 +145,8 @@
 
 /* Command definition */
 
-#define CONFIG_BOOTDELAY              1
-
 #define CONFIG_PREBOOT                 ""
 
-#define CONFIG_LOADADDR                               0x12000000
-#define CONFIG_SYS_TEXT_BASE          0x17800000
-
 #ifdef CONFIG_CMD_SATA
 #define CONFIG_DRIVE_SATA "sata "
 #else
@@ -318,8 +313,6 @@
 #define CONFIG_SYS_MEMTEST_END        0x10010000
 #define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000
 
-#define CONFIG_SYS_LOAD_ADDR          CONFIG_LOADADDR
-
 #define CONFIG_CMDLINE_EDITING
 
 /* Physical Memory Map */

diff --git a/include/configs/novena.h b/include/configs/novena.h
index 5bdc22df9abcca6db76c0121bdb6d325013c66e1..801d01b3b9db89adc11c0d04115376820dbc8084 100644 (file)
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -77,12 +77,9 @@
 #endif
 
 /* Booting Linux */
-#define CONFIG_BOOTDELAY               5
 #define CONFIG_BOOTFILE                        "fitImage"
 #define CONFIG_BOOTARGS                        "console=ttymxc1,115200 "
 #define CONFIG_BOOTCOMMAND             "run net_nfs"
-#define CONFIG_LOADADDR                        0x18000000
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_HOSTNAME                        novena
 
 /* Physical Memory Map */

diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
index 1a40851a9bc45bc8d6cf96d3cc9c3da90ba3c48e..1c77b95bf12adb12197cd5612060988873f1e2bb 100644 (file)
--- a/include/configs/ot1200.h
+++ b/include/configs/ot1200.h
@@ -139,13 +139,8 @@
 
 /* Command definition */
 
-#define CONFIG_BOOTDELAY               2
-
 #define CONFIG_PREBOOT                 ""
 
-#define CONFIG_LOADADDR                0x12000000
-#define CONFIG_SYS_TEXT_BASE           0x17800000
-
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_HUSH_PARSER
@@ -156,8 +151,6 @@
 #define CONFIG_SYS_MAXARGS             16
 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
 #define CONFIG_CMDLINE_EDITING
 
 /* Physical Memory Map */

diff --git a/include/configs/platinum.h b/include/configs/platinum.h
index b192c3f5262c042d9d54f1e0523fa562f6390001..51f7baaa528146beda6c971684678319ff64602e 100644 (file)
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -150,14 +150,10 @@
 /* Device tree support */
 #define CONFIG_OF_LIBFDT
 
-#define CONFIG_LOADADDR                                0x12000000
-#define CONFIG_SYS_TEXT_BASE                   0x17800000
-
 #define CONFIG_SYS_MEMTEST_START               PHYS_SDRAM
 #define CONFIG_SYS_MEMTEST_END                 (CONFIG_SYS_MEMTEST_START + \
                                                 PHYS_SDRAM_SIZE - (12 << 20))
 
-#define CONFIG_BOOTDELAY                       3
 #define CONFIG_BOOTCOMMAND                     "run bootubi_scr"
 
 /* Miscellaneous configurable options */
@@ -176,8 +172,6 @@
 #define CONFIG_SYS_MAXARGS                     16
 #define CONFIG_SYS_BARGSIZE                    CONFIG_SYS_CBSIZE
 
-#define CONFIG_SYS_LOAD_ADDR                   CONFIG_LOADADDR
-
 /* MTD/UBI/UBIFS config */
 #define CONFIG_LZO
 #define CONFIG_MTD_DEVICE

diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h
index adc6d7f58faf70af3261356ab9e04620afec6e79..92ff9ab8e25cae3776aa1eb573288785807419f5 100644 (file)
--- a/include/configs/secomx6quq7.h
+++ b/include/configs/secomx6quq7.h
@@ -31,12 +31,8 @@
 #define CONFIG_CMD_BMODE
 #define CONFIG_CMD_SETEXPR
 
-#define CONFIG_BOOTDELAY               3
-
 #define CONFIG_SYS_MEMTEST_START       0x10000000
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
-#define CONFIG_LOADADDR                        0x12000000
-#define CONFIG_SYS_TEXT_BASE           0x17800000
 
 /* MMC Configuration */
 #define CONFIG_FSL_ESDHC
@@ -110,7 +106,6 @@
 #define CONFIG_SYS_MAXARGS             16
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
 
 #define CONFIG_CMDLINE_EDITING

diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 2e37a5cf54c71c4466585d1b35eacbc6e9400df0..eef77c82e74ebfb705f71821803cb41482ac9a00 100644 (file)
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -21,7 +21,6 @@
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT              "Matrix U-Boot> "
-#define CONFIG_BOOTDELAY               3
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_MAXARGS             16
@@ -45,9 +44,7 @@
 #define CONFIG_SYS_MEMTEST_END \
        (CONFIG_SYS_MEMTEST_START + 500 * 1024 * 1024)
 
-#define CONFIG_SYS_TEXT_BASE           0x80000000
 #define CONFIG_SYS_BOOTMAPSZ           0x6C000000
-#define CONFIG_SYS_LOAD_ADDR           0x10800000
 
 /* Serial console */
 #define CONFIG_MXC_UART

diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index 909724c572e379604a2329cadea84dfc69db6985..f308d7c81f22e2b0b309b81902c3a4b6123207a0 100644 (file)
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -81,11 +81,6 @@
 
 /* Command definition */
 
-#define CONFIG_BOOTDELAY               3
-
-#define CONFIG_LOADADDR                        0x12000000
-#define CONFIG_SYS_TEXT_BASE           0x17800000
-
 #define CONFIG_SYS_MEMTEST_START       0x10000000
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + (500 << 20))
 
@@ -179,8 +174,6 @@
 #define CONFIG_SYS_MAXARGS             16
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS           1
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR

diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 4d1575f128d16dba9ec94590bec0946558dbb93d..06c73b676c38f0dbeae5251803d12887b409d516 100644 (file)
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -136,10 +136,6 @@
 #define CONFIG_CMD_ITEST
 #define CONFIG_CMD_SETEXPR
 
-#define CONFIG_BOOTDELAY               3
-
-#define CONFIG_LOADADDR                        0x12000000
-
 /* place code in last 4 MiB of RAM */
 #define CONFIG_SYS_TEXT_BASE           0x2fc00000
 #define CONFIG_SYS_TEXT_BASE           0x4fc00000
@@ -403,8 +399,6 @@
 #define CONFIG_SYS_MAXARGS             16
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_STACKSIZE               (128u * SZ_1K)
 

diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index 9fa18f511ffaeaa7be7a4d26ef9710a8de6f7382..86899c473275dce3a63bd49c7d94cad73007146b 100644 (file)
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -60,12 +60,8 @@
 #define CONFIG_CMD_BMODE
 #define CONFIG_CMD_SETEXPR
 
-#define CONFIG_BOOTDELAY               3
-
 #define CONFIG_SYS_MEMTEST_START       0x10000000
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
-#define CONFIG_LOADADDR                        0x12000000
-#define CONFIG_SYS_TEXT_BASE           0x17800000
 
 /* MMC Configuration */
 #define CONFIG_FSL_ESDHC
@@ -181,8 +177,6 @@
 #define CONFIG_SYS_MAXARGS            16
 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
 #define CONFIG_CMDLINE_EDITING
 
 /* Physical Memory Map */

diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 4db6d8febf5f1e4eddf7cb9544f0c6a83138837d..1baa31543048e92574b4d7a7e855599a466d4095 100644 (file)
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -37,12 +37,8 @@
 #define CONFIG_CMD_BMODE
 #define CONFIG_CMD_SETEXPR
 
-#define CONFIG_BOOTDELAY               5
-
 #define CONFIG_SYS_MEMTEST_START       0x10000000
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
-#define CONFIG_LOADADDR                        0x12000000
-#define CONFIG_SYS_TEXT_BASE           0x17800000
 
 /* I2C Configs */
 #define CONFIG_CMD_I2C
@@ -242,8 +238,6 @@
 #define CONFIG_SYS_MAXARGS            16
 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
 #define CONFIG_CMDLINE_EDITING
 
 /* Physical Memory Map */

diff --git a/include/configs/warp.h b/include/configs/warp.h
index 1c8b71f1585b85808dc5ac5d4444888984688c49..c9e510f913f5b9c03fd8cbbd73bbe85ff242d5a1 100644 (file)
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -50,11 +50,6 @@
 #undef CONFIG_CMD_NET
 #undef CONFIG_CMD_NFS
 
-#define CONFIG_BOOTDELAY               3
-
-#define CONFIG_LOADADDR                        0x82000000
-#define CONFIG_SYS_TEXT_BASE           0x87800000
-
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_HUSH_PARSER
@@ -71,8 +66,6 @@
 #define CONFIG_SYS_MEMTEST_START       0x80000000
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + SZ_256M)
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_STACKSIZE               SZ_128K