commit 20e072f37402 ("image: check "bootm_low" and "bootm_size" if "initrd_high" is missing"), forces to check "bootm_low" and "bootm_size" if "initrd_high" is missing. It causes Linux boot up failure with ramdisk size > 90MB.
So setting initrd_high to avoid rootfs relocation.
Signed-off-by: Alison Wang alison.wang@nxp.com Signed-off-by: Prabhakar Kushwaha prabhakar.kushwaha@nxp.com --- include/configs/B4860QDS.h | 1 + include/configs/BSC9131RDB.h | 1 + include/configs/BSC9132QDS.h | 1 + include/configs/C29XPCIE.h | 1 + include/configs/MPC8536DS.h | 1 + include/configs/MPC8541CDS.h | 1 + include/configs/MPC8544DS.h | 1 + include/configs/MPC8548CDS.h | 1 + include/configs/MPC8555CDS.h | 1 + include/configs/MPC8568MDS.h | 1 + include/configs/MPC8569MDS.h | 1 + include/configs/MPC8572DS.h | 1 + include/configs/P1010RDB.h | 1 + include/configs/P1022DS.h | 1 + include/configs/P1023RDB.h | 1 + include/configs/P2041RDB.h | 1 + include/configs/T102xQDS.h | 1 + include/configs/T102xRDB.h | 1 + include/configs/T1040QDS.h | 1 + include/configs/T104xRDB.h | 1 + include/configs/T208xQDS.h | 1 + include/configs/T208xRDB.h | 1 + include/configs/T4240QDS.h | 1 + include/configs/T4240RDB.h | 1 + include/configs/corenet_ds.h | 1 + include/configs/cyrus.h | 1 + include/configs/p1_p2_rdb_pc.h | 1 + include/configs/p1_twr.h | 1 + 28 files changed, 28 insertions(+)
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index d28e003ba9..f45d4938f9 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -732,6 +732,7 @@ unsigned long get_board_ddr_clk(void); #endif
#define CONFIG_EXTRA_ENV_SETTINGS \ + "initrd_high=0xffffffff\0" \ HWCONFIG \ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\ "netdev=eth0\0" \ diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 56e6e149d5..c0eeb31925 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -332,6 +332,7 @@ extern unsigned long get_sdram_size(void); #define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server */
#define CONFIG_EXTRA_ENV_SETTINGS \ + "initrd_high=0xffffffff\0" \ "netdev=eth0\0" \ "uboot=" CONFIG_UBOOTPATH "\0" \ "loadaddr=1000000\0" \ diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 96a92f133c..eb578e8cb1 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -545,6 +545,7 @@ combinations. this should be removed later #endif
#define CONFIG_EXTRA_ENV_SETTINGS \ + "initrd_high=0xffffffff\0" \ "netdev=eth0\0" \ "uboot=" CONFIG_UBOOTPATH "\0" \ "loadaddr=1000000\0" \ diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index 125a26ba77..a86401e8c2 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -449,6 +449,7 @@ #define CONFIG_DEF_HWCONFIG fsl_ddr:ecc=on
#define CONFIG_EXTRA_ENV_SETTINGS \ + "initrd_high=0xffffffff\0" \ "hwconfig=" __stringify(CONFIG_DEF_HWCONFIG) "\0" \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 9f0039c549..52c3950fc1 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -630,6 +630,7 @@ #define CONFIG_LOADADDR 1000000
#define CONFIG_EXTRA_ENV_SETTINGS \ +"initrd_high=0xffffffff\0" \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ "tftpflash=tftpboot $loadaddr $uboot; " \ diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index 238dd67f0b..3d800f32c5 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -376,6 +376,7 @@ extern unsigned long get_clock_freq(void); #define CONFIG_LOADADDR 200000 /*default location for tftp and bootm*/
#define CONFIG_EXTRA_ENV_SETTINGS \ + "initrd_high=0xffffffff\0" \ "netdev=eth0\0" \ "consoledev=ttyS1\0" \ "ramdiskaddr=600000\0" \ diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 64e0aa1ca6..c74a324b7e 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -384,6 +384,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_LOADADDR 1000000 /*default location for tftp and bootm*/
#define CONFIG_EXTRA_ENV_SETTINGS \ +"initrd_high=0xffffffff\0" \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ "tftpflash=tftpboot $loadaddr $uboot; " \ diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index cdd70a1d90..c308f908ef 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -492,6 +492,7 @@ extern unsigned long get_clock_freq(void); #define CONFIG_LOADADDR 1000000 /*default location for tftp and bootm*/
#define CONFIG_EXTRA_ENV_SETTINGS \ + "initrd_high=0xffffffff\0" \ "hwconfig=fsl_ddr:ecc=off\0" \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index bcef1e71be..ecad9c77cc 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -372,6 +372,7 @@ extern unsigned long get_clock_freq(void); #define CONFIG_LOADADDR 200000 /*default location for tftp and bootm*/
#define CONFIG_EXTRA_ENV_SETTINGS \ + "initrd_high=0xffffffff\0" \ "netdev=eth0\0" \ "consoledev=ttyS1\0" \ "ramdiskaddr=600000\0" \ diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index 6d9a964ca7..0fa3cfaa13 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -390,6 +390,7 @@ extern unsigned long get_clock_freq(void); #define CONFIG_LOADADDR 200000 /*default location for tftp and bootm*/
#define CONFIG_EXTRA_ENV_SETTINGS \ + "initrd_high=0xffffffff\0" \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ "ramdiskaddr=600000\0" \ diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index ae92c37fe5..9239b431aa 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -483,6 +483,7 @@ extern unsigned long get_clock_freq(void); #define CONFIG_LOADADDR 200000 /*default location for tftp and bootm*/
#define CONFIG_EXTRA_ENV_SETTINGS \ + "initrd_high=0xffffffff\0" \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ "ramdiskaddr=600000\0" \ diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 303922a6c3..ee8dbe2297 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -586,6 +586,7 @@ #define CONFIG_LOADADDR 1000000
#define CONFIG_EXTRA_ENV_SETTINGS \ +"initrd_high=0xffffffff\0" \ "hwconfig=fsl_ddr:ctlr_intlv=bank,bank_intlv=cs0_cs1,ecc=off\0" \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 344d99d25e..55042c1813 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -732,6 +732,7 @@ extern unsigned long get_sdram_size(void); #define CONFIG_LOADADDR 1000000
#define CONFIG_EXTRA_ENV_SETTINGS \ + "initrd_high=0xffffffff\0" \ "hwconfig=" __stringify(CONFIG_DEF_HWCONFIG) "\0" \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 62165dfef7..7d0c51c1f9 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -599,6 +599,7 @@ #define CONFIG_LOADADDR 1000000
#define CONFIG_EXTRA_ENV_SETTINGS \ + "initrd_high=0xffffffff\0" \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ "ubootaddr=" __stringify(CONFIG_SYS_TEXT_BASE) "\0" \ diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h index 8dbfb06343..64a1696f51 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -312,6 +312,7 @@ extern unsigned long get_clock_freq(void); #endif
#define CONFIG_EXTRA_ENV_SETTINGS \ + "initrd_high=0xffffffff\0" \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ "loadaddr=1000000\0" \ diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index bf9b1c483f..3bfc35cdbd 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -608,6 +608,7 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define __USB_PHY_TYPE utmi
#define CONFIG_EXTRA_ENV_SETTINGS \ + "initrd_high=0xffffffff\0" \ "hwconfig=fsl_ddr:ctlr_intlv=cacheline," \ "bank_intlv=cs0_cs1\0" \ "netdev=eth0\0" \ diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 8001e7002f..a9b22d082a 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -777,6 +777,7 @@ unsigned long get_board_ddr_clk(void); #define __USB_PHY_TYPE utmi
#define CONFIG_EXTRA_ENV_SETTINGS \ + "initrd_high=0xffffffff\0" \ "hwconfig=fsl_ddr:ctlr_intlv=cacheline,bank_intlv=cs0_cs1;\0" \ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0" \ "bootargs=root=/dev/ram rw console=ttyS0,115200\0" \ diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index e80ba14bd6..3d3b46a891 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -799,6 +799,7 @@ unsigned long get_board_ddr_clk(void); #endif
#define CONFIG_EXTRA_ENV_SETTINGS \ + "initrd_high=0xffffffff\0" \ "hwconfig=fsl_ddr:ctlr_intlv=cacheline," \ "bank_intlv=" __stringify(BANK_INTLV) "\0" \ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0" \ diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index c0a1bb44c5..23a0d89f3c 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -660,6 +660,7 @@ unsigned long get_board_ddr_clk(void); #define __USB_PHY_TYPE utmi
#define CONFIG_EXTRA_ENV_SETTINGS \ + "initrd_high=0xffffffff\0" \ "hwconfig=fsl_ddr:bank_intlv=auto;" \ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\ "netdev=eth0\0" \ diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index a8f7885821..a054b973c9 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -809,6 +809,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #endif
#define CONFIG_EXTRA_ENV_SETTINGS \ + "initrd_high=0xffffffff\0" \ "hwconfig=fsl_ddr:bank_intlv=cs0_cs1;" \ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) ";"\ "usb2:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\ diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 50413eb247..a5539f32f1 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -746,6 +746,7 @@ unsigned long get_board_ddr_clk(void); #define __USB_PHY_TYPE utmi
#define CONFIG_EXTRA_ENV_SETTINGS \ + "initrd_high=0xffffffff\0" \ "hwconfig=fsl_ddr:" \ "ctlr_intlv=" __stringify(CTRL_INTLV_PREFERED) "," \ "bank_intlv=auto;" \ diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index ca1916afe7..48eb1d0457 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -693,6 +693,7 @@ unsigned long get_board_ddr_clk(void); #define __USB_PHY_TYPE utmi
#define CONFIG_EXTRA_ENV_SETTINGS \ + "initrd_high=0xffffffff\0" \ "hwconfig=fsl_ddr:" \ "ctlr_intlv=" __stringify(CTRL_INTLV_PREFERED) "," \ "bank_intlv=auto;" \ diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 597ba2ebcc..9316100d9a 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -516,6 +516,7 @@ unsigned long get_board_ddr_clk(void); #endif
#define CONFIG_EXTRA_ENV_SETTINGS \ + "initrd_high=0xffffffff\0" \ "hwconfig=fsl_ddr:" \ "ctlr_intlv=" __stringify(CTRL_INTLV_PREFERED) "," \ "bank_intlv=auto;" \ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 87d65e4c04..21d100a436 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -667,6 +667,7 @@ unsigned long get_board_ddr_clk(void); #endif
#define CONFIG_EXTRA_ENV_SETTINGS \ + "initrd_high=0xffffffff\0" \ "hwconfig=fsl_ddr:" \ "ctlr_intlv=" __stringify(CTRL_INTLV_PREFERED) "," \ "bank_intlv=auto;" \ diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 83c2642457..b6688b02a9 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -621,6 +621,7 @@ #endif
#define CONFIG_EXTRA_ENV_SETTINGS \ + "initrd_high=0xffffffff\0" \ "hwconfig=fsl_ddr:ctlr_intlv=cacheline," \ "bank_intlv=cs0_cs1;" \ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) ";"\ diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index dde0dc3662..41bb552649 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -440,6 +440,7 @@ #define __USB_PHY_TYPE utmi
#define CONFIG_EXTRA_ENV_SETTINGS \ +"initrd_high=0xffffffff\0" \ "hwconfig=fsl_ddr:ctlr_intlv=cacheline," \ "bank_intlv=cs0_cs1;" \ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) ";"\ diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index d0f5529637..624f9eb526 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -841,6 +841,7 @@ i2c mw 18 3 __SW_BOOT_MASK 1; reset #endif
#define CONFIG_EXTRA_ENV_SETTINGS \ +"initrd_high=0xffffffff\0" \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ "loadaddr=1000000\0" \ diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index e02c31db2a..5a2826bed1 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -404,6 +404,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_LOADADDR 1000000
#define CONFIG_EXTRA_ENV_SETTINGS \ +"initrd_high=0xffffffff\0" \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ "loadaddr=1000000\0" \