Support Orange Pi Zero3

.gitignore

@@ -14,6 +14,7 @@
 *.swp
 *.tar.gz
 
+b.sh
 .tmp
 kernel
 output

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

@@ -60,6 +60,8 @@ 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" == "next" ]] && OVERLAYDIR="/boot/dtb/allwinner/overlay";
 	# detect desktop
 	check_desktop
 	dialog --backtitle "$BACKTITLE" --title "Please wait" --infobox "\nLoading Orange Pi configuration utility ... " 5 45

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

external/packages/blobs/asound.state/asound.state.sun50iw9-current

@@ -1,37 +1,47 @@
-state.sndahub {
+state.audiocodec {
 	control.1 {
 		iface MIXER
-		name 'I2S0IN Switch'
-		value false
+		name 'tx hub mode'
+		value Off
 		comment {
 			access 'read write'
-			type BOOLEAN
+			type ENUMERATED
 			count 1
+			item.0 Off
+			item.1 On
 		}
 	}
 	control.2 {
 		iface MIXER
-		name 'I2S0OUT Switch'
-		value false
+		name 'digital volume'
+		value 63
 		comment {
 			access 'read write'
-			type BOOLEAN
+			type INTEGER
 			count 1
+			range '0 - 63'
+			dbmin -9999999
+			dbmax 4121460
+			dbvalue.0 4121460
 		}
 	}
 	control.3 {
 		iface MIXER
-		name 'I2S1IN Switch'
-		value false
+		name 'lineout volume'
+		value 31
 		comment {
 			access 'read write'
-			type BOOLEAN
+			type INTEGER
 			count 1
+			range '0 - 31'
+			dbmin -9999999
+			dbmax 150
+			dbvalue.0 150
 		}
 	}
 	control.4 {
 		iface MIXER
-		name 'I2S1OUT Switch'
+		name 'LINEOUT Switch'
 		value true
 		comment {
 			access 'read write'
@@ -41,8 +51,8 @@ state.sndahub {
 	}
 	control.5 {
 		iface MIXER
-		name 'I2S2IN Switch'
-		value false
+		name 'OutputL Mixer DACL Switch'
+		value true
 		comment {
 			access 'read write'
 			type BOOLEAN
@@ -51,7 +61,127 @@ state.sndahub {
 	}
 	control.6 {
 		iface MIXER
-		name 'I2S2OUT Switch'
+		name 'OutputL Mixer DACR Switch'
+		value true
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.7 {
+		iface MIXER
+		name 'OutputR Mixer DACL Switch'
+		value true
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.8 {
+		iface MIXER
+		name 'OutputR Mixer DACR Switch'
+		value true
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.9 {
+		iface MIXER
+		name 'LINEOUTL src LR'
+		value On
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 Off
+			item.1 On
+		}
+	}
+	control.10 {
+		iface MIXER
+		name 'LINEOUTR src LR'
+		value On
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 Off
+			item.1 On
+		}
+	}
+}
+state.sndahub {
+	control.1 {
+		iface MIXER
+		name 'ahub audio format Function'
+		value null
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 null
+			item.1 pcm
+			item.2 AC3
+			item.3 MPEG1
+			item.4 MP3
+			item.5 MPEG2
+			item.6 AAC
+			item.7 DTS
+			item.8 ATRAC
+			item.9 ONE_BIT_AUDIO
+			item.10 DOLBY_DIGITAL_PLUS
+			item.11 DTS_HD
+			item.12 MAT
+			item.13 WMAPRO
+		}
+	}
+	control.2 {
+		iface MIXER
+		name 'I2S0IN Switch'
+		value false
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.3 {
+		iface MIXER
+		name 'I2S0OUT Switch'
+		value false
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.4 {
+		iface MIXER
+		name 'I2S1IN Switch'
+		value false
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.5 {
+		iface MIXER
+		name 'I2S1OUT Switch'
+		value true
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.6 {
+		iface MIXER
+		name 'I2S2IN Switch'
 		value false
 		comment {
 			access 'read write'
@@ -61,7 +191,7 @@ state.sndahub {
 	}
 	control.7 {
 		iface MIXER
-		name 'I2S3IN Switch'
+		name 'I2S2OUT Switch'
 		value false
 		comment {
 			access 'read write'
@@ -71,7 +201,7 @@ state.sndahub {
 	}
 	control.8 {
 		iface MIXER
-		name 'I2S3OUT Switch'
+		name 'I2S3IN Switch'
 		value false
 		comment {
 			access 'read write'
@@ -81,7 +211,7 @@ state.sndahub {
 	}
 	control.9 {
 		iface MIXER
-		name 'DAM0IN Switch'
+		name 'I2S3OUT Switch'
 		value false
 		comment {
 			access 'read write'
@@ -91,7 +221,7 @@ state.sndahub {
 	}
 	control.10 {
 		iface MIXER
-		name 'DAM1IN Switch'
+		name 'DAM0IN Switch'
 		value false
 		comment {
 			access 'read write'
@@ -101,7 +231,7 @@ state.sndahub {
 	}
 	control.11 {
 		iface MIXER
-		name 'DAM0OUT Switch'
+		name 'DAM1IN Switch'
 		value false
 		comment {
 			access 'read write'
@@ -111,7 +241,7 @@ state.sndahub {
 	}
 	control.12 {
 		iface MIXER
-		name 'DAM1OUT Switch'
+		name 'DAM0OUT Switch'
 		value false
 		comment {
 			access 'read write'
@@ -120,6 +250,16 @@ state.sndahub {
 		}
 	}
 	control.13 {
+		iface MIXER
+		name 'DAM1OUT Switch'
+		value false
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.14 {
 		iface MIXER
 		name 'APBIF0 Src Select'
 		value NONE
@@ -139,7 +279,7 @@ state.sndahub {
 			item.9 DAM1_TXDIF
 		}
 	}
-	control.14 {
+	control.15 {
 		iface MIXER
 		name 'APBIF1 Src Select'
 		value NONE
@@ -159,7 +299,7 @@ state.sndahub {
 			item.9 DAM1_TXDIF
 		}
 	}
-	control.15 {
+	control.16 {
 		iface MIXER
 		name 'APBIF2 Src Select'
 		value NONE
@@ -179,7 +319,7 @@ state.sndahub {
 			item.9 DAM1_TXDIF
 		}
 	}
-	control.16 {
+	control.17 {
 		iface MIXER
 		name 'I2S0 Src Select'
 		value NONE
@@ -199,7 +339,7 @@ state.sndahub {
 			item.9 DAM1_TXDIF
 		}
 	}
-	control.17 {
+	control.18 {
 		iface MIXER
 		name 'I2S1 Src Select'
 		value APBIF_TXDIF0
@@ -219,7 +359,7 @@ state.sndahub {
 			item.9 DAM1_TXDIF
 		}
 	}
-	control.18 {
+	control.19 {
 		iface MIXER
 		name 'I2S2 Src Select'
 		value NONE
@@ -239,7 +379,7 @@ state.sndahub {
 			item.9 DAM1_TXDIF
 		}
 	}
-	control.19 {
+	control.20 {
 		iface MIXER
 		name 'I2S3 Src Select'
 		value NONE
@@ -259,7 +399,7 @@ state.sndahub {
 			item.9 DAM1_TXDIF
 		}
 	}
-	control.20 {
+	control.21 {
 		iface MIXER
 		name 'DAM0Chan0 Src Select'
 		value NONE
@@ -279,7 +419,7 @@ state.sndahub {
 			item.9 DAM1_TXDIF
 		}
 	}
-	control.21 {
+	control.22 {
 		iface MIXER
 		name 'DAM0Chan1 Src Select'
 		value NONE
@@ -299,7 +439,7 @@ state.sndahub {
 			item.9 DAM1_TXDIF
 		}
 	}
-	control.22 {
+	control.23 {
 		iface MIXER
 		name 'DAM0Chan2 Src Select'
 		value NONE
@@ -319,7 +459,7 @@ state.sndahub {
 			item.9 DAM1_TXDIF
 		}
 	}
-	control.23 {
+	control.24 {
 		iface MIXER
 		name 'DAM1Chan0 Src Select'
 		value NONE
@@ -339,7 +479,7 @@ state.sndahub {
 			item.9 DAM1_TXDIF
 		}
 	}
-	control.24 {
+	control.25 {
 		iface MIXER
 		name 'DAM1Chan1 Src Select'
 		value NONE
@@ -359,7 +499,7 @@ state.sndahub {
 			item.9 DAM1_TXDIF
 		}
 	}
-	control.25 {
+	control.26 {
 		iface MIXER
 		name 'DAM1Chan2 Src Select'
 		value NONE
@@ -380,137 +520,332 @@ state.sndahub {
 		}
 	}
 }
-state.allwinnerhdmi {
+state.sndhdmi {
 	control.1 {
-		iface PCM
-		name 'Playback Channel Map'
-		value.0 3
-		value.1 4
-		value.2 0
-		value.3 0
-		value.4 0
-		value.5 0
-		value.6 0
-		value.7 0
+		iface MIXER
+		name 'hdmi audio format Function'
+		value pcm
 		comment {
-			access read
-			type INTEGER
-			count 8
-			range '0 - 36'
-		}
-	}
-	control.2 {
-		iface PCM
-		name ELD
-		value '100008006c1000010000000000000000410c1000323450464c333534332f5433090701000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
-		comment {
-			access 'read volatile'
-			type BYTES
-			count 128
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 null
+			item.1 pcm
+			item.2 AC3
+			item.3 MPEG1
+			item.4 MP3
+			item.5 MPEG2
+			item.6 AAC
+			item.7 DTS
+			item.8 ATRAC
+			item.9 ONE_BIT_AUDIO
+			item.10 DOLBY_DIGITAL_PLUS
+			item.11 DTS_HD
+			item.12 MAT
+			item.13 WMAPRO
 		}
 	}
 }
-state.Codec {
+state.snddaudio2 {
+	control {
+	}
+}
+state.ahubdam {
 	control.1 {
 		iface MIXER
-		name 'digital volume'
-		value 0
+		name 'APBIF0 Src Select'
+		value NONE
 		comment {
 			access 'read write'
-			type INTEGER
+			type ENUMERATED
 			count 1
-			range '0 - 63'
-			dbmin -9999999
-			dbmax 4121460
-			dbvalue.0 -9999999
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
 		}
 	}
 	control.2 {
 		iface MIXER
-		name 'LINEOUT volume'
-		value 30
+		name 'APBIF1 Src Select'
+		value I2S1_TXDIF
 		comment {
 			access 'read write'
-			type INTEGER
+			type ENUMERATED
 			count 1
-			range '0 - 31'
-			dbmin -9999999
-			dbmax 150
-			dbvalue.0 0
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
 		}
 	}
 	control.3 {
 		iface MIXER
-		name 'LINEOUT Switch'
-		value true
+		name 'APBIF2 Src Select'
+		value NONE
 		comment {
 			access 'read write'
-			type BOOLEAN
+			type ENUMERATED
 			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
 		}
 	}
 	control.4 {
 		iface MIXER
-		name 'Left Output Mixer DACL Switch'
-		value true
+		name 'I2S0 Src Select'
+		value NONE
 		comment {
 			access 'read write'
-			type BOOLEAN
+			type ENUMERATED
 			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
 		}
 	}
 	control.5 {
 		iface MIXER
-		name 'Left Output Mixer DACR Switch'
-		value true
+		name 'I2S1 Src Select'
+		value APBIF_TXDIF1
 		comment {
 			access 'read write'
-			type BOOLEAN
+			type ENUMERATED
 			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
 		}
 	}
 	control.6 {
 		iface MIXER
-		name 'Right Output Mixer DACL Switch'
-		value true
+		name 'I2S2 Src Select'
+		value NONE
 		comment {
 			access 'read write'
-			type BOOLEAN
+			type ENUMERATED
 			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
 		}
 	}
 	control.7 {
 		iface MIXER
-		name 'Right Output Mixer DACR Switch'
-		value true
+		name 'I2S3 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.8 {
+		iface MIXER
+		name 'DAM0C0 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.9 {
+		iface MIXER
+		name 'DAM0C1 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.10 {
+		iface MIXER
+		name 'DAM0C2 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.11 {
+		iface MIXER
+		name 'DAM1C0 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.12 {
+		iface MIXER
+		name 'DAM1C1 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.13 {
+		iface MIXER
+		name 'DAM1C2 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+}
+state.ahubhdmi {
+	control.1 {
+		iface MIXER
+		name 'audio data format'
+		value PCM
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NULL
+			item.1 PCM
+			item.2 AC3
+			item.3 MPEG1
+			item.4 MP3
+			item.5 MPEG2
+			item.6 AAC
+			item.7 DTS
+			item.8 ATRAC
+			item.9 ONE_BIT_AUDIO
+			item.10 DOLBY_DIGITAL_PLUS
+			item.11 DTS_HD
+			item.12 MAT
+			item.13 DST
+			item.14 WMAPRO
+		}
+	}
+	control.2 {
+		iface MIXER
+		name 'loopback debug'
+		value false
 		comment {
 			access 'read write'
 			type BOOLEAN
 			count 1
 		}
 	}
-	control.8 {
-		iface MIXER
-		name 'Left LINEOUT Mux'
-		value LOMixer
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 LOMixer
-			item.1 LROMixer
-		}
-	}
-	control.9 {
-		iface MIXER
-		name 'Right LINEOUT Mux'
-		value ROMixer
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 ROMixer
-			item.1 LROMixer
-		}
-	}
 }

external/packages/blobs/asound.state/asound.state.sun50iw9-next

@@ -0,0 +1,942 @@
+state.sndahub {
+	control.1 {
+		iface MIXER
+		name 'I2S0IN Switch'
+		value false
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.2 {
+		iface MIXER
+		name 'I2S0OUT Switch'
+		value false
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.3 {
+		iface MIXER
+		name 'I2S1IN Switch'
+		value false
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.4 {
+		iface MIXER
+		name 'I2S1OUT Switch'
+		value true
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.5 {
+		iface MIXER
+		name 'I2S2IN Switch'
+		value false
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.6 {
+		iface MIXER
+		name 'I2S2OUT Switch'
+		value false
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.7 {
+		iface MIXER
+		name 'I2S3IN Switch'
+		value false
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.8 {
+		iface MIXER
+		name 'I2S3OUT Switch'
+		value false
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.9 {
+		iface MIXER
+		name 'DAM0IN Switch'
+		value false
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.10 {
+		iface MIXER
+		name 'DAM1IN Switch'
+		value false
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.11 {
+		iface MIXER
+		name 'DAM0OUT Switch'
+		value false
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.12 {
+		iface MIXER
+		name 'DAM1OUT Switch'
+		value false
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.13 {
+		iface MIXER
+		name 'APBIF0 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.14 {
+		iface MIXER
+		name 'APBIF1 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.15 {
+		iface MIXER
+		name 'APBIF2 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.16 {
+		iface MIXER
+		name 'I2S0 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.17 {
+		iface MIXER
+		name 'I2S1 Src Select'
+		value APBIF_TXDIF0
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.18 {
+		iface MIXER
+		name 'I2S2 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.19 {
+		iface MIXER
+		name 'I2S3 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.20 {
+		iface MIXER
+		name 'DAM0Chan0 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.21 {
+		iface MIXER
+		name 'DAM0Chan1 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.22 {
+		iface MIXER
+		name 'DAM0Chan2 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.23 {
+		iface MIXER
+		name 'DAM1Chan0 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.24 {
+		iface MIXER
+		name 'DAM1Chan1 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.25 {
+		iface MIXER
+		name 'DAM1Chan2 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+}
+state.allwinnerhdmi {
+	control.1 {
+		iface PCM
+		name 'Playback Channel Map'
+		value.0 3
+		value.1 4
+		value.2 0
+		value.3 0
+		value.4 0
+		value.5 0
+		value.6 0
+		value.7 0
+		comment {
+			access read
+			type INTEGER
+			count 8
+			range '0 - 36'
+		}
+	}
+	control.2 {
+		iface PCM
+		name ELD
+		value '100008006c1000010000000000000000410c1000323450464c333534332f5433090701000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
+		comment {
+			access 'read volatile'
+			type BYTES
+			count 128
+		}
+	}
+}
+state.Codec {
+	control.1 {
+		iface MIXER
+		name 'digital volume'
+		value 0
+		comment {
+			access 'read write'
+			type INTEGER
+			count 1
+			range '0 - 63'
+			dbmin -9999999
+			dbmax 4121460
+			dbvalue.0 -9999999
+		}
+	}
+	control.2 {
+		iface MIXER
+		name 'LINEOUT volume'
+		value 30
+		comment {
+			access 'read write'
+			type INTEGER
+			count 1
+			range '0 - 31'
+			dbmin -9999999
+			dbmax 150
+			dbvalue.0 0
+		}
+	}
+	control.3 {
+		iface MIXER
+		name 'LINEOUT Switch'
+		value true
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.4 {
+		iface MIXER
+		name 'Left Output Mixer DACL Switch'
+		value true
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.5 {
+		iface MIXER
+		name 'Left Output Mixer DACR Switch'
+		value true
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.6 {
+		iface MIXER
+		name 'Right Output Mixer DACL Switch'
+		value true
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.7 {
+		iface MIXER
+		name 'Right Output Mixer DACR Switch'
+		value true
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.8 {
+		iface MIXER
+		name 'Left LINEOUT Mux'
+		value LOMixer
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 LOMixer
+			item.1 LROMixer
+		}
+	}
+	control.9 {
+		iface MIXER
+		name 'Right LINEOUT Mux'
+		value ROMixer
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 ROMixer
+			item.1 LROMixer
+		}
+	}
+}
+state.audiocodec {
+	control.1 {
+		iface MIXER
+		name 'digital volume'
+		value 0
+		comment {
+			access 'read write'
+			type INTEGER
+			count 1
+			range '0 - 63'
+			dbmin -9999999
+			dbmax 4121460
+			dbvalue.0 -9999999
+		}
+	}
+	control.2 {
+		iface MIXER
+		name 'LINEOUT volume'
+		value 31
+		comment {
+			access 'read write'
+			type INTEGER
+			count 1
+			range '0 - 31'
+			dbmin -9999999
+			dbmax 150
+			dbvalue.0 150
+		}
+	}
+	control.3 {
+		iface MIXER
+		name 'LINEOUT Switch'
+		value true
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.4 {
+		iface MIXER
+		name 'Left Output Mixer DACL Switch'
+		value true
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.5 {
+		iface MIXER
+		name 'Left Output Mixer DACR Switch'
+		value true
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.6 {
+		iface MIXER
+		name 'Right Output Mixer DACL Switch'
+		value true
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.7 {
+		iface MIXER
+		name 'Right Output Mixer DACR Switch'
+		value true
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.8 {
+		iface MIXER
+		name 'Left LINEOUT Mux'
+		value LOMixer
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 LOMixer
+			item.1 LROMixer
+		}
+	}
+	control.9 {
+		iface MIXER
+		name 'Right LINEOUT Mux'
+		value ROMixer
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 ROMixer
+			item.1 LROMixer
+		}
+	}
+}
+state.ahubdam {
+	control.1 {
+		iface MIXER
+		name 'APBIF0 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.2 {
+		iface MIXER
+		name 'APBIF1 Src Select'
+		value I2S1_TXDIF
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.3 {
+		iface MIXER
+		name 'APBIF2 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.4 {
+		iface MIXER
+		name 'I2S0 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.5 {
+		iface MIXER
+		name 'I2S1 Src Select'
+		value APBIF_TXDIF1
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.6 {
+		iface MIXER
+		name 'I2S2 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.7 {
+		iface MIXER
+		name 'I2S3 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.8 {
+		iface MIXER
+		name 'DAM0C0 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.9 {
+		iface MIXER
+		name 'DAM0C1 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.10 {
+		iface MIXER
+		name 'DAM0C2 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.11 {
+		iface MIXER
+		name 'DAM1C0 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.12 {
+		iface MIXER
+		name 'DAM1C1 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+	control.13 {
+		iface MIXER
+		name 'DAM1C2 Src Select'
+		value NONE
+		comment {
+			access 'read write'
+			type ENUMERATED
+			count 1
+			item.0 NONE
+			item.1 APBIF_TXDIF0
+			item.2 APBIF_TXDIF1
+			item.3 APBIF_TXDIF2
+			item.4 I2S0_TXDIF
+			item.5 I2S1_TXDIF
+			item.6 I2S2_TXDIF
+			item.7 I2S3_TXDIF
+			item.8 DAM0_TXDIF
+			item.9 DAM1_TXDIF
+		}
+	}
+}
+state.ahubhdmi {
+	control.1 {
+		iface MIXER
+		name 'loopback debug'
+		value false
+		comment {
+			access 'read write'
+			type BOOLEAN
+			count 1
+		}
+	}
+	control.2 {
+		iface PCM
+		name 'Playback Channel Map'
+		value.0 0
+		value.1 0
+		value.2 0
+		value.3 0
+		value.4 0
+		value.5 0
+		value.6 0
+		value.7 0
+		comment {
+			access read
+			type INTEGER
+			count 8
+			range '0 - 36'
+		}
+	}
+	control.3 {
+		iface PCM
+		name 'IEC958 Playback Mask'
+		value ffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+		comment {
+			access read
+			type IEC958
+			count 1
+		}
+	}
+	control.4 {
+		iface PCM
+		name 'IEC958 Playback Default'
+		value '0400000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
+		comment {
+			access 'read write'
+			type IEC958
+			count 1
+		}
+	}
+	control.5 {
+		iface PCM
+		name ELD
+		value '10000600651000010000000000000000061433455443313536097f0700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
+		comment {
+			access 'read volatile'
+			type BYTES
+			count 128
+		}
+	}
+}

external/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml

@@ -35,6 +35,7 @@
         <property name="workspace0" type="empty">
           <property name="color-style" type="int" value="0"/>
           <property name="image-style" type="int" value="5"/>
+          <property name="image-path" type="string" value="/usr/share/backgrounds/orangepi/orangepi-default.png"/>
           <property name="last-image" type="string" value="/usr/share/backgrounds/orangepi/orangepi-default.png"/>
         </property>
         <property name="workspace1" type="empty">

external/packages/bsp/common/etc/X11/xorg.conf.d/01-orangepi-defaults.conf

@@ -1,10 +0,0 @@
-Section "Monitor"
-	Identifier		"Monitor0"
-	Option			"DPMS" "false"
-EndSection
-Section "ServerFlags"
-	Option			"BlankTime" "0"
-	Option			"StandbyTime" "0"
-	Option			"SuspendTime" "0"
-	Option			"OffTime" "0"
-EndSection

external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization

@@ -162,15 +162,46 @@ prepare_board() {
 
 			/usr/bin/pwm-fan.sh &
 			;;
-		orangepizero2|orangepizero2-lts|orangepizero2-b|orangepi400)
-			if [[ $BRANCH == current ]]; then
-				# Initial hdmi audio
-				aplay /usr/share/sounds/alsa/mute.wav -D hw:0,0 > /dev/null 2>&1
-				aplay /usr/share/sounds/alsa/mute.wav -D hw:1,0 > /dev/null 2>&1
-				aplay /usr/share/sounds/alsa/mute.wav -D hw:0,0 > /dev/null 2>&1
+		orangepizero2|orangepizero2-lts|orangepizero2-b|orangepizero3|orangepir1b)
+			kv=$(uname -r)
+
+			#if [[ $BRANCH == current ]]; then
+			#	# Initial hdmi audio
+			#	aplay /usr/share/sounds/alsa/mute.wav -D hw:0,0 > /dev/null 2>&1
+			#	aplay /usr/share/sounds/alsa/mute.wav -D hw:1,0 > /dev/null 2>&1
+			#	aplay /usr/share/sounds/alsa/mute.wav -D hw:0,0 > /dev/null 2>&1
+			#fi
+
+			if [[ $BOARD == orangepir1b ]]; then
+
+				#for 100m interface
+				interface_100m="eth1"
+				echo netdev > /sys/class/leds/100m_act/trigger
+				echo "${interface_100m}" > /sys/class/leds/100m_act/device_name
+				echo 1 > /sys/class/leds/100m_act/tx
+				echo 1 > /sys/class/leds/100m_act/rx
+
+				echo netdev > /sys/class/leds/100m_link/trigger
+				echo ${interface_100m} > /sys/class/leds/100m_link/device_name
+				echo 1 > /sys/class/leds/100m_link/link
+
+				echo netdev > /sys/class/leds/lan_led/trigger
+				echo ${interface_100m} > /sys/class/leds/lan_led/device_name
+				echo 1 > /sys/class/leds/lan_led/link
+				echo 1 > /sys/class/leds/lan_led/tx
+				echo 1 > /sys/class/leds/lan_led/rx
+
+				#for 1000m interface
+				interface_1000m="eth0"
+				echo netdev > /sys/class/leds/wan_led/trigger
+				echo ${interface_1000m} > /sys/class/leds/wan_led/device_name
+				echo 1 > /sys/class/leds/wan_led/link
+				echo 1 > /sys/class/leds/wan_led/tx
+				echo 1 > /sys/class/leds/wan_led/rx
+
 			fi
 
-			if [[ $BRANCH == legacy ]]; then
+			if [[ ${kv} == 4.9* ]]; then
 				aplay /usr/share/sounds/alsa/audio.wav -D hw:2,0 > /dev/null 2>&1
 			fi
 

external/packages/bsp/common/usr/src/hello/Makefile

@@ -0,0 +1,10 @@
+ifneq ($(KERNELRELEASE),)
+obj-m:=hello.o
+else
+KDIR :=/lib/modules/$(shell uname -r)/build
+PWD  :=$(shell pwd)
+all:
+	make -C $(KDIR) M=$(PWD) modules
+clean:
+	rm -f *.ko *.o *.mod.o *.mod *.symvers *.cmd  *.mod.c *.order
+endif

external/packages/bsp/common/usr/src/hello/hello.c

@@ -0,0 +1,20 @@
+#include <linux/init.h>
+#include <linux/module.h>
+
+static int hello_init(void)
+{
+	printk("Hello Orange Pi -- init\n");
+
+	return 0;
+}
+static void hello_exit(void)
+{
+	printk("Hello Orange Pi -- exit\n");
+
+	return;
+}
+
+module_init(hello_init);
+module_exit(hello_exit);
+
+MODULE_LICENSE("GPL");

external/packages/bsp/overlays_arm64/etc/docker/daemon.json

@@ -0,0 +1,5 @@
+{
+  "registry-mirrors": [
+    "https://docker.mirrors.ustc.edu.cn"
+  ]
+}

external/packages/bsp/overlays_arm64/usr/bin/auto_login_cli.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+if [[ -z $1 ]]; then
+	user=root
+else
+	user=$1
+fi
+
+[[ -d /lib/systemd/system/getty@.service.d/ ]] && rm /lib/systemd/system/getty@.service.d/ -rf
+[[ -f /lib/systemd/system/serial-getty@.service.d/override.conf ]] && rm /lib/systemd/system/serial-getty@.service.d/override.conf -f
+[[ -d /etc/systemd/system/getty@.service.d/ ]] && rm /etc/systemd/system/getty@.service.d/ -rf
+[[ -f /etc/systemd/system/serial-getty@.service.d/override.conf ]] && rm /etc/systemd/system/serial-getty@.service.d/override.conf -f
+
+if [[ $1 == "-d" ]]; then
+	exit
+fi
+
+mkdir -p /etc/systemd/system/getty@.service.d/
+mkdir -p /etc/systemd/system/serial-getty@.service.d/
+cat <<-EOF >  \
+/etc/systemd/system/serial-getty@.service.d/override.conf
+[Service]
+ExecStartPre=/bin/sh -c 'exec /bin/sleep 10'
+ExecStart=
+ExecStart=-/sbin/agetty --noissue --autologin ${user} %I \$TERM
+Type=idle
+EOF
+cp /etc/systemd/system/serial-getty@.service.d/override.conf  \
+/etc/systemd/system/getty@.service.d/override.conf

external/packages/bsp/overlays_arm64/usr/bin/cat_serial.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+cat /proc/cpuinfo | grep "Serial"

external/packages/bsp/overlays_arm64/usr/bin/compile_python.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+sudo apt-get update
+sudo apt-get install -y build-essential zlib1g-dev  \
+libncurses5-dev libgdbm-dev libnss3-dev libssl-dev libsqlite3-dev  \
+libreadline-dev libffi-dev curl libbz2-dev
+
+version=3.9.9
+[[ -n $1 ]] && version=$1
+
+# optimize build time with 100% CPU usage
+CPUS=$(grep -c 'processor' /proc/cpuinfo)
+CTHREADS="-j$((CPUS + CPUS/2))"
+
+wget https://cdn.npmmirror.com/binaries/python/$version/Python-${version}.tgz
+tar xvf Python-${version}.tgz
+cd Python-${version}
+./configure --enable-optimizations
+make ${CTHREADS}
+sudo make altinstall

external/packages/bsp/overlays_arm64/usr/bin/desktop_login.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [[ -z $1 ]]; then
+        user=root
+else
+        user=$1
+fi
+
+sudo sed -i '/autologin-user=/d' /etc/lightdm/lightdm.conf.d/22-orangepi-autologin.conf
+sudo echo autologin-user=${user} >> /etc/lightdm/lightdm.conf.d/22-orangepi-autologin.conf
+sudo sed -i 's/root/anything/' /etc/pam.d/lightdm-autologin

external/packages/bsp/overlays_arm64/usr/bin/disable_desktop_autologin.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+sudo sed -i  \
+"s/autologin-user=.*/#&/"  \
+/etc/lightdm/lightdm.conf.d/22-orangepi-autologin.conf

external/packages/bsp/overlays_arm64/usr/bin/enable_docker.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+sudo systemctl enable docker.service
+sudo systemctl start docker.service

external/packages/bsp/overlays_arm64/usr/bin/install_bt_panel.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+wget -O install.sh  \
+http://download.bt.cn/install/install-ubuntu_6.0.sh && sudo bash install.sh

external/packages/bsp/overlays_arm64/usr/bin/install_docker.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+distributor_id=$(lsb_release -is)
+distributor_id=${distributor_id,}
+
+sudo apt-get remove -y docker docker-engine docker-ce docker.io 
+sudo apt-get update
+sudo apt-get install -y apt-transport-https ca-certificates curl gnupg2 software-properties-common
+
+curl -fsSL https://repo.huaweicloud.com/docker-ce/linux/${distributor_id}/gpg | sudo apt-key add -
+echo "deb [arch=$(dpkg --print-architecture)] https://repo.huaweicloud.com/docker-ce/linux/${distributor_id} $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list
+
+sudo apt-get update
+sudo apt-get install -y docker-ce docker-ce-cli containerd.io
+
+sudo groupadd docker
+sudo usermod -aG docker $USER

external/packages/bsp/overlays_arm64/usr/bin/install_qt.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+release=$(lsb_release -cs)
+
+sudo apt update
+if [[ $release =~ focal|bionic|buster ]]; then
+	sudo apt-get -y install qt5-default qttools5-dev-tools qtbase5-doc-html qt5-assistant qt5-doc
+elif [[ $release =~ bullseye|bookworm|jammy ]]; then
+	sudo apt-get -y install qttools5-dev-tools qtbase5-doc-html qt5-assistant qt5-doc qt5-qmake qt5-qmake-bin
+else
+	echo "Unsupported system!"
+	exit
+fi
+
+sudo apt-get -y install qtcreator qmlscene gdb qtdeclarative5-dev qtbase5-examples cmake
+
+sudo chown orangepi:orangepi /usr/lib/aarch64-linux-gnu/qt5/examples -R
+
+qmake -v

external/packages/bsp/overlays_arm64/usr/bin/install_ros.sh

@@ -0,0 +1,74 @@
+#!/bin/bash
+
+#mirror_url=http://mirrors.ustc.edu.cn
+mirror_url=https://repo.huaweicloud.com
+
+if [[ -n $1 && $1 =~ ros1|ros2 ]]; then
+	version=$1
+else
+	echo "usage: install_ros.sh ros1/ros2"
+	exit
+fi
+
+release=$(lsb_release -cs)
+
+if [[ $version == "ros1" && $release =~ focal ]]; then
+
+	[[ -f /etc/apt/sources.list.d/ros-latest.list ]] && sudo rm /etc/apt/sources.list.d/ros-latest.list
+	sudo sh -c "echo deb ${mirror_url}/ros/ubuntu $(lsb_release -sc) main > /etc/apt/sources.list.d/ros1.list"
+	sudo apt-key adv --keyserver 'hkp://keyserver.ubuntu.com:80' --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
+	sudo apt update
+	sudo apt install -y ros-noetic-desktop-full
+
+	sudo sh -c 'echo "source /opt/ros/noetic/setup.bash" >> /root/.bashrc'
+	echo "source /opt/ros/noetic/setup.bash" >> /home/orangepi/.bashrc
+
+	sudo apt install -y python3-rosdep python3-rosinstall python3-rosinstall-generator python3-wstool build-essential
+
+	sudo sh -c 'echo "151.101.84.133 raw.githubusercontent.com" >> /etc/hosts'
+	source /opt/ros/noetic/setup.bash
+	sudo rosdep init
+	rosdep update
+
+	exit
+fi
+
+if [[ $version == "ros2" && $release =~ focal ]]; then
+
+	sudo apt-key adv --keyserver 'hkp://keyserver.ubuntu.com:80' --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
+	echo "deb [arch=$(dpkg --print-architecture)] ${mirror_url}/ros2/ubuntu $(source /etc/os-release && echo $UBUNTU_CODENAME) main" | sudo tee /etc/apt/sources.list.d/ros2.list
+
+	sudo apt update
+	sudo apt install -y ros-galactic-desktop
+	sudo apt install -y ros-dev-tools
+
+	sudo sh -c 'echo "source /opt/ros/galactic/setup.bash" >> /root/.bashrc'
+	echo "source /opt/ros/galactic/setup.bash" >> /home/orangepi/.bashrc
+
+	source /opt/ros/galactic/setup.bash
+	ros2 -h
+
+	exit
+
+fi
+
+if [[ $version == "ros2" && $release =~ jammy ]]; then
+
+	sudo apt-key adv --keyserver 'hkp://keyserver.ubuntu.com:80' --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
+	echo "deb [arch=$(dpkg --print-architecture)] ${mirror_url}/ros2/ubuntu $(source /etc/os-release && echo $UBUNTU_CODENAME) main" | sudo tee /etc/apt/sources.list.d/ros2.list
+
+	sudo apt update
+	sudo apt install -y ros-humble-desktop
+	sudo apt install -y ros-dev-tools
+
+	sudo sh -c 'echo "source /opt/ros/humble/setup.bash" >> /root/.bashrc'
+	echo "source /opt/ros/humble/setup.bash" >> /home/orangepi/.bashrc
+
+	source /opt/ros/humble/setup.bash
+	ros2 -h
+
+	exit
+
+fi
+
+echo "Unsupported System!"

external/packages/bsp/overlays_arm64/usr/bin/reset_ssh.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+sudo rm /etc/ssh/ssh_host_*
+sudo dpkg-reconfigure openssh-server

external/packages/bsp/overlays_arm64/usr/bin/set_swap.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+sudo swapoff -a
+sudo dd if=/dev/zero of=/swapfile bs=1G count=8
+sudo chmod 0600 /swapfile
+sudo mkswap /swapfile
+sudo swapon /swapfile
+sudo sed -i '/swapfile/d' /etc/fstab
+sudo bash -c 'echo "/swapfile swap swap sw 0 0" >> /etc/fstab'

external/packages/bsp/overlays_arm64/usr/bin/set_vnc.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+[[ -d ~/.vnc ]] && rm -rf ~/.vnc
+
+vncserver
+vncserver -kill :1
+mv ~/.vnc/xstartup ~/.vnc/xstartup.bak
+
+cat <<-EOF >  \
+~/.vnc/xstartup
+#!/bin/bash
+xrdb $HOME/.Xresources
+startxfce4 &
+EOF
+
+chmod +x ~/.vnc/xstartup
+vncserver
+
+sync

external/packages/bsp/overlays_arm64/usr/bin/test_ros.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+if [[ -f /opt/ros/noetic/setup.bash ]]; then
+
+	source /opt/ros/noetic/setup.bash
+	roscore &
+
+	sleep 5
+
+	rosrun turtlesim turtlesim_node &
+	rosrun turtlesim turtle_teleop_key
+
+fi
+
+if [[ -f /opt/ros/galactic/setup.bash ]]; then
+
+	source /opt/ros/galactic/setup.bash
+	ros2 run demo_nodes_cpp talker &
+	ros2 run demo_nodes_py listener
+
+fi
+
+if [[ -f /opt/ros/humble/setup.bash ]]; then
+
+	source /opt/ros/humble/setup.bash
+	ros2 run demo_nodes_cpp talker &
+	ros2 run demo_nodes_py listener
+
+fi

external/packages/bsp/overlays_arm64/usr/lib/systemd/system/getty@.service.d/override.conf

@@ -0,0 +1,5 @@
+[Service]
+ExecStartPre=/bin/sh -c 'exec /bin/sleep 10'
+ExecStart=
+ExecStart=-/sbin/agetty --noissue --autologin orangepi %I $TERM
+Type=idle

external/packages/bsp/overlays_arm64/usr/lib/systemd/system/serial-getty@.service.d/override.conf

@@ -0,0 +1,5 @@
+[Service]
+ExecStartPre=/bin/sh -c 'exec /bin/sleep 10'
+ExecStart=
+ExecStart=-/sbin/agetty --noissue --autologin orangepi %I $TERM
+Type=idle

external/packages/pack-uboot/sun50iw9/bin/boot_package.cfg-linux5.4

@@ -0,0 +1,6 @@
+[package]
+item=u-boot,                 u-boot.fex
+item=monitor,                monitor.fex
+item=dtbo,                   p1.dtbo
+item=optee,                  optee.fex
+item=dtb,                    sunxi.fex

external/packages/pack-uboot/sun50iw9/bin/dts/orangepizero2-b-u-boot.dts

@@ -1476,10 +1476,10 @@
 			};
 
 			twi1@0 {
-				allwinner,pins = "PA2", "PA3";
+				allwinner,pins = "PH0", "PH1";
 				allwinner,pname = "twi1_scl", "twi1_sda";
 				allwinner,function = "twi1";
-				allwinner,muxsel = <0x4>;
+				allwinner,muxsel = <0x5>;
 				allwinner,drive = <0x1>;
 				allwinner,pull = <0x0>;
 				linux,phandle = <0x3f>;
@@ -1487,7 +1487,7 @@
 			};
 
 			twi1@1 {
-				allwinner,pins = "PA2", "PA3";
+				allwinner,pins = "PH0", "PH1";
 				allwinner,function = "io_disabled";
 				allwinner,muxsel = <0x7>;
 				allwinner,drive = <0x1>;
@@ -1497,7 +1497,7 @@
 			};
 
 			twi2@0 {
-				allwinner,pins = "PE20", "PE21";
+				allwinner,pins = "PH2", "PH3";
 				allwinner,pname = "twi2_scl", "twi2_sda";
 				allwinner,function = "twi2";
 				allwinner,muxsel = <0x5>;
@@ -1508,7 +1508,7 @@
 			};
 
 			twi2@1 {
-				allwinner,pins = "PE20", "PE21";
+				allwinner,pins = "PH2", "PH3";
 				allwinner,function = "io_disabled";
 				allwinner,muxsel = <0x7>;
 				allwinner,drive = <0x1>;
@@ -3478,7 +3478,7 @@
 			//sd-uhs-ddr50;
 			//sd-uhs-sdr104;
 			ctl-spec-caps = <0x8>;
-			vdmmc-supply = <&reg_dcdc5>;
+			//vdmmc-supply = <&reg_dcdc5>;
 		};
 
 		sdmmc@04021000 {

external/packages/pack-uboot/sun50iw9/bin/dts/orangepizero2-lts-u-boot.dts

@@ -1371,7 +1371,7 @@
 			};
 
 			uart2@0 {
-				allwinner,pins = "PG15", "PG16", "PG17", "PG18";
+				allwinner,pins = "PH5", "PH6", "PH7", "PH8";
 				allwinner,pname = "uart2_tx", "uart2_rx", "uart2_rts", "uart2_cts";
 				allwinner,function = "uart2";
 				allwinner,muxsel = <0x2>;
@@ -1382,7 +1382,7 @@
 			};
 
 			uart2@1 {
-				allwinner,pins = "PG15", "PG16", "PG17", "PG18";
+				allwinner,pins = "PH5", "PH6", "PH7", "PH8";
 				allwinner,function = "io_disabled";
 				allwinner,muxsel = <0x7>;
 				allwinner,drive = <0x1>;
@@ -1476,10 +1476,10 @@
 			};
 
 			twi1@0 {
-				allwinner,pins = "PA2", "PA3";
+				allwinner,pins = "PH0", "PH1";
 				allwinner,pname = "twi1_scl", "twi1_sda";
 				allwinner,function = "twi1";
-				allwinner,muxsel = <0x4>;
+				allwinner,muxsel = <0x5>;
 				allwinner,drive = <0x1>;
 				allwinner,pull = <0x0>;
 				linux,phandle = <0x3f>;
@@ -1487,7 +1487,7 @@
 			};
 
 			twi1@1 {
-				allwinner,pins = "PA2", "PA3";
+				allwinner,pins = "PH0", "PH1";
 				allwinner,function = "io_disabled";
 				allwinner,muxsel = <0x7>;
 				allwinner,drive = <0x1>;
@@ -1497,7 +1497,7 @@
 			};
 
 			twi2@0 {
-				allwinner,pins = "PE20", "PE21";
+				allwinner,pins = "PH2", "PH3";
 				allwinner,pname = "twi2_scl", "twi2_sda";
 				allwinner,function = "twi2";
 				allwinner,muxsel = <0x5>;
@@ -1508,7 +1508,7 @@
 			};
 
 			twi2@1 {
-				allwinner,pins = "PE20", "PE21";
+				allwinner,pins = "PH2", "PH3";
 				allwinner,function = "io_disabled";
 				allwinner,muxsel = <0x7>;
 				allwinner,drive = <0x1>;
@@ -1539,7 +1539,7 @@
 			};
 
 			twi4@0 {
-				allwinner,pins = "PG15", "PG16";
+				allwinner,pins = "PH6", "PH7";
 				allwinner,pname = "twi4_scl", "twi4_sda";
 				allwinner,function = "twi4";
 				allwinner,muxsel = <0x5>;
@@ -1550,7 +1550,7 @@
 			};
 
 			twi4@1 {
-				allwinner,pins = "PG15", "PG16";
+				allwinner,pins = "PH6", "PH7";
 				allwinner,function = "io_disabled";
 				allwinner,muxsel = <0x7>;
 				allwinner,drive = <0x1>;
@@ -2565,7 +2565,7 @@
 			phandle = <0x11a>;
 		};
 
-		uart@05000000 {
+		uart0: uart@05000000 {
 			compatible = "allwinner,sun50i-uart";
 			device_type = "uart0";
 			reg = <0x0 0x5000000 0x0 0x400>;
@@ -2581,7 +2581,7 @@
 			pinctrl-0 = <0x187>;
 		};
 
-		uart@05000400 {
+		uart1: uart@05000400 {
 			compatible = "allwinner,sun50i-uart";
 			device_type = "uart1";
 			reg = <0x0 0x5000400 0x0 0x400>;
@@ -2597,7 +2597,7 @@
 			phandle = <0x11c>;
 		};
 
-		uart@05000800 {
+		uart2: uart@05000800 {
 			compatible = "allwinner,sun50i-uart";
 			device_type = "uart2";
 			reg = <0x0 0x5000800 0x0 0x400>;
@@ -2607,13 +2607,11 @@
 			pinctrl-0 = <0x30>;
 			pinctrl-1 = <0x31>;
 			uart2_port = <0x2>;
-			uart2_type = <0x4>;
+			uart2_type = <0x2>;
 			status = "disabled";
-			linux,phandle = <0x11d>;
-			phandle = <0x11d>;
 		};
 
-		uart@05000c00 {
+		uart3: uart@05000c00 {
 			compatible = "allwinner,sun50i-uart";
 			device_type = "uart3";
 			reg = <0x0 0x5000c00 0x0 0x400>;
@@ -2629,7 +2627,7 @@
 			phandle = <0x11e>;
 		};
 
-		uart@05001000 {
+		uart4: uart@05001000 {
 			compatible = "allwinner,sun50i-uart";
 			device_type = "uart4";
 			reg = <0x0 0x5001000 0x0 0x400>;
@@ -2645,7 +2643,7 @@
 			phandle = <0x11f>;
 		};
 
-		uart@05001400 {
+		uart5: uart@05001400 {
 			compatible = "allwinner,sun50i-uart";
 			device_type = "uart5";
 			reg = <0x0 0x5001400 0x0 0x400>;
@@ -2661,7 +2659,7 @@
 			phandle = <0x120>;
 		};
 
-		twi@0x05002000 {
+		i2c0: twi@0x05002000 {
 			#address-cells = <0x1>;
 			#size-cells = <0x0>;
 			compatible = "allwinner,sun50i-twi";
@@ -2678,7 +2676,7 @@
 			phandle = <0x121>;
 		};
 
-		twi@0x05002400 {
+		i2c1: twi@0x05002400 {
 			#address-cells = <0x1>;
 			#size-cells = <0x0>;
 			compatible = "allwinner,sun50i-twi";
@@ -2695,7 +2693,7 @@
 			phandle = <0x122>;
 		};
 
-		twi@0x05002800 {
+		i2c2: twi@0x05002800 {
 			#address-cells = <0x1>;
 			#size-cells = <0x0>;
 			compatible = "allwinner,sun50i-twi";
@@ -2712,7 +2710,7 @@
 			phandle = <0x123>;
 		};
 
-		twi@0x05002c00 {
+		i2c3: twi@0x05002c00 {
 			#address-cells = <0x1>;
 			#size-cells = <0x0>;
 			compatible = "allwinner,sun50i-twi";
@@ -2729,7 +2727,7 @@
 			phandle = <0x124>;
 		};
 
-		twi@0x05003000 {
+		i2c4: twi@0x05003000 {
 			#address-cells = <0x1>;
 			#size-cells = <0x0>;
 			compatible = "allwinner,sun50i-twi";
@@ -2742,11 +2740,9 @@
 			pinctrl-0 = <0x48>;
 			pinctrl-1 = <0x49>;
 			status = "disabled";
-			linux,phandle = <0x125>;
-			phandle = <0x125>;
 		};
 
-		twi@0x07081400 {
+		i2c5: twi@0x07081400 {
 			#address-cells = <0x1>;
 			#size-cells = <0x0>;
 			compatible = "allwinner,sun50i-twi";
@@ -2760,78 +2756,149 @@
 			pinctrl-1 = <0x4c>;
 			status = "okay";
 			no_suspend = <0x1>;
-			linux,phandle = <0x126>;
-			phandle = <0x126>;
 
-			pmu {
-				compatible = "x-powers,axp1530";
+			pmu0: pmu {
+				compatible = "x-powers,axp806";
 				reg = <0x36>;
 				wakeup-source;
-				linux,phandle = <0x127>;
-				phandle = <0x127>;
 
 				standby_param {
-					vcc-dram = <0x4>;
-					linux,phandle = <0x128>;
-					phandle = <0x128>;
+					vcc-dram = <0x8>;
 				};
 
 				regulators {
-
-					dcdc1 {
-						regulator-name = "axp1530-dcdc1";
-						regulator-min-microvolt = <0x7a120>;
-						regulator-max-microvolt = <0x33e140>;
-						regulator-step-delay-us = <0x19>;
-						regulator-final-delay-us = <0x32>;
+					reg_dcdc1: dcdca {
+						regulator-name = "axp806-dcdca";
+						regulator-min-microvolt = <600000>;
+						regulator-max-microvolt = <1520000>;
+						regulator-step-delay-us = <25>;
+						regulator-final-delay-us = <50>;
 						regulator-always-on;
-						linux,phandle = <0x129>;
-						phandle = <0x129>;
 					};
 
-					dcdc2 {
-						regulator-name = "axp1530-dcdc2";
-						regulator-min-microvolt = <0x7a120>;
-						regulator-max-microvolt = <0x177fa0>;
-						regulator-step-delay-us = <0x19>;
-						regulator-final-delay-us = <0x32>;
-						regulator-ramp-delay = <0xc8>;
-						regulator-always-on;
-						linux,phandle = <0xd6>;
-						phandle = <0xd6>;
+					reg_dcdc2: dcdcb {
+						regulator-name = "axp806-dcdcb";
+						regulator-min-microvolt = <1000000>;
+						regulator-max-microvolt = <2550000>;
+						regulator-step-delay-us = <25>;
+						regulator-final-delay-us = <50>;
 					};
 
-					dcdc3 {
-						regulator-name = "axp1530-dcdc3";
-						regulator-min-microvolt = <0x16e360>;
-						regulator-max-microvolt = <0x16e360>;
-						regulator-step-delay-us = <0x19>;
-						regulator-final-delay-us = <0x32>;
+					reg_dcdc3: dcdcc {
+						regulator-name = "axp806-dcdcc";
+						regulator-min-microvolt = <600000>;
+						regulator-max-microvolt = <1520000>;
+						regulator-step-delay-us = <25>;
+						regulator-final-delay-us = <50>;
 						regulator-always-on;
-						linux,phandle = <0x12a>;
-						phandle = <0x12a>;
 					};
 
-					ldo1 {
-						regulator-name = "axp1530-aldo1";
-						regulator-min-microvolt = <0x1b7740>;
-						regulator-max-microvolt = <0x1b7740>;
-						regulator-step-delay-us = <0x19>;
-						regulator-final-delay-us = <0x32>;
+					reg_dcdc4: dcdcd {
+						regulator-name = "axp806-dcdcd";
+						regulator-min-microvolt = <600000>;
+						regulator-max-microvolt = <3300000>;
+						regulator-step-delay-us = <25>;
+						regulator-final-delay-us = <50>;
 						regulator-always-on;
-						linux,phandle = <0x68>;
-						phandle = <0x68>;
 					};
 
-					ldo2 {
-						regulator-name = "axp1530-dldo1";
-						regulator-min-microvolt = <0x325aa0>;
-						regulator-max-microvolt = <0x325aa0>;
-						regulator-step-delay-us = <0x19>;
-						regulator-final-delay-us = <0x32>;
+					reg_dcdc5: dcdce {
+						regulator-name = "axp806-dcdce";
+						regulator-min-microvolt = <3300000>;
+						regulator-max-microvolt = <3300000>;
+						regulator-step-delay-us = <25>;
+						regulator-final-delay-us = <50>;
 						regulator-always-on;
-						linux,phandle = <0x69>;
-						phandle = <0x69>;
+					};
+
+					reg_aldo1: aldo1 {
+						regulator-name = "axp806-aldo1";
+						regulator-min-microvolt = <3300000>;
+						regulator-max-microvolt = <3300000>;
+						regulator-step-delay-us = <25>;
+						regulator-final-delay-us = <50>;
+						regulator-always-on;
+					};
+
+					reg_aldo2: aldo2 {
+						regulator-name = "axp806-aldo2";
+						regulator-min-microvolt = <3300000>;
+						regulator-max-microvolt = <3300000>;
+						regulator-step-delay-us = <25>;
+						regulator-final-delay-us = <50>;
+						regulator-always-on;
+					};
+
+					reg_aldo3: aldo3 {
+						regulator-name = "axp806-aldo3";
+						regulator-min-microvolt = <3300000>;
+						regulator-max-microvolt = <3300000>;
+						regulator-step-delay-us = <25>;
+						regulator-final-delay-us = <50>;
+						regulator-always-on;
+					};
+
+					reg_bldo1: bldo1 {
+						regulator-name = "axp806-bldo1";
+						regulator-min-microvolt = <180000>;
+						regulator-max-microvolt = <1800000>;
+						regulator-step-delay-us = <25>;
+						regulator-final-delay-us = <50>;
+						regulator-always-on;
+					};
+
+					reg_bldo2: bldo2 {
+						regulator-name = "axp806-bldo2";
+						regulator-min-microvolt = <700000>;
+						regulator-max-microvolt = <1900000>;
+						regulator-step-delay-us = <25>;
+						regulator-final-delay-us = <50>;
+						regulator-always-on;
+					};
+
+					reg_bldo3: bldo3 {
+						regulator-name = "axp806-bldo3";
+						regulator-min-microvolt = <700000>;
+						regulator-max-microvolt = <1900000>;
+						regulator-step-delay-us = <25>;
+						regulator-final-delay-us = <50>;
+					};
+
+					reg_bldo4: bldo4 {
+						regulator-name = "axp806-bldo4";
+						regulator-min-microvolt = <700000>;
+						regulator-max-microvolt = <1900000>;
+						regulator-step-delay-us = <25>;
+						regulator-final-delay-us = <50>;
+					};
+
+					reg_cldo1: cldo1 {
+						regulator-name = "axp806-cldo1";
+						regulator-min-microvolt = <1800000>;
+						regulator-max-microvolt = <1800000>;
+						regulator-step-delay-us = <25>;
+						regulator-final-delay-us = <50>;
+						regulator-always-on;
+					};
+
+					reg_cldo2: cldo2 {
+						regulator-name = "axp806-cldo2";
+						regulator-min-microvolt = <700000>;
+						regulator-max-microvolt = <4200000>;
+						regulator-step-delay-us = <25>;
+						regulator-final-delay-us = <50>;
+					};
+
+					reg_cldo3: cldo3 {
+						regulator-name = "axp806-cldo3";
+						regulator-min-microvolt = <700000>;
+						regulator-max-microvolt = <3300000>;
+						regulator-step-delay-us = <25>;
+						regulator-final-delay-us = <50>;
+					};
+
+					reg_sw: sw {
+						regulator-name = "axp806-sw";
 					};
 				};
 			};
@@ -3384,8 +3451,6 @@
 			ctl-spec-caps = <0x8>;
 			vmmc-supply = <0x69>;
 			vqmmc-supply = <0x68>;
-			linux,phandle = <0x145>;
-			phandle = <0x145>;
 		};
 
 		sdmmc@04020000 {
@@ -3402,24 +3467,18 @@
 			max-frequency = <0x8f0d180>;
 			bus-width = <0x4>;
 			cd-gpios = <0x53 0x5 0x6 0x6 0x1 0x3 0xffffffff>;
-			cap-sd-highspeed;
+			//cap-sd-highspeed;
 			cap-wait-while-busy;
 			no-sdio;
 			no-mmc;
 			sunxi-power-save-mode;
 			status = "okay";
 			cd-used-24M;
-			sd-uhs-sdr50;
-			sd-uhs-ddr50;
-			sd-uhs-sdr104;
+			//sd-uhs-sdr50;
+			//sd-uhs-ddr50;
+			//sd-uhs-sdr104;
 			ctl-spec-caps = <0x8>;
-			vmmc-supply = <0x69>;
-			vqmmc33sw-supply = <0x69>;
-			vdmmc33sw-supply = <0x69>;
-			vqmmc18sw-supply = <0x68>;
-			vdmmc18sw-supply = <0x68>;
-			linux,phandle = <0x146>;
-			phandle = <0x146>;
+			//vdmmc-supply = <&reg_dcdc5>;
 		};
 
 		sdmmc@04021000 {
@@ -4434,13 +4493,6 @@
 			dldo1_vol = <0xf4f24>;
 		};
 
-		axp1530_power_sply {
-			device_type = "axp1530_power_sply";
-			dcdc2_vol = <0xf4628>;
-			aldo1_vol = <0xf4948>;
-			dldo1_vol = <0xf4f24>;
-		};
-
 		axp806_power_sply {
 			device_type = "axp806_power_sply";
 			dcdce_vol = <0xf4f24>;
@@ -4448,6 +4500,7 @@
 			aldo1_vol = <0xf4f24>;
 			bldo1_vol = <0xf4948>;
 			bldo2_vol = <0xf4948>;
+			cldo1_vol = <0xf4948>;
 		};
 
 		card_boot {

external/packages/pack-uboot/sun50iw9/bin/dts/orangepizero2-u-boot-legacy.dts

@@ -5,7 +5,7 @@
 	interrupt-parent = <0x1>;
 	#address-cells = <0x2>;
 	#size-cells = <0x2>;
-	model = "Orange Pi 400";
+	model = "Orange Pi Zero 2";
 	compatible = "allwinner,h616", "arm,sun50iw9p1";
 
 	clocks {
@@ -532,12 +532,10 @@
 			phandle = <0xf3>;
 		};
 
-		pwm {
+		clk_pwm: pwm {
 			#clock-cells = <0x0>;
 			compatible = "allwinner,periph-clock";
 			clock-output-names = "pwm";
-			linux,phandle = <0x9b>;
-			phandle = <0x9b>;
 		};
 
 		iommu {
@@ -1321,7 +1319,7 @@
 				phandle = <0xd2>;
 			};
 
-			/*s_cir0@0 {
+			s_cir0@0 {
 				allwinner,pins = "PH10";
 				allwinner,function = "ir";
 				allwinner,muxsel = <0x3>;
@@ -1329,15 +1327,7 @@
 				allwinner,pull = <0x1>;
 				linux,phandle = <0x24>;
 				phandle = <0x24>;
-			};*/
-
-	                hp_det: hp-det {
-                                allwinner,pins = "PH10";
-                                allwinner,function = "gpio_in";
-                                allwinner,muxsel = <0x0>;
-                                allwinner,drive = <0x2>;
-                                allwinner,pull = <0x1>;
-       		        };
+			};
 
 			vdevice@0 {
 				allwinner,pins = "PA1", "PA2";
@@ -1381,7 +1371,7 @@
 			};
 
 			uart2@0 {
-				allwinner,pins = "PG15", "PG16", "PG17", "PG18";
+				allwinner,pins = "PH5", "PH6", "PH7", "PH8";
 				allwinner,pname = "uart2_tx", "uart2_rx", "uart2_rts", "uart2_cts";
 				allwinner,function = "uart2";
 				allwinner,muxsel = <0x2>;
@@ -1392,7 +1382,7 @@
 			};
 
 			uart2@1 {
-				allwinner,pins = "PG15", "PG16", "PG17", "PG18";
+				allwinner,pins = "PH5", "PH6", "PH7", "PH8";
 				allwinner,function = "io_disabled";
 				allwinner,muxsel = <0x7>;
 				allwinner,drive = <0x1>;
@@ -1486,10 +1476,10 @@
 			};
 
 			twi1@0 {
-				allwinner,pins = "PA2", "PA3";
+				allwinner,pins = "PH0", "PH1";
 				allwinner,pname = "twi1_scl", "twi1_sda";
 				allwinner,function = "twi1";
-				allwinner,muxsel = <0x4>;
+				allwinner,muxsel = <0x5>;
 				allwinner,drive = <0x1>;
 				allwinner,pull = <0x0>;
 				linux,phandle = <0x3f>;
@@ -1497,7 +1487,7 @@
 			};
 
 			twi1@1 {
-				allwinner,pins = "PA2", "PA3";
+				allwinner,pins = "PH0", "PH1";
 				allwinner,function = "io_disabled";
 				allwinner,muxsel = <0x7>;
 				allwinner,drive = <0x1>;
@@ -1549,7 +1539,7 @@
 			};
 
 			twi4@0 {
-				allwinner,pins = "PG15", "PG16";
+				allwinner,pins = "PH6", "PH7";
 				allwinner,pname = "twi4_scl", "twi4_sda";
 				allwinner,function = "twi4";
 				allwinner,muxsel = <0x5>;
@@ -1560,7 +1550,7 @@
 			};
 
 			twi4@1 {
-				allwinner,pins = "PG15", "PG16";
+				allwinner,pins = "PH6", "PH7";
 				allwinner,function = "io_disabled";
 				allwinner,muxsel = <0x7>;
 				allwinner,drive = <0x1>;
@@ -1817,7 +1807,7 @@
 
 			ahub_daudio2@0 {
 				allwinner,pins = "PG11", "PG12", "PG13", "PG14";
-				allwinner,function = "h_i2s2";
+				allwinner,function = "h_pcm2";
 				allwinner,muxsel = <0x2>;
 				allwinner,drive = <0x1>;
 				allwinner,pull = <0x0>;
@@ -1837,7 +1827,7 @@
 
 			ahub_daudio3@0 {
 				allwinner,pins = "PH5", "PH6", "PH7", "PH8", "PH9";
-				allwinner,function = "h_i2s3";
+				allwinner,function = "h_pcm3";
 				allwinner,muxsel = <0x3>;
 				allwinner,drive = <0x1>;
 				allwinner,pull = <0x0>;
@@ -2187,26 +2177,94 @@
 				phandle = <0x9a>;
 			};
 
-			pwm5@0 {
+			pwm1_pin: pwm1-pin {
+				allwinner,pins = "PH3";
+				allwinner,function = "pwm1";
+				allwinner,muxsel = <0x4>;
+				allwinner,drive = <0xffffffff>;
+				allwinner,pull = <0x0>;
+				allwinner,data = <0xffffffff>;
+			};
+
+			pwm1_pin_sleep: pwm1-pin-sleep {
+				allwinner,pins = "PH3";
+				allwinner,function = "io_disabled";
+				allwinner,muxsel = <0x7>;
+				allwinner,drive = <0xffffffff>;
+				allwinner,pull = <0x0>;
+				allwinner,data = <0xffffffff>;
+			};
+
+			pwm2_pin: pwm2-pin {
+				allwinner,pins = "PH2";
+				allwinner,function = "pwm2";
+				allwinner,muxsel = <0x4>;
+				allwinner,drive = <0xffffffff>;
+				allwinner,pull = <0x0>;
+				allwinner,data = <0xffffffff>;
+			};
+
+			pwm2_pin_sleep: pwm2-pin-sleep {
+				allwinner,pins = "PH2";
+				allwinner,function = "io_disabled";
+				allwinner,muxsel = <0x7>;
+				allwinner,drive = <0xffffffff>;
+				allwinner,pull = <0x0>;
+				allwinner,data = <0xffffffff>;
+			};
+
+			pwm3_pin: pwm3-pin {
+				allwinner,pins = "PH0";
+				allwinner,function = "pwm3";
+				allwinner,muxsel = <0x4>;
+				allwinner,drive = <0xffffffff>;
+				allwinner,pull = <0x0>;
+				allwinner,data = <0xffffffff>;
+			};
+
+			pwm3_pin_sleep: pwm3-pin-sleep {
+				allwinner,pins = "PH0";
+				allwinner,function = "io_disabled";
+				allwinner,muxsel = <0x7>;
+				allwinner,drive = <0xffffffff>;
+				allwinner,pull = <0x0>;
+				allwinner,data = <0xffffffff>;
+			};
+
+			pwm4_pin: pwm4-pin {
+				allwinner,pins = "PH1";
+				allwinner,function = "pwm4";
+				allwinner,muxsel = <0x4>;
+				allwinner,drive = <0xffffffff>;
+				allwinner,pull = <0x0>;
+				allwinner,data = <0xffffffff>;
+			};
+
+			pwm4_pin_sleep: pwm4-pin-sleep {
+				allwinner,pins = "PH1";
+				allwinner,function = "io_disabled";
+				allwinner,muxsel = <0x7>;
+				allwinner,drive = <0xffffffff>;
+				allwinner,pull = <0x0>;
+				allwinner,data = <0xffffffff>;
+			};
+
+			pwm5_pin: pwm5-pin {
 				allwinner,pins = "PA12";
 				allwinner,function = "pwm5";
 				allwinner,muxsel = <0x2>;
 				allwinner,drive = <0xffffffff>;
 				allwinner,pull = <0x0>;
 				allwinner,data = <0xffffffff>;
-				linux,phandle = <0xa2>;
-				phandle = <0xa2>;
 			};
 
-			pwm5@1 {
+			pwm5_pin_sleep: pwm5_pin_sleep {
 				allwinner,pins = "PA12";
 				allwinner,function = "io_disabled";
 				allwinner,muxsel = <0x7>;
 				allwinner,drive = <0xffffffff>;
 				allwinner,pull = <0x0>;
 				allwinner,data = <0xffffffff>;
-				linux,phandle = <0xa3>;
-				phandle = <0xa3>;
 			};
 
 			standby@0 {
@@ -2429,7 +2487,7 @@
 			clocks = <0x9 0x25>;
 			supply = "vcc-pl";
 			supply_vol = "3300000";
-			status = "disabled";
+			status = "okay";
 			s_cir0_used = <0x1>;
 			ir_power_key_code0 = <0x40>;
 			ir_addr_code0 = <0xfe01>;
@@ -2507,7 +2565,7 @@
 			phandle = <0x11a>;
 		};
 
-		uart@05000000 {
+		uart0: uart@05000000 {
 			compatible = "allwinner,sun50i-uart";
 			device_type = "uart0";
 			reg = <0x0 0x5000000 0x0 0x400>;
@@ -2523,7 +2581,7 @@
 			pinctrl-0 = <0x187>;
 		};
 
-		uart@05000400 {
+		uart1: uart@05000400 {
 			compatible = "allwinner,sun50i-uart";
 			device_type = "uart1";
 			reg = <0x0 0x5000400 0x0 0x400>;
@@ -2539,7 +2597,7 @@
 			phandle = <0x11c>;
 		};
 
-		uart@05000800 {
+		uart2: uart@05000800 {
 			compatible = "allwinner,sun50i-uart";
 			device_type = "uart2";
 			reg = <0x0 0x5000800 0x0 0x400>;
@@ -2549,13 +2607,11 @@
 			pinctrl-0 = <0x30>;
 			pinctrl-1 = <0x31>;
 			uart2_port = <0x2>;
-			uart2_type = <0x4>;
+			uart2_type = <0x2>;
 			status = "disabled";
-			linux,phandle = <0x11d>;
-			phandle = <0x11d>;
 		};
 
-		uart@05000c00 {
+		uart3: uart@05000c00 {
 			compatible = "allwinner,sun50i-uart";
 			device_type = "uart3";
 			reg = <0x0 0x5000c00 0x0 0x400>;
@@ -2571,7 +2627,7 @@
 			phandle = <0x11e>;
 		};
 
-		uart@05001000 {
+		uart4: uart@05001000 {
 			compatible = "allwinner,sun50i-uart";
 			device_type = "uart4";
 			reg = <0x0 0x5001000 0x0 0x400>;
@@ -2587,7 +2643,7 @@
 			phandle = <0x11f>;
 		};
 
-		uart@05001400 {
+		uart5: uart@05001400 {
 			compatible = "allwinner,sun50i-uart";
 			device_type = "uart5";
 			reg = <0x0 0x5001400 0x0 0x400>;
@@ -2598,12 +2654,12 @@
 			pinctrl-1 = <0x3a>;
 			uart5_port = <0x5>;
 			uart5_type = <0x2>;
-			status = "disabled";
+			status = "okay";
 			linux,phandle = <0x120>;
 			phandle = <0x120>;
 		};
 
-		twi@0x05002000 {
+		i2c0: twi@0x05002000 {
 			#address-cells = <0x1>;
 			#size-cells = <0x0>;
 			compatible = "allwinner,sun50i-twi";
@@ -2620,7 +2676,7 @@
 			phandle = <0x121>;
 		};
 
-		twi@0x05002400 {
+		i2c1: twi@0x05002400 {
 			#address-cells = <0x1>;
 			#size-cells = <0x0>;
 			compatible = "allwinner,sun50i-twi";
@@ -2637,7 +2693,24 @@
 			phandle = <0x122>;
 		};
 
-		twi@0x05002c00 {
+		i2c2: twi@0x05002800 {
+			#address-cells = <0x1>;
+			#size-cells = <0x0>;
+			compatible = "allwinner,sun50i-twi";
+			device_type = "twi2";
+			reg = <0x0 0x5002800 0x0 0x400>;
+			interrupts = <0x0 0x8 0x4>;
+			clocks = <0x41>;
+			clock-frequency = <0x30d40>;
+			pinctrl-names = "default", "sleep";
+			pinctrl-0 = <0x42>;
+			pinctrl-1 = <0x43>;
+			status = "disabled";
+			linux,phandle = <0x123>;
+			phandle = <0x123>;
+		};
+
+		i2c3: twi@0x05002c00 {
 			#address-cells = <0x1>;
 			#size-cells = <0x0>;
 			compatible = "allwinner,sun50i-twi";
@@ -2649,12 +2722,12 @@
 			pinctrl-names = "default", "sleep";
 			pinctrl-0 = <0x45>;
 			pinctrl-1 = <0x46>;
-			status = "disabled";
+			status = "okay";
 			linux,phandle = <0x124>;
 			phandle = <0x124>;
 		};
 
-		twi@0x05003000 {
+		i2c4: twi@0x05003000 {
 			#address-cells = <0x1>;
 			#size-cells = <0x0>;
 			compatible = "allwinner,sun50i-twi";
@@ -2667,11 +2740,9 @@
 			pinctrl-0 = <0x48>;
 			pinctrl-1 = <0x49>;
 			status = "disabled";
-			linux,phandle = <0x125>;
-			phandle = <0x125>;
 		};
 
-		twi@0x07081400 {
+		i2c5: twi@0x07081400 {
 			#address-cells = <0x1>;
 			#size-cells = <0x0>;
 			compatible = "allwinner,sun50i-twi";
@@ -2685,22 +2756,14 @@
 			pinctrl-1 = <0x4c>;
 			status = "okay";
 			no_suspend = <0x1>;
-			linux,phandle = <0x126>;
-			phandle = <0x126>;
 
 			pmu {
 				compatible = "x-powers,axp1530";
-				//compatible = "x-powers,axp806";
 				reg = <0x36>;
 				wakeup-source;
 				linux,phandle = <0x127>;
 				phandle = <0x127>;
 
-				interrupt-parent = <0x53>;
-				interrupts = <0x8 0x6 0x8>;
-				interrupt-controller;
-				#interrupt-cells = <1>;
-
 				standby_param {
 					vcc-dram = <0x4>;
 					linux,phandle = <0x128>;
@@ -2764,84 +2827,21 @@
 						linux,phandle = <0x69>;
 						phandle = <0x69>;
 					};
-
-				/*	cldo2 {
-						regulator-name = "axp806-cldo2";
-						regulator-min-microvolt = <0x00325aa0>;
-						regulator-max-microvolt = <0x00325aa0>;
-						regulator-step-delay-us = <0x00000019>;
-						regulator-final-delay-us = <0x00000032>;
-						regulator-always-on;
-						linux,phandle = <0x579>;
-						phandle = <0x579>;
-					};*/
 				};
 			};
 		};
 
-		twi@0x05002800 {
-			#address-cells = <0x1>;
-			#size-cells = <0x0>;
-			compatible = "allwinner,sun50i-twi";
-			device_type = "twi2";
-			reg = <0x0 0x5002800 0x0 0x400>;
-			interrupts = <0x0 0x8 0x4>;
-			clocks = <0x41>;
-			clock-frequency = <0x61A80>;
-			pinctrl-names = "default", "sleep";
-			pinctrl-0 = <0x42>;
-			pinctrl-1 = <0x43>;
-			status = "okay";
-			linux,phandle = <0x123>;
-			phandle = <0x123>;
-
-                        pca9555: pca9555@20{
-				compatible = "nxp,pca9555";
-				interrupt-parent = <0x53>;
-				interrupts = <0x7 0x4 0x4>;
-				gpio-controller;
-				#gpio-cells = <2>;
-				interrupt-controller;
-				#interrupt-cells = <2>;
-				reg = <0x20>;
-                        };
-
-			es8316: es8316@11 {
-				#sound-dai-cells = <0>;
-				compatible = "everest,es8316";
-				//pinctrl-names = "default";
-				//pinctrl-0 = <&hp_det>;
-				//hp-det-gpio = <0x53 7 10 0x6 1 0xffffffff 0xffffffff>;
-				reg = <0x11>;
-			};
-		};
-
-
-		i2c-gpio@1 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			compatible = "i2c-gpio";
-			gpios = <&pca9555 2 3 /* sda */
-				 &pca9555 3 3 /* scl */ >;
-
-			i2c-gpio,delay-us = <2>;
-
-			/* status = "okay"; */
-			status = "disabled";
-		};
-
 		usbc0@0 {
 			device_type = "usbc0";
 			compatible = "allwinner,sunxi-otg-manager";
-			usb_port_type = <0x1>;
-			usb_detect_type = <0x0>;
+			usb_port_type = <0x0>;
+			usb_detect_type = <0x1>;
 			usb_id_gpio;
 			usb_det_vbus_gpio;
 			usb_drv_vbus_gpio;
-			usb_host_init_state = <0x1>;
+			usb_host_init_state = <0x0>;
 			usb_regulator_io = "nocare";
-			usb_wakeup_suspend = <0x1>;
+			usb_wakeup_suspend = <0x2>;
 			usb_luns = <0x3>;
 			usb_serial_unique = <0x0>;
 			usb_serial_number = "20080411";
@@ -3034,8 +3034,7 @@
 			linein_gain = <0x3>;
 			digital_vol = <0x0>;
 			lineout_vol = <0x1a>;
-			gpio-spk = <&pca9555 0 1>;
-			pa_ctl_level = <0x0>;
+			pa_ctl_level = <0x1>;
 			pa_msleep_time = <0x64>;
 			ramp_func_used = <0x1>;
 			avcc-supply = <0x68>;
@@ -3080,6 +3079,15 @@
 			phandle = <0x7b>;
 		};
 
+		cpudai3-controller@0x05097000 {
+			compatible = "allwinner,sunxi-ahub-cpudai";
+			reg = <0x0 0x5097000 0x0 0xadf>;
+			id = <0x3>;
+			status = "okay";
+			linux,phandle = <0x139>;
+			phandle = <0x139>;
+		};
+
 		ahub_codec@0x05097000 {
 			compatible = "allwinner,sunxi-ahub";
 			reg = <0x0 0x5097000 0x0 0xadf>;
@@ -3155,9 +3163,8 @@
 			phandle = <0x73>;
 		};
 
-		ahub_daudio3:ahub_daudio3@0x05097000 {
+		ahub_daudio3@0x05097000 {
 			compatible = "allwinner,sunxi-ahub-daudio";
-			#sound-dai-cells = <0>;
 			reg = <0x0 0x5097000 0x0 0xadf>;
 			clocks = <0x60 0x7 0x6a>;
 			pinctrl-names = "default", "sleep";
@@ -3165,7 +3172,7 @@
 			pinctrl-1 = <0x70>;
 			tdm_num = <0x3>;
 			device_type = "ahub_daudio3";
-			status = "okay";
+			status = "disabled";
 			pinconfig = <0x1>;
 			frametype = <0x0>;
 			pcm_lrck_period = <0x20>;
@@ -3207,12 +3214,10 @@
 		};
 
 		sound@3 {
-			compatible = "allwinner,sunxi-rt5651-sound";
+			compatible = "allwinner,sunxi-daudio3-machine";
 			sunxi,cpudai-controller = <0x74>;
 			device_type = "snddaudio3";
 			status = "disabled";
-                        sunxi,snddaudio-codec = "rt5651.2-001a";
-                        sunxi,snddaudio-codec-dai = "rt5651-aif1";
 			linux,phandle = <0x13d>;
 			phandle = <0x13d>;
 		};
@@ -3271,10 +3276,19 @@
 			pinctrl-1 = <0x80>;
 			spi0_cs_number = <0x1>;
 			spi0_cs_bitmap = <0x1>;
-			status = "disabled";
+			status = "okay";
 			spi_slave_mode = <0x0>;
 			linux,phandle = <0x142>;
 			phandle = <0x142>;
+
+			spi_board0 {
+				device_type = "spi_board0";
+				compatible = "rohm,dh2228fv";
+				spi-max-frequency = <0x1000000>;
+				reg = <0x0>;
+				spi-rx-bus-width = <0x1>;
+				spi-tx-bus-width = <0x1>;
+			};
 		};
 
 		spi@05011000 {
@@ -3291,33 +3305,19 @@
 			pinctrl-1 = <0x84>;
 			spi1_cs_number = <0x2>;
 			spi1_cs_bitmap = <0x2>;
-			status = "disabled";
+			status = "okay";
 			spi_slave_mode = <0x0>;
 			linux,phandle = <0x143>;
 			phandle = <0x143>;
-		};
 
-		spi-gpio@0 {
-			compatible = "spi-gpio";
-			#address-cells = <0x1>;
-
-			gpio-sck  = <&pca9555 4 0>;
-			gpio-miso = <&pca9555 5 0>;
-			gpio-mosi = <&pca9555 6 0>;
-			cs-gpios  = <&pca9555 7 0>;
-			num-chipselects = <1>;
-			status = "disabled";
-
-                        device_0@0 {
-                                compatible = "rohm,dh2228fv";
-                                spi-max-frequency = <500000>;
-                                reg = <0x0>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-                                spi-rx-bus-width = <0x1>;
-                                spi-tx-bus-width = <0x1>;
-				bits-per-word = <8>;
-                        };
+			spi_board1 {
+				device_type = "spi_board1";
+				compatible = "rohm,dh2228fv";
+				spi-max-frequency = <0x1000000>;
+				reg = <0x1>;
+				spi-rx-bus-width = <0x1>;
+				spi-tx-bus-width = <0x1>;
+			};
 		};
 
 		pcie@0x05400000 {
@@ -3334,45 +3334,11 @@
 			#interrupt-cells = <0x1>;
 			interrupt-map-mask = <0x0 0x0 0x0 0x0>;
 			interrupt-map = <0x0 0x0 0x0 0x1 0x85 0x0 0x7f 0x4>;
-			status = "disabled";
+			status = "okay";
 			linux,phandle = <0x144>;
 			phandle = <0x144>;
 		};
 
-		sdmmc@04020000 {
-			compatible = "allwinner,sunxi-mmc-v4p1x";
-			device_type = "sdc0";
-			reg = <0x0 0x4020000 0x0 0x1000>;
-			interrupts = <0x0 0x23 0x4>;
-			clocks = <0x9 0x86 0x8d 0x8e 0x8f>;
-			clock-names = "osc24m", "pll_periph", "mmc", "ahb", "rst";
-			pinctrl-names = "default", "sleep", "uart_jtag";
-			pinctrl-0 = <0x90>;
-			pinctrl-1 = <0x91>;
-			pinctrl-2 = <0x92>;
-			max-frequency = <0x8f0d180>;
-			bus-width = <0x4>;
-			cd-gpios = <0x53 0x5 0x6 0x6 0x1 0x3 0xffffffff>;
-			cap-sd-highspeed;
-			cap-wait-while-busy;
-			no-sdio;
-			no-mmc;
-			sunxi-power-save-mode;
-			status = "okay";
-			cd-used-24M;
-			sd-uhs-sdr50;
-			sd-uhs-ddr50;
-			sd-uhs-sdr104;
-			ctl-spec-caps = <0x8>;
-			vmmc-supply;
-			vqmmc33sw-supply;
-			vdmmc33sw-supply;
-			vqmmc18sw-supply;
-			vdmmc18sw-supply;
-			linux,phandle = <0x146>;
-			phandle = <0x146>;
-		};
-
 		sdmmc@04022000 {
 			compatible = "allwinner,sunxi-mmc-v4p6x";
 			device_type = "sdc2";
@@ -3389,12 +3355,10 @@
 			mmc-cache-ctrl;
 			non-removable;
 			max-frequency = <0x5f5e100>;
-			//max-frequency = <0x2FAF080>;
 			cap-erase;
 			mmc-high-capacity-erase-size;
 			no-sdio;
 			no-sd;
-
 			sdc_tm4_sm0_freq0 = <0x0>;
 			sdc_tm4_sm0_freq1 = <0x0>;
 			sdc_tm4_sm1_freq0 = <0x0>;
@@ -3405,29 +3369,43 @@
 			sdc_tm4_sm3_freq1 = <0x5>;
 			sdc_tm4_sm4_freq0 = <0x50000>;
 			sdc_tm4_sm4_freq1 = <0x4>;
-
-			//sdc_tm4_sm0_freq0 = <0xffffffff>;
-			//sdc_tm4_sm0_freq1 = <0xffffffff>;
-			//sdc_tm4_sm1_freq0 = <0xff17ffff>;
-			//sdc_tm4_sm1_freq1 = <0xffffffff>;
-			//sdc_tm4_sm2_freq0 = <0xff0d14ff>;
-			//sdc_tm4_sm2_freq1 = <0xffffffff>;
-			//sdc_tm4_sm3_freq0 = <0x1414ffff>;
-			//sdc_tm4_sm3_freq1 = <0xffff1d19>;
-			//sdc_tm4_sm4_freq0 = <0x0f18ffff>;
-			//sdc_tm4_sm4_freq1 = <0xffffff07>;
-
-			status = "okay";
+			status = "disabled";
 			mmc-ddr-1_8v;
 			mmc-hs200-1_8v;
 			mmc-hs400-1_8v;
 			sunxi-power-save-mode;
 			sunxi-dis-signal-vol-sw;
 			ctl-spec-caps = <0x8>;
-                        vmmc-supply;
-                        vqmmc-supply;
-			linux,phandle = <0x145>;
-			phandle = <0x145>;
+			vmmc-supply = <0x69>;
+			vqmmc-supply = <0x68>;
+		};
+
+		sdmmc@04020000 {
+			compatible = "allwinner,sunxi-mmc-v4p1x";
+			device_type = "sdc0";
+			reg = <0x0 0x4020000 0x0 0x1000>;
+			interrupts = <0x0 0x23 0x4>;
+			clocks = <0x9 0x86 0x8d 0x8e 0x8f>;
+			clock-names = "osc24m", "pll_periph", "mmc", "ahb", "rst";
+			pinctrl-names = "default", "sleep", "uart_jtag";
+			pinctrl-0 = <0x90>;
+			pinctrl-1 = <0x91>;
+			pinctrl-2 = <0x92>;
+			max-frequency = <0x8f0d180>;
+			bus-width = <0x4>;
+			cd-gpios = <0x53 0x5 0x6 0x6 0x1 0x3 0xffffffff>;
+			//cap-sd-highspeed;
+			cap-wait-while-busy;
+			no-sdio;
+			no-mmc;
+			sunxi-power-save-mode;
+			status = "okay";
+			cd-used-24M;
+			//sd-uhs-sdr50;
+			//sd-uhs-ddr50;
+			//sd-uhs-sdr104;
+			ctl-spec-caps = <0x8>;
+			//vdmmc-supply = <&reg_dcdc5>;
 		};
 
 		sdmmc@04021000 {
@@ -3533,7 +3511,7 @@
 		lcd0@01c0c000 {
 			compatible = "allwinner,sunxi-lcd0";
 			pinctrl-names = "active", "sleep";
-			status = "okay";
+			status = "disabled";
 			lcd_used = <0x0>;
 			lcd_driver_name = "default_lcd";
 			lcd_backlight = <0x32>;
@@ -3606,10 +3584,6 @@
 			hdmi_skip_bootedid = <0x1>;
 			ddc_en_io_ctrl = <0x0>;
 			power_io_ctrl = <0x0>;
-			hdmi_det_io = <0x53 0x8 0x10 0x0 0x0 0x0 0x0>;
-			vga_det_io =  <0x53 0x6 0x13 0x0 0x0 0x0 0x0>;
-			hhpd_set_io = <0x53 0x2 0x3 0x1 0x0 0x0 0x0>;
-			vga_reset_io = <0x53 0x2 0x4 0x1 0x0 0x0 0x0>;
 			linux,phandle = <0x14d>;
 			phandle = <0x14d>;
 		};
@@ -3637,63 +3611,57 @@
 		pwm@0300a000 {
 			compatible = "allwinner,sunxi-pwm";
 			reg = <0x0 0x300a000 0x0 0x3ff>;
-			clocks = <0x9b>;
+			clocks = <&clk_pwm>;
 			pwm-number = <0x6>;
 			pwm-base = <0x0>;
-			pwms = <0x9c 0x9d 0x9e 0x9f 0xa0 0xa1>;
-			linux,phandle = <0x150>;
-			phandle = <0x150>;
+			pwms = <&pwm0>, <&pwm1>,<&pwm2>, <&pwm3>, <&pwm4>, <&pwm5>;
 		};
 
-		pwm0@0300a000 {
+		pwm0: pwm0@0300a000 {
 			compatible = "allwinner,sunxi-pwm0";
 			pinctrl-names = "active", "sleep";
 			reg_base = <0x300a000>;
-			linux,phandle = <0x9c>;
-			phandle = <0x9c>;
 		};
 
-		pwm1@0300a000 {
+		pwm1: pwm1@0300a000 {
 			compatible = "allwinner,sunxi-pwm1";
 			pinctrl-names = "active", "sleep";
+			pinctrl-0 = <&pwm1_pin>;
+			pinctrl-1 = <&pwm1_pin_sleep>;
 			reg_base = <0x300a000>;
-			linux,phandle = <0x9d>;
-			phandle = <0x9d>;
 		};
 
-		pwm2@0300a000 {
+		pwm2: pwm2@0300a000 {
 			compatible = "allwinner,sunxi-pwm2";
 			pinctrl-names = "active", "sleep";
+			pinctrl-0 = <&pwm2_pin>;
+			pinctrl-1 = <&pwm2_pin_sleep>;
 			reg_base = <0x300a000>;
-			linux,phandle = <0x9e>;
-			phandle = <0x9e>;
 		};
 
-		pwm3@0300a000 {
+		pwm3: pwm3@0300a000 {
 			compatible = "allwinner,sunxi-pwm3";
 			pinctrl-names = "active", "sleep";
+			pinctrl-0 = <&pwm3_pin>;
+			pinctrl-1 = <&pwm3_pin_sleep>;
 			reg_base = <0x300a000>;
-			linux,phandle = <0x9f>;
-			phandle = <0x9f>;
 		};
 
-		pwm4@0300a000 {
+		pwm4: pwm4@0300a000 {
 			compatible = "allwinner,sunxi-pwm4";
 			pinctrl-names = "active", "sleep";
+			pinctrl-0 = <&pwm4_pin>;
+			pinctrl-1 = <&pwm4_pin_sleep>;
 			reg_base = <0x300a000>;
-			linux,phandle = <0xa0>;
-			phandle = <0xa0>;
 		};
 
-		pwm5@0300a000 {
+		pwm5: pwm5@0300a000 {
 			compatible = "allwinner,sunxi-pwm5";
 			pinctrl-names = "active", "sleep";
 			reg_base = <0x300a000>;
-			pinctrl-0 = <0xa2>;
-			pinctrl-1 = <0xa3>;
+			pinctrl-0 = <&pwm5_pin>;
+			pinctrl-1 = <&pwm5_pin_sleep>;
 			clk_bypass_output = <0x1>;
-			linux,phandle = <0xa1>;
-			phandle = <0xa1>;
 		};
 
 		ac200 {
@@ -4180,6 +4148,8 @@
 			clock-names = "bus";
 			nvmem-cells = <0xc4>;
 			nvmem-cell-names = "calibration";
+			nvmem-names = "sid";
+			nvmem = <&sunxi_sid>;
 			#thermal-sensor-cells = <0x1>;
 			linux,phandle = <0xc5>;
 			phandle = <0xc5>;
@@ -4295,7 +4265,7 @@
 			reg = <0x0 0x5070800 0x0 0x400>;
 			clocks = <0xca>;
 			interrupts = <0x0 0x14 0x0>;
-			status = "disabled";
+			status = "okay";
 			key_cnt = <0x5>;
 			key0 = <0xd2 0x73>;
 			key1 = <0x19a 0x72>;
@@ -4375,7 +4345,7 @@
 			clocks = <0x1b>;
 			bt_power;
 			bt_io_regulator;
-			//bt_rst_n = <0x53 0x6 0x13 0x1 0xffffffff 0xffffffff 0x0>;
+			bt_rst_n = <0x53 0x6 0x13 0x1 0xffffffff 0xffffffff 0x0>;
 			status = "okay";
 			linux,phandle = <0x177>;
 			phandle = <0x177>;
@@ -4403,34 +4373,25 @@
 
 		gpio_para {
 			device_type = "gpio_para";
-			status = "disabled";
+			status = "okay";
 			compatible = "allwinner,sunxi-init-gpio";
 			gpio_num = <0x0>;
-			//gpio_pin_1 = <0x53 8 16 0x1 1 0xffffffff 0xffffffff>; /* PI16 for USBC0 VBUS */
 		};
 
                 leds {
-			compatible = "gpio-leds";
+                        compatible = "gpio-leds";
 
-			power {
-			        label = "power_led";
-				gpios = <0x53 0x2 0x7 0x1 0xffffffff 0xffffffff 0x0>; /* PC7 */
-			        default-state = "on";
-			};
+                        power {
+                                label = "orangepi:red:power";
+				gpios = <0x53 0x2 0xc 0x1 0xffffffff 0xffffffff 0x0>; /* PC12 */
+                                default-state = "off";
+                        };
 
-			capslock {
-			        label = "caps_led";
-				gpios = <0x53 0x2 0x2 0x1 0xffffffff 0xffffffff 0x0>; // PC2
-				linux,default-trigger = "kbd-capslock";
-			        default-state = "off";
-			};
-
-			numlock {
-			        label = "num_led";
-				gpios = <0x53 0x2 0xc 0x1 0xffffffff 0xffffffff 0x0>; // PC12
-				linux,default-trigger = "kbd-numlock";
-			        default-state = "off";
-			};
+                        status {
+                                label = "orangepi:green:status";
+				gpios = <0x53 0x2 0xd 0x1 0xffffffff 0xffffffff 0x0>; /* PC13 */
+                                default-state = "on";
+                        };
                 };
 
 		product {
@@ -4459,9 +4420,6 @@
 			dcdc2_vol = <0xf4628>;
 			aldo1_vol = <0xf4948>;
 			dldo1_vol = <0xf4f24>;
-			bldo2_vol = <0xf4948>;
-			cldo2_vol = <0xf4f24>;
-			cldo3_vol = <0xf4948>;
 		};
 
 		axp1530_power_sply {
@@ -4469,19 +4427,14 @@
 			dcdc2_vol = <0xf4628>;
 			aldo1_vol = <0xf4948>;
 			dldo1_vol = <0xf4f24>;
-			bldo2_vol = <0xf4948>;
-			cldo2_vol = <0xf4f24>;
-			cldo3_vol = <0xf4948>;
 		};
 
 		axp806_power_sply {
 			device_type = "axp806_power_sply";
 			dcdce_vol = <0xf4f24>;
+			dcdcd_vol = <0xf4786>;
 			aldo1_vol = <0xf4f24>;
 			bldo1_vol = <0xf4948>;
-			bldo2_vol = <0xf4948>;
-			cldo2_vol = <0xf4f24>;
-			cldo3_vol = <0xf4948>;
 		};
 
 		card_boot {
@@ -4493,14 +4446,13 @@
 		boot_init_gpio {
 			device_type = "boot_init_gpio";
 			status = "okay";
-			gpio0 = <0x53 0x2 12 0x1 0xffffffff 0xffffffff 0x0>;
-			gpio1 = <0x53 0x2 0x2 0x1 0xffffffff 0xffffffff 0x0>;
-			gpio2 = <0x53 0x2 0x7 0x1 0xffffffff 0xffffffff 0x1>;
+			gpio0 = <0x53 0x2 0xc 0x1 0xffffffff 0xffffffff 0x1>;
+			gpio1 = <0x53 0x2 0xd 0x1 0xffffffff 0xffffffff 0x0>;
 		};
 
 		ir_boot_recovery {
 			device_type = "ir_boot_recovery";
-			status = "disabled";
+			status = "okay";
 			ir_work_mode = <0x1>;
 			ir_press_times = <0x2>;
 			ir_detect_time = <0x1>;
@@ -5116,13 +5068,6 @@
 			dram_tpr13 = <0x40>;
 		};
 
-                //sunxi_hdmi_detect {
-                //        compatible = "allwinner,sun50iw9-hdmi-detect";
-                //        status = "okay";
-                //        key_io = <0x53 0x8 0x10 0x0 0x0 0x0 0x0>;
-                //        hhpd_io = <0x53 0x2 0x3 0x1 0x0 0x0 0x0>;
-                //};
-
 		secure {
 			device_type = "secure";
 			dram_region_mbytes = <0x50>;
@@ -5527,7 +5472,7 @@
 		phandle = <0x17d>;
 	};
 
-	sunxi-sid-ng@03006000 {
+	sunxi_sid: sunxi-sid-ng@03006000 {
 		compatible = "allwinner,sun50iw9p1-sid";
 		reg = <0x0 0x3006000 0x0 0x1000>;
 		#address-cells = <0x1>;
@@ -5593,23 +5538,6 @@
 		phandle = <0x28>;
 	};
 
-	headphones-sound {
-		status = "okay";
-		compatible = "simple-audio-card";
-		pinctrl-names = "default";
-		pinctrl-0 = <&hp_det>;
-		simple-audio-card,format = "i2s";
-		simple-audio-card,name = "rk-es8316-hp-sound";
-		simple-audio-card,mclk-fs = <256>;
-		simple-audio-card,hp-det-gpio = <0x53 7 10 0x6 1 0xffffffff 0xffffffff>;
-		simple-audio-card,cpu {
-			sound-dai = <&ahub_daudio3>;
-		};
-		simple-audio-card,codec {
-			sound-dai = <&es8316>;
-		};
-	};
-
 	gpu@0x01800000 {
 		device_type = "gpu";
 		compatible = "arm,mali-midgard";

external/packages/pack-uboot/sun50iw9/bin/dts/orangepizero2-u-boot.dts

@@ -1476,10 +1476,10 @@
 			};
 
 			twi1@0 {
-				allwinner,pins = "PA2", "PA3";
+				allwinner,pins = "PH0", "PH1";
 				allwinner,pname = "twi1_scl", "twi1_sda";
 				allwinner,function = "twi1";
-				allwinner,muxsel = <0x4>;
+				allwinner,muxsel = <0x5>;
 				allwinner,drive = <0x1>;
 				allwinner,pull = <0x0>;
 				linux,phandle = <0x3f>;
@@ -1487,7 +1487,7 @@
 			};
 
 			twi1@1 {
-				allwinner,pins = "PA2", "PA3";
+				allwinner,pins = "PH0", "PH1";
 				allwinner,function = "io_disabled";
 				allwinner,muxsel = <0x7>;
 				allwinner,drive = <0x1>;
@@ -1497,7 +1497,7 @@
 			};
 
 			twi2@0 {
-				allwinner,pins = "PE20", "PE21";
+				allwinner,pins = "PH2", "PH3";
 				allwinner,pname = "twi2_scl", "twi2_sda";
 				allwinner,function = "twi2";
 				allwinner,muxsel = <0x5>;
@@ -1508,7 +1508,7 @@
 			};
 
 			twi2@1 {
-				allwinner,pins = "PE20", "PE21";
+				allwinner,pins = "PH2", "PH3";
 				allwinner,function = "io_disabled";
 				allwinner,muxsel = <0x7>;
 				allwinner,drive = <0x1>;

external/packages/pack-uboot/sun50iw9/bin/sys_config/sys_config_orangepir1b.fex

@@ -6,7 +6,7 @@
 
 [product]
 version = "100"
-machine = "evb"
+machine = "orangepizero3"
 
 [platform]
 eraseflag   = 1
@@ -37,33 +37,26 @@ dragonboard_test= 0
 dcdc2_vol                  = 1001000
 aldo1_vol                  = 1001800
 dldo1_vol                  = 1003300
-cldo2_vol                  = 1003300
+cldo1_vol		   = 1001800
 
 [axp1530_power_sply]
 dcdc2_vol                  = 1001000
 aldo1_vol                  = 1001800
 dldo1_vol                  = 1003300
-cldo2_vol                  = 1003300
+cldo1_vol		   = 1001800
 
 [axp806_power_sply]
 dcdce_vol                  = 1003300
+;dcdcd_vol                  = 1001110
 aldo1_vol		   = 1003300
 bldo1_vol		   = 1001800
-cldo2_vol                  = 1003300
+bldo2_vol		   = 1001800
+cldo1_vol                  = 1001800
 
 [card_boot]
 logical_start   = 40960
 sprite_gpio0    =
 
-;----------------------------------------------------------------------------------
-; GPIO init on uboot
-;----------------------------------------------------------------------------------
-[boot_init_gpio]
-boot_init_gpio_used      = 1
-gpio0 =  port:PC12<1><default><default><0>
-gpio1 =  port:PC2<1><default><default><0>
-gpio2 =  port:PC7<1><default><default><1>
-
 ;----------------------------------------------------------------------------------
 ;   ir_boot_recovery_used : 1: used this function  0: not used
 ;   ir_work_mode          : 模式选择
@@ -84,7 +77,7 @@ gpio2 =  port:PC7<1><default><default><1>
 ;----------------------------------------------------------------------------------
 
 [ir_boot_recovery]
-ir_boot_recovery_used       = 0
+ir_boot_recovery_used       = 1
 ir_work_mode                = 1
 ir_press_times              = 2
 ir_detect_time              = 1
@@ -117,7 +110,7 @@ ir_addr_code3               = 0xfe01
 ;   recovery_key      :  按键配置.
 ;----------------------------------------------------------------------------------
 [key_boot_recovery]
-recovery_key_used       = 0
+recovery_key_used       = 1
 press_mode_enable       = 0
 key_work_mode           = 0
 short_press_mode        = 0
@@ -196,7 +189,6 @@ pll8            = 360
 pll9            = 297
 pll10           = 264
 
-
 ;*****************************************************************************
 ;
 ;dram select configuration
@@ -208,65 +200,63 @@ pll10           = 264
 ;gpadc_channel	:	选择gpadc通道	有效值(0-3)
 ;select_gpio1-4	:	选择gpio pin
 ;*****************************************************************************
-[dram_select_para]
-select_mode	= 1
-select_gpio0	= port:PI14<0><1><default><default>
-select_gpio1	= port:PI15<0><1><default><default>
-select_gpio2	= port:PI16<0><1><default><default>
-select_gpio3	=
 
 
+[dram_select_para]
+select_mode	= 0
+gpadc_channel	= 1
+select_gpio0	=
+select_gpio1	=
+select_gpio2	=
+select_gpio3	=
+
 ;*****************************************************************************
 ;sdram configuration
 ;
-; dram_para:     无CK跨接电容参数（保留）
-; dram_para1:    有CK跨接电容参数（保留）
-; dram_para2~6:  暂时预留
-; dram_para7:    无CK跨接电容参数（保留）
-; dram_para8~15: 暂时预留
 ;*****************************************************************************
 [dram_para]
-dram_clk       = 648
-dram_type      = 3
-dram_dx_odt    = 0x03030303
-dram_dx_dri    = 0x0e0e0e0e
-dram_ca_dri    = 0x1c12
-dram_odt_en    = 1
-dram_para1     = 0x30fb
-dram_para2     = 0x0000
-dram_mr0       = 0x840
-dram_mr1       = 0x4
-dram_mr2       = 0x8
-dram_mr3       = 0x0
-dram_mr4       = 0x0
-dram_mr5       = 0x0
-dram_mr6       = 0x0
-dram_mr11      = 0x0
-dram_mr12      = 0x0
-dram_mr13      = 0x0
-dram_mr14      = 0x0
-dram_mr16      = 0x0
-dram_mr17      = 0x0
-dram_mr22      = 0x0
-dram_tpr0      = 0xC0000C05
-dram_tpr1      = 0x0
-dram_tpr2      = 0x0
-dram_tpr3      = 0x0
-dram_tpr6      = 0x33808080
-dram_tpr10     = 0x002F0007
-dram_tpr11     = 0xffffdddd
-dram_tpr12     = 0xfedf7557
-dram_tpr13     = 0x40
+dram_clk = 792
+dram_type = 8
+dram_dx_odt = 0x07070707
+dram_dx_dri = 0x0e0e0e0e
+dram_ca_dri = 0x0e0e
+dram_odt_en = 0xaaaaeeee
+dram_para1 = 0x30fa
+dram_para2 = 0x0000
+dram_mr0 = 0x0
+dram_mr1 = 0x34
+dram_mr2 = 0x1b
+dram_mr3 = 0x33
+dram_mr4 = 0x3
+dram_mr5 = 0x0
+dram_mr6 = 0x0
+dram_mr11 = 0x4
+dram_mr12 = 0x72
+dram_mr13 = 0x0
+dram_mr14 = 0x9
+dram_mr16 = 0x0
+dram_mr17 = 0x0
+dram_mr22 = 0x24
+dram_tpr0 = 0x0
+dram_tpr1 = 0x0
+dram_tpr2 = 0x0
+dram_tpr3 = 0x0
+dram_tpr6 = 0x35808080
+dram_tpr10 = 0x402f6663
+dram_tpr11 = 0x36363535
+dram_tpr12 = 0x10101110
+dram_tpr13 = 0x2080C60
 
 [dram_para1]
-dram_clk       = 648
+
+dram_clk       = 720
 dram_type      = 3
-dram_dx_odt    = 0x03030303
+dram_dx_odt    = 0x08080808
 dram_dx_dri    = 0x0e0e0e0e
-dram_ca_dri    = 0x1c1c
+dram_ca_dri    = 0x0e0e
 dram_odt_en    = 1
-dram_para1     = 0x30fb
-dram_para2     = 0x0000
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
 dram_mr0       = 0x840
 dram_mr1       = 0x4
 dram_mr2       = 0x8
@@ -281,25 +271,26 @@ dram_mr14      = 0x0
 dram_mr16      = 0x0
 dram_mr17      = 0x0
 dram_mr22      = 0x0
-dram_tpr0      = 0xC0001305
+dram_tpr0      = 0x0
 dram_tpr1      = 0x0
 dram_tpr2      = 0x0
 dram_tpr3      = 0x0
 dram_tpr6      = 0x33808080
-dram_tpr10     = 0x002F0006
-dram_tpr11     = 0xffffdddd
-dram_tpr12     = 0xfedf7657
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
 dram_tpr13     = 0x40
 
 [dram_para2]
-dram_clk       = 648
+
+dram_clk       = 720
 dram_type      = 3
-dram_dx_odt    = 0x03030303
+dram_dx_odt    = 0x08080808
 dram_dx_dri    = 0x0e0e0e0e
-dram_ca_dri    = 0x1c1c
+dram_ca_dri    = 0x0e0e
 dram_odt_en    = 1
-dram_para1     = 0x30fb
-dram_para2     = 0x0000
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
 dram_mr0       = 0x840
 dram_mr1       = 0x4
 dram_mr2       = 0x8
@@ -314,25 +305,26 @@ dram_mr14      = 0x0
 dram_mr16      = 0x0
 dram_mr17      = 0x0
 dram_mr22      = 0x0
-dram_tpr0      = 0xC0001305
+dram_tpr0      = 0x0
 dram_tpr1      = 0x0
 dram_tpr2      = 0x0
 dram_tpr3      = 0x0
 dram_tpr6      = 0x33808080
-dram_tpr10     = 0x002F0006
-dram_tpr11     = 0xffffdddd
-dram_tpr12     = 0xfedf7657
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
 dram_tpr13     = 0x40
 
 [dram_para3]
-dram_clk       = 648
+
+dram_clk       = 720
 dram_type      = 3
-dram_dx_odt    = 0x03030303
+dram_dx_odt    = 0x08080808
 dram_dx_dri    = 0x0e0e0e0e
-dram_ca_dri    = 0x1c1c
+dram_ca_dri    = 0x0e0e
 dram_odt_en    = 1
-dram_para1     = 0x30fb
-dram_para2     = 0x0000
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
 dram_mr0       = 0x840
 dram_mr1       = 0x4
 dram_mr2       = 0x8
@@ -347,25 +339,26 @@ dram_mr14      = 0x0
 dram_mr16      = 0x0
 dram_mr17      = 0x0
 dram_mr22      = 0x0
-dram_tpr0      = 0xC0001305
+dram_tpr0      = 0x0
 dram_tpr1      = 0x0
 dram_tpr2      = 0x0
 dram_tpr3      = 0x0
 dram_tpr6      = 0x33808080
-dram_tpr10     = 0x002F0006
-dram_tpr11     = 0xffffdddd
-dram_tpr12     = 0xfedf7657
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
 dram_tpr13     = 0x40
 
 [dram_para4]
-dram_clk       = 648
+
+dram_clk       = 720
 dram_type      = 3
-dram_dx_odt    = 0x03030303
+dram_dx_odt    = 0x08080808
 dram_dx_dri    = 0x0e0e0e0e
-dram_ca_dri    = 0x1c1c
+dram_ca_dri    = 0x0e0e
 dram_odt_en    = 1
-dram_para1     = 0x30fb
-dram_para2     = 0x0000
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
 dram_mr0       = 0x840
 dram_mr1       = 0x4
 dram_mr2       = 0x8
@@ -380,25 +373,26 @@ dram_mr14      = 0x0
 dram_mr16      = 0x0
 dram_mr17      = 0x0
 dram_mr22      = 0x0
-dram_tpr0      = 0xC0001305
+dram_tpr0      = 0x0
 dram_tpr1      = 0x0
 dram_tpr2      = 0x0
 dram_tpr3      = 0x0
 dram_tpr6      = 0x33808080
-dram_tpr10     = 0x002F0006
-dram_tpr11     = 0xffffdddd
-dram_tpr12     = 0xfedf7657
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
 dram_tpr13     = 0x40
 
 [dram_para5]
-dram_clk       = 648
+
+dram_clk       = 720
 dram_type      = 3
-dram_dx_odt    = 0x03030303
+dram_dx_odt    = 0x08080808
 dram_dx_dri    = 0x0e0e0e0e
-dram_ca_dri    = 0x1c1c
+dram_ca_dri    = 0x0e0e
 dram_odt_en    = 1
-dram_para1     = 0x30fb
-dram_para2     = 0x0000
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
 dram_mr0       = 0x840
 dram_mr1       = 0x4
 dram_mr2       = 0x8
@@ -413,25 +407,26 @@ dram_mr14      = 0x0
 dram_mr16      = 0x0
 dram_mr17      = 0x0
 dram_mr22      = 0x0
-dram_tpr0      = 0xC0001305
+dram_tpr0      = 0x0
 dram_tpr1      = 0x0
 dram_tpr2      = 0x0
 dram_tpr3      = 0x0
 dram_tpr6      = 0x33808080
-dram_tpr10     = 0x002F0006
-dram_tpr11     = 0xffffdddd
-dram_tpr12     = 0xfedf7657
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
 dram_tpr13     = 0x40
 
 [dram_para6]
-dram_clk       = 648
+
+dram_clk       = 720
 dram_type      = 3
-dram_dx_odt    = 0x03030303
+dram_dx_odt    = 0x08080808
 dram_dx_dri    = 0x0e0e0e0e
-dram_ca_dri    = 0x1c1c
+dram_ca_dri    = 0x0e0e
 dram_odt_en    = 1
-dram_para1     = 0x30fb
-dram_para2     = 0x0000
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
 dram_mr0       = 0x840
 dram_mr1       = 0x4
 dram_mr2       = 0x8
@@ -446,25 +441,26 @@ dram_mr14      = 0x0
 dram_mr16      = 0x0
 dram_mr17      = 0x0
 dram_mr22      = 0x0
-dram_tpr0      = 0xC0001305
+dram_tpr0      = 0x0
 dram_tpr1      = 0x0
 dram_tpr2      = 0x0
 dram_tpr3      = 0x0
 dram_tpr6      = 0x33808080
-dram_tpr10     = 0x002F0006
-dram_tpr11     = 0xffffdddd
-dram_tpr12     = 0xfedf7657
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
 dram_tpr13     = 0x40
 
 [dram_para7]
-dram_clk       = 648
+
+dram_clk       = 720
 dram_type      = 3
-dram_dx_odt    = 0x03030303
+dram_dx_odt    = 0x08080808
 dram_dx_dri    = 0x0e0e0e0e
-dram_ca_dri    = 0x1c12
+dram_ca_dri    = 0x0e0e
 dram_odt_en    = 1
-dram_para1     = 0x30fb
-dram_para2     = 0x0000
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
 dram_mr0       = 0x840
 dram_mr1       = 0x4
 dram_mr2       = 0x8
@@ -479,25 +475,26 @@ dram_mr14      = 0x0
 dram_mr16      = 0x0
 dram_mr17      = 0x0
 dram_mr22      = 0x0
-dram_tpr0      = 0xC0000C05
+dram_tpr0      = 0x0
 dram_tpr1      = 0x0
 dram_tpr2      = 0x0
 dram_tpr3      = 0x0
 dram_tpr6      = 0x33808080
-dram_tpr10     = 0x002F0007
-dram_tpr11     = 0xffffdddd
-dram_tpr12     = 0xfedf7557
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
 dram_tpr13     = 0x40
 
 [dram_para8]
-dram_clk       = 648
+
+dram_clk       = 720
 dram_type      = 3
-dram_dx_odt    = 0x03030303
+dram_dx_odt    = 0x08080808
 dram_dx_dri    = 0x0e0e0e0e
-dram_ca_dri    = 0x1c1c
+dram_ca_dri    = 0x0e0e
 dram_odt_en    = 1
-dram_para1     = 0x30fb
-dram_para2     = 0x0000
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
 dram_mr0       = 0x840
 dram_mr1       = 0x4
 dram_mr2       = 0x8
@@ -512,25 +509,26 @@ dram_mr14      = 0x0
 dram_mr16      = 0x0
 dram_mr17      = 0x0
 dram_mr22      = 0x0
-dram_tpr0      = 0xC0001305
+dram_tpr0      = 0x0
 dram_tpr1      = 0x0
 dram_tpr2      = 0x0
 dram_tpr3      = 0x0
 dram_tpr6      = 0x33808080
-dram_tpr10     = 0x002F0006
-dram_tpr11     = 0xffffdddd
-dram_tpr12     = 0xfedf7657
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
 dram_tpr13     = 0x40
 
 [dram_para9]
-dram_clk       = 648
+
+dram_clk       = 720
 dram_type      = 3
-dram_dx_odt    = 0x03030303
+dram_dx_odt    = 0x08080808
 dram_dx_dri    = 0x0e0e0e0e
-dram_ca_dri    = 0x1c1c
+dram_ca_dri    = 0x0e0e
 dram_odt_en    = 1
-dram_para1     = 0x30fb
-dram_para2     = 0x0000
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
 dram_mr0       = 0x840
 dram_mr1       = 0x4
 dram_mr2       = 0x8
@@ -545,25 +543,26 @@ dram_mr14      = 0x0
 dram_mr16      = 0x0
 dram_mr17      = 0x0
 dram_mr22      = 0x0
-dram_tpr0      = 0xC0001305
+dram_tpr0      = 0x0
 dram_tpr1      = 0x0
 dram_tpr2      = 0x0
 dram_tpr3      = 0x0
 dram_tpr6      = 0x33808080
-dram_tpr10     = 0x002F0006
-dram_tpr11     = 0xffffdddd
-dram_tpr12     = 0xfedf7657
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
 dram_tpr13     = 0x40
 
 [dram_para10]
-dram_clk       = 648
+
+dram_clk       = 720
 dram_type      = 3
-dram_dx_odt    = 0x03030303
+dram_dx_odt    = 0x08080808
 dram_dx_dri    = 0x0e0e0e0e
-dram_ca_dri    = 0x1c1c
+dram_ca_dri    = 0x0e0e
 dram_odt_en    = 1
-dram_para1     = 0x30fb
-dram_para2     = 0x0000
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
 dram_mr0       = 0x840
 dram_mr1       = 0x4
 dram_mr2       = 0x8
@@ -578,25 +577,26 @@ dram_mr14      = 0x0
 dram_mr16      = 0x0
 dram_mr17      = 0x0
 dram_mr22      = 0x0
-dram_tpr0      = 0xC0001305
+dram_tpr0      = 0x0
 dram_tpr1      = 0x0
 dram_tpr2      = 0x0
 dram_tpr3      = 0x0
 dram_tpr6      = 0x33808080
-dram_tpr10     = 0x002F0006
-dram_tpr11     = 0xffffdddd
-dram_tpr12     = 0xfedf7657
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
 dram_tpr13     = 0x40
 
 [dram_para11]
-dram_clk       = 648
+
+dram_clk       = 720
 dram_type      = 3
-dram_dx_odt    = 0x03030303
+dram_dx_odt    = 0x08080808
 dram_dx_dri    = 0x0e0e0e0e
-dram_ca_dri    = 0x1c1c
+dram_ca_dri    = 0x0e0e
 dram_odt_en    = 1
-dram_para1     = 0x30fb
-dram_para2     = 0x0000
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
 dram_mr0       = 0x840
 dram_mr1       = 0x4
 dram_mr2       = 0x8
@@ -611,25 +611,26 @@ dram_mr14      = 0x0
 dram_mr16      = 0x0
 dram_mr17      = 0x0
 dram_mr22      = 0x0
-dram_tpr0      = 0xC0001305
+dram_tpr0      = 0x0
 dram_tpr1      = 0x0
 dram_tpr2      = 0x0
 dram_tpr3      = 0x0
 dram_tpr6      = 0x33808080
-dram_tpr10     = 0x002F0006
-dram_tpr11     = 0xffffdddd
-dram_tpr12     = 0xfedf7657
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
 dram_tpr13     = 0x40
 
 [dram_para12]
-dram_clk       = 648
+
+dram_clk       = 720
 dram_type      = 3
-dram_dx_odt    = 0x03030303
+dram_dx_odt    = 0x08080808
 dram_dx_dri    = 0x0e0e0e0e
-dram_ca_dri    = 0x1c1c
+dram_ca_dri    = 0x0e0e
 dram_odt_en    = 1
-dram_para1     = 0x30fb
-dram_para2     = 0x0000
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
 dram_mr0       = 0x840
 dram_mr1       = 0x4
 dram_mr2       = 0x8
@@ -644,25 +645,26 @@ dram_mr14      = 0x0
 dram_mr16      = 0x0
 dram_mr17      = 0x0
 dram_mr22      = 0x0
-dram_tpr0      = 0xC0001305
+dram_tpr0      = 0x0
 dram_tpr1      = 0x0
 dram_tpr2      = 0x0
 dram_tpr3      = 0x0
 dram_tpr6      = 0x33808080
-dram_tpr10     = 0x002F0006
-dram_tpr11     = 0xffffdddd
-dram_tpr12     = 0xfedf7657
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
 dram_tpr13     = 0x40
 
 [dram_para13]
-dram_clk       = 648
+
+dram_clk       = 720
 dram_type      = 3
-dram_dx_odt    = 0x03030303
+dram_dx_odt    = 0x08080808
 dram_dx_dri    = 0x0e0e0e0e
-dram_ca_dri    = 0x1c1c
+dram_ca_dri    = 0x0e0e
 dram_odt_en    = 1
-dram_para1     = 0x30fb
-dram_para2     = 0x0000
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
 dram_mr0       = 0x840
 dram_mr1       = 0x4
 dram_mr2       = 0x8
@@ -677,25 +679,26 @@ dram_mr14      = 0x0
 dram_mr16      = 0x0
 dram_mr17      = 0x0
 dram_mr22      = 0x0
-dram_tpr0      = 0xC0001305
+dram_tpr0      = 0x0
 dram_tpr1      = 0x0
 dram_tpr2      = 0x0
 dram_tpr3      = 0x0
 dram_tpr6      = 0x33808080
-dram_tpr10     = 0x002F0006
-dram_tpr11     = 0xffffdddd
-dram_tpr12     = 0xfedf7657
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
 dram_tpr13     = 0x40
 
 [dram_para14]
-dram_clk       = 648
+
+dram_clk       = 720
 dram_type      = 3
-dram_dx_odt    = 0x03030303
+dram_dx_odt    = 0x08080808
 dram_dx_dri    = 0x0e0e0e0e
-dram_ca_dri    = 0x1c1c
+dram_ca_dri    = 0x0e0e
 dram_odt_en    = 1
-dram_para1     = 0x30fb
-dram_para2     = 0x0000
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
 dram_mr0       = 0x840
 dram_mr1       = 0x4
 dram_mr2       = 0x8
@@ -710,25 +713,26 @@ dram_mr14      = 0x0
 dram_mr16      = 0x0
 dram_mr17      = 0x0
 dram_mr22      = 0x0
-dram_tpr0      = 0xC0001305
+dram_tpr0      = 0x0
 dram_tpr1      = 0x0
 dram_tpr2      = 0x0
 dram_tpr3      = 0x0
 dram_tpr6      = 0x33808080
-dram_tpr10     = 0x002F0006
-dram_tpr11     = 0xffffdddd
-dram_tpr12     = 0xfedf7657
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
 dram_tpr13     = 0x40
 
 [dram_para15]
-dram_clk       = 648
+
+dram_clk       = 720
 dram_type      = 3
-dram_dx_odt    = 0x03030303
+dram_dx_odt    = 0x08080808
 dram_dx_dri    = 0x0e0e0e0e
-dram_ca_dri    = 0x1c1c
+dram_ca_dri    = 0x0e0e
 dram_odt_en    = 1
-dram_para1     = 0x30fb
-dram_para2     = 0x0000
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
 dram_mr0       = 0x840
 dram_mr1       = 0x4
 dram_mr2       = 0x8
@@ -743,16 +747,48 @@ dram_mr14      = 0x0
 dram_mr16      = 0x0
 dram_mr17      = 0x0
 dram_mr22      = 0x0
-dram_tpr0      = 0xC0001305
+dram_tpr0      = 0x0
 dram_tpr1      = 0x0
 dram_tpr2      = 0x0
 dram_tpr3      = 0x0
 dram_tpr6      = 0x33808080
-dram_tpr10     = 0x002F0006
-dram_tpr11     = 0xffffdddd
-dram_tpr12     = 0xfedf7657
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
 dram_tpr13     = 0x40
 
+[dram_para16]
+dram_clk = 792
+dram_type = 8
+dram_dx_odt = 0x07070707
+dram_dx_dri = 0x0e0e0e0e
+dram_ca_dri = 0x0e0e
+dram_odt_en = 0xaaaaeeee
+dram_para1 = 0x30fa
+dram_para2 = 0x0000
+dram_mr0 = 0x0
+dram_mr1 = 0x34
+dram_mr2 = 0x1b
+dram_mr3 = 0x33
+dram_mr4 = 0x3
+dram_mr5 = 0x0
+dram_mr6 = 0x0
+dram_mr11 = 0x4
+dram_mr12 = 0x72
+dram_mr13 = 0x0
+dram_mr14 = 0x9
+dram_mr16 = 0x0
+dram_mr17 = 0x0
+dram_mr22 = 0x24
+dram_tpr0 = 0x0
+dram_tpr1 = 0x0
+dram_tpr2 = 0x0
+dram_tpr3 = 0x0
+dram_tpr6 = 0x35808080
+dram_tpr10 = 0x402f6663
+dram_tpr11 = 0x36363535
+dram_tpr12 = 0x10101110
+dram_tpr13 = 0x2080C60
 
 ;----------------------------------------------------------------------------------
 ;os life cycle para configuration
@@ -803,7 +839,6 @@ nand0_p1 = 0x55aaaa55
 nand0_p2 = 0x55aaaa55
 nand0_p3 = 0x55aaaa55
 
-
 [secure]
 dram_region_mbytes       = 80
 drm_region_mbytes        = 0

external/packages/pack-uboot/sun50iw9/bin/sys_config/sys_config_orangepizero2-b.fex

@@ -223,39 +223,37 @@ select_gpio3	=
 ;
 ;*****************************************************************************
 [dram_para]
-
-dram_clk       = 720
-dram_type      = 3
-dram_dx_odt    = 0x08080808
-dram_dx_dri    = 0x0e0e0e0e
-dram_ca_dri    = 0x0e0e
-dram_odt_en    = 1
-dram_para1     = 0x30FA
-dram_para2     = 0x1000
-dram_mr0       = 0x840
-dram_mr1       = 0x4
-dram_mr2       = 0x8
-dram_mr3       = 0x0
-dram_mr4       = 0x0
-dram_mr5       = 0x0
-dram_mr6       = 0x0
-dram_mr11      = 0x0
-dram_mr12      = 0x0
-dram_mr13      = 0x0
-dram_mr14      = 0x0
-dram_mr16      = 0x0
-dram_mr17      = 0x0
-dram_mr22      = 0x0
-dram_tpr0      = 0x0
-dram_tpr1      = 0x0
-dram_tpr2      = 0x0
-dram_tpr3      = 0x0
-dram_tpr6      = 0x33808080
-dram_tpr10     = 0x00f83438
-dram_tpr11     = 0x0
-dram_tpr12     = 0x0
-dram_tpr13     = 0x40
-
+dram_clk = 672
+dram_type = 7
+dram_dx_odt = 0x06060606
+dram_dx_dri = 0x0d0d0d0d
+dram_ca_dri = 0x0d0d
+dram_odt_en = 0x9988eeee
+dram_para1 = 0x30fa
+dram_para2 = 0x1000
+dram_mr0 = 0x0
+dram_mr1 = 0xc3
+dram_mr2 = 0x6
+dram_mr3 = 0x1
+dram_mr4 = 0x0
+dram_mr5 = 0x0
+dram_mr6 = 0x0
+dram_mr11 = 0x0
+dram_mr12 = 0x0
+dram_mr13 = 0x0
+dram_mr14 = 0x0
+dram_mr16 = 0x0
+dram_mr17 = 0x0
+dram_mr22 = 0x0
+dram_tpr0 = 0x0
+dram_tpr1 = 0x0
+dram_tpr2 = 0x0
+dram_tpr3 = 0x0
+dram_tpr6 = 0x2fb28080
+dram_tpr10 = 0x402f4429
+dram_tpr11 = 0x0d0e0a09
+dram_tpr12 = 0x0c0d0a0b
+dram_tpr13 = 0xc60
 
 [dram_para1]
 

external/packages/pack-uboot/sun50iw9/bin/sys_config/sys_config_orangepizero2-lts.fex

@@ -37,11 +37,13 @@ dragonboard_test= 0
 dcdc2_vol                  = 1001000
 aldo1_vol                  = 1001800
 dldo1_vol                  = 1003300
+cldo1_vol		   = 1001800
 
 [axp1530_power_sply]
 dcdc2_vol                  = 1001000
 aldo1_vol                  = 1001800
 dldo1_vol                  = 1003300
+cldo1_vol		   = 1001800
 
 [axp806_power_sply]
 dcdce_vol                  = 1003300
@@ -49,6 +51,7 @@ dcdce_vol                  = 1003300
 aldo1_vol		   = 1003300
 bldo1_vol		   = 1001800
 bldo2_vol		   = 1001800
+cldo1_vol                  = 1001800
 
 [card_boot]
 logical_start   = 40960
@@ -220,39 +223,37 @@ select_gpio3	=
 ;
 ;*****************************************************************************
 [dram_para]
-
-dram_clk       = 720
-dram_type      = 3
-dram_dx_odt    = 0x08080808
-dram_dx_dri    = 0x0e0e0e0e
-dram_ca_dri    = 0x0e0e
-dram_odt_en    = 1
-dram_para1     = 0x30FA
-dram_para2     = 0x1000
-dram_mr0       = 0x840
-dram_mr1       = 0x4
-dram_mr2       = 0x8
-dram_mr3       = 0x0
-dram_mr4       = 0x0
-dram_mr5       = 0x0
-dram_mr6       = 0x0
-dram_mr11      = 0x0
-dram_mr12      = 0x0
-dram_mr13      = 0x0
-dram_mr14      = 0x0
-dram_mr16      = 0x0
-dram_mr17      = 0x0
-dram_mr22      = 0x0
-dram_tpr0      = 0x0
-dram_tpr1      = 0x0
-dram_tpr2      = 0x0
-dram_tpr3      = 0x0
-dram_tpr6      = 0x33808080
-dram_tpr10     = 0x00f83438
-dram_tpr11     = 0x0
-dram_tpr12     = 0x0
-dram_tpr13     = 0x40
-
+dram_clk = 792
+dram_type = 8
+dram_dx_odt = 0x07070707
+dram_dx_dri = 0x0e0e0e0e
+dram_ca_dri = 0x0e0e
+dram_odt_en = 0xaaaaeeee
+dram_para1 = 0x30fa
+dram_para2 = 0x0000
+dram_mr0 = 0x0
+dram_mr1 = 0x34
+dram_mr2 = 0x1b
+dram_mr3 = 0x33
+dram_mr4 = 0x3
+dram_mr5 = 0x0
+dram_mr6 = 0x0
+dram_mr11 = 0x4
+dram_mr12 = 0x72
+dram_mr13 = 0x0
+dram_mr14 = 0x9
+dram_mr16 = 0x0
+dram_mr17 = 0x0
+dram_mr22 = 0x24
+dram_tpr0 = 0x0
+dram_tpr1 = 0x0
+dram_tpr2 = 0x0
+dram_tpr3 = 0x0
+dram_tpr6 = 0x35808080
+dram_tpr10 = 0x402f6663
+dram_tpr11 = 0x36363535
+dram_tpr12 = 0x10101110
+dram_tpr13 = 0x2080C60
 
 [dram_para1]
 

external/packages/pack-uboot/sun50iw9/bin/sys_config/sys_config_orangepizero3.fex

@@ -0,0 +1,845 @@
+;sunxi platform application
+;---------------------------------------------------------------------------------------------------------
+; 说明： 脚本中的字符串区分大小写，用户可以修改"="后面的数值，但是不要修改前面的字符串
+; 描述gpio的形式：Port:端口+组内序号<功能分配><内部电阻状态><驱动能力><输出电平状态>
+;---------------------------------------------------------------------------------------------------------
+
+[product]
+version = "100"
+machine = "orangepizero3"
+
+[platform]
+eraseflag   = 1
+debug_mode  = 3
+
+;----------------------------------------------------------------------------------
+;[target]  system bootup configuration
+;boot_clock	= CPU boot frequency, Unit: MHz
+;storage_type	= boot medium, 0-nand, 1-card0, 2-card2, -1(defualt)auto scan
+;advert_enable  = 0-close advert logo    1-open advert logo     (只有多核启动下有效)
+;----------------------------------------------------------------------------------
+[target]
+boot_clock   	= 1008
+storage_type    = -1
+advert_enable   = 0
+burn_key        = 1
+dragonboard_test= 0
+
+;----------------------------------------------------------------------------------
+;   system configuration
+;   ?
+;dcdc2_vol							---set dcdc2 voltage,mV,500-1200,10mV/step
+;											1220-1540,20mV/step
+;aldo1_vol							---set aldo1 voltage,mV,500-3500,100mV/step
+;dldo1_vol							---set dldo1 voltage,mV,500-3500,100mV/step
+;----------------------------------------------------------------------------------
+[power_sply]
+dcdc2_vol                  = 1001000
+aldo1_vol                  = 1001800
+dldo1_vol                  = 1003300
+cldo1_vol		   = 1001800
+
+[axp1530_power_sply]
+dcdc2_vol                  = 1001000
+aldo1_vol                  = 1001800
+dldo1_vol                  = 1003300
+cldo1_vol		   = 1001800
+
+[axp806_power_sply]
+dcdce_vol                  = 1003300
+;dcdcd_vol                  = 1001110
+aldo1_vol		   = 1003300
+bldo1_vol		   = 1001800
+bldo2_vol		   = 1001800
+cldo1_vol                  = 1001800
+
+[card_boot]
+logical_start   = 40960
+sprite_gpio0    =
+
+;----------------------------------------------------------------------------------
+;   ir_boot_recovery_used : 1: used this function  0: not used
+;   ir_work_mode          : 模式选择
+;                           0: 刷机,
+;                           1: 一键恢复(uboot阶段),
+;                           2: 安卓recovery,
+;                           3: 安卓恢复出厂设置.
+;                           如果不设置，默认为安卓recovery .
+;   ir_press_times        : ir遥控器连续按几次才生效,如果不设置默认为按1次生效
+;   ir_detect_time        : ir遥控检测时间,单位:ms,如果不设置默认为3000ms
+;   ir_key_no_duplicate   : ir遥控按键是否可重复，0：可重复(默认)，1：不可重复；
+;                           不可重复表示一个按键无论被按下几次，都只算ir_press_times的一次；
+;                           不可重复的应用场景为组合按键功能，如:交替按下'菜单键'和'音量-键'进入安卓recovery.
+;   ir_recovery_key_code0 : ir check key code
+;   ir_addr_code0         : ir key addr
+;                           you can increase ir support num, like:
+;                           ir_recovery_key_code1, or 2, 3, but limit to 16
+;----------------------------------------------------------------------------------
+
+[ir_boot_recovery]
+ir_boot_recovery_used       = 1
+ir_work_mode                = 1
+ir_press_times              = 2
+ir_detect_time              = 1
+ir_key_no_duplicate         = 0
+ir_recovery_key_code0       = 0x11
+ir_addr_code0               = 0xfe01
+ir_recovery_key_code1       = 0x19
+ir_addr_code1               = 0xfe01
+ir_recovery_key_code2       = 0x4c
+ir_addr_code2               = 0xfe01
+ir_recovery_key_code3       = 0x00
+ir_addr_code3               = 0xfe01
+
+
+;----------------------------------------------------------------------------------
+;   recovery_key_used :  模块使能端，    1：开启，0：关闭
+;   press_mode_enable :  长短按模式使能，1：开启，0：关闭
+;                        a)如果开启了该模式，则key_work_mode失效，short_press_mode和long_press_mode生>效,
+    ;                      recovery按键可以通过长按和短按来触发两种不同的模式;
+;                        b)如果关闭了该模式，则key_work_mode生效，recovery按键只能触发一种模式.
+;   key_work_mode     :  模式选择
+;                        0: 刷机,
+;                        1: 一键恢复(uboot阶段),
+;                        2: 安卓recovery,
+;                        3: 安卓恢复出厂设置.
+;                        如果不设置，模式为安卓recovery.
+;   short_press_mode  :  长按触发的模式，选项同上.
+;   long_press_mode   :  短按触发的模式，选项同上.
+;   key_press_time    :  定义长按的时间，单位:毫秒.
+;   recovery_key      :  按键配置.
+;----------------------------------------------------------------------------------
+[key_boot_recovery]
+recovery_key_used       = 1
+press_mode_enable       = 0
+key_work_mode           = 0
+short_press_mode        = 0
+long_press_mode         = 1
+key_press_time          = 2000
+recovery_key =
+
+
+;---------------------------------------------------------------------------------------------------------
+; if 1 == standby_mode, then support super standby;
+; else, support normal standby.
+;---------------------------------------------------------------------------------------------------------
+[pm_para]
+standby_mode		= 1
+
+[card0_boot_para]
+card_ctrl       = 0
+card_high_speed = 1
+card_line       = 4
+sdc_d1          = port:PF0<2><1><3><default>
+sdc_d0          = port:PF1<2><1><3><default>
+sdc_clk         = port:PF2<2><1><3><default>
+sdc_cmd         = port:PF3<2><1><3><default>
+sdc_d3          = port:PF4<2><1><3><default>
+sdc_d2          = port:PF5<2><1><3><default>
+;sdc_type	= "tm1"
+
+[card2_boot_para]
+card_ctrl       = 2
+card_high_speed = 1
+card_line       = 8
+sdc_clk         = port:PC5<3><1><3><default>
+sdc_cmd         = port:PC6<3><1><3><default>
+sdc_d0          = port:PC10<3><1><3><default>
+sdc_d1          = port:PC13<3><1><3><default>
+sdc_d2          = port:PC15<3><1><3><default>
+sdc_d3          = port:PC8<3><1><3><default>
+sdc_d4          = port:PC9<3><1><3><default>
+sdc_d5          = port:PC11<3><1><3><default>
+sdc_d6          = port:PC14<3><1><3><default>
+sdc_d7          = port:PC16<3><1><3><default>
+sdc_emmc_rst    = port:PC1<3><1><3><default>
+sdc_ds          = port:PC0<3><2><3><default>
+sdc_ex_dly_used = 2
+sdc_io_1v8	= 1
+;sdc_dis_host_caps = 0x100
+;sdc_type	= "tm4"
+
+[gpio_bias]
+pc_bias		= 1800
+
+[twi_para]
+twi_port        = 0
+twi_scl         = port:PH14<2><default><default><default>
+twi_sda         = port:PH15<2><default><default><default>
+
+[auto_print]
+auto_print_used = 1
+
+[uart_para]
+uart_debug_port = 0
+uart_debug_tx   = port:PH00<2><1><default><default>
+uart_debug_rx   = port:PH01<2><1><default><default>
+
+[jtag_para]
+jtag_enable     = 0
+jtag_ms         = port:PH9<3><default><default><default>
+jtag_ck         = port:PH10<3><default><default><default>
+jtag_do         = port:PH11<3><default><default><default>
+jtag_di         = port:PH12<3><default><default><default>
+
+[clock]
+pll4            = 300
+pll6            = 600
+pll8            = 360
+pll9            = 297
+pll10           = 264
+
+;*****************************************************************************
+;
+;dram select configuration
+;
+;select_mode	:	dram模式选择,	0:不进行自动识别
+;					1:gpio识别模式(dram_para, dram_para1-15, 共16组有效)
+;					2:gpadc识别模式(dram_para, dram_para1-7, 共8组有效)
+;					3:1个IO+gpadc识别模式(dram_para, dram_para1-15, 共16组有效)。其中IO配置优先级按select_gpio0>select_gpio1>select_gpio2>select_gpio3
+;gpadc_channel	:	选择gpadc通道	有效值(0-3)
+;select_gpio1-4	:	选择gpio pin
+;*****************************************************************************
+
+
+[dram_select_para]
+select_mode	= 0
+gpadc_channel	= 1
+select_gpio0	=
+select_gpio1	=
+select_gpio2	=
+select_gpio3	=
+
+;*****************************************************************************
+;sdram configuration
+;
+;*****************************************************************************
+[dram_para]
+dram_clk = 792
+dram_type = 8
+dram_dx_odt = 0x07070707
+dram_dx_dri = 0x0e0e0e0e
+dram_ca_dri = 0x0e0e
+dram_odt_en = 0xaaaaeeee
+dram_para1 = 0x30fa
+dram_para2 = 0x0000
+dram_mr0 = 0x0
+dram_mr1 = 0x34
+dram_mr2 = 0x1b
+dram_mr3 = 0x33
+dram_mr4 = 0x3
+dram_mr5 = 0x0
+dram_mr6 = 0x0
+dram_mr11 = 0x4
+dram_mr12 = 0x72
+dram_mr13 = 0x0
+dram_mr14 = 0x9
+dram_mr16 = 0x0
+dram_mr17 = 0x0
+dram_mr22 = 0x24
+dram_tpr0 = 0x0
+dram_tpr1 = 0x0
+dram_tpr2 = 0x0
+dram_tpr3 = 0x0
+dram_tpr6 = 0x35808080
+dram_tpr10 = 0x402f6663
+dram_tpr11 = 0x36363535
+dram_tpr12 = 0x10101110
+dram_tpr13 = 0x2080C60
+
+[dram_para1]
+
+dram_clk       = 720
+dram_type      = 3
+dram_dx_odt    = 0x08080808
+dram_dx_dri    = 0x0e0e0e0e
+dram_ca_dri    = 0x0e0e
+dram_odt_en    = 1
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
+dram_mr0       = 0x840
+dram_mr1       = 0x4
+dram_mr2       = 0x8
+dram_mr3       = 0x0
+dram_mr4       = 0x0
+dram_mr5       = 0x0
+dram_mr6       = 0x0
+dram_mr11      = 0x0
+dram_mr12      = 0x0
+dram_mr13      = 0x0
+dram_mr14      = 0x0
+dram_mr16      = 0x0
+dram_mr17      = 0x0
+dram_mr22      = 0x0
+dram_tpr0      = 0x0
+dram_tpr1      = 0x0
+dram_tpr2      = 0x0
+dram_tpr3      = 0x0
+dram_tpr6      = 0x33808080
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
+dram_tpr13     = 0x40
+
+[dram_para2]
+
+dram_clk       = 720
+dram_type      = 3
+dram_dx_odt    = 0x08080808
+dram_dx_dri    = 0x0e0e0e0e
+dram_ca_dri    = 0x0e0e
+dram_odt_en    = 1
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
+dram_mr0       = 0x840
+dram_mr1       = 0x4
+dram_mr2       = 0x8
+dram_mr3       = 0x0
+dram_mr4       = 0x0
+dram_mr5       = 0x0
+dram_mr6       = 0x0
+dram_mr11      = 0x0
+dram_mr12      = 0x0
+dram_mr13      = 0x0
+dram_mr14      = 0x0
+dram_mr16      = 0x0
+dram_mr17      = 0x0
+dram_mr22      = 0x0
+dram_tpr0      = 0x0
+dram_tpr1      = 0x0
+dram_tpr2      = 0x0
+dram_tpr3      = 0x0
+dram_tpr6      = 0x33808080
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
+dram_tpr13     = 0x40
+
+[dram_para3]
+
+dram_clk       = 720
+dram_type      = 3
+dram_dx_odt    = 0x08080808
+dram_dx_dri    = 0x0e0e0e0e
+dram_ca_dri    = 0x0e0e
+dram_odt_en    = 1
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
+dram_mr0       = 0x840
+dram_mr1       = 0x4
+dram_mr2       = 0x8
+dram_mr3       = 0x0
+dram_mr4       = 0x0
+dram_mr5       = 0x0
+dram_mr6       = 0x0
+dram_mr11      = 0x0
+dram_mr12      = 0x0
+dram_mr13      = 0x0
+dram_mr14      = 0x0
+dram_mr16      = 0x0
+dram_mr17      = 0x0
+dram_mr22      = 0x0
+dram_tpr0      = 0x0
+dram_tpr1      = 0x0
+dram_tpr2      = 0x0
+dram_tpr3      = 0x0
+dram_tpr6      = 0x33808080
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
+dram_tpr13     = 0x40
+
+[dram_para4]
+
+dram_clk       = 720
+dram_type      = 3
+dram_dx_odt    = 0x08080808
+dram_dx_dri    = 0x0e0e0e0e
+dram_ca_dri    = 0x0e0e
+dram_odt_en    = 1
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
+dram_mr0       = 0x840
+dram_mr1       = 0x4
+dram_mr2       = 0x8
+dram_mr3       = 0x0
+dram_mr4       = 0x0
+dram_mr5       = 0x0
+dram_mr6       = 0x0
+dram_mr11      = 0x0
+dram_mr12      = 0x0
+dram_mr13      = 0x0
+dram_mr14      = 0x0
+dram_mr16      = 0x0
+dram_mr17      = 0x0
+dram_mr22      = 0x0
+dram_tpr0      = 0x0
+dram_tpr1      = 0x0
+dram_tpr2      = 0x0
+dram_tpr3      = 0x0
+dram_tpr6      = 0x33808080
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
+dram_tpr13     = 0x40
+
+[dram_para5]
+
+dram_clk       = 720
+dram_type      = 3
+dram_dx_odt    = 0x08080808
+dram_dx_dri    = 0x0e0e0e0e
+dram_ca_dri    = 0x0e0e
+dram_odt_en    = 1
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
+dram_mr0       = 0x840
+dram_mr1       = 0x4
+dram_mr2       = 0x8
+dram_mr3       = 0x0
+dram_mr4       = 0x0
+dram_mr5       = 0x0
+dram_mr6       = 0x0
+dram_mr11      = 0x0
+dram_mr12      = 0x0
+dram_mr13      = 0x0
+dram_mr14      = 0x0
+dram_mr16      = 0x0
+dram_mr17      = 0x0
+dram_mr22      = 0x0
+dram_tpr0      = 0x0
+dram_tpr1      = 0x0
+dram_tpr2      = 0x0
+dram_tpr3      = 0x0
+dram_tpr6      = 0x33808080
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
+dram_tpr13     = 0x40
+
+[dram_para6]
+
+dram_clk       = 720
+dram_type      = 3
+dram_dx_odt    = 0x08080808
+dram_dx_dri    = 0x0e0e0e0e
+dram_ca_dri    = 0x0e0e
+dram_odt_en    = 1
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
+dram_mr0       = 0x840
+dram_mr1       = 0x4
+dram_mr2       = 0x8
+dram_mr3       = 0x0
+dram_mr4       = 0x0
+dram_mr5       = 0x0
+dram_mr6       = 0x0
+dram_mr11      = 0x0
+dram_mr12      = 0x0
+dram_mr13      = 0x0
+dram_mr14      = 0x0
+dram_mr16      = 0x0
+dram_mr17      = 0x0
+dram_mr22      = 0x0
+dram_tpr0      = 0x0
+dram_tpr1      = 0x0
+dram_tpr2      = 0x0
+dram_tpr3      = 0x0
+dram_tpr6      = 0x33808080
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
+dram_tpr13     = 0x40
+
+[dram_para7]
+
+dram_clk       = 720
+dram_type      = 3
+dram_dx_odt    = 0x08080808
+dram_dx_dri    = 0x0e0e0e0e
+dram_ca_dri    = 0x0e0e
+dram_odt_en    = 1
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
+dram_mr0       = 0x840
+dram_mr1       = 0x4
+dram_mr2       = 0x8
+dram_mr3       = 0x0
+dram_mr4       = 0x0
+dram_mr5       = 0x0
+dram_mr6       = 0x0
+dram_mr11      = 0x0
+dram_mr12      = 0x0
+dram_mr13      = 0x0
+dram_mr14      = 0x0
+dram_mr16      = 0x0
+dram_mr17      = 0x0
+dram_mr22      = 0x0
+dram_tpr0      = 0x0
+dram_tpr1      = 0x0
+dram_tpr2      = 0x0
+dram_tpr3      = 0x0
+dram_tpr6      = 0x33808080
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
+dram_tpr13     = 0x40
+
+[dram_para8]
+
+dram_clk       = 720
+dram_type      = 3
+dram_dx_odt    = 0x08080808
+dram_dx_dri    = 0x0e0e0e0e
+dram_ca_dri    = 0x0e0e
+dram_odt_en    = 1
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
+dram_mr0       = 0x840
+dram_mr1       = 0x4
+dram_mr2       = 0x8
+dram_mr3       = 0x0
+dram_mr4       = 0x0
+dram_mr5       = 0x0
+dram_mr6       = 0x0
+dram_mr11      = 0x0
+dram_mr12      = 0x0
+dram_mr13      = 0x0
+dram_mr14      = 0x0
+dram_mr16      = 0x0
+dram_mr17      = 0x0
+dram_mr22      = 0x0
+dram_tpr0      = 0x0
+dram_tpr1      = 0x0
+dram_tpr2      = 0x0
+dram_tpr3      = 0x0
+dram_tpr6      = 0x33808080
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
+dram_tpr13     = 0x40
+
+[dram_para9]
+
+dram_clk       = 720
+dram_type      = 3
+dram_dx_odt    = 0x08080808
+dram_dx_dri    = 0x0e0e0e0e
+dram_ca_dri    = 0x0e0e
+dram_odt_en    = 1
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
+dram_mr0       = 0x840
+dram_mr1       = 0x4
+dram_mr2       = 0x8
+dram_mr3       = 0x0
+dram_mr4       = 0x0
+dram_mr5       = 0x0
+dram_mr6       = 0x0
+dram_mr11      = 0x0
+dram_mr12      = 0x0
+dram_mr13      = 0x0
+dram_mr14      = 0x0
+dram_mr16      = 0x0
+dram_mr17      = 0x0
+dram_mr22      = 0x0
+dram_tpr0      = 0x0
+dram_tpr1      = 0x0
+dram_tpr2      = 0x0
+dram_tpr3      = 0x0
+dram_tpr6      = 0x33808080
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
+dram_tpr13     = 0x40
+
+[dram_para10]
+
+dram_clk       = 720
+dram_type      = 3
+dram_dx_odt    = 0x08080808
+dram_dx_dri    = 0x0e0e0e0e
+dram_ca_dri    = 0x0e0e
+dram_odt_en    = 1
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
+dram_mr0       = 0x840
+dram_mr1       = 0x4
+dram_mr2       = 0x8
+dram_mr3       = 0x0
+dram_mr4       = 0x0
+dram_mr5       = 0x0
+dram_mr6       = 0x0
+dram_mr11      = 0x0
+dram_mr12      = 0x0
+dram_mr13      = 0x0
+dram_mr14      = 0x0
+dram_mr16      = 0x0
+dram_mr17      = 0x0
+dram_mr22      = 0x0
+dram_tpr0      = 0x0
+dram_tpr1      = 0x0
+dram_tpr2      = 0x0
+dram_tpr3      = 0x0
+dram_tpr6      = 0x33808080
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
+dram_tpr13     = 0x40
+
+[dram_para11]
+
+dram_clk       = 720
+dram_type      = 3
+dram_dx_odt    = 0x08080808
+dram_dx_dri    = 0x0e0e0e0e
+dram_ca_dri    = 0x0e0e
+dram_odt_en    = 1
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
+dram_mr0       = 0x840
+dram_mr1       = 0x4
+dram_mr2       = 0x8
+dram_mr3       = 0x0
+dram_mr4       = 0x0
+dram_mr5       = 0x0
+dram_mr6       = 0x0
+dram_mr11      = 0x0
+dram_mr12      = 0x0
+dram_mr13      = 0x0
+dram_mr14      = 0x0
+dram_mr16      = 0x0
+dram_mr17      = 0x0
+dram_mr22      = 0x0
+dram_tpr0      = 0x0
+dram_tpr1      = 0x0
+dram_tpr2      = 0x0
+dram_tpr3      = 0x0
+dram_tpr6      = 0x33808080
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
+dram_tpr13     = 0x40
+
+[dram_para12]
+
+dram_clk       = 720
+dram_type      = 3
+dram_dx_odt    = 0x08080808
+dram_dx_dri    = 0x0e0e0e0e
+dram_ca_dri    = 0x0e0e
+dram_odt_en    = 1
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
+dram_mr0       = 0x840
+dram_mr1       = 0x4
+dram_mr2       = 0x8
+dram_mr3       = 0x0
+dram_mr4       = 0x0
+dram_mr5       = 0x0
+dram_mr6       = 0x0
+dram_mr11      = 0x0
+dram_mr12      = 0x0
+dram_mr13      = 0x0
+dram_mr14      = 0x0
+dram_mr16      = 0x0
+dram_mr17      = 0x0
+dram_mr22      = 0x0
+dram_tpr0      = 0x0
+dram_tpr1      = 0x0
+dram_tpr2      = 0x0
+dram_tpr3      = 0x0
+dram_tpr6      = 0x33808080
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
+dram_tpr13     = 0x40
+
+[dram_para13]
+
+dram_clk       = 720
+dram_type      = 3
+dram_dx_odt    = 0x08080808
+dram_dx_dri    = 0x0e0e0e0e
+dram_ca_dri    = 0x0e0e
+dram_odt_en    = 1
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
+dram_mr0       = 0x840
+dram_mr1       = 0x4
+dram_mr2       = 0x8
+dram_mr3       = 0x0
+dram_mr4       = 0x0
+dram_mr5       = 0x0
+dram_mr6       = 0x0
+dram_mr11      = 0x0
+dram_mr12      = 0x0
+dram_mr13      = 0x0
+dram_mr14      = 0x0
+dram_mr16      = 0x0
+dram_mr17      = 0x0
+dram_mr22      = 0x0
+dram_tpr0      = 0x0
+dram_tpr1      = 0x0
+dram_tpr2      = 0x0
+dram_tpr3      = 0x0
+dram_tpr6      = 0x33808080
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
+dram_tpr13     = 0x40
+
+[dram_para14]
+
+dram_clk       = 720
+dram_type      = 3
+dram_dx_odt    = 0x08080808
+dram_dx_dri    = 0x0e0e0e0e
+dram_ca_dri    = 0x0e0e
+dram_odt_en    = 1
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
+dram_mr0       = 0x840
+dram_mr1       = 0x4
+dram_mr2       = 0x8
+dram_mr3       = 0x0
+dram_mr4       = 0x0
+dram_mr5       = 0x0
+dram_mr6       = 0x0
+dram_mr11      = 0x0
+dram_mr12      = 0x0
+dram_mr13      = 0x0
+dram_mr14      = 0x0
+dram_mr16      = 0x0
+dram_mr17      = 0x0
+dram_mr22      = 0x0
+dram_tpr0      = 0x0
+dram_tpr1      = 0x0
+dram_tpr2      = 0x0
+dram_tpr3      = 0x0
+dram_tpr6      = 0x33808080
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
+dram_tpr13     = 0x40
+
+[dram_para15]
+
+dram_clk       = 720
+dram_type      = 3
+dram_dx_odt    = 0x08080808
+dram_dx_dri    = 0x0e0e0e0e
+dram_ca_dri    = 0x0e0e
+dram_odt_en    = 1
+dram_para1     = 0x30FA
+dram_para2     = 0x1000
+dram_mr0       = 0x840
+dram_mr1       = 0x4
+dram_mr2       = 0x8
+dram_mr3       = 0x0
+dram_mr4       = 0x0
+dram_mr5       = 0x0
+dram_mr6       = 0x0
+dram_mr11      = 0x0
+dram_mr12      = 0x0
+dram_mr13      = 0x0
+dram_mr14      = 0x0
+dram_mr16      = 0x0
+dram_mr17      = 0x0
+dram_mr22      = 0x0
+dram_tpr0      = 0x0
+dram_tpr1      = 0x0
+dram_tpr2      = 0x0
+dram_tpr3      = 0x0
+dram_tpr6      = 0x33808080
+dram_tpr10     = 0x00f83438
+dram_tpr11     = 0x0
+dram_tpr12     = 0x0
+dram_tpr13     = 0x40
+
+[dram_para16]
+dram_clk = 792
+dram_type = 8
+dram_dx_odt = 0x07070707
+dram_dx_dri = 0x0e0e0e0e
+dram_ca_dri = 0x0e0e
+dram_odt_en = 0xaaaaeeee
+dram_para1 = 0x30fa
+dram_para2 = 0x0000
+dram_mr0 = 0x0
+dram_mr1 = 0x34
+dram_mr2 = 0x1b
+dram_mr3 = 0x33
+dram_mr4 = 0x3
+dram_mr5 = 0x0
+dram_mr6 = 0x0
+dram_mr11 = 0x4
+dram_mr12 = 0x72
+dram_mr13 = 0x0
+dram_mr14 = 0x9
+dram_mr16 = 0x0
+dram_mr17 = 0x0
+dram_mr22 = 0x24
+dram_tpr0 = 0x0
+dram_tpr1 = 0x0
+dram_tpr2 = 0x0
+dram_tpr3 = 0x0
+dram_tpr6 = 0x35808080
+dram_tpr10 = 0x402f6663
+dram_tpr11 = 0x36363535
+dram_tpr12 = 0x10101110
+dram_tpr13 = 0x2080C60
+
+;----------------------------------------------------------------------------------
+;os life cycle para configuration
+;----------------------------------------------------------------------------------
+
+;----------------------------------------------------------------------------------
+;uart configuration
+;uart_type ---  2 (2 wire), 4 (4 wire), 8 (8 wire, full function)
+;----------------------------------------------------------------------------------
+[uart0]
+uart0_used       = 1
+uart0_port       = 0
+uart0_type       = 2
+uart0_tx         = port:PH00<2><1><default><default>
+uart0_rx         = port:PH01<2><1><default><default>
+
+[nand0_para]
+nand0_support_2ch    = 0
+
+nand0_used          = 0
+nand0_we            = port:PC00<2><0><1><default>
+nand0_ale           = port:PC01<2><0><1><default>
+nand0_cle           = port:PC02<2><0><1><default>
+nand0_ce0           = port:PC03<2><1><1><default>
+nand0_nre           = port:PC04<2><0><1><default>
+nand0_rb0           = port:PC05<2><1><1><default>
+nand0_d0           = port:PC06<2><0><1><default>
+nand0_d1           = port:PC07<2><0><1><default>
+nand0_d2            = port:PC08<2><0><1><default>
+nand0_d3            = port:PC09<2><0><1><default>
+nand0_d4            = port:PC10<2><0><1><default>
+nand0_d5            = port:PC11<2><0><1><default>
+nand0_d6            = port:PC12<2><0><1><default>
+nand0_d7            = port:PC13<2><0><1><default>
+nand0_ndqs            = port:PC14<2><0><1><default>
+nand0_ce1            = port:PC15<2><1><1><default>
+nand0_rb1          = port:PC16<2><1><1><default>
+
+nand0_regulator1 		= "vcc-nand"
+nand0_regulator2 		= "none"
+nand0_cache_level = 0x55aaaa55
+nand0_flush_cache_num = 0x55aaaa55
+nand0_capacity_level = 0x55aaaa55
+nand0_id_number_ctl = 0x55aaaa55
+nand0_print_level = 0x55aaaa55
+nand0_p0 = 0x55aaaa55
+nand0_p1 = 0x55aaaa55
+nand0_p2 = 0x55aaaa55
+nand0_p3 = 0x55aaaa55
+
+[secure]
+dram_region_mbytes       = 80
+drm_region_mbytes        = 0
+drm_region_start_mbytes  = 0

scripts/distributions.sh

@@ -451,6 +451,8 @@ POST_INSTALL_KERNEL_DEBS
 	cp "${EXTER}"/packages/blobs/audio_wav/audio.wav "${SDCARD}"/usr/share/sounds/alsa/
 	cp "${EXTER}"/packages/blobs/audio_wav/mute.wav "${SDCARD}"/usr/share/sounds/alsa/
 
+	cp "${EXTER}"/packages/blobs/test.mp4 "${SDCARD}"/usr/local/
+
 	# copy watchdog test programm
 	cp "${EXTER}"/packages/blobs/watchdog/watchdog_test_${ARCH} "${SDCARD}"/usr/local/bin/watchdog_test
 

scripts/main.sh

@@ -226,6 +226,8 @@ if [[ -z $BOARD ]]; then
 	options+=("orangepizero2"		"Allwinner H616 quad core 512MB/1GB RAM WiFi/BT GBE SPI")
 	#options+=("orangepizero2-b"		"Allwinner H616 quad core 512MB/1GB RAM WiFi/BT GBE SPI")
 	#options+=("orangepizero2-lts"           "Allwinner H616 quad core 1.5GB RAM WiFi/BT GBE SPI")
+	options+=("orangepizero3"		"Allwinner H618 quad core 1GB/1.5GB/2GB/4GB RAM WiFi/BT GBE SPI")
+	#options+=("orangepir1b"			"Allwinner H618 quad core 1.5GB/2GB/4GB RAM WiFi/BT GBE SPI")
 	#options+=("orangepi400"			"Allwinner H616 quad core 4GB RAM WiFi/BT GBE eMMC VGA")
 	options+=("orangepi4"                   "Rockchip  RK3399 hexa core 4GB RAM GBE eMMC USB3 USB-C WiFi/BT")
 	options+=("orangepi4-lts"                 "Rockchip  RK3399 hexa core 4GB RAM GBE eMMC USB3 USB-C WiFi/BT")

scripts/makeboarddeb.sh

@@ -297,6 +297,7 @@ create_board_package()
 	BOARD_TYPE=$BOARD_TYPE
 	INITRD_ARCH=${INITRD_ARCH}
 	KERNEL_IMAGE_TYPE=${KERNEL_IMAGE_TYPE}
+	BRANCH=${BRANCH}
 	EOF
 
 	# this is required for NFS boot to prevent deconfiguring the network on shutdown