board,configs: rename aarch32 -> arm for consistency with BR2_ARCH

All build scripts use $BR2_ARCH to determine location of critical board files
and configuration.  As per previous decisions, the BR2_ARCH variable controls
all naming in Infix and for consistency the defconfig files are also renamed.

This fixes the issue with missing DTB file(s) for the Raspberry Pi 2B.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

board/Config.in

@@ -1,6 +1,6 @@
 menu "Board Support"
 
-source "$BR2_EXTERNAL_INFIX_PATH/board/aarch32/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/board/arm/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/board/riscv64/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/board/x86_64/Config.in"

board/aarch32/Config.in

@@ -1,5 +0,0 @@
-if BR2_arm
-
-source "$BR2_EXTERNAL_INFIX_PATH/board/aarch32/raspberrypi-rpi2/Config.in"
-
-endif

board/aarch32/board.mk

@@ -1 +0,0 @@
-

board/arm/Config.in

@@ -0,0 +1,5 @@
+if BR2_arm
+
+source "$BR2_EXTERNAL_INFIX_PATH/board/arm/raspberrypi-rpi2/Config.in"
+
+endif

board/arm/README.md

@@ -1,5 +1,5 @@
-aarch32
-=======
+Arm 32-bit
+==========
 
 Board Specific Documentation
 ----------------------------

board/arm/board.mk

@@ -0,0 +1 @@
+include $(sort $(wildcard $(BR2_EXTERNAL_INFIX_PATH)/board/arm/*/*.mk))

board/arm/raspberrypi-rpi2/Config.in

@@ -5,11 +5,10 @@ config BR2_PACKAGE_RASPBERRYPI_RPI2
 	select BR2_PACKAGE_FEATURE_WIFI
 	select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI
 	select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI
-
 	help
 	  Support for the 32-bit ARMv7 Raspberry Pi 2B single-board computer
 	  (SBC) with BCM2836 quad-core Cortex-A7 processor.
 
-	  This was the only Raspberry Pi model with the BCM2836 and the 2B
-	  actually got a BCM2837 (Cortex-A53) underclocked an w/o wifi in
-	  the v1.2 board revision.
+	  This was the only Raspberry Pi model with the BCM2836 and the rare
+	  RPi 2B board revision v1.2 actually got an underclocked BCM2837,
+	  which is the saem Cortex-A53 as the RPi3, but w/o wifi.

board/arm/raspberrypi-rpi2/README.md

@@ -21,9 +21,8 @@ The board features:
 How to Build
 ------------
 
-Since there are no pre-built images for ARM32, you need to build both Infix
-and the bootloader from source.
-
+Since there are no pre-built images for ARM 32-bit, you need to build both
+Infix and the bootloader from source.
 
 1. Clone the repository
 
@@ -37,12 +36,12 @@ and the bootloader from source.
 
 3. Build Infix (in another tree)
 
-        make O=x-arm32 aarch32_defconfig
-        make O=x-arm32
+        make O=x-arm arm_defconfig
+        make O=x-arm
 
 4. Create the SD card image
 
-        ./utils/mkimage.sh -b x-boot -r x-arm32 raspberrypi-rpi2
+        ./utils/mkimage.sh -b x-boot -r x-arm raspberrypi-rpi2
 
 The resulting image can be found in `x-boot/images/infix-arm-sdcard.img`
 

board/common/qemu/Config.in.in

@@ -231,7 +231,7 @@ config QEMU_NET_MODEL
 	  if you want to play with low-level stuff like ethtool, you
 	  might want to test the Intel 82545EM driver, e1000.
 
-	  Note: ARM32 uses virtio-net-device (MMIO) by default.
+	  Note: ARM 32-bit uses virtio-net-device (MMIO) by default.
 
 config QEMU_NET_BRIDGE_DEV
 	string "Bridge device"

board/common/qemu/run.sh

@@ -83,7 +83,7 @@ loader_args()
 
 append_args()
 {
-    # ARM32 doesn't support virtio console properly, always use serial
+    # ARM 32-bit doesn't support virtio console properly, always use serial
     if [ "$CONFIG_QEMU_arm" ]; then
 	echo -n "console=ttyAMA0 "
     elif [ "$CONFIG_QEMU_CONSOLE_VIRTIO" ]; then
@@ -122,7 +122,7 @@ rootfs_args()
 	echo -n "-device sd-card,drive=mmc "
 	echo -n "-drive id=mmc,file=$CONFIG_QEMU_ROOTFS,if=none,format=raw "
     elif [ "$CONFIG_QEMU_ROOTFS_VSCSI" = "y" ]; then
-	# ARM32 virt machine uses MMIO virtio devices, not PCI
+	# ARM 32-bit virt machine uses MMIO virtio devices, not PCI
 	if [ "$CONFIG_QEMU_arm" ]; then
 	    echo -n "-drive file=qemu.qcow2,if=none,format=qcow2,id=rootfs "
 	    echo -n "-device virtio-blk-device,drive=rootfs "
@@ -189,7 +189,7 @@ rw_args()
 	mkfs.ext4 -L cfg "$CONFIG_QEMU_RW" >/dev/null 2>&1
     fi
 
-    # ARM32 virt machine uses MMIO virtio devices, not PCI
+    # ARM 32-bit virt machine uses MMIO virtio devices, not PCI
     if [ "$CONFIG_QEMU_arm" ]; then
 	echo -n "-drive file=aux.ext4,if=none,format=raw,id=aux "
 	echo -n "-device virtio-blk-device,drive=aux "

configs/arm_defconfig

@@ -24,13 +24,13 @@ BR2_SYSTEM_DHCP="eth0"
 BR2_ENABLE_LOCALE_WHITELIST="C en_US en_CA C.UTF-8"
 BR2_GENERATE_LOCALE="en_US en_CA C.UTF-8"
 BR2_TARGET_TZ_INFO=y
-BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNAL_INFIX_PATH}/board/aarch32/rootfs"
+BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNAL_INFIX_PATH}/board/arm/rootfs"
 BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch32/linux_defconfig"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/arm/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_INFIX_PATH}/board/common/busybox_defconfig"

configs/arm_minimal_defconfig

@@ -24,13 +24,13 @@ BR2_SYSTEM_DHCP="eth0"
 BR2_ENABLE_LOCALE_WHITELIST="C en_US en_CA C.UTF-8"
 BR2_GENERATE_LOCALE="en_US en_CA C.UTF-8"
 BR2_TARGET_TZ_INFO=y
-BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNAL_INFIX_PATH}/board/aarch32/rootfs"
+BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNAL_INFIX_PATH}/board/arm/rootfs"
 BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch32/linux_defconfig"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/arm/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_INFIX_PATH}/board/common/busybox_defconfig"

configs/rpi2_boot_defconfig

@@ -17,16 +17,16 @@ BR2_SYSTEM_BIN_SH_NONE=y
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y
-BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch32/raspberrypi-rpi2/config.txt"
-BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch32/raspberrypi-rpi2/cmdline.txt"
+BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/arm/raspberrypi-rpi2/config.txt"
+BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/arm/raspberrypi-rpi2/cmdline.txt"
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_BAREBOX=y
 BR2_TARGET_BAREBOX_CUSTOM_VERSION=y
 BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE="2025.06.0"
 BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="rpi"
-BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES="${BR2_EXTERNAL_INFIX_PATH}/board/aarch32/raspberrypi-rpi2/barebox/extras.config"
-BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV_PATH="${BR2_EXTERNAL_INFIX_PATH}/board/aarch32/raspberrypi-rpi2/barebox/env"
+BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES="${BR2_EXTERNAL_INFIX_PATH}/board/arm/raspberrypi-rpi2/barebox/extras.config"
+BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV_PATH="${BR2_EXTERNAL_INFIX_PATH}/board/arm/raspberrypi-rpi2/barebox/env"
 BR2_TARGET_BAREBOX_IMAGE_FILE="images/barebox-raspberry-pi-2.img"
 BR2_PACKAGE_HOST_BMAP_TOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y

utils/mkimage.sh

@@ -130,7 +130,7 @@ validate_board()
     fi
 
     board_underscore=$(echo "$BOARD" | tr '-' '_')
-    for arch in aarch32 aarch64 x86_64 riscv64; do
+    for arch in arm aarch64 x86_64 riscv64; do
         for variant in "$BOARD" "$board_underscore"; do
             candidate="$BR2_EXTERNAL_INFIX_PATH/board/$arch/$variant"
             if [ -d "$candidate" ]; then