Merge branch '2019-06-14-master-imports'

- Kconfig migrations of SPL_BOOT_xxx, SYS_LDSCRIPT, IP_DEFRAG,
  TFTP_BLOCKSIZE.
- Typo fixes, other minor corrections.

1 files changed, 0 insertions, 7 deletions

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8651d569c50..22de7a4b6ca 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -927,7 +927,6 @@ CONFIG_IPAM390_GPIO_BOOTMODE
 CONFIG_IPAM390_GPIO_LED_GREEN
 CONFIG_IPAM390_GPIO_LED_RED
 CONFIG_IPROC
-CONFIG_IP_DEFRAG
 CONFIG_IRAM_BASE
 CONFIG_IRAM_END
 CONFIG_IRAM_SIZE
@@ -1771,7 +1770,6 @@ CONFIG_SPL_COMMON_INIT_DDR
 CONFIG_SPL_CONSOLE
 CONFIG_SPL_ETH_DEVICE
 CONFIG_SPL_FLUSH_IMAGE
-CONFIG_SPL_FSL_PBL
 CONFIG_SPL_FS_LOAD_ARGS_NAME
 CONFIG_SPL_FS_LOAD_KERNEL_NAME
 CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
@@ -1783,11 +1781,9 @@ CONFIG_SPL_LOAD_FIT_ADDRESS
 CONFIG_SPL_MAX_FOOTPRINT
 CONFIG_SPL_MAX_PEB_SIZE
 CONFIG_SPL_MAX_SIZE
-CONFIG_SPL_MMC_BOOT
 CONFIG_SPL_MPC83XX_WAIT_FOR_NAND
 CONFIG_SPL_MXS_PSWITCH_WAIT
 CONFIG_SPL_NAND_BASE
-CONFIG_SPL_NAND_BOOT
 CONFIG_SPL_NAND_DRIVERS
 CONFIG_SPL_NAND_ECC
 CONFIG_SPL_NAND_IDENT
@@ -1810,7 +1806,6 @@ CONFIG_SPL_SATA_BOOT_DEVICE
 CONFIG_SPL_SIZE
 CONFIG_SPL_SKIP_RELOCATE
 CONFIG_SPL_SPAACT_ADDR
-CONFIG_SPL_SPI_BOOT
 CONFIG_SPL_SPI_FLASH_MINIMAL
 CONFIG_SPL_STACK
 CONFIG_SPL_STACK_ADDR
@@ -3149,7 +3144,6 @@ CONFIG_SYS_LBC_SDRAM_SIZE
 CONFIG_SYS_LB_SDRAM
 CONFIG_SYS_LCD_BASE
 CONFIG_SYS_LDB_CLOCK
-CONFIG_SYS_LDSCRIPT
 CONFIG_SYS_LED_BASE
 CONFIG_SYS_LED_DISP_BASE
 CONFIG_SYS_LIME_BASE
@@ -4251,7 +4245,6 @@ CONFIG_TESTPIN_MASK
 CONFIG_TESTPIN_REG
 CONFIG_TEST_LIST_SORT
 CONFIG_TFP410_I2C_ADDR
-CONFIG_TFTP_BLOCKSIZE
 CONFIG_TFTP_FILE_NAME_MAX_LEN
 CONFIG_TFTP_PORT
 CONFIG_TFTP_TSIZE