Convert CONFIG_BOOTFILE to Kconfig

This converts the following to Kconfig:
   CONFIG_BOOTFILE

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini
2022-02-25 11:19:48 -05:00
parent 6d21dd313b
commit fdfb17b1f5
212 changed files with 342 additions and 106 deletions

View File

@@ -52,7 +52,6 @@
#define CONFIG_SYS_I2C_PINMUX_SET (GPIO_PAR_FECI2C_SCL_I2CSCL | GPIO_PAR_FECI2C_SDA_I2CSDA)
/* this must be included AFTER the definition of CONFIG COMMANDS (if any) */
#define CONFIG_BOOTFILE "u-boot.bin"
#ifdef CONFIG_MCFFEC
# define CONFIG_IPADDR 192.162.1.2
# define CONFIG_NETMASK 255.255.255.0

View File

@@ -329,7 +329,6 @@
#define CONFIG_HOSTNAME "mpc837x_rdb"
#define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_RAMDISKFILE "rootfs.ext2.gz.uboot"
#define CONFIG_BOOTFILE "uImage"
/* U-Boot image on TFTP server */
#define CONFIG_UBOOTPATH "u-boot.bin"
#define CONFIG_FDTFILE "mpc8379_rdb.dtb"

View File

@@ -405,7 +405,6 @@
#define CONFIG_HOSTNAME "unknown"
#define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_BOOTFILE "8548cds/uImage.uboot"
#define CONFIG_UBOOTPATH 8548cds/u-boot.bin /* TFTP server */
#define CONFIG_SERVERIP 192.168.1.1

View File

@@ -612,7 +612,6 @@ extern unsigned long get_sdram_size(void);
#endif
#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH u-boot.bin/* U-Boot image on TFTP server */
#define CONFIG_EXTRA_ENV_SETTINGS \

View File

@@ -413,7 +413,6 @@
* Environment Configuration
*/
#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH u-boot.bin
#define __USB_PHY_TYPE utmi

View File

@@ -534,7 +534,6 @@
* Environment Configuration
*/
#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
#define __USB_PHY_TYPE utmi

View File

@@ -552,7 +552,6 @@
* Environment Configuration
*/
#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server*/
#define __USB_PHY_TYPE utmi

View File

@@ -538,7 +538,6 @@
* Environment Configuration
*/
#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server */
#define __USB_PHY_TYPE utmi

View File

@@ -491,7 +491,6 @@
* Environment Configuration
*/
#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server */
#define __USB_PHY_TYPE utmi

View File

@@ -215,7 +215,6 @@
* Environment Configuration
*/
#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server*/
#define HVBOOT \

View File

@@ -44,9 +44,6 @@
#endif /* CONFIG_MTD_RAW_NAND */
/* Environment information */
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x82000000\0" \
"console=ttyS2,115200n8\0" \

View File

@@ -57,11 +57,6 @@
"Do you have u-boot-update.img and u-boot.head on first (FAT) SD card partition?\"" \
"; fi\0"
/*
* Environment configuration
*/
#define CONFIG_BOOTFILE "uImage"
/*
* Console configuration
*/

View File

@@ -76,7 +76,6 @@
#define CONFIG_HOSTNAME "ccdc"
#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE "ccdc.img"
#define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth1\0" \

View File

@@ -410,7 +410,6 @@
* Environment Configuration
*/
#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
#ifdef CONFIG_TARGET_P4080DS

View File

@@ -155,7 +155,6 @@
/*
* U-Boot general configuration
*/
#define CONFIG_BOOTFILE "uImage" /* Boot file name */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */

View File

@@ -94,8 +94,6 @@
* U-Boot Commands
*/
#define CONFIG_BOOTFILE "uImage"
/*
* SPL specific defines
*/

View File

@@ -18,7 +18,6 @@
/*
* Environment
*/
#define CONFIG_BOOTFILE "app.bin"
#define CONFIG_EXTRA_ENV_SETTINGS \
"upgrade_image=u-boot.bin\0" \

View File

@@ -83,7 +83,6 @@
/* TODO: Turn into string option and migrate to Kconfig */
#define CONFIG_HOSTNAME "gazerbeam"
#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \

View File

@@ -104,7 +104,6 @@ setenv core_iccm_3 0x6; setenv core_dccm_3 0x6;\0"
/*
* Environment configuration
*/
#define CONFIG_BOOTFILE "uImage"
/* Cli configuration */
#define CONFIG_SYS_CBSIZE SZ_2K

View File

@@ -100,11 +100,6 @@ setenv core_iccm_1 0x6; setenv core_dccm_1 0x6; \
setenv core_iccm_2 0x10; setenv core_dccm_2 0x10; \
setenv core_iccm_3 0x6; setenv core_dccm_3 0x6;\0"
/*
* Environment configuration
*/
#define CONFIG_BOOTFILE "uImage"
/* Cli configuration */
#define CONFIG_SYS_CBSIZE SZ_2K

View File

@@ -214,7 +214,6 @@
#define CONFIG_NETDEV eth1
#define CONFIG_HOSTNAME "ids8313"
#define CONFIG_ROOTPATH "/opt/eldk-4.2/ppc_6xx"
#define CONFIG_BOOTFILE "ids8313/uImage"
#define CONFIG_UBOOTPATH "ids8313/u-boot.bin"
#define CONFIG_FDTFILE "ids8313/ids8313.dtb"
#define CONFIG_ENV_FLAGS_LIST_STATIC "ethaddr:mo,eth1addr:mo"

View File

@@ -29,7 +29,6 @@
#define CONFIG_SERVERIP 192.168.1.100
#define CONFIG_IPADDR 192.168.1.104
#define CONFIG_BOOTFILE "uImage"
/*
* Miscellaneous configurable options

View File

@@ -68,10 +68,4 @@
CONFIG_SYS_SDRAM_BASE) - \
CONFIG_SYS_MALLOC_LEN - \
CONFIG_ENV_SIZE
/*
* Environment
*/
#define CONFIG_BOOTFILE "app.bin"
#endif /* _CONFIG_IOT_DEVKIT_H_ */

View File

@@ -50,7 +50,6 @@
/*
* U-Boot general configuration
*/
#define CONFIG_BOOTFILE "uImage" /* Boot file name */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */

View File

@@ -118,11 +118,6 @@
/* Watchdog */
/*
* Boot Linux
*/
#define CONFIG_BOOTFILE "boot/fitImage"
/*
* NAND SPL
*/

View File

@@ -22,9 +22,6 @@
/* Ethernet */
/* Booting Linux */
#define CONFIG_BOOTFILE "uImage"
/* Extra Environment */
#define CONFIG_EXTRA_ENV_SETTINGS \
"update_sd_firmware_filename=u-boot.sd\0" \

View File

@@ -30,9 +30,6 @@
#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (512 << 10)
#endif
/* Boot Linux */
#define CONFIG_BOOTFILE "uImage"
/* Extra Environments */
#define CONFIG_EXTRA_ENV_SETTINGS \
"update_sd_firmware_filename=u-boot.sd\0" \

View File

@@ -44,9 +44,6 @@
#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (512 << 10)
#endif
/* Boot Linux */
#define CONFIG_BOOTFILE "uImage"
/* Extra Environment */
#define CONFIG_EXTRA_ENV_SETTINGS \
"ubifs_file=filesystem.ubifs\0" \

View File

@@ -25,7 +25,6 @@
*/
/* Booting Linux */
#define CONFIG_BOOTFILE "fitImage"
#define CONFIG_HOSTNAME "novena"
/* Physical Memory Map */

View File

@@ -22,11 +22,6 @@
#define CONFIG_SYS_BOOTM_LEN SZ_32M
/*
* Environment configuration
*/
#define CONFIG_BOOTFILE "uImage"
/*
* Console configuration
*/

View File

@@ -146,7 +146,6 @@
/*
* U-Boot general configuration
*/
#define CONFIG_BOOTFILE "zImage" /* Boot file name */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */

View File

@@ -548,7 +548,6 @@
*/
#define CONFIG_HOSTNAME "unknown"
#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
#ifdef __SW_BOOT_NOR

View File

@@ -93,7 +93,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
* Environment Configuration
*/
#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server*/
#endif /* __QEMU_PPCE500_H */

View File

@@ -24,9 +24,6 @@
*/
#define CONFIG_SYS_I2C_RTC_ADDR 0x68
/* Booting Linux */
#define CONFIG_BOOTFILE "zImage"
#define CONFIG_SYS_BOOTM_LEN (64 << 20)
/* Environment settings */

View File

@@ -10,9 +10,6 @@
/* Memory configurations */
#define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */
/* Booting Linux */
#define CONFIG_BOOTFILE "fitImage"
/* Environment is in MMC */
/* Extra Environment */

View File

@@ -11,9 +11,6 @@
/* Memory configurations */
#define PHYS_SDRAM_1_SIZE 0x10000000
/* Booting Linux */
#define CONFIG_BOOTFILE "zImage"
/* Ethernet on SoC (EMAC) */
#if defined(CONFIG_CMD_NET)
#define CONFIG_ARP_TIMEOUT 500UL

View File

@@ -10,9 +10,6 @@
/* Memory configurations */
#define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on MCV */
/* Booting Linux */
#define CONFIG_BOOTFILE "fitImage"
/* Environment is in MMC */
/* Extra Environment */

View File

@@ -72,13 +72,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
/*
* Environment variable
*/
#ifdef CONFIG_FIT
#define CONFIG_BOOTFILE "kernel.itb"
#else
#define CONFIG_BOOTFILE "Image"
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"bootfile=" CONFIG_BOOTFILE "\0" \

View File

@@ -11,7 +11,6 @@
#define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on VINING_FPGA */
/* Booting Linux */
#define CONFIG_BOOTFILE "fitImage"
#define CONFIG_SYS_BOOTM_LEN 0x2000000 /* 32 MiB */
/* Extra Environment */

View File

@@ -31,7 +31,6 @@
func(USB, usb, 0) \
func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h>
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_EXTRA_ENV_SETTINGS \
"kernel_addr_r=0x40000000\0" \
"fdtfile=stih410-b2260.dtb\0" \

View File

@@ -45,11 +45,6 @@
#define ETH0_BASE_ADDRESS 0xFE100000
#define ETH1_BASE_ADDRESS 0xFE110000
/*
* Environment configuration
*/
#define CONFIG_BOOTFILE "uImage"
/*
* Console configuration
*/

View File

@@ -79,7 +79,6 @@
#define CONFIG_ROOTPATH "/nfs/root/path"
#ifdef CONFIG_FIT
#define CONFIG_BOOTFILE "fitImage"
#define KERNEL_ADDR_R_OFFSET "0x05100000"
#define LINUXBOOT_ENV_SETTINGS \
"tftpboot=tftpboot $kernel_addr_r $bootfile &&" \
@@ -87,11 +86,9 @@
"__nfsboot=run tftpboot\0"
#else
#ifdef CONFIG_ARM64
#define CONFIG_BOOTFILE "Image"
#define LINUXBOOT_CMD "booti"
#define KERNEL_ADDR_R_OFFSET "0x02080000"
#else
#define CONFIG_BOOTFILE "zImage"
#define LINUXBOOT_CMD "bootz"
#define KERNEL_ADDR_R_OFFSET "0x00208000"
#endif

View File

@@ -67,12 +67,6 @@
* Environment
*/
/*
* Boot Linux
*/
#define CONFIG_BOOTFILE "uImage"
/*
* SPL
*/

View File

@@ -67,7 +67,6 @@
/* Default environment */
#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_HOSTNAME "x86"
#define CONFIG_BOOTFILE "bzImage"
#define CONFIG_RAMDISK_ADDR 0x4000000
#if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB)
#define CONFIG_OTHBOOTARGS "othbootargs=\0"

View File

@@ -31,11 +31,6 @@
#define PHYS_SDRAM_1_SIZE 0x10000000 /* Max 256 MB RAM */
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
/* Environment */
/* Booting Linux */
#define CONFIG_BOOTFILE "uImage"
/* Extra Environment */
#define CONFIG_HOSTNAME "xea"

View File

@@ -97,7 +97,6 @@
/* U-Boot general configuration */
/*==============================*/
#define CONFIG_BOOTFILE "uImage"
/* Console I/O Buffer Size */
#define CONFIG_SYS_CBSIZE 1024
/* Boot Argument Buffer Size */

View File

@@ -77,7 +77,7 @@ const char default_environment[] = {
#ifdef CONFIG_HOSTNAME
"hostname=" CONFIG_HOSTNAME "\0"
#endif
#ifdef CONFIG_BOOTFILE
#ifdef CONFIG_USE_BOOTFILE
"bootfile=" CONFIG_BOOTFILE "\0"
#endif
#ifdef CONFIG_SYS_LOAD_ADDR