Support Orange Pi Zero3

external/config/boards/orangepi3-lts.conf

@@ -8,3 +8,4 @@ MODULES_BLACKLIST_LEGACY="bcmdhd"
 ATFBRANCH="tag:v2.2"
 DISTRIB_TYPE_LEGACY="buster focal"
 DISTRIB_TYPE_CURRENT="bullseye focal jammy"
+REVISION="3.1.0"

external/config/boards/orangepir1b.conf

@@ -0,0 +1,13 @@
+# Allwinner H618 quad core 1.5GB RAM
+BOARD_NAME="OPI R1B"
+BOARDFAMILY="sun50iw9"
+BOOTCONFIG="orangepi_r1b_defconfig"
+KERNEL_TARGET="legacy,current,next"
+MODULES_LEGACY="uwe5622_bsp_sdio sprdwl_ng sprdbt_tty"
+MODULES_CURRENT="uwe5622_bsp_sdio sprdwl_ng sprdbt_tty"
+MODULES_BLACKLIST_LEGACY="bcmdhd"
+MODULES_BLACKLIST_CURRENT="bcmdhd"
+DISTRIB_TYPE_LEGACY="buster focal"
+DISTRIB_TYPE_CURRENT="bullseye focal jammy"
+BOOT_LOGO="desktop"
+REVISION="1.0.0"

external/config/boards/orangepizero2.conf

@@ -1,10 +1,15 @@
-# Allwinner H616 quad core 512MB/1GB RAM SoC WiFi USB-C
-BOARD_NAME="Orange Pi Zero2"
+# Allwinner H616 quad core 1GB RAM
+BOARD_NAME="OPI Zero2"
 BOARDFAMILY="sun50iw9"
 BOOTCONFIG="orangepi_zero2_defconfig"
-KERNEL_TARGET="current"
+KERNEL_TARGET="current,next"
 MODULES_LEGACY="uwe5622_bsp_sdio sprdwl_ng sprdbt_tty"
-MODULES_CURRENT="sprdwl_ng sprdbt_tty"
+MODULES_CURRENT="uwe5622_bsp_sdio sprdwl_ng sprdbt_tty"
+MODULES_NEXT="uwe5622_bsp_sdio sprdwl_ng sprdbt_tty"
 MODULES_BLACKLIST_LEGACY="bcmdhd"
-DISTRIB_TYPE_LEGACY="buster focal"
-DISTRIB_TYPE_CURRENT="bullseye bookworm focal jammy"
+MODULES_BLACKLIST_CURRENT="bcmdhd"
+DISTRIB_TYPE_LEGACY="buster"
+DISTRIB_TYPE_CURRENT="bullseye focal jammy"
+DISTRIB_TYPE_NEXT="bullseye bookworm jammy"
+BOOT_LOGO="desktop"
+REVISION="3.1.0"

external/config/boards/orangepizero3.conf

@@ -0,0 +1,15 @@
+# Allwinner H618 quad core 1GB/1.5GB/2GB/4GB RAM
+BOARD_NAME="OPI Zero3"
+BOARDFAMILY="sun50iw9"
+BOOTCONFIG="orangepi_zero3_defconfig"
+KERNEL_TARGET="current,next"
+MODULES_LEGACY="uwe5622_bsp_sdio sprdwl_ng sprdbt_tty"
+MODULES_CURRENT="uwe5622_bsp_sdio sprdwl_ng sprdbt_tty"
+MODULES_NEXT="uwe5622_bsp_sdio sprdwl_ng sprdbt_tty"
+MODULES_BLACKLIST_LEGACY="bcmdhd"
+MODULES_BLACKLIST_CURRENT="bcmdhd"
+DISTRIB_TYPE_LEGACY="buster"
+DISTRIB_TYPE_CURRENT="bullseye focal jammy"
+DISTRIB_TYPE_NEXT="bullseye bookworm jammy"
+BOOT_LOGO="desktop"
+REVISION="1.0.0"

external/config/bootenv/sun50iw9-default.txt

@@ -1,4 +1,5 @@
 verbosity=1
+bootlogo=false
 console=both
 disp_mode=1080p60
 fb0_width=1920

external/config/bootscripts/boot-sun50i-next.cmd

@@ -27,7 +27,11 @@ fi
 
 if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=ttyS0,115200 console=tty1"; fi
 if test "${console}" = "serial"; then setenv consoleargs "console=ttyS0,115200"; fi
-if test "${bootlogo}" = "true"; then setenv consoleargs "bootsplash.bootfile=bootsplash.orangepi ${consoleargs}"; fi
+if test "${bootlogo}" = "true"; then
+	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
+else
+	setenv consoleargs "splash=verbose ${consoleargs}"
+fi
 
 # get PARTUUID of first partition on SD/eMMC it was loaded from
 # mmc 0 is always mapped to device u-boot (2016.09+) was loaded from

external/config/bootscripts/boot-sun50iw9.cmd

@@ -28,7 +28,11 @@ fi
 
 if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=${debug_uart},115200 console=tty1"; fi
 if test "${console}" = "serial"; then setenv consoleargs "console=${debug_uart},115200"; fi
-if test "${bootlogo}" = "true"; then setenv consoleargs "bootsplash.bootfile=bootsplash.orangepi ${consoleargs}"; fi
+if test "${bootlogo}" = "true"; then
+	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
+else
+	setenv consoleargs "splash=verbose ${consoleargs}"
+fi
 
 # get PARTUUID of first partition on SD/eMMC it was loaded from
 # mmc 0 is always mapped to device u-boot (2016.09+) was loaded from
@@ -71,6 +75,13 @@ if test "${mmc_bootdev}" = "2"; then
 	fdt set /soc/sdmmc@04022000 max-frequency <${emmc_max_frequency}>
 fi
 
+for overlay_file in ${overlays}; do
+	if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/sunxi/overlay/${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
+done
+
 for overlay_file in ${user_overlays}; do
         if load ${devtype} ${devnum} ${load_addr} ${prefix}overlay-user/${overlay_file}.dtbo; then
                 echo "Applying user provided DT overlay ${overlay_file}.dtbo"

external/config/cli/bookworm/main/packages.additional

@@ -5,6 +5,7 @@ i2c-tools
 iozone3
 jq
 libcrack2
+lm-sensors
 lsof
 mc
 mmc-utils

external/config/cli/bullseye/main/packages.additional

@@ -5,6 +5,7 @@ i2c-tools
 iozone3
 jq
 libcrack2
+lm-sensors
 lsof
 mc
 mmc-utils

external/config/cli/buster/main/packages.additional

@@ -5,6 +5,7 @@ i2c-tools
 iozone3
 jq
 libcrack2
+lm-sensors
 lsof
 mc
 mmc-utils

external/config/cli/focal/main/packages.additional

@@ -5,6 +5,7 @@ i2c-tools
 iozone3
 jq
 libcrack2
+lm-sensors
 lsof
 mc
 mmc-utils

external/config/cli/jammy/main/packages.additional

@@ -5,6 +5,7 @@ i2c-tools
 iozone3
 jq
 libcrack2
+lm-sensors
 lsof
 mc
 mmc-utils

external/config/desktop/jammy/environments/kde-plasma/support

@@ -1 +1 @@
-supported
+csc

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

@@ -1267,6 +1267,7 @@ CONFIG_MTD=y
 CONFIG_MTD_OF_PARTS=y
 # CONFIG_MTD_AR7_PARTS is not set
 CONFIG_MTD_SUNXI_PARTS=y
+CONFIG_UBOOT_DISP_ENABLE=y
 
 #
 # User Modules And Translation Layers
@@ -1733,37 +1734,15 @@ CONFIG_USB_NET_ZAURUS=y
 # CONFIG_USB_NET_QUECTEL is not set
 CONFIG_WLAN=y
 CONFIG_WLAN_VENDOR_ADMTEK=y
-CONFIG_ATH_COMMON=m
 CONFIG_WLAN_VENDOR_ATH=y
 # CONFIG_ATH_DEBUG is not set
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K=m
-CONFIG_ATH9K_AHB=y
-# CONFIG_ATH9K_DEBUGFS is not set
-# CONFIG_ATH9K_DYNACK is not set
-# CONFIG_ATH9K_WOW is not set
-CONFIG_ATH9K_RFKILL=y
-CONFIG_ATH9K_CHANNEL_CONTEXT=y
-CONFIG_ATH9K_PCOEM=y
-CONFIG_ATH9K_HTC=m
-CONFIG_ATH9K_HTC_DEBUGFS=y
-CONFIG_ATH9K_HWRNG=y
-CONFIG_CARL9170=m
-CONFIG_CARL9170_LEDS=y
-CONFIG_CARL9170_WPC=y
-CONFIG_CARL9170_HWRNG=y
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-# CONFIG_ATH6KL_DEBUG is not set
-CONFIG_AR5523=m
-CONFIG_ATH10K=m
-# CONFIG_ATH10K_DEBUG is not set
-# CONFIG_ATH10K_DEBUGFS is not set
-CONFIG_WCN36XX=m
-# CONFIG_WCN36XX_DEBUGFS is not set
+# CONFIG_ATH9K is not set
+# CONFIG_ATH9K_HTC is not set
+# CONFIG_CARL9170 is not set
+# CONFIG_ATH6KL is not set
+# CONFIG_AR5523 is not set
+# CONFIG_ATH10K is not set
+# CONFIG_WCN36XX is not set
 CONFIG_WLAN_VENDOR_ATMEL=y
 # CONFIG_AT76C50X_USB is not set
 CONFIG_WLAN_VENDOR_BROADCOM=y
@@ -1782,6 +1761,7 @@ CONFIG_WLAN_VENDOR_MARVELL=y
 # CONFIG_MWIFIEX is not set
 CONFIG_WLAN_VENDOR_MEDIATEK=y
 # CONFIG_MT7601U is not set
+# CONFIG_MT7663 is not set
 # CONFIG_WLAN_VENDOR_RALINK is not set
 CONFIG_WLAN_VENDOR_REALTEK=y
 CONFIG_RTL8187=m
@@ -1833,10 +1813,14 @@ CONFIG_AW_BIND_VERIFY=y
 # CONFIG_WLAN_UWE5621 is not set
 CONFIG_WLAN_UWE5622=m
 CONFIG_SPRDWL_NG=m
-# CONFIG_UNISOC_WIFI_PS is not set
+CONFIG_UNISOC_WIFI_PS=y
 CONFIG_TTY_OVERY_SDIO=m
 CONFIG_RTL8822BS=m
 CONFIG_RTL8821CS=m
+# CONFIG_RTL8822CS is not set
+CONFIG_RTL8821CU=m
+CONFIG_RTL8192FU=m
+# CONFIG_AIC_WLAN_SUPPORT is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -1851,7 +1835,7 @@ CONFIG_RTL8821CS=m
 CONFIG_INPUT=y
 CONFIG_INPUT_LEDS=y
 CONFIG_INPUT_FF_MEMLESS=y
-CONFIG_INPUT_POLLDEV=y
+# CONFIG_INPUT_POLLDEV is not set
 # CONFIG_INPUT_SPARSEKMAP is not set
 # CONFIG_INPUT_MATRIXKMAP is not set
 
@@ -1876,8 +1860,8 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_QT1070 is not set
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_LKKBD is not set
-CONFIG_KEYBOARD_GPIO=y
-CONFIG_KEYBOARD_GPIO_POLLED=y
+# CONFIG_KEYBOARD_GPIO is not set
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
 # CONFIG_KEYBOARD_TCA6416 is not set
 # CONFIG_KEYBOARD_TCA8418 is not set
 # CONFIG_KEYBOARD_MATRIX is not set
@@ -2034,7 +2018,6 @@ CONFIG_INPUT_GPIO=y
 # CONFIG_INPUT_ADXL34X is not set
 # CONFIG_INPUT_IMS_PCU is not set
 # CONFIG_INPUT_CMA3000 is not set
-# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
 # CONFIG_INPUT_DRV2665_HAPTICS is not set
 # CONFIG_INPUT_DRV2667_HAPTICS is not set
@@ -2169,7 +2152,7 @@ CONFIG_I2C_SMBUS=y
 #
 # I2C Algorithms
 #
-CONFIG_I2C_ALGOBIT=m
+# CONFIG_I2C_ALGOBIT is not set
 # CONFIG_I2C_ALGOPCF is not set
 # CONFIG_I2C_ALGOPCA is not set
 
@@ -2184,7 +2167,7 @@ CONFIG_I2C_ALGOBIT=m
 # CONFIG_I2C_CBUS_GPIO is not set
 # CONFIG_I2C_DESIGNWARE_PLATFORM is not set
 # CONFIG_I2C_EMEV2 is not set
-CONFIG_I2C_GPIO=m
+# CONFIG_I2C_GPIO is not set
 # CONFIG_I2C_MV64XXX is not set
 # CONFIG_I2C_NOMADIK is not set
 # CONFIG_I2C_OCORES is not set
@@ -2222,10 +2205,10 @@ CONFIG_SPI_MASTER=y
 #
 # CONFIG_SPI_ALTERA is not set
 # CONFIG_SPI_AXI_SPI_ENGINE is not set
-CONFIG_SPI_BITBANG=m
+# CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_DESIGNWARE is not set
-CONFIG_SPI_GPIO=m
+# CONFIG_SPI_GPIO is not set
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_PL022 is not set
@@ -2302,7 +2285,6 @@ CONFIG_PINCTRL_SUN50IW9P1=y
 CONFIG_PINCTRL_SUN50IW9P1_R=y
 CONFIG_GPIOLIB=y
 CONFIG_OF_GPIO=y
-CONFIG_GPIOLIB_IRQCHIP=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_GENERIC=y
@@ -2331,9 +2313,8 @@ CONFIG_GPIO_GENERIC_PLATFORM=y
 # CONFIG_GPIO_ADNP is not set
 # CONFIG_GPIO_MAX7300 is not set
 # CONFIG_GPIO_MAX732X is not set
-CONFIG_GPIO_PCA953X=y
-CONFIG_GPIO_PCA953X_IRQ=y
-CONFIG_GPIO_PCF857X=y
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_TPIC2810 is not set
 # CONFIG_GPIO_TS4900 is not set
@@ -3147,6 +3128,8 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 CONFIG_SND_SUNXI_SOC_RWFUNC=y
 CONFIG_SND_SUNXI_SOC_CPUDAI=y
 CONFIG_SND_SUNXI_SOC_HDMI=y
+CONFIG_SND_SUNXI_SOC_SPDIF=y
+CONFIG_SND_SUNXI_SOC_DMIC=y
 CONFIG_SND_SUNXI_SOC=y
 CONFIG_SND_SUN50IW9_CODEC=y
 CONFIG_AHUB_FREQ_REQ=y
@@ -3158,10 +3141,10 @@ CONFIG_SND_SUNXI_SOC_SUN50IW9_CODEC=y
 CONFIG_SND_SUNXI_SOC_CODEC_CPU_DAI=y
 CONFIG_SND_SUNXI_SOC_SUNXI_HDMIAUDIO=y
 CONFIG_SND_SUNXI_SOC_SUNXI_DAUDIO=y
-# CONFIG_SND_SUNXI_SOC_SUNXI_SPDIF is not set
-# CONFIG_SND_SUNXI_SOC_SUNXI_DMIC is not set
+CONFIG_SND_SUNXI_SOC_SUNXI_SPDIF=y
+CONFIG_SND_SUNXI_SOC_SUNXI_DMIC=y
 CONFIG_SND_SUNXI_SOC_AHUB=y
-CONFIG_SUNXI_AUDIO_DEBUG=y
+# CONFIG_SUNXI_AUDIO_DEBUG is not set
 # CONFIG_SND_SOC_XTFPGA_I2S is not set
 CONFIG_SND_SOC_I2C_AND_SPI=y
 
@@ -3191,6 +3174,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+CONFIG_SND_SOC_DMIC=y
 # CONFIG_SND_SOC_ES8328 is not set
 # CONFIG_SND_SOC_GTM601 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
@@ -3248,9 +3232,8 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_NAU8810 is not set
 # CONFIG_SND_SOC_TPA6130A2 is not set
 # CONFIG_SND_SOC_AC107 is not set
-CONFIG_SND_SIMPLE_CARD_UTILS=y
-CONFIG_SND_SIMPLE_CARD=y
-CONFIG_SND_SIMPLE_SCU_CARD=y
+# CONFIG_SND_SIMPLE_CARD is not set
+# CONFIG_SND_SIMPLE_SCU_CARD is not set
 # CONFIG_SOUND_PRIME is not set
 
 #
@@ -3695,7 +3678,7 @@ CONFIG_MMC_SUNXI=y
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_CLASS_FLASH=y
+CONFIG_LEDS_CLASS_FLASH=m
 
 #
 # LED drivers
@@ -3715,7 +3698,7 @@ CONFIG_LEDS_LP5523=m
 CONFIG_LEDS_LP5562=m
 CONFIG_LEDS_LP8501=m
 CONFIG_LEDS_LP8860=m
-CONFIG_LEDS_PCA955X=y
+CONFIG_LEDS_PCA955X=m
 CONFIG_LEDS_PCA963X=m
 CONFIG_LEDS_DAC124S085=m
 CONFIG_LEDS_PWM=m
@@ -3740,21 +3723,22 @@ CONFIG_LEDS_SYSCON=y
 # LED Triggers
 #
 CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_ONESHOT=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_MTD=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_CPU=y
-CONFIG_LEDS_TRIGGER_GPIO=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 
 #
 # iptables trigger is under Netfilter config (LED target)
 #
-CONFIG_LEDS_TRIGGER_TRANSIENT=y
-CONFIG_LEDS_TRIGGER_CAMERA=y
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
 CONFIG_LEDS_TRIGGER_PANIC=y
+CONFIG_LEDS_TRIGGER_NETDEV=y
 # CONFIG_ACCESSIBILITY is not set
 CONFIG_EDAC_SUPPORT=y
 # CONFIG_EDAC is not set
@@ -3789,7 +3773,7 @@ CONFIG_RTC_DRV_DS1374_WDT=y
 CONFIG_RTC_DRV_DS1672=m
 CONFIG_RTC_DRV_HYM8563=m
 CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_RS5C372=y
+CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_ISL1208=m
 CONFIG_RTC_DRV_ISL12022=m
 CONFIG_RTC_DRV_X1205=m

external/config/optional/families/sun50iw9/_config/desktop/bookworm/environments/xfce/config_base/packages

@@ -0,0 +1,21 @@
+cheese
+chromium
+fcitx-config-gtk
+fcitx-frontend-gtk3
+fcitx-frontend-qt5
+fcitx-googlepinyin
+fcitx-table-all
+fcitx-ui-classic
+fonts-arphic-bsmi00lp
+fonts-arphic-gbsn00lp
+fonts-arphic-gkai00mp
+fonts-glyphicons-halflings
+geany
+glmark2-es2-x11
+glmark2-x11
+im-config
+pkg-config libglib2.0-dev
+screenfetch
+tightvncserver
+vlc
+zenity

external/config/optional/families/sun50iw9/_config/desktop/bullseye/environments/xfce/config_base/packages

@@ -0,0 +1,29 @@
+apt-transport-https
+cheese
+chromium
+debhelper
+fakeroot
+fcitx
+fcitx-frontend-gtk2
+fcitx-frontend-gtk3
+fcitx-frontend-qt5
+fcitx-googlepinyin
+fcitx-table
+fcitx-table-all
+fonts-arphic-bsmi00lp
+fonts-arphic-gbsn00lp
+fonts-arphic-gkai00mp
+fcitx-config-gtk
+fcitx-googlepinyin
+fcitx-ui-light
+fcitx-ui-qimpanel
+geany
+gparted
+im-config
+screenfetch
+tightvncserver
+v4l-utils
+vlc
+xinput
+xrdp
+zenity

external/config/optional/families/sun50iw9/_config/desktop/focal/environments/xfce/config_base/packages

@@ -0,0 +1,25 @@
+cheese
+debhelper
+dkms
+fakeroot
+fcitx-chewing
+fcitx-frontend-gtk2
+fcitx-frontend-gtk3
+fcitx-frontend-qt5
+fcitx-module-cloudpinyin
+fcitx-pinyin
+fcitx-sunpinyin
+fcitx-table-cangjie
+fcitx-table-wubi
+fcitx-ui-classic
+fcitx-ui-qimpanel
+fonts-noto-cjk
+fonts-noto-cjk-extra
+geany
+glmark2
+glmark2-es2
+screenfetch
+tightvncserver
+vlc
+xinput
+xrdp

external/config/optional/families/sun50iw9/_config/desktop/jammy/environments/xfce/config_base/packages

@@ -0,0 +1,39 @@
+clinfo
+debhelper
+dkms
+fakeroot
+fcitx5-chinese-addons
+fcitx5-config-qt
+fcitx5-data
+fcitx5 fonts-noto-cjk-extra
+fcitx5-frontend-gtk2
+fcitx5-frontend-gtk3
+fcitx5-frontend-gtk4
+fcitx5-frontend-qt5
+fcitx5-module-cloudpinyin
+fonts-arphic-bsmi00lp
+fonts-arphic-gbsn00lp
+fonts-arphic-gkai00mp
+fonts-noto-cjk
+geany
+glmark2
+glmark2-es2
+gnome-user-docs-fr
+gnome-user-docs-zh-hans
+im-config
+language-pack-gnome-zh-hans
+language-pack-zh-hans
+language-selector-gnome
+libjsoncpp-dev
+libpipewire-0.3-0
+libqt5qmlworkerscript5
+python2
+qml-module-qtquick2
+screenfetch
+tightvncserver
+vlc
+wngerman
+wogerman
+xinput
+xrdp
+zenity

external/config/sources/families/include/sunxi64_common.inc

@@ -26,40 +26,32 @@ family_tweaks()
 {
 	# execute specific tweaks function if present
 	[[ $(type -t family_tweaks_s) == function ]] && family_tweaks_s
-	#cp $SRC/packages/blobs/splash/orangepi-u-boot-24.bmp $SDCARD/boot/boot.bmp
-
-	#if [[ $BOARD == orangepizero2 ]]; then
-
-	#	install_deb_chroot "$EXTER/cache/debs/extra/bullseye-desktop/xfce4-zorinmenulite-plugin_1.1.2_arm64.deb"
-	#	install_deb_chroot "$EXTER/cache/debs/extra/bullseye-desktop/dockbarx-common_1.0~beta+git20210222-1~ppa1_all.deb"
-	#	install_deb_chroot "$EXTER/cache/debs/extra/bullseye-desktop/dockbarx-dockx_1.0~beta+git20210222-1~ppa1_all.deb"
-	#	install_deb_chroot "$EXTER/cache/debs/extra/bullseye-desktop/dockbarx_1.0~beta+git20210222-1~ppa1_all.deb"
-	#	install_deb_chroot "$EXTER/cache/debs/extra/bullseye-desktop/xfce4-dockbarx-plugin_0.6+git20210221-1~ppa2~20.10_arm64.deb"
-	#	install_deb_chroot "$EXTER/cache/debs/extra/bullseye-desktop/dockbarx-theme-zorin_1.1.0_all.deb"
-	#	#install_deb_chroot "$EXTER/cache/debs/extra/bullseye-desktop/scratch-desktop_3.26.0_arm64.deb"
-	#fi
 
 	if [[ $RELEASE == jammy && $BUILD_DESKTOP == yes && $install_chromium == yes ]]; then
 
-		chromium_name="chromium-browser_101.0.4951.15-0ubuntu1~ppa1~22.04.1_arm64.deb"
-		chromium_extra_name="chromium-codecs-ffmpeg-extra_101.0.4951.15-0ubuntu1~ppa1~22.04.1_arm64.deb"
+		chromium_name="chromium-browser_107.0.5304.62-0ubuntu1~ppa1~22.04.1_arm64.deb"
+		chromium_extra_name="chromium-codecs-ffmpeg-extra_107.0.5304.62-0ubuntu1~ppa1~22.04.1_arm64.deb"
+		chromium_browser_l10n_name="chromium-browser-l10n_107.0.5304.62-0ubuntu1~ppa1~22.04.1_all.deb"
 		chromium_url="http://ppa.launchpadcontent.net/saiarcot895/chromium-beta/ubuntu/pool/main/c/chromium-browser"
 		chromium=${EXTER}/cache/debs/arm64/${chromium_name}
 		chromium_extra=${EXTER}/cache/debs/arm64/${chromium_extra_name}
+		chromium_browser_l10n=${EXTER}/cache/debs/arm64/${chromium_browser_l10n_name}
 
 		if [[ ! -f $chromium_extra ]]; then
 			wget -P ${EXTER}/cache/debs/arm64 ${chromium_url}/${chromium_name}
 			wget -P ${EXTER}/cache/debs/arm64 ${chromium_url}/${chromium_extra_name}
+			wget -P ${EXTER}/cache/debs/arm64 ${chromium_url}/${chromium_browser_l10n_name}
 		fi
 
 		install_deb_chroot $chromium_extra
 		install_deb_chroot $chromium
+		install_deb_chroot $chromium_browser_l10n
 
 	fi
 
 	if [[ $RELEASE == jammy && $BUILD_DESKTOP == yes && $install_firefox == yes ]]; then
 
-		firefox_name="firefox-esr_102.1.0esr+build1-0ubuntu0.22.04.1_arm64.deb"
+		firefox_name="firefox-esr_102.6.0esr+build1-0ubuntu0.22.04.1_arm64.deb"
 		firefox_url="https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/pool/main/f/firefox-esr/"
 		firefox=${EXTER}/cache/debs/arm64/${firefox_name}
 

external/config/sources/families/rockchip-rk3588.conf

@@ -116,7 +116,7 @@ family_tweaks_s() {
 	chroot "${SDCARD}" /bin/bash -c "ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime"
 	chroot "${SDCARD}" /bin/bash -c "dpkg-reconfigure -f noninteractive tzdata" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1
 
-	chroot $SDCARD /bin/bash -c "apt-get -y -qq install lm-sensors usb-modeswitch tree dnsmasq v4l-utils swig python3-dev python3-setuptools bluez libncurses-dev" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1
+	chroot $SDCARD /bin/bash -c "apt-get -y -qq install usb-modeswitch tree dnsmasq v4l-utils swig python3-dev python3-setuptools bluez libncurses-dev" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1
 
 	install_wiringop
 	install_docker

external/config/sources/families/sun50iw9.conf

@@ -6,96 +6,133 @@ LINUXFAMILY=sun50iw9
 [[ -z $CPUMAX ]] && CPUMAX=1512000
 GOVERNOR=ondemand
 
+ASOUND_STATE=asound.state.sun50iw9-${BRANCH}
+
 case $BRANCH in
 
         legacy)
 
 		KERNELBRANCH="branch:orange-pi-4.9-sun50iw9"
-		KERNELPATCHDIR=${BOARDFAMILY}-${BRANCH}
 		BOOTBRANCH='branch:v2018.05-sun50iw9'
+
+		KERNELPATCHDIR=${BOARDFAMILY}-${BRANCH}
 		UBOOT_TARGET_MAP=";;dts/${BOARD}-u-boot.dts boot0_sdcard.fex boot_package.fex"
 		UBOOT_COMPILER="arm-linux-gnueabi-"
 		UBOOT_USE_GCC='> 6.0'
 		BOOTENV_FILE=sun50iw9-default.txt
 		BOOTSCRIPT='boot-sun50iw9.cmd:boot.cmd'
+		KERNEL_USE_GCC='> 10.0'
 		OFFSET=20
 		ATFSOURCE=""
 		ATF_COMPILE="no"
 		INITRD_ARCH=arm
-		[[ ${BOARD} =~ orangepizero2|orangepizero2-b|orangepizero2-lts ]] && ASOUND_STATE='asound.state.sun50iw9-legacy'
-		[[ ${BOARD} == orangepi400 ]] && ASOUND_STATE='asound.state.orangepi400-es8316'
 
         ;;
 
 	current)
 
+		OVERLAY_PREFIX='sun50i-h616'
+		KERNELBRANCH="branch:orange-pi-5.4-sun50iw9"
+		#BOOTBRANCH='branch:u-boot-2018'
+		BOOTBRANCH='branch:u-boot-2018-h618'
+		#BOOTBRANCH='branch:v2018.05-sun50iw9'
+
+		KERNELPATCHDIR=${BOARDFAMILY}-${BRANCH}
+		UBOOT_TARGET_MAP=";;dts/${BOARD}-u-boot.dts boot0_sdcard.fex boot_package.fex"
+		UBOOT_COMPILER="arm-linux-gnueabi-"
+		UBOOT_USE_GCC='> 6.0'
+		BOOTENV_FILE=sun50iw9-default.txt
+		BOOTSCRIPT='boot-sun50iw9.cmd:boot.cmd'
+		KERNEL_USE_GCC='> 10.0'
+		OFFSET=20
+		ATFSOURCE=""
+		ATF_COMPILE="no"
+		INITRD_ARCH=arm
+
+	;;
+
+	next)
+
 		OVERLAY_PREFIX='sun50i-h616'
 		ATFSOURCE='https://github.com/ARM-software/arm-trusted-firmware'
 		ATFBRANCH='branch:master'
 		ATF_PLAT="sun50i_h616";
 		ATF_TARGET_MAP='PLAT=sun50i_h616 DEBUG=1 bl31;;build/sun50i_h616/debug/bl31.bin'
 		UBOOT_TARGET_MAP=';;u-boot-sunxi-with-spl.bin'
-		#BOOTBRANCH='branch:v2021.07-sunxi'
-		BOOTBRANCH='branch:v2021.10-sunxi'
-		BOOTSCRIPT='boot-sun50iw9-current.cmd:boot.cmd'
-		ASOUND_STATE='asound.state.sun50iw9-current'
+		[[ $BOARD =~ orangepizero2 ]] && BOOTBRANCH='branch:v2021.10-sunxi'
+		[[ $BOARD =~ orangepizero3|orangepir1b ]] && BOOTBRANCH='v2021.07-sunxi'
+		BOOTSCRIPT='boot-sun50iw9-next.cmd:boot.cmd'
 
-		KERNELBRANCH="branch:orange-pi-5.16-sunxi64"
-		LINUXCONFIG="linux-5.16-sun50iw9-current"
+		## For Linux5.16.y
+		#KERNELBRANCH="branch:orange-pi-5.16-sunxi64"
+		#LINUXCONFIG="linux-5.16-sun50iw9-current"
 
+		## For Linu6.1.y
+		KERNELBRANCH="branch:orange-pi-6.1-sun50iw9"
+		LINUXCONFIG="linux-6.1-sun50iw9-next"
 	;;
 
 esac
 
 family_tweaks_s()
 {
+	rsync -a --chown=root:root "${EXTER}"/packages/bsp/overlays_arm64/* ${SDCARD}/
 
-        if [[ $BOARD =~ orangepizero2|orangepizero2-lts|orangepizero2-b ]]; then
-
-		chroot $SDCARD /bin/bash -c "apt-get -y -qq install rfkill bluetooth bluez bluez-tools" >/dev/null 2>&1
-        fi
+	chroot $SDCARD /bin/bash -c "apt-get -y -qq install rfkill bluetooth bluez bluez-tools ir-keytable tree lirc v4l-utils" >/dev/null 2>&1
 
 	if [[ $BUILD_DESKTOP == yes ]]; then
 
 		sed -i "s/auto-profiles = yes/auto-profiles = no/" ${SDCARD}/usr/share/pulseaudio/alsa-mixer/profile-sets/default.conf
 
-		if [[ $BRANCH == legacy ]]; then
+		if [[ $BRANCH =~ legacy ]]; then
 			echo "load-module module-alsa-sink device=hw:0,0 sink_name=AudioCodec-Playback sink_properties=\"device.description='Audio Codec'\"" >> ${SDCARD}/etc/pulse/default.pa
 			echo "load-module module-alsa-sink device=hw:1,0 sink_name=HDMI-Playback sink_properties=\"device.description='HDMI Audio'\"" >> ${SDCARD}/etc/pulse/default.pa
-		elif [[ $BRANCH == current ]]; then
-			echo "load-module module-alsa-sink device=hw:2,0 sink_name=AudioCodec-Playback sink_properties=\"device.description='Audio Codec'\"" >> ${SDCARD}/etc/pulse/default.pa
-			echo "load-module module-alsa-sink device=hw:0,0 sink_name=HDMI-Playback sink_properties=\"device.description='HDMI Audio'\"" >> ${SDCARD}/etc/pulse/default.pa
+		elif [[ $BRANCH =~ current|next ]]; then
+			echo "load-module module-alsa-sink device=hw:0,0 sink_name=AudioCodec-Playback sink_properties=\"device.description='Audio Codec'\"" >> ${SDCARD}/etc/pulse/default.pa
+			echo "load-module module-alsa-sink device=hw:2,0 sink_name=HDMI-Playback sink_properties=\"device.description='HDMI Audio'\"" >> ${SDCARD}/etc/pulse/default.pa
 		fi
 	fi
 
+	if [[ ${BRANCH} == current ]]; then
+		sed -i 's/^debug_uart.*/debug_uart=ttyAS0/' "${SDCARD}"/boot/orangepiEnv.txt
+		SERIALCON="ttyAS0"
+	fi
+
+	install_wiringop
+	install_docker
 }
 
 family_tweaks_bsp()
 {
-	:
+
+	install -m 755 $EXTER/packages/blobs/bt/hciattach/hciattach_opi_${ARCH} $destination/usr/bin/hciattach_opi
+
 }
 
 uboot_custom_postprocess()
 {
 
-	if [[ ${BRANCH} == legacy ]]; then
+	if [[ ${BRANCH} =~ legacy|current ]]; then
 
-		rm dts/*.dts sys_config ${BOARD}-u-boot.dtb -r >/dev/null 2>&1
+		rm dts/*.dts sys_config ${BOARD}-u-boot-${BRANCH}.dtb -r >/dev/null 2>&1
 		export PATH=${EXTER}/packages/pack-uboot/${BOARDFAMILY}/tools/:$PATH
 		cp ${EXTER}/packages/pack-uboot/${BOARDFAMILY}/bin/* . -r
 		cp sys_config/sys_config_${BOARD}.fex sys_config.fex
 		cp u-boot.bin u-boot.fex
-		[[ ${BOARD} =~ orangepizero2-b|orangepizero2-lts ]] && mv boot0_sdcard_new.fex boot0_sdcard.fex
+		if [[ $KERNELBRANCH == "branch:orange-pi-5.4-sun50iw9" ]]; then
+			mv monitor.fex-linux5.4 monitor.fex
+			mv boot_package.cfg-linux5.4 boot_package.cfg
+			mv boot0_sdcard.fex-linux5.4 boot0_sdcard.fex
+		fi
 
 		# make u-boot dtb
-		$EXTER/packages/pack-uboot/${BOARDFAMILY}/tools/dtc -p 2048 -W no-unit_address_vs_reg -@ -O dtb -o ${BOARD}-u-boot.dtb -b 0 dts/${BOARD}-u-boot.dts >/dev/null 2>&1
+		$EXTER/packages/pack-uboot/${BOARDFAMILY}/tools/dtc -p 2048 -W no-unit_address_vs_reg -@ -O dtb -o ${BOARD}-u-boot.dtb -b 0 dts/${BOARD}-u-boot-${BRANCH}.dts >/dev/null 2>&1
 		[[ ! -f ${BOARD}-u-boot.dtb ]] && exit_with_error "dts compilation failed"
 
 		busybox unix2dos sys_config.fex
 		$EXTER/packages/pack-uboot/${BOARDFAMILY}/tools/script sys_config.fex >/dev/null 2>&1
 		cp ${BOARD}-u-boot.dtb sunxi.fex
 		$EXTER/packages/pack-uboot/${BOARDFAMILY}/tools/update_dtb sunxi.fex 4096 >/dev/null 2>&1
-		$EXTER/packages/pack-uboot/${BOARDFAMILY}/tools/update_boot0 boot0_sdcard.fex sys_config.bin SDMMC_CARD >/dev/null 2>&1
 
 		$EXTER/packages/pack-uboot/${BOARDFAMILY}/tools/update_uboot -no_merge u-boot.fex sys_config.bin >/dev/null 2>&1
 		update_uboot -no_merge u-boot.bin sys_config.bin >/dev/null 2>&1