diff options
| author | Tom Rini <[email protected]> | 2021-12-02 07:12:28 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-12-02 07:12:28 -0500 |
| commit | cdccb39e37ba5b43dcae4e783c15f0471acf5529 (patch) | |
| tree | dbd895067824be9bfa258710e4869d3573314b88 /scripts | |
| parent | fc47dbb26e9d86a688e69e198b2ed0749db16756 (diff) | |
| parent | 6d99f866952bb5df7fe699b3db29a97d75e5c445 (diff) | |
Merge branch '2021-12-01-assorted-updates' into next
- Have SPL skip length 0 images, some clean-ups related to CONFIG
symbols and the known list of unmigrated symbols and pinctrl updates.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.autoconf | 3 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf index 8a3efdb2db0..5ed9abc8e14 100644 --- a/scripts/Makefile.autoconf +++ b/scripts/Makefile.autoconf @@ -67,7 +67,8 @@ quiet_cmd_autoconf = GEN $@ quiet_cmd_u_boot_cfg = CFG $@ cmd_u_boot_cfg = \ $(CPP) $(c_flags) $2 -DDO_DEPS_ONLY -dM $(srctree)/include/common.h > [email protected] && { \ - grep 'define CONFIG_' [email protected] > $@; \ + grep 'define CONFIG_' [email protected] | \ + sed '/define CONFIG_IS_ENABLED(/d;/define CONFIG_VAL(/d;' > $@; \ rm [email protected]; \ } || { \ rm [email protected]; false; \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 50dd3f92e78..e2cf73cc053 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -633,7 +633,6 @@ CONFIG_IRAM_SIZE CONFIG_IRAM_STACK CONFIG_IRAM_TOP CONFIG_IRDA_BASE -CONFIG_IS_ENABLED CONFIG_JFFS2_DEV CONFIG_JFFS2_LZO CONFIG_JFFS2_NAND @@ -3042,7 +3041,6 @@ CONFIG_USE_ONENAND_BOARD_INIT CONFIG_UTBIPAR_INIT_TBIPA CONFIG_U_BOOT_HDR_ADDR CONFIG_U_BOOT_HDR_SIZE -CONFIG_VAL CONFIG_VAR_SIZE_SPL CONFIG_VERY_BIG_RAM CONFIG_VIDEO_BCM2835 |