From a83a580c70e81b52259a08ccd681a09f1b448f38 Mon Sep 17 00:00:00 2001
From: uvok cheetah
Date: Fri, 13 Sep 2024 12:41:31 +0200
Subject: Use partial config instead of full defconfig

---
 configs/uvok_raspberrypi3.conf         | 57 ++++++++++++++++++++++++
 configs/uvok_raspberrypi3_64_defconfig | 79 ----------------------------------
 2 files changed, 57 insertions(+), 79 deletions(-)
 create mode 100644 configs/uvok_raspberrypi3.conf
 delete mode 100644 configs/uvok_raspberrypi3_64_defconfig

diff --git a/configs/uvok_raspberrypi3.conf b/configs/uvok_raspberrypi3.conf
new file mode 100644
index 0000000..ca49be3
--- /dev/null
+++ b/configs/uvok_raspberrypi3.conf
@@ -0,0 +1,57 @@
+# FRAGMENT / partial config
+# use the support/kconfig/merge_config.sh script
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="${BR2_EXTERNAL_UVOK_BUILDROOT_PATH}/custom/kernel_fragment"
+BR2_PACKAGE_BC=y
+BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT=y
+BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y
+BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI=y
+BR2_PACKAGE_BZIP2=y
+BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_COREUTILS=y
+BR2_PACKAGE_DIFFUTILS=y
+BR2_PACKAGE_DROPBEAR=y
+BR2_PACKAGE_FILE=y
+BR2_PACKAGE_GIT=y
+BR2_PACKAGE_GZIP=y
+BR2_PACKAGE_HOST_GENEXT2FS=y
+BR2_PACKAGE_HWDATA=y
+BR2_PACKAGE_IPROUTE2=y
+BR2_PACKAGE_IPUTILS=y
+BR2_PACKAGE_IW=y
+BR2_PACKAGE_KMON=y
+BR2_PACKAGE_LESS=y
+BR2_PACKAGE_LIBCAP=y
+BR2_PACKAGE_LIBCURL_COOKIES_SUPPORT=n
+BR2_PACKAGE_LIBCURL_CURL=y
+BR2_PACKAGE_LIBCURL=y
+# for micropython to function "properly", use os stuff
+BR2_PACKAGE_LIBFFI=y
+BR2_PACKAGE_MBEDTLS=y
+BR2_PACKAGE_MICROPYTHON_LIB=y
+BR2_PACKAGE_MICROPYTHON=y
+BR2_PACKAGE_NANO=y
+BR2_PACKAGE_NCDU=y
+BR2_PACKAGE_NETHOGS=y
+# time syncing, once at boot suffices
+BR2_PACKAGE_NTP_NTPD=n
+BR2_PACKAGE_NTP_SNTP=y
+BR2_PACKAGE_NTP=y
+BR2_PACKAGE_PROCPS_NG=y
+BR2_PACKAGE_PSMISC=y
+# cut down start
+BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_CD=y
+BR2_PACKAGE_RPI_UTILS=y
+BR2_PACKAGE_STRESS_NG=y
+BR2_PACKAGE_STRESS=y
+BR2_PACKAGE_SUDO=y
+BR2_PACKAGE_UTIL_LINUX_MOUNT=y
+BR2_PACKAGE_UTIL_LINUX=y
+BR2_PACKAGE_WGET=y
+BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_UVOK_BUILDROOT_PATH}/custom/overlay/"
+# add our own adjustments
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3-64/post-build.sh ${BR2_EXTERNAL_UVOK_BUILDROOT_PATH}/custom-scripts/modify-raspi.sh"
+BR2_SYSTEM_BIN_SH_ZSH=y
+BR2_TARGET_GENERIC_HOSTNAME="br-raspi3b"
+# reserve slightly more space
+BR2_TARGET_ROOTFS_EXT2_SIZE="150M"
+BR2_TOOLCHAIN_BUILDROOT_MUSL=y
diff --git a/configs/uvok_raspberrypi3_64_defconfig b/configs/uvok_raspberrypi3_64_defconfig
deleted file mode 100644
index 9351c1c..0000000
--- a/configs/uvok_raspberrypi3_64_defconfig
+++ /dev/null
@@ -1,79 +0,0 @@
-BR2_aarch64=y
-BR2_ARM_FPU_VFPV4=y
-BR2_TOOLCHAIN_BUILDROOT_MUSL=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_TARGET_GENERIC_HOSTNAME="br-raspi3b"
-BR2_SYSTEM_BIN_SH_ZSH=y
-BR2_SYSTEM_DHCP="eth0"
-BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_UVOK_BUILDROOT_PATH}/custom/overlay/"
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3-64/post-build.sh ${BR2_EXTERNAL_UVOK_BUILDROOT_PATH}/custom-scripts/modify-raspi.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3-64/post-image.sh"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz"
-BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2837-rpi-3-b"
-BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
-BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
-BR2_PACKAGE_BZIP2=y
-BR2_PACKAGE_GZIP=y
-BR2_PACKAGE_XZ=y
-BR2_PACKAGE_STRESS=y
-BR2_PACKAGE_STRESS_NG=y
-BR2_PACKAGE_DIFFUTILS=y
-BR2_PACKAGE_GIT=y
-BR2_PACKAGE_B43_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_RPI_FIRMWARE=y
-BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y
-BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y
-BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_CD=y
-BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi3-64/config_3_64bit.txt"
-BR2_PACKAGE_HWDATA=y
-BR2_PACKAGE_MICROPYTHON=y
-BR2_PACKAGE_MICROPYTHON_LIB=y
-BR2_PACKAGE_CA_CERTIFICATES=y
-BR2_PACKAGE_MBEDTLS=y
-BR2_PACKAGE_LIBCURL=y
-BR2_PACKAGE_LIBCURL_CURL=y
-# BR2_PACKAGE_LIBCURL_COOKIES_SUPPORT is not set
-BR2_PACKAGE_LIBCAP=y
-BR2_PACKAGE_LIBFFI=y
-BR2_PACKAGE_BC=y
-BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_IPROUTE2=y
-BR2_PACKAGE_IPUTILS=y
-BR2_PACKAGE_IW=y
-BR2_PACKAGE_NETHOGS=y
-BR2_PACKAGE_NTP=y
-BR2_PACKAGE_NTP_SNTP=y
-# BR2_PACKAGE_NTP_NTPD is not set
-BR2_PACKAGE_WGET=y
-BR2_PACKAGE_FILE=y
-BR2_PACKAGE_SUDO=y
-BR2_PACKAGE_COREUTILS=y
-BR2_PACKAGE_KMOD=y
-BR2_PACKAGE_KMOD_TOOLS=y
-BR2_PACKAGE_KMON=y
-BR2_PACKAGE_NCDU=y
-BR2_PACKAGE_PROCPS_NG=y
-BR2_PACKAGE_PSMISC=y
-BR2_PACKAGE_UTIL_LINUX=y
-BR2_PACKAGE_UTIL_LINUX_MOUNT=y
-BR2_PACKAGE_LESS=y
-BR2_PACKAGE_NANO=y
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_4=y
-BR2_TARGET_ROOTFS_EXT2_SIZE="150M"
-# BR2_TARGET_ROOTFS_TAR is not set
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
-BR2_PACKAGE_HOST_GENEXT2FS=y
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_KMOD_XZ=y
-BR2_PACKAGE_HOST_MTOOLS=y
-BR2_PACKAGE_RPI_UTILS=y
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="${BR2_EXTERNAL_UVOK_BUILDROOT_PATH}/custom/kernel_fragment"
-- 
cgit v1.2.3