[no ci] General: sync buildroot configurations (#1583)

Makefile

@@ -1,10 +1,10 @@
-BR_VER = 2024.02.1
+BR_VER = 2024.02.6
 BR_MAKE = $(MAKE) -C $(TARGET)/buildroot-$(BR_VER) BR2_EXTERNAL=$(PWD)/general O=$(TARGET)
 BR_LINK = https://github.com/buildroot/buildroot/archive
 BR_FILE = /tmp/buildroot-$(BR_VER).tar.gz
 TARGET ?= $(PWD)/output
 
-CONFIG = $(error variable BOARD is not defined)
+CONFIG = $(error variable BOARD not defined)
 TIMER := $(shell date +%s)
 
 ifeq ($(or $(MAKECMDGOALS), $(BOARD)),)
@@ -28,8 +28,9 @@ br-%: defconfig
 	@$(BR_MAKE) $(subst br-,,$@)
 
 defconfig: prepare
-	@echo --- $(or $(CONFIG),$(error variable BOARD is not found))
-	@$(BR_MAKE) BR2_DEFCONFIG=$(PWD)/$(CONFIG) defconfig
+	@echo --- $(or $(CONFIG),$(error variable BOARD not found))
+	@cat $(CONFIG) $(PWD)/general/openipc.fragment > $(TARGET)/openipc_defconfig
+	@$(BR_MAKE) BR2_DEFCONFIG=$(TARGET)/openipc_defconfig defconfig
 
 prepare:
 	@if test ! -e $(TARGET)/buildroot-$(BR_VER); then \
@@ -49,10 +50,10 @@ list:
 	@ls -1 br-ext-chip-*/configs
 
 package:
-	@find general/package/* -maxdepth 0 -type d -printf "br-%f\n" | grep -v patch
+	@find $(PWD)/general/package/* -maxdepth 0 -type d -printf "br-%f\n" | grep -v patch
 
 toolname:
-	@general/scripts/show_toolchains.sh $(CONFIG)
+	@$(PWD)/general/scripts/show_toolchains.sh $(CONFIG)
 
 clean:
 	@rm -rf $(TARGET)/build $(TARGET)/images $(TARGET)/per-package $(TARGET)/target

br-ext-chip-allwinner/configs/v83x_lite_defconfig

@@ -1,122 +1,64 @@
 # Architecture
 BR2_arm=y
 BR2_cortex_a7=y
-# BR2_ARM_EABI is not set
-BR2_ARM_EABIHF=y
 BR2_ARM_FPU_NEON_VFPV4=y
-# BR2_ARM_INSTRUCTIONS_THUMB2 is not set
+
+# Local
+BR2_TOOLCHAIN_BUILDROOT_VENDOR="openipc"
+BR2_TOOLCHAIN_BUILDROOT_MUSL=y
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="4.9.118"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
-
-# Toolchain
-BR2_PER_PACKAGE_DIRECTORIES=y
 BR2_GCC_VERSION_13_X=y
-# BR2_TOOLCHAIN_USES_UCLIBC is not set
-# BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set
-# BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc"
-BR2_TOOLCHAIN_USES_MUSL=y
-BR2_TOOLCHAIN_BUILDROOT_MUSL=y
-BR2_TOOLCHAIN_BUILDROOT_LIBC="musl"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_KERNEL).tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/$(OPENIPC_SOC_FAMILY)/kernel/v83x.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/$(OPENIPC_SOC_FAMILY)/v83x.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
+# Filesystem
+BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL)/package/busybox/busybox.config"
+BR2_PACKAGE_UBOOT_TOOLS=y
+BR2_PACKAGE_ZLIB=y
+BR2_PACKAGE_LIBV4L=y
+BR2_PACKAGE_LIBV4L_UTILS=y
+# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
+BR2_PACKAGE_WIRELESS_TOOLS=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
+BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
+BR2_TARGET_ROOTFS_CPIO=y
+BR2_TARGET_ROOTFS_SQUASHFS=y
+BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y
+
 # OpenIPC
 BR2_OPENIPC_SOC_VENDOR="allwinner"
 BR2_OPENIPC_SOC_MODEL="v83x"
 BR2_OPENIPC_SOC_FAMILY="v83x"
 BR2_OPENIPC_VARIANT="lite"
 BR2_OPENIPC_FLASH_SIZE="8"
 
-# Filesystem
-# BR2_TARGET_TZ_INFO is not set
-BR2_TARGET_ROOTFS_CPIO=y
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y
-BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL)/overlay"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL)/scripts/rootfs_script.sh"
-
-# OpenIPC configuration
-BR2_TOOLCHAIN_BUILDROOT_VENDOR="openipc"
-BR2_TARGET_GENERIC_ISSUE="Welcome to OpenIPC"
-BR2_TARGET_GENERIC_HOSTNAME="openipc-v83x"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL)/package/all-patches"
-
-# OpenIPC packages
-BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL)/package/busybox/busybox.config"
-BR2_PACKAGE_DROPBEAR_OPENIPC=y
-# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
-# BR2_PACKAGE_FDK_AAC_OPENIPC is not set
-BR2_PACKAGE_UBOOT_TOOLS=y
+# Packages
 BR2_PACKAGE_ALLWINNER_OSDRV_V83X=y
-# BR2_PACKAGE_HISI_GPIO is not set
+BR2_PACKAGE_ATBM60XX=y
+BR2_PACKAGE_DROPBEAR_OPENIPC=y
 BR2_PACKAGE_IPCTOOL=y
-BR2_PACKAGE_JSON_C=y
 BR2_PACKAGE_JSONFILTER=y
 BR2_PACKAGE_LIBCURL_OPENIPC=y
 BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y
-# BR2_PACKAGE_LIBCURL_OPENIPC_VERBOSE is not set
 # BR2_PACKAGE_LIBCURL_OPENIPC_PROXY_SUPPORT is not set
 # BR2_PACKAGE_LIBCURL_OPENIPC_COOKIES_SUPPORT is not set
 # BR2_PACKAGE_LIBCURL_OPENIPC_EXTRA_PROTOCOLS_FEATURES is not set
-BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y
 BR2_PACKAGE_LIBEVENT_OPENIPC=y
-BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y
 BR2_PACKAGE_LIBOGG_OPENIPC=y
-BR2_PACKAGE_LIBYAML=y
-# BR2_PACKAGE_MAJESTIC is not set
-# BR2_PACKAGE_MAJESTIC_FONTS is not set
+BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC=y
+BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MEDIATEK_MT7601U=y
 BR2_PACKAGE_MAJESTIC_WEBUI=y
 BR2_PACKAGE_MBEDTLS_OPENIPC=y
-# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set
-# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set
-# BR2_PACKAGE_MINI_SNMPD is not set
-# BR2_PACKAGE_MOTORS is not set
-# BR2_PACKAGE_OPUS_OPENIPC is not set
-BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
-# BR2_PACKAGE_SSHPASS is not set
-# BR2_PACKAGE_UACME_OPENIPC is not set
 BR2_PACKAGE_VTUND_OPENIPC=y
 BR2_PACKAGE_YAML_CLI=y
-# BR2_PACKAGE_QUIRC_OPENIPC is not set
-
-# V4L
-BR2_PACKAGE_LIBV4L=y
-BR2_PACKAGE_LIBV4L_UTILS=y
-
-# WiFi
-BR2_PACKAGE_WIRELESS_TOOLS=y
-BR2_PACKAGE_WPA_SUPPLICANT=y
-BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
-BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
-BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC=y
-BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MEDIATEK_MT7601U=y
-# BR2_PACKAGE_RTL8188EU is not set
-BR2_PACKAGE_ATBM60XX=y
-
-# WIREGUARD
-# BR2_PACKAGE_WIREGUARD_LINUX_COMPAT is not set
-# BR2_PACKAGE_WIREGUARD_TOOLS is not set
-
-# DEBUG
-# BR2_PACKAGE_HOST_GDB is not set
-# BR2_PACKAGE_GDB is not set
-
-# CCACHE
-BR2_CCACHE=y
-BR2_CCACHE_DIR="$(HOME)/.ccache"
-BR2_OPTIMIZE_S=y
-
-# Compression
-BR2_PACKAGE_ZLIB=y

br-ext-chip-allwinner/configs/v83x_ultimate_defconfig

@@ -1,128 +1,64 @@
 # Architecture
 BR2_arm=y
 BR2_cortex_a7=y
-# BR2_ARM_EABI is not set
-BR2_ARM_EABIHF=y
 BR2_ARM_FPU_NEON_VFPV4=y
-# BR2_ARM_INSTRUCTIONS_THUMB2 is not set
+
+# Local
+BR2_TOOLCHAIN_BUILDROOT_VENDOR="openipc"
+BR2_TOOLCHAIN_BUILDROOT_MUSL=y
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="4.9.118"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
-
-# Toolchain
-BR2_PER_PACKAGE_DIRECTORIES=y
 BR2_GCC_VERSION_13_X=y
-# BR2_TOOLCHAIN_USES_UCLIBC is not set
-# BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set
-# BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc"
-BR2_TOOLCHAIN_USES_MUSL=y
-BR2_TOOLCHAIN_BUILDROOT_MUSL=y
-BR2_TOOLCHAIN_BUILDROOT_LIBC="musl"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_KERNEL).tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/$(OPENIPC_SOC_FAMILY)/kernel/v83x.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/$(OPENIPC_SOC_FAMILY)/v83x.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_XZ=y
 
+# Filesystem
+BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL)/package/busybox/busybox.config"
+BR2_PACKAGE_UBOOT_TOOLS=y
+BR2_PACKAGE_ZLIB=y
+BR2_PACKAGE_LIBV4L=y
+BR2_PACKAGE_LIBV4L_UTILS=y
+# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
+BR2_PACKAGE_WIRELESS_TOOLS=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
+BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
+BR2_TARGET_ROOTFS_CPIO=y
+BR2_TARGET_ROOTFS_SQUASHFS=y
+BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y
+
 # OpenIPC
 BR2_OPENIPC_SOC_VENDOR="allwinner"
 BR2_OPENIPC_SOC_MODEL="v83x"
 BR2_OPENIPC_SOC_FAMILY="v83x"
 BR2_OPENIPC_VARIANT="ultimate"
 BR2_OPENIPC_FLASH_SIZE="16"
 
-# Filesystem
-# BR2_TARGET_TZ_INFO is not set
-BR2_TARGET_ROOTFS_CPIO=y
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y
-BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL)/overlay"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL)/scripts/rootfs_script.sh"
-
-# OpenIPC configuration
-BR2_TOOLCHAIN_BUILDROOT_VENDOR="openipc"
-BR2_TARGET_GENERIC_ISSUE="Welcome to OpenIPC"
-BR2_TARGET_GENERIC_HOSTNAME="openipc-v83x"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL)/package/all-patches"
-
-# OpenIPC packages
-BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL)/package/busybox/busybox.config"
-BR2_PACKAGE_DROPBEAR_OPENIPC=y
-# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
-# BR2_PACKAGE_FDK_AAC_OPENIPC is not set
-BR2_PACKAGE_UBOOT_TOOLS=y
+# Packages
 BR2_PACKAGE_ALLWINNER_OSDRV_V83X=y
-# BR2_PACKAGE_HISI_GPIO is not set
+BR2_PACKAGE_ATBM60XX=y
+BR2_PACKAGE_DROPBEAR_OPENIPC=y
 BR2_PACKAGE_IPCTOOL=y
-BR2_PACKAGE_JSON_C=y
 BR2_PACKAGE_JSONFILTER=y
-BR2_PACKAGE_LIBCURL_OPENIPC=y
 BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y
-# BR2_PACKAGE_LIBCURL_OPENIPC_VERBOSE is not set
 # BR2_PACKAGE_LIBCURL_OPENIPC_PROXY_SUPPORT is not set
 # BR2_PACKAGE_LIBCURL_OPENIPC_COOKIES_SUPPORT is not set
 # BR2_PACKAGE_LIBCURL_OPENIPC_EXTRA_PROTOCOLS_FEATURES is not set
-BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y
 BR2_PACKAGE_LIBEVENT_OPENIPC=y
-BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y
 BR2_PACKAGE_LIBOGG_OPENIPC=y
-BR2_PACKAGE_LIBYAML=y
-# BR2_PACKAGE_MAJESTIC is not set
-# BR2_PACKAGE_MAJESTIC_FONTS is not set
+BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC=y
+BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MEDIATEK_MT7601U=y
 BR2_PACKAGE_MAJESTIC_WEBUI=y
-BR2_PACKAGE_MBEDTLS_OPENIPC=y
-# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set
-# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set
-# BR2_PACKAGE_MINI_SNMPD is not set
-# BR2_PACKAGE_MOTORS is not set
-# BR2_PACKAGE_OPUS_OPENIPC is not set
-BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
-# BR2_PACKAGE_SSHPASS is not set
 BR2_PACKAGE_UACME_OPENIPC=y
 BR2_PACKAGE_VTUND_OPENIPC=y
 BR2_PACKAGE_YAML_CLI=y
-# BR2_PACKAGE_QUIRC_OPENIPC is not set
-
-# V4L
-BR2_PACKAGE_LIBV4L=y
-BR2_PACKAGE_LIBV4L_UTILS=y
-
-# WiFi
-BR2_PACKAGE_WIRELESS_TOOLS=y
-BR2_PACKAGE_WPA_SUPPLICANT=y
-BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
-BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
-BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC=y
-BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MEDIATEK_MT7601U=y
-# BR2_PACKAGE_RTL8188EU is not set
-BR2_PACKAGE_ATBM60XX=y
-
-# WIREGUARD
-# BR2_PACKAGE_WIREGUARD_LINUX_COMPAT is not set
-# BR2_PACKAGE_WIREGUARD_TOOLS is not set
-
-# DEBUG
-# BR2_PACKAGE_HOST_GDB is not set
-# BR2_PACKAGE_GDB is not set
-
-# CCACHE
-BR2_CCACHE=y
-BR2_CCACHE_DIR="$(HOME)/.ccache"
-BR2_OPTIMIZE_S=y
-
-# ZEROTIER
 BR2_PACKAGE_ZEROTIER_ONE=y
-
-# Compression
-BR2_PACKAGE_ZLIB=y
-
-# FFMPEG
-# BR2_PACKAGE_FFMPEG_OPENIPC is not set

br-ext-chip-ambarella/configs/s2l22m_lite_defconfig

@@ -1 +0,0 @@
-#

br-ext-chip-ambarella/configs/s2l33m_lite_defconfig

@@ -1 +0,0 @@
-#