From: Tom Rini <trini@konsulko.com>
Date: Tue, 19 Apr 2022 21:02:21 +0000 (-0400)
Subject: Merge branch '2022-04-19-assorted-updates'
X-Git-Tag: v2025.01-rc5-pxa1908~1450
X-Git-Url: http://git.dujemihanovic.xyz/img/static/gitweb.css?a=commitdiff_plain;h=246e03476ba325051600017b552460d7f37c3191;p=u-boot.git

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
---

246e03476ba325051600017b552460d7f37c3191
diff --cc scripts/config_whitelist.txt
index 4c03ed9499,4c03ed9499..0c3c0b33d5
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@@ -1334,7 -1334,7 +1334,6 @@@ CONFIG_SYS_MEMORY_BAS
  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 -1858,7 +1857,6 @@@ CONFIG_TSECV
  CONFIG_TSECV2_1
  CONFIG_TSEC_TBICR_SETTINGS
  CONFIG_TWL6030_POWER
--CONFIG_TZSW_RESERVED_DRAM_SIZE
  CONFIG_UBIFS_VOLUME
  CONFIG_UBI_PART
  CONFIG_UBI_SIZE