Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/MPC837XERDB.h | 4 ++-- include/configs/MPC8548CDS.h | 4 ++-- include/configs/P1010RDB.h | 4 ++-- include/configs/P2041RDB.h | 4 ++-- include/configs/T102xRDB.h | 4 ++-- include/configs/T104xRDB.h | 4 ++-- include/configs/T208xQDS.h | 4 ++-- include/configs/T208xRDB.h | 4 ++-- include/configs/T4240RDB.h | 4 ++-- include/configs/p1_p2_rdb_pc.h | 4 ++-- include/configs/qemu-ppce500.h | 2 +- scripts/config_whitelist.txt | 2 +- 12 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index b9ac67fae0be..13406cfa547b 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -228,12 +228,12 @@ #define CFG_HOSTNAME "mpc837x_rdb" #define CFG_ROOTPATH "/nfsroot" /* U-Boot image on TFTP server */ -#define CONFIG_UBOOTPATH "u-boot.bin" +#define CFG_UBOOTPATH "u-boot.bin" #define CFG_FDTFILE "mpc8379_rdb.dtb"
#define CFG_EXTRA_ENV_SETTINGS \ "netdev=" CFG_NETDEV "\0" \ - "uboot=" CONFIG_UBOOTPATH "\0" \ + "uboot=" CFG_UBOOTPATH "\0" \ "tftpflash=tftp $loadaddr $uboot;" \ "protect off " __stringify(CONFIG_TEXT_BASE) \ " +$filesize; " \ diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index a493d73a4a82..ef3f8f4b2b0e 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -329,7 +329,7 @@
#define CFG_HOSTNAME "unknown" #define CFG_ROOTPATH "/nfsroot" -#define CONFIG_UBOOTPATH 8548cds/u-boot.bin /* TFTP server */ +#define CFG_UBOOTPATH 8548cds/u-boot.bin /* TFTP server */
#define CFG_SERVERIP 192.168.1.1 #define CFG_GATEWAYIP 192.168.1.1 @@ -338,7 +338,7 @@ #define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:ecc=off\0" \ "netdev=eth0\0" \ - "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ + "uboot=" __stringify(CFG_UBOOTPATH) "\0" \ "tftpflash=tftpboot $loadaddr $uboot; " \ "protect off " __stringify(CONFIG_TEXT_BASE) \ " +$filesize; " \ diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 91e5c544f616..15700b390b66 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -413,12 +413,12 @@ extern unsigned long get_sdram_size(void); */
#define CFG_ROOTPATH "/opt/nfsroot" -#define CONFIG_UBOOTPATH u-boot.bin/* U-Boot image on TFTP server */ +#define CFG_UBOOTPATH u-boot.bin/* U-Boot image on TFTP server */
#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=" __stringify(CONFIG_DEF_HWCONFIG) "\0" \ "netdev=eth0\0" \ - "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ + "uboot=" __stringify(CFG_UBOOTPATH) "\0" \ "loadaddr=1000000\0" \ "consoledev=ttyS0\0" \ "ramdiskaddr=2000000\0" \ diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 5432ad9e3950..2fa9d777b926 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -309,7 +309,7 @@ * Environment Configuration */ #define CFG_ROOTPATH "/opt/nfsroot" -#define CONFIG_UBOOTPATH u-boot.bin +#define CFG_UBOOTPATH u-boot.bin
#define __USB_PHY_TYPE utmi
@@ -317,7 +317,7 @@ "hwconfig=fsl_ddr:ctlr_intlv=cacheline," \ "bank_intlv=cs0_cs1\0" \ "netdev=eth0\0" \ - "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ + "uboot=" __stringify(CFG_UBOOTPATH) "\0" \ "ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0" \ "tftpflash=tftpboot $loadaddr $uboot && " \ "protect off $ubootaddr +$filesize && " \ diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 36db5a5ad0bf..dff468d93bf1 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -424,7 +424,7 @@ * Environment Configuration */ #define CFG_ROOTPATH "/opt/nfsroot" -#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ +#define CFG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ #define __USB_PHY_TYPE utmi
#ifdef CONFIG_ARCH_T1024 @@ -443,7 +443,7 @@ ARCH_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:ctlr_intlv=cacheline," \ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0" \ - "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ + "uboot=" __stringify(CFG_UBOOTPATH) "\0" \ "ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0" \ "bootargs=root=/dev/ram rw console=ttyS0,115200\0" \ "netdev=eth0\0" \ diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index b7aab1c1087c..7b9669a6eb98 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -414,7 +414,7 @@ * Environment Configuration */ #define CFG_ROOTPATH "/opt/nfsroot" -#define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server*/ +#define CFG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server*/
#define __USB_PHY_TYPE utmi #define RAMDISKFILE "t104xrdb/ramdisk.uboot" @@ -436,7 +436,7 @@ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) ";"\ "usb2:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\ "netdev=eth0\0" \ - "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ + "uboot=" __stringify(CFG_UBOOTPATH) "\0" \ "ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0" \ "tftpflash=tftpboot $loadaddr $uboot && " \ "protect off $ubootaddr +$filesize && " \ diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 9d0141586156..ac1a7614b6a2 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -422,7 +422,7 @@ * Environment Configuration */ #define CFG_ROOTPATH "/opt/nfsroot" -#define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server */ +#define CFG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server */
#define __USB_PHY_TYPE utmi
@@ -432,7 +432,7 @@ "bank_intlv=auto;" \ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\ "netdev=eth0\0" \ - "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ + "uboot=" __stringify(CFG_UBOOTPATH) "\0" \ "ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0" \ "tftpflash=tftpboot $loadaddr $uboot && " \ "protect off $ubootaddr +$filesize && " \ diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index fb7bdea3fe48..3f51554d2322 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -388,7 +388,7 @@ * Environment Configuration */ #define CFG_ROOTPATH "/opt/nfsroot" -#define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server */ +#define CFG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server */
#define __USB_PHY_TYPE utmi
@@ -398,7 +398,7 @@ "bank_intlv=auto;" \ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\ "netdev=eth0\0" \ - "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ + "uboot=" __stringify(CFG_UBOOTPATH) "\0" \ "ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0" \ "tftpflash=tftpboot $loadaddr $uboot && " \ "protect off $ubootaddr +$filesize && " \ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 1b3eb7d9f2b8..9081bd03749d 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -139,7 +139,7 @@ * Environment Configuration */ #define CFG_ROOTPATH "/opt/nfsroot" -#define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server*/ +#define CFG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server*/
#define HVBOOT \ "setenv bootargs config-addr=0x60000000; " \ @@ -388,7 +388,7 @@ "bank_intlv=auto;" \ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\ "netdev=eth0\0" \ - "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ + "uboot=" __stringify(CFG_UBOOTPATH) "\0" \ "ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0" \ "tftpflash=tftpboot $loadaddr $uboot && " \ "protect off $ubootaddr +$filesize && " \ diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 4560a432bed6..2dc271771615 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -420,13 +420,13 @@ */ #define CFG_HOSTNAME "unknown" #define CFG_ROOTPATH "/opt/nfsroot" -#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ +#define CFG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
#include "p1_p2_bootsrc.h"
#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ -"uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ +"uboot=" __stringify(CFG_UBOOTPATH) "\0" \ "loadaddr=1000000\0" \ "bootfile=uImage\0" \ "tftpflash=tftpboot $loadaddr $uboot; " \ diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index edf8222d5411..9040874a23ea 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -59,6 +59,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void); * Environment Configuration */ #define CFG_ROOTPATH "/opt/nfsroot" -#define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server*/ +#define CFG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server*/
#endif /* __QEMU_PPCE500_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index c2bc53a582f0..cd44d281e0ec 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -234,7 +234,7 @@ CFG_TSECV2_1 CFG_TSEC_TBICR_SETTINGS CFG_UBIFS_VOLUME CFG_UBI_PART -CONFIG_UBOOTPATH +CFG_UBOOTPATH CONFIG_UBOOT_SECTOR_COUNT CONFIG_UBOOT_SECTOR_START CONFIG_UEC_ETH