[DistroKit] [PATCH 3/5] v7a: barebox: extend support to SAMA5D4-based Wifx L1

[Ahmad Fatoum <a.fatoum@pengutronix.de>]

Support for booting the Wifx L1 from SD-Card is upstream in barebox
since v2023.02.0. We have 2023.02.1, so let's enable it.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 configs/platform-v7a/barebox-at91.config      | 55 ++++++++++++++++---
 configs/platform-v7a/barebox-at91.config.diff | 45 ++++++++++++++-
 configs/platform-v7a/rules/barebox-at91.make  |  1 +
 3 files changed, 89 insertions(+), 12 deletions(-)

diff --git a/configs/platform-v7a/barebox-at91.config b/configs/platform-v7a/barebox-at91.config
index 78e8e8523d55..b9f129a0ef5f 100644
--- a/configs/platform-v7a/barebox-at91.config
+++ b/configs/platform-v7a/barebox-at91.config
@@ -52,6 +52,7 @@ CONFIG_CPU_32v7=y
 CONFIG_HAVE_AT91_UTMI=y
 CONFIG_HAVE_AT91_USB_CLK=y
 CONFIG_COMMON_CLK_AT91=y
+CONFIG_HAVE_AT91_SMD=y
 CONFIG_HAVE_AT91_H32MX=y
 CONFIG_HAVE_AT91_GENERATED_CLK=y
 CONFIG_HAVE_AT91_AUDIO_PLL=y
@@ -63,6 +64,7 @@ CONFIG_HAVE_AT91SAM9_RST=y
 CONFIG_SOC_SAMA5=y
 CONFIG_SOC_SAMA5_MULTI=y
 CONFIG_SOC_SAMA5D2=y
+CONFIG_SOC_SAMA5D4=y
 CONFIG_ARCH_TEXT_BASE=0x23f00000
 
 #
@@ -76,7 +78,7 @@ CONFIG_AT91_MULTI_BOARDS=y
 # CONFIG_MACH_SAMA5D3_XPLAINED is not set
 CONFIG_MACH_SAMA5D27_SOM1=y
 CONFIG_MACH_SAMA5D27_GIANTBOARD=y
-# CONFIG_MACH_SAMA5D4_WIFX is not set
+CONFIG_MACH_SAMA5D4_WIFX=y
 
 #
 # AT91 Board Options
@@ -112,6 +114,7 @@ CONFIG_UIMAGE=y
 CONFIG_LOGBUF=y
 CONFIG_STDDEV=y
 CONFIG_MENUTREE=y
+CONFIG_UBIFORMAT=y
 CONFIG_BOOT=y
 
 #
@@ -237,7 +240,7 @@ CONFIG_EXTERNAL_DTS_FRAGMENTS=""
 CONFIG_COMPILE_LOGLEVEL=6
 CONFIG_DEFAULT_LOGLEVEL=7
 # CONFIG_DEBUG_LL is not set
-CONFIG_DEBUG_AT91_UART_BASE=0xf8020000
+CONFIG_DEBUG_AT91_UART_BASE=0xfc069000
 # CONFIG_DEBUG_INITCALLS is not set
 # CONFIG_DEBUG_PBL is not set
 # CONFIG_DEBUG_PROBES is not set
@@ -281,6 +284,7 @@ CONFIG_CMD_IMD=y
 CONFIG_CMD_MEMINFO=y
 CONFIG_CMD_ARM_MMUINFO=y
 CONFIG_CMD_REGULATOR=y
+# CONFIG_CMD_NVMEM is not set
 CONFIG_CMD_VERSION=y
 # CONFIG_CMD_MMC is not set
 # CONFIG_CMD_MMC_EXTCSD is not set
@@ -311,6 +315,8 @@ CONFIG_CMD_UIMAGE=y
 CONFIG_CMD_PARTITION=y
 CONFIG_CMD_AUTOMOUNT=y
 CONFIG_CMD_MOUNT=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFORMAT=y
 CONFIG_CMD_UMOUNT=y
 # end of Partition
 
@@ -422,6 +428,9 @@ CONFIG_CMD_FLASH=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_LED=y
+CONFIG_CMD_NAND=y
+# CONFIG_CMD_NANDTEST is not set
+# CONFIG_CMD_NAND_BITFLIP is not set
 # CONFIG_CMD_POWEROFF is not set
 CONFIG_CMD_SPI=y
 CONFIG_CMD_LED_TRIGGER=y
@@ -580,11 +589,25 @@ CONFIG_MTD_M25P80=y
 # end of Self contained MTD devices
 
 # CONFIG_DRIVER_CFI is not set
-# CONFIG_NAND is not set
+CONFIG_NAND=y
+# CONFIG_MTD_NAND_ECC_SOFT is not set
+# CONFIG_NAND_ECC_HW_SYNDROME is not set
+# CONFIG_NAND_ALLOW_ERASE_BAD is not set
+CONFIG_NAND_ATMEL=y
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+# CONFIG_MTD_NAND_DENALI is not set
 CONFIG_MTD_SPI_NOR=y
 # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
 # CONFIG_SPI_CADENCE_QUADSPI is not set
-# CONFIG_MTD_UBI is not set
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_BEB_LIMIT=20
+CONFIG_MTD_UBI_FASTMAP=y
+
+#
+# UBI debugging options
+#
+# CONFIG_MTD_UBI_CHECK_IO is not set
+# CONFIG_MTD_UBI_GENERAL_EXTRA_CHECKS is not set
 CONFIG_DISK=y
 CONFIG_DISK_WRITE=y
 
@@ -658,13 +681,14 @@ CONFIG_MFD_SYSCON=y
 CONFIG_MFD_ATMEL_FLEXCOM=y
 # CONFIG_MFD_RK808 is not set
 # CONFIG_MFD_AXP20X_I2C is not set
+CONFIG_MFD_ATMEL_SMC=y
 # end of Multifunction device drivers
 
 #
 # Misc devices
 #
 # CONFIG_JTAG is not set
-# CONFIG_SRAM is not set
+CONFIG_SRAM=y
 CONFIG_STATE_DRV=y
 CONFIG_DEV_MEM=y
 # CONFIG_UBOOTVAR is not set
@@ -683,7 +707,7 @@ CONFIG_LED_TRIGGERS=y
 # EEPROM support
 #
 # CONFIG_EEPROM_AT25 is not set
-# CONFIG_EEPROM_AT24 is not set
+CONFIG_EEPROM_AT24=y
 # end of EEPROM support
 
 #
@@ -729,11 +753,15 @@ CONFIG_GPIOLIB=y
 # Pin controllers
 #
 CONFIG_PINCTRL=y
+CONFIG_PINCTRL_AT91=y
 CONFIG_PINCTRL_AT91PIO4=y
 # CONFIG_PINCTRL_SINGLE is not set
 # end of Pin controllers
 
-# CONFIG_NVMEM is not set
+CONFIG_NVMEM=y
+# CONFIG_NVMEM_RMEM is not set
+# CONFIG_NVMEM_SNVS_LPGPR is not set
+# CONFIG_EEPROM_93XX46 is not set
 
 #
 # Bus devices
@@ -771,7 +799,7 @@ CONFIG_REGULATOR_FIXED=y
 #
 # Memory controller drivers
 #
-# CONFIG_ATMEL_EBI is not set
+CONFIG_ATMEL_EBI=y
 # end of Memory controller drivers
 
 #
@@ -795,6 +823,7 @@ CONFIG_REGULATOR_FIXED=y
 # end of NVME Support
 
 # CONFIG_SYSCON_REBOOT_MODE is not set
+# CONFIG_NVMEM_REBOOT_MODE is not set
 # CONFIG_POWER_RESET_SYSCON is not set
 # CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
 # CONFIG_POWER_RESET_GPIO is not set
@@ -827,6 +856,10 @@ CONFIG_FS_FAT=y
 CONFIG_FS_FAT_WRITE=y
 CONFIG_FS_FAT_LFN=y
 # CONFIG_FS_JFFS2 is not set
+CONFIG_FS_UBIFS=y
+# CONFIG_FS_UBIFS_COMPRESSION_LZO is not set
+# CONFIG_FS_UBIFS_COMPRESSION_ZLIB is not set
+CONFIG_FS_UBIFS_COMPRESSION_ZSTD=y
 # CONFIG_FS_BPKFS is not set
 # CONFIG_FS_UIMAGEFS is not set
 # CONFIG_FS_PSTORE is not set
@@ -858,16 +891,19 @@ CONFIG_FS_FAT_LFN=y
 #
 CONFIG_PARAMETER=y
 CONFIG_UNCOMPRESS=y
+CONFIG_XXHASH=y
 # CONFIG_ZLIB is not set
 CONFIG_BZLIB=y
 # CONFIG_LZ4_DECOMPRESS is not set
-# CONFIG_ZSTD_DECOMPRESS is not set
+CONFIG_ZSTD_DECOMPRESS=y
 # CONFIG_XZ_DECOMPRESS is not set
 # CONFIG_BASE64 is not set
 CONFIG_PROCESS_ESCAPE_SEQUENCE=y
 CONFIG_LZO_DECOMPRESS=y
 CONFIG_FNMATCH=y
 CONFIG_QSORT=y
+CONFIG_LIBSCAN=y
+CONFIG_LIBUBIGEN=y
 # CONFIG_RATP is not set
 # CONFIG_ALLOW_PRNG_FALLBACK is not set
 # CONFIG_CRC_CCITT is not set
@@ -882,6 +918,7 @@ CONFIG_QSORT=y
 # CONFIG_BLOBGEN is not set
 CONFIG_ARCH_HAS_STACK_DUMP=y
 CONFIG_ARCH_HAS_DATA_ABORT_MASK=y
+CONFIG_GENERIC_ALLOCATOR=y
 # end of Library routines
 
 #
diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff
index a08422ffe318..2b7b71b6879b 100644
--- a/configs/platform-v7a/barebox-at91.config.diff
+++ b/configs/platform-v7a/barebox-at91.config.diff
@@ -11,7 +11,7 @@ CONFIG_ARCH_TEXT_BASE=0x23f00000
 CONFIG_AT91SAM9_SMC=y
 CONFIG_AT91_MCI_PBL=y
 CONFIG_AT91_MULTI_BOARDS=y
-# CONFIG_ATMEL_EBI is not set
+CONFIG_ATMEL_EBI=y
 # CONFIG_BOARD_ARM_GENERIC_DT is not set
 # CONFIG_BOARD_GENERIC_DT is undefined
 CONFIG_BOOTM_OFTREE_UIMAGE=y
@@ -21,14 +21,20 @@ CONFIG_CMD_AT91CLK=y
 CONFIG_CMD_AT91_BOOT_TEST=y
 CONFIG_CMD_MENU_MANAGEMENT=y
 # CONFIG_CMD_MMC is not set
+CONFIG_CMD_NAND=y
+# CONFIG_CMD_NANDTEST is not set
+# CONFIG_CMD_NAND_BITFLIP is not set
+# CONFIG_CMD_NVMEM is not set
 # CONFIG_CMD_SMC is undefined
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFORMAT=y
 # CONFIG_CMD_USB is undefined
 # CONFIG_CMD_USBGADGET is undefined
 CONFIG_COMMON_CLK_AT91=y
 CONFIG_COMPILE_LOGLEVEL=6
 # CONFIG_CPU_SUPPORTS_32BIT_KERNEL is undefined
 # CONFIG_CPU_SUPPORTS_64BIT_KERNEL is undefined
-CONFIG_DEBUG_AT91_UART_BASE=0xf8020000
+CONFIG_DEBUG_AT91_UART_BASE=0xfc069000
 # CONFIG_DEBUG_PBL is not set
 CONFIG_DEFAULT_LOGLEVEL=7
 # CONFIG_DRIVER_NET_ARC_EMAC is undefined
@@ -38,9 +44,16 @@ CONFIG_DRIVER_SERIAL_ATMEL=y
 # CONFIG_DRIVER_SPI_ATMEL is not set
 # CONFIG_DRIVER_SPI_FSL_QUADSPI is not set
 # CONFIG_DRIVER_SPI_GPIO is not set
+# CONFIG_EEPROM_93XX46 is not set
+CONFIG_EEPROM_AT24=y
 # CONFIG_FASTBOOT_BASE is undefined
 # CONFIG_FASTBOOT_CMD_OEM is undefined
 # CONFIG_FASTBOOT_SPARSE is undefined
+CONFIG_FS_UBIFS=y
+# CONFIG_FS_UBIFS_COMPRESSION_LZO is not set
+# CONFIG_FS_UBIFS_COMPRESSION_ZLIB is not set
+CONFIG_FS_UBIFS_COMPRESSION_ZSTD=y
+CONFIG_GENERIC_ALLOCATOR=y
 # CONFIG_GPIO_PL061 is undefined
 # CONFIG_GPIO_RASPBERRYPI_EXP is undefined
 CONFIG_HAS_MACB=y
@@ -50,6 +63,7 @@ CONFIG_HAVE_AT91_DDRAMC=y
 CONFIG_HAVE_AT91_GENERATED_CLK=y
 CONFIG_HAVE_AT91_H32MX=y
 CONFIG_HAVE_AT91_I2S_MUX_CLK=y
+CONFIG_HAVE_AT91_SMD=y
 CONFIG_HAVE_AT91_USB_CLK=y
 CONFIG_HAVE_AT91_UTMI=y
 CONFIG_HAVE_MACH_ARM_HEAD=y
@@ -64,6 +78,8 @@ CONFIG_IMAGE_COMPRESSION_NONE=y
 CONFIG_IMD_TARGET=y
 # CONFIG_KEYBOARD_USB is undefined
 # CONFIG_LIBFDT is undefined
+CONFIG_LIBSCAN=y
+CONFIG_LIBUBIGEN=y
 # CONFIG_MACH_AT91SAM9263EK is not set
 # CONFIG_MACH_AT91SAM9X5EK is not set
 # CONFIG_MACH_MICROCHIP_KSZ9477_EVB is not set
@@ -77,7 +93,7 @@ CONFIG_IMD_TARGET=y
 CONFIG_MACH_SAMA5D27_GIANTBOARD=y
 CONFIG_MACH_SAMA5D27_SOM1=y
 # CONFIG_MACH_SAMA5D3_XPLAINED is not set
-# CONFIG_MACH_SAMA5D4_WIFX is not set
+CONFIG_MACH_SAMA5D4_WIFX=y
 # CONFIG_MACH_SKOV_ARM9CPU is not set
 CONFIG_MCI_ATMEL=y
 CONFIG_MCI_ATMEL_SDHCI=y
@@ -89,17 +105,35 @@ CONFIG_MCI_MMC_BOOT_PARTITIONS=y
 CONFIG_MCI_SDHCI=y
 # CONFIG_MCI_STARTUP is not set
 CONFIG_MFD_ATMEL_FLEXCOM=y
+CONFIG_MFD_ATMEL_SMC=y
 CONFIG_MFD_SYSCON=y
 CONFIG_MTD_M25P80=y
+# CONFIG_MTD_NAND_DENALI is not set
+# CONFIG_MTD_NAND_ECC_SOFT is not set
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
 CONFIG_MTD_SPI_NOR=y
 # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
 # CONFIG_MTD_SST25L is not set
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_CHECK_IO is not set
+CONFIG_MTD_UBI_FASTMAP=y
+# CONFIG_MTD_UBI_GENERAL_EXTRA_CHECKS is not set
+CONFIG_NAND=y
+# CONFIG_NAND_ALLOW_ERASE_BAD is not set
+CONFIG_NAND_ATMEL=y
+# CONFIG_NAND_ECC_HW_SYNDROME is not set
 # CONFIG_NET_USB is undefined
 # CONFIG_NET_USB_ASIX is undefined
 # CONFIG_NET_USB_RTL8152 is undefined
 # CONFIG_NET_USB_SMSC95XX is undefined
+CONFIG_NVMEM=y
+# CONFIG_NVMEM_REBOOT_MODE is not set
+# CONFIG_NVMEM_RMEM is not set
+# CONFIG_NVMEM_SNVS_LPGPR is not set
 CONFIG_OF_BAREBOX_ENV_IN_FS=y
 CONFIG_PBL_CONSOLE=y
+CONFIG_PINCTRL_AT91=y
 CONFIG_PINCTRL_AT91PIO4=y
 # CONFIG_PINCTRL_BCM283X is undefined
 CONFIG_PROMPT="barebox:"
@@ -109,12 +143,15 @@ CONFIG_REGULATOR_FIXED=y
 # CONFIG_SERIAL_AMBA_PL011 is undefined
 CONFIG_SOC_SAMA5=y
 CONFIG_SOC_SAMA5D2=y
+CONFIG_SOC_SAMA5D4=y
 CONFIG_SOC_SAMA5_MULTI=y
 CONFIG_SPI_ATMEL_QUADSPI=y
 # CONFIG_SPI_CADENCE_QUADSPI is not set
 CONFIG_SPI_MEM=y
+CONFIG_SRAM=y
 # CONFIG_SYSCON_REBOOT_MODE is not set
 # CONFIG_THUMB2_BAREBOX is undefined
+CONFIG_UBIFORMAT=y
 # CONFIG_USB is undefined
 # CONFIG_USBGADGET_START is undefined
 # CONFIG_USB_DWC2_GADGET is undefined
@@ -135,6 +172,7 @@ CONFIG_SPI_MEM=y
 # CONFIG_USB_XHCI is undefined
 CONFIG_WATCHDOG_AT91SAM9=y
 # CONFIG_WATCHDOG_BCM2835 is undefined
+CONFIG_XXHASH=y
 # CONFIG_XZ_DECOMPRESS is not set
 # CONFIG_XZ_DEC_ARM is undefined
 # CONFIG_XZ_DEC_ARMTHUMB is undefined
@@ -143,3 +181,4 @@ CONFIG_WATCHDOG_AT91SAM9=y
 # CONFIG_XZ_DEC_SPARC is undefined
 # CONFIG_XZ_DEC_X86 is undefined
 # CONFIG_ZLIB is not set
+CONFIG_ZSTD_DECOMPRESS=y
diff --git a/configs/platform-v7a/rules/barebox-at91.make b/configs/platform-v7a/rules/barebox-at91.make
index 9563a2327e00..fe426e400bed 100644
--- a/configs/platform-v7a/rules/barebox-at91.make
+++ b/configs/platform-v7a/rules/barebox-at91.make
@@ -47,6 +47,7 @@ BAREBOX_AT91_CONF_OPT := \
 BAREBOX_AT91_MAKE_OPT := $(BAREBOX_AT91_CONF_OPT)
 
 BAREBOX_AT91_IMAGES := \
+        images/barebox-wifx-l1.img \
         images/barebox-sama5d27-som1-ek.img \
         images/barebox-sama5d27-som1-ek-xload-mmc.img \
         images/barebox-groboards-sama5d27-giantboard.img \
-- 
2.39.2