Skip to content

Commit 50514b4

Browse files
troglobittroglobit
authored
Merge pull request #1375 from kernelkit/aarch32-fixes
Sync defconfigs, fix aarch32 (now arm) build
2 parents 550f5ec + c152c5f commit 50514b4

45 files changed

Lines changed: 134 additions & 90 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎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/aarch64/linux_defconfig‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,7 @@ CONFIG_PHY_SAMSUNG_USB2=y
578578
CONFIG_NVMEM_LAYOUT_ONIE_TLV=y
579579
CONFIG_MUX_MMIO=y
580580
CONFIG_EXT2_FS=y
581+
CONFIG_EXT2_FS_POSIX_ACL=y
581582
CONFIG_EXT4_FS=y
582583
CONFIG_EXT4_FS_POSIX_ACL=y
583584
CONFIG_BTRFS_FS=y
@@ -597,8 +598,11 @@ CONFIG_SQUASHFS_LZO=y
597598
CONFIG_SQUASHFS_XZ=y
598599
CONFIG_SQUASHFS_ZSTD=y
599600
CONFIG_9P_FS=y
601+
CONFIG_NLS_DEFAULT="iso8859-15"
600602
CONFIG_NLS_CODEPAGE_437=y
601603
CONFIG_NLS_ISO8859_1=y
604+
CONFIG_NLS_ISO8859_15=y
605+
CONFIG_NLS_UTF8=y
602606
CONFIG_SECURITY=y
603607
CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,bpf"
604608
CONFIG_CRYPTO_CCM=m

‎board/aarch64/raspberrypi-rpi64/Config.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ config BR2_PACKAGE_RASPBERRYPI_RPI64
55
select BR2_PACKAGE_FEATURE_WIFI
66
select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI
77
select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI
8-
8+
select BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169
99
help
1010
Raspberry Pi 64-bit adds support for the Raspberry Pi family of
1111
of single-board computers (SBC), RPi 3B and later, including the

‎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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,9 @@ CONFIG_RASPBERRYPI_POWER=y
395395
CONFIG_PWM=y
396396
CONFIG_PWM_BCM2835=y
397397
CONFIG_EXT2_FS=y
398+
CONFIG_EXT2_FS_POSIX_ACL=y
399+
CONFIG_EXT4_FS=y
400+
CONFIG_EXT4_FS_POSIX_ACL=y
398401
CONFIG_BTRFS_FS=y
399402
CONFIG_BTRFS_FS_POSIX_ACL=y
400403
CONFIG_FANOTIFY=y
@@ -412,8 +415,10 @@ CONFIG_SQUASHFS_LZO=y
412415
CONFIG_SQUASHFS_XZ=y
413416
CONFIG_SQUASHFS_ZSTD=y
414417
CONFIG_9P_FS=y
418+
CONFIG_NLS_DEFAULT="iso8859-15"
415419
CONFIG_NLS_CODEPAGE_437=y
416420
CONFIG_NLS_ISO8859_1=y
421+
CONFIG_NLS_ISO8859_15=y
417422
CONFIG_NLS_UTF8=y
418423
CONFIG_CRYPTO_CCM=y
419424
CONFIG_CRYPTO_GCM=y

0 commit comments

Comments
 (0)