summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2022-04-19 17:02:21 -0400
committerTom Rini <[email protected]>2022-04-19 17:06:01 -0400
commit246e03476ba325051600017b552460d7f37c3191 (patch)
tree7014c270d3f00cf9f5dc820876726efc1ee78ab0 /scripts
parent9acf3726b654d06c50c07c3f45da9eb1cbbadf34 (diff)
parentb8a79164674230f401f696f7eb09315ad02199b5 (diff)
Merge branch '2022-04-19-assorted-updates'
- Migrate CONFIG_SYS_MEM_TOP_HIDE to Kconfig, IOMUX bugfix, 2 BTRFS bugfixes, update .gitignore and .mailmap files, aspeed GPIO bugfix, image-fit and squashfs code cleanups, enable EXT4 and ISO partitions on DeveloperBox. - populate u-boot,bootconf under /chosen, see https://github.com/devicetree-org/dt-schema/pull/71 for corresponding change
Diffstat (limited to 'scripts')
-rw-r--r--scripts/config_whitelist.txt2
1 files changed, 0 insertions, 2 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 4c03ed94999..0c3c0b33d50 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1334,7 +1334,6 @@ CONFIG_SYS_MEMORY_BASE
CONFIG_SYS_MEMORY_SIZE
CONFIG_SYS_MEM_RESERVE_SECURE
CONFIG_SYS_MEM_SIZE
-CONFIG_SYS_MEM_TOP_HIDE
CONFIG_SYS_MFD
CONFIG_SYS_MHZ
CONFIG_SYS_MIPS_TIMER_FREQ
@@ -1858,7 +1857,6 @@ CONFIG_TSECV2
CONFIG_TSECV2_1
CONFIG_TSEC_TBICR_SETTINGS
CONFIG_TWL6030_POWER
-CONFIG_TZSW_RESERVED_DRAM_SIZE
CONFIG_UBIFS_VOLUME
CONFIG_UBI_PART
CONFIG_UBI_SIZE