projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v2021.01-rc5' into next
[platform/kernel/u-boot.git]
/
scripts
/
config_whitelist.txt
diff --git
a/scripts/config_whitelist.txt
b/scripts/config_whitelist.txt
index
14d5e4c
..
e2cf205
100644
(file)
--- a/
scripts/config_whitelist.txt
+++ b/
scripts/config_whitelist.txt
@@
-101,9
+101,6
@@
CONFIG_BL1_OFFSET
CONFIG_BL1_SIZE
CONFIG_BL2_OFFSET
CONFIG_BL2_SIZE
CONFIG_BL1_SIZE
CONFIG_BL2_OFFSET
CONFIG_BL2_SIZE
-CONFIG_BMP_16BPP
-CONFIG_BMP_24BPP
-CONFIG_BMP_32BPP
CONFIG_BOARDDIR
CONFIG_BOARDNAME
CONFIG_BOARDNAME_LOCAL
CONFIG_BOARDDIR
CONFIG_BOARDNAME
CONFIG_BOARDNAME_LOCAL
@@
-290,7
+287,6
@@
CONFIG_DEBUG_UART_LINFLEXUART
CONFIG_DEBUG_WRITECOUNT
CONFIG_DEEP_SLEEP
CONFIG_DEFAULT
CONFIG_DEBUG_WRITECOUNT
CONFIG_DEEP_SLEEP
CONFIG_DEFAULT
-CONFIG_DEFAULT_CONSOLE
CONFIG_DEFAULT_IMMR
CONFIG_DESIGNWARE_ETH
CONFIG_DEVELOP
CONFIG_DEFAULT_IMMR
CONFIG_DESIGNWARE_ETH
CONFIG_DEVELOP
@@
-852,7
+848,6
@@
CONFIG_IRAM_STACK
CONFIG_IRAM_TOP
CONFIG_IRDA_BASE
CONFIG_IS_ENABLED
CONFIG_IRAM_TOP
CONFIG_IRDA_BASE
CONFIG_IS_ENABLED
-CONFIG_JFFS2_CMDLINE
CONFIG_JFFS2_DEV
CONFIG_JFFS2_LZO
CONFIG_JFFS2_NAND
CONFIG_JFFS2_DEV
CONFIG_JFFS2_LZO
CONFIG_JFFS2_NAND
@@
-966,7
+961,6
@@
CONFIG_LCD_MENU
CONFIG_LD9040
CONFIG_LEGACY
CONFIG_LEGACY_BOOTCMD_ENV
CONFIG_LD9040
CONFIG_LEGACY
CONFIG_LEGACY_BOOTCMD_ENV
-CONFIG_LG4573
CONFIG_LINUX
CONFIG_LINUX_RESET_VEC
CONFIG_LITTLETON_LCD
CONFIG_LINUX
CONFIG_LINUX_RESET_VEC
CONFIG_LITTLETON_LCD
@@
-1158,7
+1152,6
@@
CONFIG_NCEL2C100_BASE
CONFIG_NCEMIC100_BASE
CONFIG_NDS_DLM1_BASE
CONFIG_NDS_DLM2_BASE
CONFIG_NCEMIC100_BASE
CONFIG_NDS_DLM1_BASE
CONFIG_NDS_DLM2_BASE
-CONFIG_NEEDS_MANUAL_RELOC
CONFIG_NEO
CONFIG_NET2BIG_V2
CONFIG_NETCONSOLE_BUFFER_SIZE
CONFIG_NEO
CONFIG_NET2BIG_V2
CONFIG_NETCONSOLE_BUFFER_SIZE
@@
-1415,7
+1408,6
@@
CONFIG_RTC_MC13XXX
CONFIG_RTC_MCFRRTC
CONFIG_RTC_MCP79411
CONFIG_RTC_MXS
CONFIG_RTC_MCFRRTC
CONFIG_RTC_MCP79411
CONFIG_RTC_MXS
-CONFIG_RTC_PCF8563
CONFIG_RTC_PT7C4338
CONFIG_RUN_FROM_DDR0
CONFIG_RUN_FROM_DDR1
CONFIG_RTC_PT7C4338
CONFIG_RUN_FROM_DDR0
CONFIG_RUN_FROM_DDR1
@@
-2176,7
+2168,6
@@
CONFIG_SYS_FCC_PSMR
CONFIG_SYS_FDT_BASE
CONFIG_SYS_FDT_LOAD_ADDR
CONFIG_SYS_FDT_PAD
CONFIG_SYS_FDT_BASE
CONFIG_SYS_FDT_LOAD_ADDR
CONFIG_SYS_FDT_PAD
-CONFIG_SYS_FDT_SIZE
CONFIG_SYS_FEC0_IOBASE
CONFIG_SYS_FEC1_IOBASE
CONFIG_SYS_FECI2C
CONFIG_SYS_FEC0_IOBASE
CONFIG_SYS_FEC1_IOBASE
CONFIG_SYS_FECI2C
@@
-3405,7
+3396,6
@@
CONFIG_SYS_PCIE4_PHYS_SIZE
CONFIG_SYS_PCIE_MMAP_SIZE
CONFIG_SYS_PCIE_PHYS
CONFIG_SYS_PCIE_VIRT
CONFIG_SYS_PCIE_MMAP_SIZE
CONFIG_SYS_PCIE_PHYS
CONFIG_SYS_PCIE_VIRT
-CONFIG_SYS_PCI_64BIT
CONFIG_SYS_PCI_BAR0
CONFIG_SYS_PCI_BAR1
CONFIG_SYS_PCI_BAR2
CONFIG_SYS_PCI_BAR0
CONFIG_SYS_PCI_BAR1
CONFIG_SYS_PCI_BAR2
@@
-3516,7
+3506,6
@@
CONFIG_SYS_POST_WATCHDOG
CONFIG_SYS_POST_WORD_ADDR
CONFIG_SYS_PPC_DDR_WIMGE
CONFIG_SYS_PQSPAR
CONFIG_SYS_POST_WORD_ADDR
CONFIG_SYS_PPC_DDR_WIMGE
CONFIG_SYS_PQSPAR
-CONFIG_SYS_PROMPT_HUSH_PS2
CONFIG_SYS_PSDPAR
CONFIG_SYS_PSSR_VAL
CONFIG_SYS_PTCPAR
CONFIG_SYS_PSDPAR
CONFIG_SYS_PSSR_VAL
CONFIG_SYS_PTCPAR
@@
-3795,13
+3784,6
@@
CONFIG_SYS_UEC4_PHY_ADDR
CONFIG_SYS_UEC4_RX_CLK
CONFIG_SYS_UEC4_TX_CLK
CONFIG_SYS_UEC4_UCC_NUM
CONFIG_SYS_UEC4_RX_CLK
CONFIG_SYS_UEC4_TX_CLK
CONFIG_SYS_UEC4_UCC_NUM
-CONFIG_SYS_UEC5_ETH_TYPE
-CONFIG_SYS_UEC5_INTERFACE_SPEED
-CONFIG_SYS_UEC5_INTERFACE_TYPE
-CONFIG_SYS_UEC5_PHY_ADDR
-CONFIG_SYS_UEC5_RX_CLK
-CONFIG_SYS_UEC5_TX_CLK
-CONFIG_SYS_UEC5_UCC_NUM
CONFIG_SYS_UEC6_ETH_TYPE
CONFIG_SYS_UEC6_INTERFACE_SPEED
CONFIG_SYS_UEC6_INTERFACE_TYPE
CONFIG_SYS_UEC6_ETH_TYPE
CONFIG_SYS_UEC6_INTERFACE_SPEED
CONFIG_SYS_UEC6_INTERFACE_TYPE
@@
-4069,9
+4051,7
@@
CONFIG_VEXPRESS_EXTENDED_MEMORY_MAP
CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP
CONFIG_VID
CONFIG_VIDEO_BCM2835
CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP
CONFIG_VID
CONFIG_VIDEO_BCM2835
-CONFIG_VIDEO_BMP_GZIP
CONFIG_VIDEO_BMP_LOGO
CONFIG_VIDEO_BMP_LOGO
-CONFIG_VIDEO_BMP_RLE8
CONFIG_VIDEO_CORALP
CONFIG_VIDEO_DA8XX
CONFIG_VIDEO_FONT_4X6
CONFIG_VIDEO_CORALP
CONFIG_VIDEO_DA8XX
CONFIG_VIDEO_FONT_4X6
@@
-4082,7
+4062,6
@@
CONFIG_VIDEO_MB862xx_ACCEL
CONFIG_VIDEO_MXS
CONFIG_VIDEO_MXS_MODE_SYSTEM
CONFIG_VIDEO_STD_TIMINGS
CONFIG_VIDEO_MXS
CONFIG_VIDEO_MXS_MODE_SYSTEM
CONFIG_VIDEO_STD_TIMINGS
-CONFIG_VIDEO_VCXK
CONFIG_VID_FLS_ENV
CONFIG_VM86
CONFIG_VOIPAC_LCD
CONFIG_VID_FLS_ENV
CONFIG_VM86
CONFIG_VOIPAC_LCD