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
a950844
..
e2cf205
100644
(file)
--- a/
scripts/config_whitelist.txt
+++ b/
scripts/config_whitelist.txt
@@
-848,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
@@
-962,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
@@
-1154,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
@@
-2171,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
@@
-3510,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