diff --git a/configs/config b/configs/config
index e6083c2a83..81c93f00ff 100644
--- a/configs/config
+++ b/configs/config
@@ -1,26 +1,44 @@
 BR2_arm=y
-BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_KERNEL_HEADERS_5_10=y
+
+# Linux headers same as kernel, a 5.10 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
+
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_TARGET_GENERIC_HOSTNAME="piwebcam"
-BR2_TARGET_GENERIC_ISSUE=""
-BR2_INIT_SYSTEMD=y
-BR2_TARGET_GENERIC_ROOT_PASSWD="root"
-BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
-BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_PICAM_PATH)/rootfs"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_PICAM_PATH)/board/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_PICAM_PATH)/board/post-image.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="--configure-picam"
+
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,6af8ae321a801a4e20183454c65eb0d23069d8ac)/linux-6af8ae321a801a4e20183454c65eb0d23069d8ac.tar.gz"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_PICAM_PATH)/board/linux.config"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz"
+BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_PICAM_PATH)/patches/linux-custom"
+
+# Build the DTBs for A/B from the kernel sources: the zero is the same
+# as the A+ model, just in a different form-factor
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
+
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_LZ4=y
+
 BR2_PACKAGE_RPI_FIRMWARE=y
-BR2_PACKAGE_RPI_FIRMWARE_X=y
+BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y
+BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi0/config_default.txt"
+# BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set
+
+# Required tools to create the SD image
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+
+# Filesystem / image
+BR2_TARGET_ROOTFS_SQUASHFS=y
+BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_PICAM_PATH)/rootfs"
+BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_PICAM_PATH)/board/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_PICAM_PATH)/board/post-image.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="--configure-picam"
+
+# Packages
+BR2_PACKAGE_PIWEBCAM=y
+BR2_PACKAGE_CAMERA_CONTROL=y
 BR2_PACKAGE_LIBV4L=y
 BR2_PACKAGE_LIBNL=y
 # BR2_PACKAGE_SYSTEMD_PSTORE is not set
@@ -34,12 +52,10 @@ BR2_PACKAGE_LIBNL=y
 # BR2_PACKAGE_SYSTEMD_TMPFILES is not set
 # BR2_PACKAGE_SYSTEMD_VCONSOLE is not set
 BR2_PACKAGE_SYSTEMD_ANALYZE=y
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
-# BR2_TARGET_ROOTFS_TAR is not set
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_MTOOLS=y
-BR2_PACKAGE_PIWEBCAM=y
-BR2_PACKAGE_CAMERA_CONTROL=y
-BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_PICAM_PATH)/patches/linux-custom"
+
+# System
+BR2_TARGET_GENERIC_HOSTNAME="piwebcam"
+BR2_TARGET_GENERIC_ISSUE=""
+BR2_TARGET_GENERIC_ROOT_PASSWD="root"
+BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
+BR2_INIT_SYSTEMD=y
diff --git a/configs/raspberrypi0 b/configs/raspberrypi0
index 6de052f0c1..488e5a7181 100644
--- a/configs/raspberrypi0
+++ b/configs/raspberrypi0
@@ -1,2 +1,5 @@
 BR2_arm1176jzf_s=y
+BR2_ARM_EABIHF=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero"
+BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
+BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y
diff --git a/configs/raspberrypi0w b/configs/raspberrypi0w
index 3363bf9d48..c6244e0eba 100644
--- a/configs/raspberrypi0w
+++ b/configs/raspberrypi0w
@@ -1,2 +1,5 @@
 BR2_arm1176jzf_s=y
+BR2_ARM_EABIHF=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w"
+BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
+BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y
diff --git a/configs/raspberrypi4 b/configs/raspberrypi4
index 008d10401c..46f630049b 100644
--- a/configs/raspberrypi4
+++ b/configs/raspberrypi4
@@ -1,4 +1,5 @@
 BR2_cortex_a72=y
 BR2_ARM_FPU_NEON_VFPV4=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2711-rpi-4-b"
+BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y
diff --git a/package/camera-control/Config.in b/package/camera-control/Config.in
index 98d64ee505..695f7bb015 100644
--- a/package/camera-control/Config.in
+++ b/package/camera-control/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_CAMERA_CONTROL
 	bool "V4L2 Camera Control"
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_NCURSES_WCHAR
+	select BR2_TOOLCHAIN_BUILDROOT_WCHAR
 	help
 	  Install V4L2 Camera Control package