mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-24 13:43:28 +00:00
Convert CONFIG_BOOTP_SERVERIP to Kconfig
This converts the following to Kconfig: CONFIG_BOOTP_SERVERIP Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
d6b318de2f
commit
d3877fba31
16 changed files with 16 additions and 12 deletions
3
README
3
README
|
@ -1203,9 +1203,6 @@ The following options need to be configured:
|
|||
CONFIG_BOOTP_VENDOREX
|
||||
CONFIG_BOOTP_MAY_FAIL
|
||||
|
||||
CONFIG_BOOTP_SERVERIP - TFTP server will be the serverip
|
||||
environment variable, not the BOOTP server.
|
||||
|
||||
CONFIG_BOOTP_MAY_FAIL - If the DHCP server is not found
|
||||
after the configured retry count, the call will fail
|
||||
instead of starting over. This can be used to fail over
|
||||
|
|
|
@ -173,6 +173,7 @@ config STM32_ETZPC
|
|||
bool "STM32 Extended TrustZone Protection"
|
||||
depends on STM32MP15x
|
||||
default y
|
||||
imply BOOTP_SERVERIP
|
||||
help
|
||||
Say y to enable STM32 Extended TrustZone Protection
|
||||
|
||||
|
|
|
@ -31,6 +31,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
|
|||
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||||
CONFIG_BOOTP_SEND_HOSTNAME=y
|
||||
CONFIG_NET_RANDOM_ETHADDR=y
|
||||
CONFIG_BOOTP_SERVERIP=y
|
||||
CONFIG_DM=y
|
||||
CONFIG_CLK=y
|
||||
CONFIG_MMC=y
|
||||
|
|
|
@ -29,6 +29,7 @@ CONFIG_ENV_IS_IN_FLASH=y
|
|||
CONFIG_ENV_ADDR=0x80140000
|
||||
CONFIG_BOOTP_SEND_HOSTNAME=y
|
||||
CONFIG_NET_RANDOM_ETHADDR=y
|
||||
CONFIG_BOOTP_SERVERIP=y
|
||||
CONFIG_DM=y
|
||||
CONFIG_MMC=y
|
||||
CONFIG_FTSDC010=y
|
||||
|
|
|
@ -57,6 +57,7 @@ CONFIG_ENV_IS_IN_FAT=y
|
|||
CONFIG_ENV_IS_IN_NAND=y
|
||||
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||||
CONFIG_NET_RANDOM_ETHADDR=y
|
||||
CONFIG_BOOTP_SERVERIP=y
|
||||
CONFIG_SPL_DM_SEQ_ALIAS=y
|
||||
CONFIG_BOOTCOUNT_LIMIT=y
|
||||
CONFIG_FPGA_XILINX=y
|
||||
|
|
|
@ -96,6 +96,7 @@ CONFIG_ENV_IMPORT_FDT=y
|
|||
CONFIG_BOOTP_SEND_HOSTNAME=y
|
||||
CONFIG_NETCONSOLE=y
|
||||
CONFIG_IP_DEFRAG=y
|
||||
CONFIG_BOOTP_SERVERIP=y
|
||||
CONFIG_DM_DMA=y
|
||||
CONFIG_REGMAP=y
|
||||
CONFIG_SYSCON=y
|
||||
|
|
|
@ -121,6 +121,7 @@ CONFIG_ENV_IMPORT_FDT=y
|
|||
CONFIG_BOOTP_SEND_HOSTNAME=y
|
||||
CONFIG_NETCONSOLE=y
|
||||
CONFIG_IP_DEFRAG=y
|
||||
CONFIG_BOOTP_SERVERIP=y
|
||||
CONFIG_DM_DMA=y
|
||||
CONFIG_DEVRES=y
|
||||
CONFIG_DEBUG_DEVRES=y
|
||||
|
|
|
@ -76,6 +76,7 @@ CONFIG_ENV_EXT4_DEVICE_AND_PART="0:0"
|
|||
CONFIG_BOOTP_SEND_HOSTNAME=y
|
||||
CONFIG_NETCONSOLE=y
|
||||
CONFIG_IP_DEFRAG=y
|
||||
CONFIG_BOOTP_SERVERIP=y
|
||||
CONFIG_DM_DMA=y
|
||||
CONFIG_REGMAP=y
|
||||
CONFIG_SYSCON=y
|
||||
|
|
|
@ -96,6 +96,7 @@ CONFIG_ENV_EXT4_DEVICE_AND_PART="0:0"
|
|||
CONFIG_BOOTP_SEND_HOSTNAME=y
|
||||
CONFIG_NETCONSOLE=y
|
||||
CONFIG_IP_DEFRAG=y
|
||||
CONFIG_BOOTP_SERVERIP=y
|
||||
CONFIG_SPL_DM=y
|
||||
CONFIG_DM_DMA=y
|
||||
CONFIG_REGMAP=y
|
||||
|
|
|
@ -98,6 +98,7 @@ CONFIG_ENV_EXT4_DEVICE_AND_PART="0:0"
|
|||
CONFIG_BOOTP_SEND_HOSTNAME=y
|
||||
CONFIG_NETCONSOLE=y
|
||||
CONFIG_IP_DEFRAG=y
|
||||
CONFIG_BOOTP_SERVERIP=y
|
||||
CONFIG_SPL_DM=y
|
||||
CONFIG_DM_DMA=y
|
||||
CONFIG_REGMAP=y
|
||||
|
|
|
@ -17,8 +17,6 @@
|
|||
|
||||
#define CONFIG_SKIP_TRUNOFF_WATCHDOG
|
||||
|
||||
#define CONFIG_BOOTP_SERVERIP
|
||||
|
||||
#ifdef CONFIG_SKIP_LOWLEVEL_INIT
|
||||
#ifdef CONFIG_OF_CONTROL
|
||||
#undef CONFIG_OF_SEPARATE
|
||||
|
|
|
@ -15,8 +15,6 @@
|
|||
*/
|
||||
#define CONFIG_USE_INTERRUPT
|
||||
|
||||
#define CONFIG_BOOTP_SERVERIP
|
||||
|
||||
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
|
||||
#define CONFIG_MEM_REMAP
|
||||
#endif
|
||||
|
|
|
@ -9,8 +9,6 @@
|
|||
#define CONFIG_SYS_SDRAM_BASE 0x00000000
|
||||
#define CONFIG_SYS_SDRAM_SIZE 0x40000000
|
||||
|
||||
#define CONFIG_BOOTP_SERVERIP
|
||||
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
"autoload=no\0" \
|
||||
"pxefile_addr_r=0x2000000\0" \
|
||||
|
|
|
@ -25,8 +25,6 @@
|
|||
#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\
|
||||
115200}
|
||||
|
||||
#define CONFIG_BOOTP_SERVERIP
|
||||
|
||||
#ifndef SANDBOX_NO_SDL
|
||||
#define CONFIG_SANDBOX_SDL
|
||||
#endif
|
||||
|
|
|
@ -57,7 +57,6 @@
|
|||
/* Ethernet need */
|
||||
#ifdef CONFIG_DWC_ETH_QOS
|
||||
#define CONFIG_SERVERIP 192.168.1.1
|
||||
#define CONFIG_BOOTP_SERVERIP
|
||||
#define CONFIG_SYS_AUTOLOAD "no"
|
||||
#endif
|
||||
|
||||
|
|
|
@ -116,4 +116,11 @@ config UDP_CHECKSUM
|
|||
is wrong then the packet is discussed and an error is shown, like
|
||||
"UDP wrong checksum 29374a23 30ff3826"
|
||||
|
||||
config BOOTP_SERVERIP
|
||||
bool "Use the 'serverip' env var for tftp, not bootp"
|
||||
help
|
||||
Enable this if the TFTP server will be the 'serverip' environment
|
||||
variable, not the BOOTP server. This affects the operation of both
|
||||
bootp and tftp.
|
||||
|
||||
endif # if NET
|
||||
|
|
Loading…
Reference in a new issue