This reverts a hunk I missed after a rebase:
A previous commit restricts ARCH_BAREBOX_MAX_BARE_INIT to only
non-multi-image boards, so no need to touch it to be compatible
with the new multi-image changes.

---
 arch/arm/mach-at91/Kconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index ef00e32e380d..5ad1f62c8d67 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -245,13 +245,13 @@ config ARCH_BAREBOX_MAX_BARE_INIT_SIZE
        hex
        default 0x1000 if ARCH_AT91SAM9260
        default 0x27000 if ARCH_AT91SAM9261
+       default 0x12000 if ARCH_AT91SAM9263
        default 0x4000 if ARCH_AT91SAM9G20
        default 0x3000 if ARCH_AT91SAM9G10
        default 0xF000 if ARCH_AT91SAM9G45
+       default 0x6000 if ARCH_AT91SAM9X5
        default 0x6000 if ARCH_AT91SAM9N12
-       default 0x12000 if SOC_AT91SAM9263
-       default 0x6000 if SOC_AT91SAM9X5
-       default 0x6000 if SOC_SAMA5D3
+       default 0x6000 if ARCH_SAMA5D3
        default 0xffffffff
 
 if ARCH_AT91RM9200
-- 
2.23.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Reply via email to