From 8183058188cd2d9424503b68de8606c5900ba74b Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 22 May 2015 17:30:49 +0100 Subject: [PATCH] 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 --- include/configs/aristainetos-common.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/mx6_common.h | 10 ++++++++++ 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 ------- 22 files changed, 10 insertions(+), 124 deletions(-) diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index 89bb08576a..7d3499a2f2 100644 --- 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 ced4d6c84a..db454a503a 100644 --- 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 5ef7ba726d..2a152e19be 100644 --- 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 775ac41ae1..835471f6aa 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -97,9 +97,6 @@ #define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000 - #define CONFIG_ARP_TIMEOUT 200UL /* Miscellaneous configurable options */ @@ -115,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 89c9c844d6..0db9e50d26 100644 --- 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 ae25640255..ffe9bbd67c 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -52,6 +52,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 f42db85472..2e90b83664 100644 --- 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 77b0d87403..6694fb2106 100644 --- 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 b08f0060b9..f66c822146 100644 --- 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" \ @@ -204,8 +199,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 8b450c542c..e48059cabd 100644 --- 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 72b87a20a5..474f80184c 100644 --- 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 7922bbd30b..6c80f18676 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -146,13 +146,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 @@ -319,8 +314,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 5bdc22df9a..801d01b3b9 100644 --- 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 4476e01cb8..c8e0d11b9a 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -140,13 +140,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 @@ -157,8 +152,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 b192c3f526..51f7baaa52 100644 --- 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 adc6d7f58f..92ff9ab8e2 100644 --- 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 2e37a5cf54..eef77c82e7 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 @@ -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 0aa2ba25f4..9776aebad3 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -83,11 +83,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)) @@ -181,8 +176,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 bb63caa263..cdb0eb1df9 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -138,10 +138,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 */ #if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) #define CONFIG_SYS_TEXT_BASE 0x2fc00000 @@ -407,8 +403,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 9fa18f511f..86899c4732 100644 --- 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 2d0af1aa0e..61d673e4dc 100644 --- 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 1c8b71f158..c9e510f913 100644 --- 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