From 1821c1b2ad3366d5eabd52f7ba96d460d94fe7d3 Mon Sep 17 00:00:00 2001
From: Sébastien Dailly <sebastien@dailly.me>
Date: Wed, 25 May 2022 16:19:28 +0200
Subject: Switched to latest buildroot

---
 board/config_0w.txt   | 34 ++++++++++++++++++++++++++++++
 build.sh              |  4 ++--
 configs/config        | 58 ++++++++++++++++++++++++++++++++++++++++++++-------
 configs/raspberrypi0w |  8 +++++++
 4 files changed, 94 insertions(+), 10 deletions(-)
 create mode 100644 board/config_0w.txt
 create mode 100644 configs/raspberrypi0w

diff --git a/board/config_0w.txt b/board/config_0w.txt
new file mode 100644
index 0000000..e56c611
--- /dev/null
+++ b/board/config_0w.txt
@@ -0,0 +1,34 @@
+# Please note that this is only a sample, we recommend you to change it to fit
+# your needs.
+# You should override this file using a post-build script.
+# See http://buildroot.org/manual.html#rootfs-custom
+# and http://elinux.org/RPiconfig for a description of config.txt syntax
+
+# We always use the same names, the real used variant is selected by
+# BR2_PACKAGE_RPI_FIRMWARE_{DEFAULT,X,CD} choice
+start_file=start.elf
+fixup_file=fixup.dat
+
+kernel=zImage
+
+# To use an external initramfs file
+#initramfs rootfs.cpio.gz
+
+# Disable overscan assuming the display supports displaying the full resolution
+# If the text shown on the screen disappears off the edge, comment this out
+disable_overscan=1
+
+# How much memory in MB to assign to the GPU on Pi models having
+# 256, 512 or 1024 MB total memory
+gpu_mem_256=100
+gpu_mem_512=100
+gpu_mem_1024=100
+boot_delay=0
+initial_turbo=10
+dtoverlay=dwc2
+
+# https://github.com/raspberrypi/firmware/tree/master/boot/overlays
+dtparam=krnbt=on
+dtparam=i2c=on
+dtparam=audio=on
+dtoverlay=allo-boss-dac-pcm512x-audio
diff --git a/build.sh b/build.sh
index 7b61baa..efd504d 100755
--- a/build.sh
+++ b/build.sh
@@ -7,7 +7,7 @@ usage() {
     echo " - raspberrypi3"
 }
 
-test -z ${BUILDROOT_DIR} && BUILDROOT_DIR=../buildroot 
+test -z ${BUILDROOT_DIR} && BUILDROOT_DIR="../buildroot-2022.02.1"
 
 if [ ! -d ${BUILDROOT_DIR} ]; then
     usage
@@ -32,7 +32,7 @@ case "$BOARDNAME" in
 esac
 
 # Merge custom buildroot configurations
-CONFIG_="BR2" KCONFIG_CONFIG="configs/${BOARDNAME}_defconfig" "$BUILDROOT_DIR/support/kconfig/merge_config.sh" -m -r "${BUILDROOT_DIR}/configs/${BOARDNAME}_defconfig" configs/config
+CONFIG_="BR2" KCONFIG_CONFIG="configs/${BOARDNAME}_defconfig" "$BUILDROOT_DIR/support/kconfig/merge_config.sh" -m -r 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 e6e9126..e19b275 100644
--- a/configs/config
+++ b/configs/config
@@ -1,9 +1,35 @@
+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
+
+
 BR2_HAVE_DOT_CONFIG=y
-BR2_EXTERNAL_PIAUDIO_PATH="/home/sebastien/pi0/pi_audio"
+BR2_TARGET_ROOTFS_EXT2_SIZE="255M"
 BR2_NEEDS_HOST_UTF8_LOCALE=y
-#BR2_DEFCONFIG="/home/sebastien/pi0/pi_audio/configs/raspberrypi3_defconfig"
-#BR2_SSP_NONE=y
-#BR2_RELRO_NONE=y
+
 BR2_FORTIFY_SOURCE_NONE=y
 BR2_TOOLCHAIN_USES_GLIBC=y
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
@@ -19,7 +45,7 @@ BR2_ROOTFS_MERGED_USR=y
 BR2_TARGET_ENABLE_ROOT_LOGIN=y
 BR2_TARGET_GENERIC_ROOT_PASSWD="root"
 
-BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y
+BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=n
 BR2_SYSTEM_DHCP=""
 BR2_GENERATE_LOCALE=""
 BR2_TARGET_TZ_INFO=y
@@ -37,11 +63,15 @@ 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_SOX=y
 
 BR2_PACKAGE_LIBTOOL=y
-BR2_PACKAGE_RPI_BT_FIRMWARE=y
-BR2_PACKAGE_RPI_WIFI_FIRMWARE=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
@@ -119,3 +149,15 @@ BR2_PACKAGE_UTIL_LINUX_RFKILL=y
 
 BR2_PACKAGE_AVAHI=y
 BR2_PACKAGE_AVAHI_DAEMON=y
+
+#BR2_PACKAGE_MPD=y
+#BR2_PACKAGE_MPD_AVAHI_SUPPORT=y
+#BR2_PACKAGE_MPD_LIBNFS=y
+#BR2_PACKAGE_MPD_MPG123=y
+#BR2_PACKAGE_MPD_FLAC=y
+#BR2_PACKAGE_MPD_VORBIS=y
+#BR2_PACKAGE_MPD_LIBSNDFILE=y
+#BR2_PACKAGE_FFMPEG=y
+#BR2_PACKAGE_MPD_CURL=y
+#BR2_PACKAGE_MPD_ZZIP=y
+#BR2_PACKAGE_MPD_BZIP2=y
diff --git a/configs/raspberrypi0w b/configs/raspberrypi0w
new file mode 100644
index 0000000..e20c473
--- /dev/null
+++ b/configs/raspberrypi0w
@@ -0,0 +1,8 @@
+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"
-- 
cgit v1.2.3