add berry and zero config

external/cache/sources/bananapi-config/debian-config-functions

@@ -60,7 +60,7 @@ function main(){
 	[[ "$LINUXFAMILY" == "meson64" ]] && OVERLAYDIR="/boot/dtb/amlogic/overlay";
 	[[ "$LINUXFAMILY" == "rockchip64" ]] && OVERLAYDIR="/boot/dtb/rockchip/overlay";
 	[[ "$LINUXFAMILY" == "rockchip-rk3588" ]] && OVERLAYDIR="/boot/dtb/rockchip/overlay";
-	[[ "$LINUXFAMILY" == "sun50iw9" && "$BRANCH" == "current" ]] && OVERLAYDIR="/boot/dtb/sunxi/overlay";
+	[[ "$LINUXFAMILY" == "sun50iw9" && "$BRANCH" == "current" ]] && OVERLAYDIR="/boot/dtb/sunxi/overlay/${BOARD}";
 	[[ "$LINUXFAMILY" == "sun50iw9" && "$BRANCH" == "next" ]] && OVERLAYDIR="/boot/dtb/allwinner/overlay";
 	[[ "$LINUXFAMILY" == "rockchip-rk356x" ]] && OVERLAYDIR="/boot/dtb/rockchip/overlay";
 	# detect desktop

external/config/bootscripts/boot-sun50iw9.cmd

@@ -75,8 +75,14 @@ if test "${mmc_bootdev}" = "2"; then
 	fdt set /soc/sdmmc@04022000 max-frequency <${emmc_max_frequency}>
 fi
 
+if test "${fdtfile}" = "sunxi/sun50i-h618-bananapi-m4berry.dtb"; then
+	setenv model "bpi-m4berry";
+else
+	setenv model "bpi-m4zero";
+fi
+
 for overlay_file in ${overlays}; do
-	if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/sunxi/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
+	if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/sunxi/overlay/${model}/${overlay_prefix}-${overlay_file}.dtbo; then
 		echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo"
 		fdt apply ${load_addr} || setenv overlay_error "true"
 	fi

external/config/kernel/linux-sun50iw9-current.config

@@ -2,14 +2,13 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm64 5.4.125 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0"
+CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 5.4.0-6ubuntu1~16.04.12) 5.4.0 20160609"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=110400
+CONFIG_GCC_VERSION=50400
 CONFIG_CLANG_VERSION=0
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
-CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -275,6 +274,9 @@ CONFIG_ARCH_SUN50I=y
 CONFIG_ARCH_SUN50IW9=y
 # CONFIG_ARCH_SUN50IW10 is not set
 # CONFIG_ARCH_SUN50IW12 is not set
+CONFIG_BOARD_BANANAPI_M4BERRY=y
+# CONFIG_BOARD_BANANAPI_M4ZERO is not set
+# CONFIG_BOARD_ORANGEPI_ZERO3 is not set
 # CONFIG_FPGA_V4_PLATFORM is not set
 # CONFIG_FPGA_V7_PLATFORM is not set
 CONFIG_EVB_PLATFORM=y
@@ -439,8 +441,6 @@ CONFIG_ARM64_MODULE_PLTS=y
 CONFIG_RELOCATABLE=y
 CONFIG_RANDOMIZE_BASE=y
 CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
-CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
-CONFIG_STACKPROTECTOR_PER_TASK=y
 # end of Kernel Features
 
 #
@@ -856,7 +856,7 @@ CONFIG_COMPAT_BINFMT_ELF=y
 CONFIG_ELFCORE=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_BINFMT_SCRIPT=y
-# CONFIG_BINFMT_MISC is not set
+CONFIG_BINFMT_MISC=y
 CONFIG_COREDUMP=y
 # end of Executable file formats
 
@@ -1652,6 +1652,7 @@ CONFIG_BT_DEBUGFS=y
 # Bluetooth device drivers
 #
 # CONFIG_BT_HCIBTUSB is not set
+CONFIG_BT_HCIBTUSB_RTK=m
 # CONFIG_BT_HCIBTSDIO is not set
 CONFIG_BT_HCIUART=y
 CONFIG_BT_HCIUART_H4=y
@@ -1663,7 +1664,7 @@ CONFIG_BT_HCIUART_BCSP=y
 # CONFIG_BT_HCIBPA10X is not set
 # CONFIG_BT_HCIBFUSB is not set
 # CONFIG_BT_HCIVHCI is not set
-CONFIG_BCM_BT_LPM=y
+CONFIG_BCM_BT_LPM=m
 # CONFIG_RTL_BT_LPM is not set
 # CONFIG_XR_BT_LPM is not set
 # CONFIG_BT_MRVL is not set
@@ -1693,7 +1694,7 @@ CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
 # CONFIG_CFG80211_DEFAULT_PS is not set
 # CONFIG_CFG80211_DEBUGFS is not set
 CONFIG_CFG80211_CRDA_SUPPORT=y
-# CONFIG_CFG80211_WEXT is not set
+CONFIG_CFG80211_WEXT=y
 CONFIG_MAC80211=y
 CONFIG_MAC80211_HAS_RC=y
 CONFIG_MAC80211_RC_MINSTREL=y
@@ -1928,7 +1929,7 @@ CONFIG_OF_IRQ=y
 CONFIG_OF_NET=y
 CONFIG_OF_MDIO=y
 CONFIG_OF_RESERVED_MEM=y
-# CONFIG_OF_OVERLAY is not set
+CONFIG_OF_OVERLAY=y
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_NULL_BLK is not set
@@ -2381,7 +2382,7 @@ CONFIG_USB_NET_CDCETHER=y
 CONFIG_USB_NET_CDC_NCM=y
 # CONFIG_USB_NET_HUAWEI_CDC_NCM is not set
 # CONFIG_USB_NET_CDC_MBIM is not set
-# CONFIG_USB_NET_DM9601 is not set
+CONFIG_USB_NET_DM9601=m
 # CONFIG_USB_NET_SR9700 is not set
 # CONFIG_USB_NET_SR9800 is not set
 # CONFIG_USB_NET_SMSC75XX is not set
@@ -2471,6 +2472,7 @@ CONFIG_WLAN_VENDOR_MEDIATEK=y
 CONFIG_WLAN_VENDOR_RALINK=y
 # CONFIG_RT2X00 is not set
 CONFIG_WLAN_VENDOR_REALTEK=y
+CONFIG_RTL8821CU=m
 # CONFIG_RTL8187 is not set
 CONFIG_RTL_CARDS=y
 # CONFIG_RTL8192CU is not set
@@ -2577,7 +2579,7 @@ CONFIG_KEYBOARD_SUN4I_LRADC=y
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_CAP11XX is not set
 # CONFIG_KEYBOARD_BCM is not set
-CONFIG_KEYBOARD_SUNXI=y
+CONFIG_KEYBOARD_SUNXI=m
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
 CONFIG_MOUSE_PS2_ALPS=y
@@ -2764,7 +2766,7 @@ CONFIG_INPUT_MISC=y
 CONFIG_INPUT_AXP2101_PEK=y
 CONFIG_INPUT_UINPUT=y
 # CONFIG_INPUT_PCF8574 is not set
-# CONFIG_INPUT_PWM_BEEPER is not set
+CONFIG_INPUT_PWM_BEEPER=m
 # CONFIG_INPUT_PWM_VIBRA is not set
 # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
 # CONFIG_INPUT_ADXL34X is not set
@@ -2780,7 +2782,7 @@ CONFIG_INPUT_SENSOR=y
 # CONFIG_SENSORS_SC7A20 is not set
 # CONFIG_SENSORS_MIR3DA is not set
 # CONFIG_STK3X1X is not set
-CONFIG_SUNXI_GPADC=y
+# CONFIG_SUNXI_GPADC is not set
 
 #
 # Hardware I/O ports
@@ -2820,6 +2822,7 @@ CONFIG_TRACE_ROUTER=m
 CONFIG_TRACE_SINK=m
 CONFIG_NULL_TTY=m
 CONFIG_LDISC_AUTOLOAD=y
+CONFIG_DEVGPIOMEM=y
 CONFIG_DEVMEM=y
 
 #
@@ -3329,7 +3332,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_OCC_P8_I2C is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_PMBUS is not set
-# CONFIG_SENSORS_PWM_FAN is not set
+CONFIG_SENSORS_PWM_FAN=m
 # CONFIG_SENSORS_SHT15 is not set
 # CONFIG_SENSORS_SHT21 is not set
 # CONFIG_SENSORS_SHT3x is not set
@@ -4348,7 +4351,8 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_PCM3060_SPI is not set
 # CONFIG_SND_SOC_PCM3168A_I2C is not set
 # CONFIG_SND_SOC_PCM3168A_SPI is not set
-# CONFIG_SND_SOC_PCM512x_I2C is not set
+CONFIG_SND_SOC_PCM512x=m
+CONFIG_SND_SOC_PCM512x_I2C=m
 # CONFIG_SND_SOC_PCM512x_SPI is not set
 # CONFIG_SND_SOC_RK3328 is not set
 # CONFIG_SND_SOC_RT5616 is not set
@@ -4399,7 +4403,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_WM8804_SPI is not set
 # CONFIG_SND_SOC_WM8903 is not set
 # CONFIG_SND_SOC_WM8904 is not set
-# CONFIG_SND_SOC_WM8960 is not set
+CONFIG_SND_SOC_WM8960=m
 # CONFIG_SND_SOC_WM8962 is not set
 # CONFIG_SND_SOC_WM8974 is not set
 # CONFIG_SND_SOC_WM8978 is not set
@@ -4585,29 +4589,29 @@ CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_EHCI_FSL is not set
-CONFIG_USB_EHCI_HCD_SUNXI=m
+CONFIG_USB_EHCI_HCD_SUNXI=y
 # CONFIG_USB_EHCI_HCD_PLATFORM is not set
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_FOTG210_HCD is not set
 # CONFIG_USB_MAX3421_HCD is not set
 CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_OHCI_HCD_SUNXI=m
+CONFIG_USB_OHCI_HCD_SUNXI=y
 # CONFIG_USB_OHCI_HCD_PLATFORM is not set
 # CONFIG_USB_U132_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_HCD_TEST_MODE is not set
-CONFIG_USB_SUNXI_HCD=m
-CONFIG_USB_SUNXI_HCI=m
-CONFIG_USB_SUNXI_EHCI0=m
-CONFIG_USB_SUNXI_EHCI1=m
-CONFIG_USB_SUNXI_EHCI2=m
-CONFIG_USB_SUNXI_EHCI3=m
-CONFIG_USB_SUNXI_OHCI0=m
-CONFIG_USB_SUNXI_OHCI1=m
-CONFIG_USB_SUNXI_OHCI2=m
-CONFIG_USB_SUNXI_OHCI3=m
+CONFIG_USB_SUNXI_HCD=y
+CONFIG_USB_SUNXI_HCI=y
+CONFIG_USB_SUNXI_EHCI0=y
+CONFIG_USB_SUNXI_EHCI1=y
+CONFIG_USB_SUNXI_EHCI2=y
+CONFIG_USB_SUNXI_EHCI3=y
+CONFIG_USB_SUNXI_OHCI0=y
+CONFIG_USB_SUNXI_OHCI1=y
+CONFIG_USB_SUNXI_OHCI2=y
+CONFIG_USB_SUNXI_OHCI3=y
 
 #
 # USB Device Class drivers
@@ -5583,7 +5587,7 @@ CONFIG_QUOTA_TREE=y
 # CONFIG_QFMT_V1 is not set
 CONFIG_QFMT_V2=y
 CONFIG_QUOTACTL=y
-CONFIG_AUTOFS4_FS=y
+# CONFIG_AUTOFS4_FS is not set
 CONFIG_AUTOFS_FS=y
 CONFIG_FUSE_FS=y
 # CONFIG_CUSE is not set
@@ -6308,7 +6312,6 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
-CONFIG_CC_HAS_KASAN_SW_TAGS=y
 # CONFIG_KASAN is not set
 CONFIG_KASAN_STACK=1
 CONFIG_HAVE_ARCH_KFENCE=y
@@ -6320,16 +6323,20 @@ CONFIG_KFENCE_STRESS_TEST_FAULTS=0
 # end of Memory Debugging
 
 CONFIG_ARCH_HAS_KCOV=y
-CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-# CONFIG_KCOV is not set
 # CONFIG_DEBUG_SHIRQ is not set
 
 #
 # Debug Lockups and Hangs
 #
-# CONFIG_SOFTLOCKUP_DETECTOR is not set
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_WQ_WATCHDOG is not set
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=1
+CONFIG_WQ_WATCHDOG=y
 # end of Debug Lockups and Hangs
 
 # CONFIG_PANIC_ON_OOPS is not set
@@ -6375,8 +6382,8 @@ CONFIG_DEBUG_LIST=y
 #
 # CONFIG_RCU_PERF_TEST is not set
 # CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-CONFIG_RCU_TRACE=y
+CONFIG_RCU_CPU_STALL_TIMEOUT=21
+# CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
 # end of RCU Debugging
 
@@ -6393,7 +6400,6 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACE_CLOCK=y
 CONFIG_TRACING_SUPPORT=y
 # CONFIG_FTRACE is not set
 # CONFIG_KUNIT is not set

external/config/sources/families/sun50iw9.conf

@@ -31,8 +31,8 @@ case $BRANCH in
 
 	current)
 
-		OVERLAY_PREFIX='sun50i-h616'
-		KERNELBRANCH="branch:banana-pi-5.4-sun50iw9"
+		OVERLAY_PREFIX=${BOARD}
+		KERNELBRANCH="branch:sun50iw9-5.4"
 		#BOOTBRANCH='branch:u-boot-2018'
 		[[ $BOARD =~ bpi-m4berry|bpi-m4zero ]] && BOOTBRANCH='branch:v2018.05-sunxi'
 

external/packages/pack-uboot/sun50iw9/bin/dts/bpi-m4zero-u-boot-current.dts

@@ -767,9 +767,9 @@
 
 		ac200 {
 			compatible = "allwinner,sunxi-ac200";
-			status = "disabled";
-			tv_used = <0x0>;
-			tv_twi_used = <0x0>;
+			status = "okay";
+			tv_used = <0x1>;
+			tv_twi_used = <0x1>;
 			tv_twi_id = <0x3>;
 			tv_twi_addr = <0x10>;
 			tv_pwm_ch = <0x5>;
@@ -1150,20 +1150,17 @@
 			};
 
 			gmac1@0 {
-				allwinner,pins = "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9";
-				allwinner,function = "gmac1";
-				allwinner,muxsel = <0x2>;
-				allwinner,drive = <0x3>;
-				allwinner,pull = <0x0>;
+				pins = "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9";
+				function = "gmac1";
+				drive-strength = <10>;
+				bias-pull-up;
 				phandle = <0x60>;
 			};
 
 			gmac1@1 {
-				allwinner,pins = "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9";
-				allwinner,function = "gpio_in";
-				allwinner,muxsel = <0x0>;
-				allwinner,drive = <0x3>;
-				allwinner,pull = <0x0>;
+				pins = "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9";
+				function = "gpio_in";
+				drive-strength = <10>;
 				phandle = <0x61>;
 			};
 
@@ -2359,7 +2356,7 @@
 			status = "okay";
 			sys_led {
 				label="sys_led";
-				gpio = <&pio PC 12 GPIO_ACTIVE_LOW>;
+				gpios = <0x23 0x2 0xc 0x0>; /* PC12 */
 				linux,default-trigger = "heartbeat";
 			};
 		};
@@ -2416,8 +2413,8 @@
 			pinctrl-0 = <0x60>;
 			pinctrl-1 = <0x61>;
 			pinctrl-names = "default", "sleep";
-			tx-delay = <0x7>;
-			rx-delay = <0x1f>;
+			tx-delay = <0x0>;
+			rx-delay = <0x0>;
 			phandle = <0xbc>;
 		};
 
@@ -2501,7 +2498,6 @@
 			resets = <0x2 0x31 0x2 0x29>;
 			reset-names = "hci", "phy";
 			hci_ctrl_no = <0x1>;
-			drvvbus-supply = <0x62>;
 			status = "okay";
 			phandle = <0xc2>;
 		};
@@ -2515,7 +2511,6 @@
 			resets = <0x2 0x2d 0x2 0x29>;
 			reset-names = "hci", "phy";
 			hci_ctrl_no = <0x1>;
-			drvvbus-supply = <0x62>;
 			status = "okay";
 			phandle = <0xc3>;
 		};
@@ -2541,7 +2536,6 @@
 			resets = <0x2 0x32 0x2 0x2a>;
 			reset-names = "hci", "phy";
 			hci_ctrl_no = <0x2>;
-			drvvbus-supply = <0x62>;
 			status = "okay";
 			phandle = <0xc5>;
 		};
@@ -2555,7 +2549,6 @@
 			resets = <0x2 0x2e 0x2 0x2a>;
 			reset-names = "hci", "phy";
 			hci_ctrl_no = <0x2>;
-			drvvbus-supply = <0x62>;
 			status = "okay";
 			phandle = <0xc6>;
 		};
@@ -2581,7 +2574,6 @@
 			resets = <0x2 0x33 0x2 0x2b>;
 			reset-names = "hci", "phy";
 			hci_ctrl_no = <0x3>;
-			drvvbus-supply = <0x62>;
 			status = "okay";
 			phandle = <0xc8>;
 		};
@@ -2595,7 +2587,6 @@
 			resets = <0x2 0x2f 0x2 0x2b>;
 			reset-names = "hci", "phy";
 			hci_ctrl_no = <0x3>;
-			drvvbus-supply = <0x62>;
 			status = "okay";
 			phandle = <0xc9>;
 		};
@@ -2718,7 +2709,7 @@
 
 		btlpm {
 			compatible = "allwinner,sunxi-btlpm";
-			status = "okay";
+			status = "disabled";
 			uart_index = <0x1>;
 			bt_wake = <0x23 0x6 0x11 0x0>;      /* PG17 */
 			bt_hostwake = <0x23 0x6 0x10 0x0>;  /* PG16 */
@@ -2959,17 +2950,6 @@
 		};
 	};
 
-	usb0-drvvvbus {
-		compatible = "regulator-fixed";
-		regulator-name = "usb0-drvvbus";
-		regulator-min-microvolt = <0x4c4b40>;
-		regulator-max-microvolt = <0x4c4b40>;
-		regulator-enable-ramp-delay = <0x3e8>;
-		gpio = <0x23 0x2 0x10 0x0>;
-		enable-active-high;
-		phandle = <0x62>;
-	};
-
 	box_start_os0 {
 		compatible = "allwinner,box_start_os";
 		start_type = <0x1>;
@@ -3191,6 +3171,5 @@
 		cpu_threshold = "/thermal-zones/cpu_thermal_zone/trips/trip-point@0";
 		cpu_target = "/thermal-zones/cpu_thermal_zone/trips/trip-point@1";
 		cpu_crit = "/thermal-zones/cpu_thermal_zone/trips/cpu_crit@0";
-		usb0_drvvbus = "/usb0-drvvvbus";
 	};
 };

scripts/configuration.sh

@@ -411,11 +411,19 @@ DESTIMG="${SRC}/.tmp/image-${MOUNT_UUID}"
 
 BOOTCONFIG_VAR_NAME=BOOTCONFIG_${BRANCH^^}
 [[ -n ${!BOOTCONFIG_VAR_NAME} ]] && BOOTCONFIG=${!BOOTCONFIG_VAR_NAME}
-[[ -z $LINUXCONFIG ]] && LINUXCONFIG="linux-${LINUXFAMILY}-${BRANCH}"
 [[ -z $BOOTPATCHDIR ]] && BOOTPATCHDIR="u-boot-$LINUXFAMILY"
 [[ -z $ATFPATCHDIR ]] && ATFPATCHDIR="atf-$LINUXFAMILY"
 [[ -z $KERNELPATCHDIR ]] && KERNELPATCHDIR="$LINUXFAMILY-$BRANCH"
 
+if [[ -z $LINUXCONFIG ]] && [[ "${BOARD}" == "bpi-m4berry" ]]; then
+    LINUXCONFIG="bananapi_m4berry_defconfig"
+elif [[ -z $LINUXCONFIG ]] && [[ "${BOARD}" == "bpi-m4zero" ]]; then
+    LINUXCONFIG="bananapi_m4zero_defconfig"
+else
+    LINUXCONFIG="linux-${LINUXFAMILY}-${BRANCH}"
+fi
+
+
 if [[ "$RELEASE" =~ ^(xenial|bionic|focal|hirsute|impish)$ ]]; then
 		DISTRIBUTION="Ubuntu"
 elif [[ "$RELEASE" == jammy ]]; then

scripts/debootstrap.sh

@@ -479,9 +479,9 @@ prepare_partitions() {
 	UEFISIZE=${UEFISIZE:-0}
 	BIOSSIZE=${BIOSSIZE:-0}
 	UEFI_MOUNT_POINT=${UEFI_MOUNT_POINT:-/boot/efi}
-	UEFI_FS_LABEL="${UEFI_FS_LABEL:-opi_efi}"
-	ROOT_FS_LABEL="${ROOT_FS_LABEL:-opi_root}"
-	BOOT_FS_LABEL="${BOOT_FS_LABEL:-opi_boot}"
+	UEFI_FS_LABEL="${UEFI_FS_LABEL:-bpi_efi}"
+	ROOT_FS_LABEL="${ROOT_FS_LABEL:-bpi_root}"
+	BOOT_FS_LABEL="${BOOT_FS_LABEL:-bpi_boot}"
 
 	call_extension_method "pre_prepare_partitions" "prepare_partitions_custom" << 'PRE_PREPARE_PARTITIONS'
 *allow custom options for mkfs*