Convert CONFIG_BOOTP_MAY_FAIL et al to Kconfig

This converts the following to Kconfig:
   CONFIG_BOOTP_MAY_FAIL
   CONFIG_BOOTP_VENDOREX
   CONFIG_BOOTP_BOOTFILESIZE
   CONFIG_BOOTP_NISDOMAIN
   CONFIG_BOOTP_TIMEOFFSET

Cc: Ramon Fried <rfried.dev@gmail.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini
2022-02-25 11:19:50 -05:00
parent 028aa0946f
commit a542e4307d
222 changed files with 195 additions and 225 deletions

View File

@@ -31,7 +31,6 @@
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
/*
* MEMORY ORGANIZATION

View File

@@ -28,11 +28,6 @@
#define CONFIG_SYS_RX_ETH_BUFFER 0
#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
/*
* MEMORY ORGANIZATION
* -Monitor at top of sdram.

View File

@@ -22,11 +22,6 @@
#define CONFIG_WATCHDOG_TIMEOUT 5000 /* timeout in milliseconds, max timeout is 6.71sec */
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#ifdef CONFIG_MCFFEC
# define CONFIG_MII_INIT 1
# define CONFIG_SYS_DISCOVER_PHY

View File

@@ -23,11 +23,6 @@
#undef CONFIG_MONITOR_IS_IN_RAM /* no pre-loader required!!! ;-) */
/*
* BOOTP options
*/
#undef CONFIG_BOOTP_BOOTFILESIZE
/*
* Clock configuration: enable only one of the following options
*/

View File

@@ -32,11 +32,6 @@
. = DEFINED(env_offset) ? env_offset : .; \
env/embedded.o(.text);
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#ifdef CONFIG_MCFFEC
# define CONFIG_MII_INIT 1
# define CONFIG_SYS_DISCOVER_PHY

View File

@@ -33,11 +33,6 @@
. = DEFINED(env_offset) ? env_offset : .; \
env/embedded.o(.text);
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
/* Available command configuration */
#ifdef CONFIG_MCFFEC

View File

@@ -30,11 +30,6 @@
. = DEFINED(env_offset) ? env_offset : .; \
env/embedded.o(.text*);
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#ifdef CONFIG_MCFFEC
# define CONFIG_MII_INIT 1
# define CONFIG_SYS_DISCOVER_PHY

View File

@@ -295,11 +295,6 @@
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#ifdef CONFIG_MMC
#define CONFIG_FSL_ESDHC_PIN_MUX
#define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR

View File

@@ -374,11 +374,6 @@
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
/*
* Miscellaneous configurable options
*/

View File

@@ -33,9 +33,4 @@
* NS16550 Configuration
*/
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#endif /* __AST_COMMON_CONFIG_H */

View File

@@ -15,11 +15,6 @@
#define CONFIG_SYS_AT91_SLOW_CLOCK 32768
#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#ifdef CONFIG_SD_BOOT
#else

View File

@@ -39,11 +39,6 @@
/* general purpose I/O */
#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE 1
/*
* SDRAM: 1 bank, min 32, max 128 MB
* Initialized before u-boot gets started.

View File

@@ -39,11 +39,6 @@
#define CONFIG_ATMEL_LCD_BGR555
#endif
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
/* SDRAM */
#define CONFIG_SYS_SDRAM_BASE 0x20000000
#define CONFIG_SYS_SDRAM_SIZE 0x04000000

View File

@@ -41,11 +41,6 @@
#define CONFIG_ATMEL_LCD 1
#define CONFIG_ATMEL_LCD_BGR555 1
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE 1
/* SDRAM */
#define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS1
#define CONFIG_SYS_SDRAM_SIZE 0x04000000

View File

@@ -32,11 +32,6 @@
/* board specific(not enough SRAM) */
#define CONFIG_AT91SAM9G45_LCD_BASE 0x73E00000
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
/* SDRAM */
#define CONFIG_SYS_SDRAM_BASE 0x70000000
#define CONFIG_SYS_SDRAM_SIZE 0x08000000

View File

@@ -23,11 +23,6 @@
#define CONFIG_LCD_INFO_BELOW_LOGO
#define CONFIG_ATMEL_LCD_RGB565
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_SYS_SDRAM_BASE 0x20000000
#define CONFIG_SYS_SDRAM_SIZE 0x08000000

View File

@@ -15,11 +15,6 @@
/* general purpose I/O */
#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
/*
* define CONFIG_USB_EHCI_HCD to enable USB Hi-Speed (aka 2.0)
* NB: in this case, USB 1.1 devices won't be recognized.

View File

@@ -27,7 +27,6 @@
#define CONFIG_NET_RETRY_COUNT 10
/* Network console */
#define CONFIG_BOOTP_MAY_FAIL /* if we don't have DHCP environment */
/* As stated above, the following choices are optional. */

View File

@@ -88,11 +88,6 @@
. = DEFINED(env_offset) ? env_offset : .; \
env/embedded.o(.text);
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#ifdef CONFIG_MCFFEC
# define CONFIG_MII_INIT 1
# define CONFIG_SYS_DISCOVER_PHY

View File

@@ -51,8 +51,6 @@
#define DM9000_IO (CONFIG_DM9000_BASE)
#define DM9000_DATA (CONFIG_DM9000_BASE + 4)
#define CONFIG_NET_RETRY_COUNT 10
#define CONFIG_BOOTP_BOOTFILESIZE
#endif
/*

View File

@@ -42,12 +42,6 @@
#define CONFIG_RED_LED AT91_PIN_PD31 /* this is the user1 led */
#define CONFIG_GREEN_LED AT91_PIN_PD0 /* this is the user2 led */
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
/* SDRAM */
#define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS6
#define CONFIG_SYS_SDRAM_SIZE 0x08000000

View File

@@ -47,10 +47,6 @@
/* TWL4030 */
/* BOOTP/DHCP options */
#define CONFIG_BOOTP_NISDOMAIN
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_TIMEOFFSET
#undef CONFIG_BOOTP_VENDOREX
/* Environment information */
#define CONFIG_EXTRA_ENV_SETTINGS \

View File

@@ -30,9 +30,6 @@
* it has to be done after each HCD reset */
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
/* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE
#define BOOT_TARGET_DEVICES(func) \
func(USB, usb, 0) \
func(MMC, mmc, 1) \

View File

@@ -26,9 +26,6 @@
/* Generic Timer Definitions */
#define COUNTER_FREQUENCY 19000000
/* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE
#ifndef CONFIG_SPL_BUILD
#include <config_distro_bootcmd.h>
#endif

View File

@@ -32,11 +32,6 @@
* Environment is in the second sector of the first 256k of flash *
*----------------------------------------------------------------------*/
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_MCFTMR
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */

View File

@@ -105,7 +105,6 @@
/* DHCP/BOOTP options */
#ifdef CONFIG_CMD_DHCP
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_SYS_AUTOLOAD "n"
#endif

View File

@@ -41,9 +41,6 @@
#define CONFIG_HIKEY_GPIO
/* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE
/* Initial environment variables */
/*

View File

@@ -199,7 +199,6 @@
/*
* U-Boot environment setup
*/
#define CONFIG_BOOTP_BOOTFILESIZE
/*
* The reserved memory

View File

@@ -19,11 +19,6 @@
/* Integrator/AP-specific configuration */
#define CONFIG_SYS_HZ_CLOCK 24000000 /* Timer 1 is clocked at 24Mhz */
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
/* Flash settings */
#define CONFIG_SYS_FLASH_SIZE 0x02000000 /* 32 MiB */
#define CONFIG_SYS_MAX_FLASH_SECT 128

View File

@@ -27,11 +27,6 @@
#define CONFIG_LOADS_ECHO
#define CONFIG_SYS_LOADS_BAUD_CHANGE
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#ifndef CONFIG_KM_DEF_ENV_BOOTPARAMS
#define CONFIG_KM_DEF_ENV_BOOTPARAMS \
"actual_bank=0\0"

View File

@@ -37,11 +37,6 @@
* Hardware drivers
*/
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
/*
* SDRAM: 1 bank, min 32, max 128 MB
* Initialized before u-boot gets started.

View File

@@ -37,11 +37,6 @@
#define XILINX_DCACHE_BYTE_SIZE 32768
#endif
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
/* size of console buffer */
#define CONFIG_SYS_CBSIZE 512
/* max number of command args */

View File

@@ -21,9 +21,6 @@
#define CONFIG_BOOT_RETRY_TIME -1
#define CONFIG_BOOT_RETRY_MIN 30
/* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE
/** Extra environment settings */
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=20080000\0" \

View File

@@ -50,9 +50,6 @@
#define CONFIG_BOOT_RETRY_TIME -1
#define CONFIG_BOOT_RETRY_MIN 30
/* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE
/* AHCI support Definitions */
#ifdef CONFIG_DM_SCSI
/** Enable 48-bit SATA addressing */

View File

@@ -51,11 +51,6 @@
#define CONFIG_NET_RETRY_COUNT 20
#define CONFIG_ARP_TIMEOUT 500 /* millisec */
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
/*--------------------------------------------------
* USB Configuration
*/

View File

@@ -137,11 +137,6 @@
#define CONFIG_ATMEL_LCD 1
#define CONFIG_ATMEL_LCD_BGR555 1
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE 1
/* SDRAM */
#define PHYS_SDRAM 0x20000000
#define PHYS_SDRAM_SIZE 0x04000000 /* 64 megs */

View File

@@ -150,11 +150,6 @@
#define CONFIG_LCD_IN_PSRAM 1
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE 1
/* SDRAM */
#define PHYS_SDRAM 0x20000000
#define PHYS_SDRAM_SIZE 0x04000000 /* 64 megs */

View File

@@ -22,11 +22,6 @@
/* general purpose I/O */
#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
/* SDRAM */
#define CONFIG_SYS_SDRAM_BASE 0x70000000
#define CONFIG_SYS_SDRAM_SIZE 0x08000000

View File

@@ -36,9 +36,6 @@
#define CONFIG_SYS_SERIAL0 PER_UART0_CFG
#define CONFIG_SYS_SERIAL1 PER_UART1_CFG
/* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE
/* SDRAM Bank #1 */
#define DDR_BASE 0x00000000
#define PHYS_SDRAM_1 DDR_BASE

View File

@@ -20,11 +20,6 @@
/* general purpose I/O */
#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
/*
* define CONFIG_USB_EHCI_HCD to enable USB Hi-Speed (aka 2.0)
* NB: in this case, USB 1.1 devices won't be recognized.

View File

@@ -90,7 +90,6 @@
#define CONFIG_AT91_WANTS_COMMON_PHY
/* BOOTP and DHCP options */
#define CONFIG_BOOTP_BOOTFILESIZE
#if !defined(CONFIG_SPL_BUILD)
/* USB configuration */

View File

@@ -91,8 +91,6 @@
/* Boot options */
#define CONFIG_BOOTP_BOOTFILESIZE
/* Environment settings */
/* Console settings */

View File

@@ -57,8 +57,6 @@
/* Boot options */
#define CONFIG_BOOTP_BOOTFILESIZE
/* Environment settings */
#define CONFIG_EXTRA_ENV_SETTINGS \

View File

@@ -168,11 +168,6 @@
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
/*
* Miscellaneous configurable options
*/

View File

@@ -33,9 +33,6 @@
#define CONFIG_SYS_SERIAL0 0x87e024000000
#define CONFIG_SYS_SERIAL1 0x87e025000000
/* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE
/* Miscellaneous configurable options */
/* Physical Memory Map */

View File

@@ -23,10 +23,6 @@
/*
* Hardware drivers
*/
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
/* SDRAM */
#define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS1

View File

@@ -99,9 +99,6 @@
#define CONFIG_PL011_CLOCK 24000000
#endif
/* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE
/* Miscellaneous configurable options */
/* Physical Memory Map */

View File

@@ -126,9 +126,6 @@
#define CONFIG_SYS_MMC_MAX_BLK_COUNT 127
/* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE
/* Miscellaneous configurable options */
#define LINUX_BOOT_PARAM_ADDR (V2M_BASE + 0x2000)

View File

@@ -62,8 +62,6 @@
* USB configuration
*/
#define CONFIG_BOOTP_BOOTFILESIZE
/* Default environment */
#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_HOSTNAME "x86"

View File

@@ -27,10 +27,6 @@
#define CONFIG_SYS_BAUDRATE_TABLE \
{ 4800, 9600, 19200, 38400, 57600, 115200 }
/* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_MAY_FAIL
/* Miscellaneous configurable options */
/* Monitor Command Prompt */

View File

@@ -17,10 +17,6 @@
/* Undef unneeded configs */
#undef CONFIG_EXTRA_ENV_SETTINGS
/* BOOTP options */
#undef CONFIG_BOOTP_BOOTFILESIZE
#undef CONFIG_BOOTP_MAY_FAIL
#undef CONFIG_SYS_CBSIZE
#define CONFIG_SYS_CBSIZE 1024

View File

@@ -27,10 +27,6 @@
#define CONFIG_SYS_BAUDRATE_TABLE \
{ 4800, 9600, 19200, 38400, 57600, 115200 }
/* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_MAY_FAIL
#ifdef CONFIG_NAND_ARASAN
# define CONFIG_SYS_MAX_NAND_DEVICE 1
#endif

View File

@@ -18,9 +18,6 @@
#undef CONFIG_EXTRA_ENV_SETTINGS
#undef CONFIG_SYS_INIT_SP_ADDR
/* BOOTP options */
#undef CONFIG_BOOTP_BOOTFILESIZE
#undef CONFIG_BOOTP_MAY_FAIL
#undef CONFIG_SYS_CBSIZE
#define CONFIG_SYS_CBSIZE 1024

View File

@@ -28,7 +28,6 @@
/* Ethernet driver */
#if defined(CONFIG_ZYNQ_GEM)
# define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
# define CONFIG_BOOTP_MAY_FAIL
#endif
/* NOR */