From a2d3f26b55b009102ebadbe0ebb760b7aeae156d Mon Sep 17 00:00:00 2001 From: Prabhakar Kushwaha Date: Thu, 8 Mar 2018 13:49:05 +0530 Subject: powerpc: configs: Set initrd_high environment varible In commit 20e072f, it force to check "bootm_low" and "bootm_size" if "initrd_high" is missing. It will cause Linux can't boot up with ramdisk size > 100MB on PPC. On PPC the initrd does not need to be loaded within the boot mapping. This assumption of what the absence of initrd_high means in commit 20e072f is not universally appropriate. As the discussion is continuing in the community, this patch is just a workaround to fix the issue. Signed-off-by: Alison Wang Signed-off-by: Prabhakar Kushwaha diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 7f9482d..5f56295 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -741,6 +741,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 c3a7e1d..5d5c1f7 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -337,6 +337,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 fcacd16..3eac9dc 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -556,6 +556,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 7e805ec..8c3eb18 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -459,6 +459,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 3319a6f..dcb81ae 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -643,6 +643,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 6b76a6f..39d296d 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -384,6 +384,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 2aea892..db09e42 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -397,6 +397,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 b47b414..20b22f6 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -502,6 +502,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 5cf9c33..b2e51a6 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -380,6 +380,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 a19b772..064a893 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -398,6 +398,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 861c8dd..28f9edb 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -493,6 +493,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 b277cdb..8849de4 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -596,6 +596,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 cbc15ae..8daf2fe 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -749,6 +749,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 4756a71..14c5c87 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -612,6 +612,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 56e3f48..d4e6477 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -320,6 +320,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 6b4c962..5b0f07e 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -620,6 +620,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 13f4c92..a5a31e3 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -789,6 +789,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 fad84d1..c87a7da 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -810,6 +810,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 c186d15..0ace914 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -671,6 +671,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 e94983a..264d6f8 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -822,6 +822,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 08f22d5..43da826 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -757,6 +757,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 0e0abca..96d03a2 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -705,6 +705,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 9843db2..bd969a6 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -521,6 +521,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 6bdc3a7..bb08cec 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -684,6 +684,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 0076df9..f4890bc 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -633,6 +633,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 610c2d3..94385d1 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -453,6 +453,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 c51ca27..7d3c5c0 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -854,6 +854,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 e969204..df0d8a4 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -414,6 +414,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" \ -- cgit v0.10.2