From 0ed24df603a196c24a4fa3a140d4b514e9d8cb11 Mon Sep 17 00:00:00 2001
From: Sébastien Dailly <sebastien@dailly.me>
Date: Sun, 6 Nov 2022 10:41:01 +0100
Subject: Use the default configuration for the board instead of duplicate it

---
 build.sh              |  5 ++++-
 configs/config        | 37 ++-----------------------------------
 configs/raspberrypi0w | 10 ++++------
 3 files changed, 10 insertions(+), 42 deletions(-)

diff --git a/build.sh b/build.sh
index 2df77ad..3ef0c29 100755
--- a/build.sh
+++ b/build.sh
@@ -32,7 +32,10 @@ case "$BOARDNAME" in
 esac
 
 # Merge custom buildroot configurations
-CONFIG_="BR2" KCONFIG_CONFIG="configs/${BOARDNAME}_defconfig" "$BUILDROOT_DIR/support/kconfig/merge_config.sh" -m -r configs/config "configs/$BOARDNAME"
+CONFIG_="BR2" KCONFIG_CONFIG="configs/${BOARDNAME}_defconfig" "$BUILDROOT_DIR/support/kconfig/merge_config.sh" -m -r \
+    "${BUILDROOT_DIR}/configs/${BOARDNAME}_defconfig" \
+    configs/config \
+    "configs/$BOARDNAME"
 sed "1i ### DO NOT EDIT, this file was automatically generated\n" -i "configs/${BOARDNAME}_defconfig"
 
 ## Create full buildroot configuration
diff --git a/configs/config b/configs/config
index ad64e99..c044e2f 100644
--- a/configs/config
+++ b/configs/config
@@ -1,30 +1,4 @@
-BR2_arm=y
-BR2_arm1176jzf_s=y
-BR2_ARM_EABIHF=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_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz"
-BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w"
-BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
-
-# 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_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_4=y
-
+## Generic configuration for all boards
 
 BR2_HAVE_DOT_CONFIG=y
 BR2_TARGET_ROOTFS_EXT2_SIZE="255M"
@@ -35,7 +9,6 @@ BR2_TOOLCHAIN_USES_GLIBC=y
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
 BR2_TOOLCHAIN_BUILDROOT_LIBC="glibc"
 BR2_PACKAGE_GLIBC=y
-BR2_USE_WCHAR=y
 BR2_ENABLE_LOCALE=y
 BR2_TARGET_GENERIC_HOSTNAME="piaudio"
 BR2_TARGET_GENERIC_ISSUE=""
@@ -63,15 +36,9 @@ BR2_PACKAGE_BLUEZ_ALSA_RFCOMM=y
 BR2_PACKAGE_PULSEAUDIO_ENABLE_ATOMIC=y
 BR2_PACKAGE_PULSEAUDIO=y
 BR2_PACKAGE_PULSEAUDIO_DAEMON=y
-#BR2_PACKAGE_SOX=y
+
 
 BR2_PACKAGE_LIBTOOL=y
-#BR2_PACKAGE_RPI_BT_FIRMWARE=y
-#BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
-BR2_PACKAGE_RPI_FIRMWARE=y
-BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI=y
-BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT=y
-BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y
 
 BR2_PACKAGE_DBUS=y
 BR2_PACKAGE_DBUS_GLIB=y
diff --git a/configs/raspberrypi0w b/configs/raspberrypi0w
index e20c473..9c875df 100644
--- a/configs/raspberrypi0w
+++ b/configs/raspberrypi0w
@@ -1,8 +1,6 @@
-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
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_X=y
-BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y
 BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="$(BR2_EXTERNAL_PIAUDIO_PATH)/board/config_0w.txt"
+
+BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI=y
+BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT=y
+BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y
-- 
cgit v1.2.3