changes for 2024

.devcontainer/docker-compose.yml

@@ -4,10 +4,7 @@ services:
     build:
       context: toolchain
       dockerfile: Dockerfile
-    cap_add:
+    privileged: true
-    - SYS_PTRACE
-    security_opt:
-    - seccomp:unconfined
     volumes:
       - ..:/workspace:cached
       - buildroot:/buildroot

.devcontainer/toolchain/scripts/get-buildroot.sh

@@ -8,7 +8,7 @@ set -o nounset
 git clone git://git.buildroot.net/buildroot /buildroot
 
 cd /buildroot
-git checkout -b csel 2021.11.1
+git checkout -b csel 2022.08.3
 
 rsync -a /workspace/config/board/ /buildroot/board/
 rsync -a /workspace/config/configs/ /buildroot/configs/

config/board/friendlyarm/nanopi-neo-plus2/patches/arm-trusted-firmware/0001_arm-trusted.patch

@@ -0,0 +1,13 @@
+diff --git a/services/std_svc/psci/psci_private.h b/services/std_svc/psci/psci_private.h
+index 24a5604e7..806cfb4fb 100644
+--- a/services/std_svc/psci/psci_private.h
++++ b/services/std_svc/psci/psci_private.h
+@@ -101,7 +101,7 @@ void psci_acquire_afflvl_locks(int start_afflvl,
+ 			       aff_map_node_t *mpidr_nodes[]);
+ void psci_release_afflvl_locks(int start_afflvl,
+ 				int end_afflvl,
+-				mpidr_aff_map_nodes_t mpidr_nodes);
++				aff_map_node_t *mpidr_nodes[]);
+ void psci_print_affinity_map(void);
+ void psci_set_max_phys_off_afflvl(uint32_t afflvl);
+ uint32_t psci_find_max_phys_off_afflvl(uint32_t start_afflvl,

config/board/friendlyarm/nanopi-neo-plus2/rootfs_overlay/etc/motd

@@ -0,0 +1,8 @@
+*****************************************************
+   __  __ ____  _____       ____ ____  _____ _
+  |  \/  / ___|| ____|     / ___/ ___|| ____| |
+  | |\/| \___ \|  _| _____| |   \___ \|  _| | |
+  | |  | |___) | |__|_____| |___ ___) | |___| |___
+  |_|  |_|____/|_____|     \____|____/|_____|_____|
+  
+*****************************************************

config/configs/csel_defconfig

@@ -1,12 +1,14 @@
 BR2_aarch64=y
 BR2_ARM_FPU_VFPV4=y
-BR2_SSP_NONE=y
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_PACKAGE_GLIBC_UTILS=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_PACKAGE_HOST_GDB=y
 BR2_PACKAGE_HOST_GDB_TUI=y
 BR2_PACKAGE_HOST_GDB_PYTHON3=y
+BR2_GLOBAL_PATCH_DIR="board/friendlyarm/nanopi-neo-plus2/patches"
+BR2_SSP_NONE=y
 BR2_TARGET_GENERIC_HOSTNAME="csel"
 BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM Nanopi NEO Plus2"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
@@ -16,7 +18,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo-plus2/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.148"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/friendlyarm/nanopi-neo-plus2/linux-extras.config"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -88,11 +90,10 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo_plus2"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/friendlyarm/nanopi-neo-plus2/uboot-extras.config"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
-BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
 BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y