diff options
| author | Tom Rini | 2019-08-12 23:03:44 -0400 |
|---|---|---|
| committer | Tom Rini | 2019-08-12 23:03:44 -0400 |
| commit | 88c7a0a8c2ce6b503ff5d5509effb2a9f844993e (patch) | |
| tree | e3c57d6e9c0cdeb438ba8f96c19f93fe14336654 /scripts | |
| parent | 60f38d82c45fef55ac04ee52b234e6dd07e31935 (diff) | |
| parent | 193a1e9f196b7fb7e913a70936c8a49060a1859c (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- Various improvements to Keymile boards - mostly DT conversation
(Pascal & Holger)
- Removal of now unsupported Keymile boards (Pascal & Holger)
- Small MVEBU PCI fix (Marek)
- Turris Omnia defconfig update (Marek)
- Misc Allied Telesis defconfig updates (Chris)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/config_whitelist.txt | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d484a4bc2f3..5de8b81334c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -129,7 +129,6 @@ CONFIG_BOARD_SIZE_LIMIT CONFIG_BOOGER CONFIG_BOOTBLOCK CONFIG_BOOTFILE -CONFIG_BOOTMAPSZ CONFIG_BOOTMODE CONFIG_BOOTM_LINUX CONFIG_BOOTM_NETBSD @@ -945,16 +944,11 @@ CONFIG_KIRKWOOD_RGMII_PAD_1V8 CONFIG_KIRQ_EN CONFIG_KM8321 CONFIG_KMCOGE4 -CONFIG_KMLION1 CONFIG_KMP204X CONFIG_KMTEGR1 -CONFIG_KMVECT1 CONFIG_KM_BOARD_EXTRA_ENV CONFIG_KM_BOARD_NAME CONFIG_KM_COGE5UN -CONFIG_KM_COMMON_ETH_INIT -CONFIG_KM_CONSOLE_TTY -CONFIG_KM_CRAMFS_ADDR CONFIG_KM_DEF_ARCH CONFIG_KM_DEF_BOOT_ARGS_CPU CONFIG_KM_DEF_ENV @@ -969,24 +963,12 @@ CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI CONFIG_KM_DISABLE_PCI CONFIG_KM_DISABLE_PCIE CONFIG_KM_ECC_MODE -CONFIG_KM_ENV_IS_IN_SPI_NOR -CONFIG_KM_FDT_ADDR -CONFIG_KM_FPGA_CONFIG -CONFIG_KM_IVM_BUS -CONFIG_KM_KERNEL_ADDR CONFIG_KM_KIRKWOOD CONFIG_KM_KIRKWOOD_128M16 CONFIG_KM_KIRKWOOD_PCI CONFIG_KM_MGCOGE3UN -CONFIG_KM_MVEXTSW_ADDR CONFIG_KM_NEW_ENV CONFIG_KM_NUSA -CONFIG_KM_PHRAM -CONFIG_KM_PIGGY4_88E6061 -CONFIG_KM_PIGGY4_88E6352 -CONFIG_KM_PNVRAM -CONFIG_KM_PORTL2 -CONFIG_KM_RESERVED_PRAM CONFIG_KM_ROOTFSSIZE CONFIG_KM_SUGP1 CONFIG_KM_SUV31 @@ -1374,7 +1356,6 @@ CONFIG_PHY_M88E1111 CONFIG_PHY_MODE_NEED_CHANGE CONFIG_PHY_RESET CONFIG_PHY_RESET_DELAY -CONFIG_PIGGY_MAC_ADRESS_OFFSET CONFIG_PIXIS_BRDCFG0_SPI CONFIG_PIXIS_BRDCFG0_USB2 CONFIG_PIXIS_BRDCFG1_AUDCLK_11 @@ -3037,9 +3018,6 @@ CONFIG_SYS_ISA_IO_BASE_ADDRESS CONFIG_SYS_ISA_IO_OFFSET CONFIG_SYS_ISA_IO_STRIDE CONFIG_SYS_ISA_MEM -CONFIG_SYS_IVM_EEPROM_ADR -CONFIG_SYS_IVM_EEPROM_MAX_LEN -CONFIG_SYS_IVM_EEPROM_PAGE_LEN CONFIG_SYS_JFFS2_FIRST_BANK CONFIG_SYS_JFFS2_FIRST_SECTOR CONFIG_SYS_JFFS2_MEM_NAND |