[U-Boot] [PATCH 06/10] 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

--- include/configs/aristainetos.h | 7 ------- include/configs/cgtqmx6eval.h | 7 ------- include/configs/cm_fx6.h | 3 --- include/configs/embestmx6boards.h | 5 ----- include/configs/gw_ventana.h | 4 ---- include/configs/hummingboard.h | 5 ----- include/configs/mx6_common.h | 6 ++++++ include/configs/mx6cuboxi.h | 7 ------- include/configs/mx6qarm2.h | 7 ------- include/configs/mx6sabre_common.h | 7 ------- include/configs/mx6slevk.h | 7 ------- include/configs/mx6sxsabresd.h | 7 ------- include/configs/nitrogen6x.h | 7 ------- include/configs/novena.h | 3 --- include/configs/ot1200.h | 7 ------- include/configs/platinum.h | 6 ------ include/configs/secomx6quq7.h | 5 ----- include/configs/tbs2910.h | 3 --- include/configs/titanium.h | 7 ------- include/configs/tqma6.h | 6 ------ include/configs/udoo.h | 6 ------ include/configs/wandboard.h | 6 ------ include/configs/warp.h | 7 ------- 23 files changed, 6 insertions(+), 129 deletions(-)

diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h index d712f04..a18e707 100644 --- a/include/configs/aristainetos.h +++ b/include/configs/aristainetos.h @@ -80,11 +80,6 @@ #define CONFIG_CMD_SETEXPR #undef CONFIG_CMD_IMLS

-#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" \ @@ -207,8 +202,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 7fb9dd5..0d33305 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -50,11 +50,6 @@ /* Command definition */ #undef CONFIG_CMD_IMLS

-#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 \ @@ -126,8 +121,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 2435d7b..0b1252f 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -254,9 +254,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 8bf88e2..6862577 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -96,9 +96,6 @@ #define CONFIG_CMD_SETEXPR #undef CONFIG_CMD_IMLS

-#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000 - #define CONFIG_ARP_TIMEOUT 200UL

/* Miscellaneous configurable options */ @@ -114,8 +111,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 47f17ef..9e83b4f 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -241,8 +241,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 @@ -302,8 +300,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/hummingboard.h b/include/configs/hummingboard.h index 21cb1a9..b15a250 100644 --- a/include/configs/hummingboard.h +++ b/include/configs/hummingboard.h @@ -35,12 +35,9 @@ #define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR #define CONFIG_CMD_MEMTEST -#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 @@ -171,8 +168,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/mx6_common.h b/include/configs/mx6_common.h index e54eee2..6fb6969 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -47,6 +47,12 @@ #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG

+/* Boot options */ +#define CONFIG_LOADADDR 0x12000000 +#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_TEXT_BASE 0x17800000 +#define CONFIG_BOOTDELAY 3 + /* GPIO */ #define CONFIG_MXC_GPIO

diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 5c871dc..36cb581 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -60,11 +60,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" @@ -178,8 +173,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 7eb162d..ce736f7 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -50,11 +50,6 @@ /* Command definition */ #undef CONFIG_CMD_IMLS

-#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" \ @@ -143,8 +138,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 82e68dc..0d3ff7b 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -77,11 +77,6 @@ #define CONFIG_CMD_SETEXPR #undef CONFIG_CMD_IMLS

-#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" \ @@ -205,8 +200,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 dad293f..6566608 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -68,11 +68,6 @@ /* Command definition */ #undef CONFIG_CMD_IMLS

-#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" \ @@ -159,8 +154,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 d2898cb..4c8c6e2 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -34,11 +34,6 @@ /* Command definition */ #undef CONFIG_CMD_IMLS

-#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" \ @@ -125,8 +120,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 0142791..2ada53b 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -147,13 +147,8 @@ /* Command definition */ #undef CONFIG_CMD_IMLS

-#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 @@ -320,8 +315,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 ca26337..ca1856c 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -78,12 +78,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 1a92bd3..356a9f5 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -141,13 +141,8 @@ /* Command definition */ #undef CONFIG_CMD_IMLS

-#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 @@ -158,8 +153,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 45a74b0..fae94e1 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -154,14 +154,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 */ @@ -180,8 +176,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 4d8fa1a..17787a1 100644 --- a/include/configs/secomx6quq7.h +++ b/include/configs/secomx6quq7.h @@ -32,12 +32,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 @@ -111,7 +107,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 cac85bc..7bbfb7b 100644 --- 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 @@ -47,9 +46,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 11aa82f..0bdf309 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -84,11 +84,6 @@ /* Command definition */ #undef CONFIG_CMD_IMLS

-#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))

@@ -182,8 +177,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 7b8182f..47443eb 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -136,10 +136,6 @@ #define CONFIG_CMD_SETEXPR #undef CONFIG_CMD_IMLS

-#define CONFIG_BOOTDELAY 3 - -#define CONFIG_LOADADDR 0x12000000 - /* place code in last 4 MiB of RAM */ #if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) #define CONFIG_SYS_TEXT_BASE 0x2fc00000 @@ -405,8 +401,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 1ec1f70..3f7c609 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -61,12 +61,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 @@ -182,8 +178,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 d1c2c2e..7268af5 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -34,12 +34,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 @@ -236,8 +232,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 2a1ce937..a406bd4 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -53,11 +53,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 @@ -74,8 +69,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