Skip to content

Commit e7943b5

Browse files
troglobittroglobit
committed
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>
1 parent 64a04eb commit e7943b5

34 files changed

Lines changed: 30 additions & 32 deletions

‎board/Config.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
menu "Board Support"
22

3-
source "$BR2_EXTERNAL_INFIX_PATH/board/aarch32/Config.in"
3+
source "$BR2_EXTERNAL_INFIX_PATH/board/arm/Config.in"
44
source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/Config.in"
55
source "$BR2_EXTERNAL_INFIX_PATH/board/riscv64/Config.in"
66
source "$BR2_EXTERNAL_INFIX_PATH/board/x86_64/Config.in"

‎board/aarch32/Config.in‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎board/aarch32/board.mk‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎board/arm/Config.in‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
if BR2_arm
2+
3+
source "$BR2_EXTERNAL_INFIX_PATH/board/arm/raspberrypi-rpi2/Config.in"
4+
5+
endif

board/aarch32/README.md renamed to board/arm/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
aarch32
2-
=======
1+
Arm 32-bit
2+
==========
33

44
Board Specific Documentation
55
----------------------------

‎board/arm/board.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
include $(sort $(wildcard $(BR2_EXTERNAL_INFIX_PATH)/board/arm/*/*.mk))

board/aarch32/boot.script renamed to board/arm/boot.script

File renamed without changes.

board/aarch32/linux_defconfig renamed to board/arm/linux_defconfig

File renamed without changes.

board/aarch32/raspberrypi-rpi2/Config.in renamed to board/arm/raspberrypi-rpi2/Config.in

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@ config BR2_PACKAGE_RASPBERRYPI_RPI2
55
select BR2_PACKAGE_FEATURE_WIFI
66
select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI
77
select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI
8-
98
help
109
Support for the 32-bit ARMv7 Raspberry Pi 2B single-board computer
1110
(SBC) with BCM2836 quad-core Cortex-A7 processor.
1211

13-
This was the only Raspberry Pi model with the BCM2836 and the 2B
14-
actually got a BCM2837 (Cortex-A53) underclocked an w/o wifi in
15-
the v1.2 board revision.
12+
This was the only Raspberry Pi model with the BCM2836 and the rare
13+
RPi 2B board revision v1.2 actually got an underclocked BCM2837,
14+
which is the saem Cortex-A53 as the RPi3, but w/o wifi.

board/aarch32/raspberrypi-rpi2/LICENSE renamed to board/arm/raspberrypi-rpi2/LICENSE

File renamed without changes.

0 commit comments

Comments
 (0)