Skip to content

Commit

Permalink
sync v24.03.20
Browse files Browse the repository at this point in the history
  • Loading branch information
@BPI-SINOVOIP
BPI-SINOVOIP committed Nov 9, 2024
1 parent d501dfa commit 4056324
Show file tree
Hide file tree
Showing 130 changed files with 6,266 additions and 2 deletions.
47 changes: 47 additions & 0 deletions config/boards/bananapim6astra.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Synaptics SL1680 SoC quad core A73(2.1Ghz) 4GB SoC eMMC USB3
BOARD_NAME="Banana Pi M6PRO EVK"
BOARDFAMILY="sl1680v3"
VENDOR="Armbian-bpi-senarytech"
BOOTCONFIG="vs680_oemboot_c05_defconfig"
KERNEL_TARGET="legacy"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
WIREGUARD="no"
#
USE_HOOK_FOR_PARTITION="yes"
rootpart=12
FIXED_IMAGE_SIZE=9137
IMAGE_PARTITION_TABLE="gpt"
#OFFSET="100"
#BOOT_FS_LABEL="BPI-BOOT"
ROOT_FS_LABEL="rootfs_a"
#BOOTSIZE="256"
SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes
#BOOTFS_TYPE="fat"

function post_family_tweaks__bananapim6_naming_audios() {
display_alert "$BOARD" "Renaming bananapim6 audios" "info"

mkdir -p $SDCARD/etc/udev/rules.d/
echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi0-sound", ENV{SOUND_DESCRIPTION}="HDMI0 Audio"' > $SDCARD/etc/udev/rules.d/90-naming-audios.rules
echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi1-sound", ENV{SOUND_DESCRIPTION}="HDMI1 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmiin-sound", ENV{SOUND_DESCRIPTION}="HDMI-In Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-dp0-sound", ENV{SOUND_DESCRIPTION}="DP0 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-es8316-sound", ENV{SOUND_DESCRIPTION}="ES8316 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules

return 0
}

# Override family config for this board; let's avoid conditionals in family config.
function post_family_config__bananapim6_use_vendor_uboot() {
BOOTSOURCE='https://github.com/BPI-SINOVOIP/pi-u-boot.git'
BOOTBRANCH='branch:v2019.10-vs680-hdmi-rx'
BOOTPATCHDIR="legacy"
}

function post_family_config__bananapim6_use_vendor_kernel() {
declare -g KERNEL_MAJOR_MINOR="5.4" # Major and minor versions of this kernel.
KERNELSOURCE='https://github.com/BPI-SINOVOIP/pi-linux.git'
KERNELBRANCH='branch:pi-5.4-vs680-hdmi-rx'
KERNELPATCHDIR="legacy"
}
58 changes: 58 additions & 0 deletions config/boards/bananapim6evb.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# Senarytech VS680 EVK SoC quad core A73(2.1Ghz) 4GB SoC eMMC USB3
BOARD_NAME="Senarytech VS680 EVK"
BOARDFAMILY="vs680"
#BOOTCONFIG="vs680_spi_defconfig"
#BOOTCONFIG="vs680_spi_boot_defconfig"
BOOTCONFIG="vs680_oemboot_defconfig"
BOOTSCRIPT='boot-vs680-evk.cmd:boot.cmd'
#BOOT_SOC="rk3588"
#vs680_a0_defconfig
#KERNEL_TARGET="legacy,edge,midstream"
KERNEL_TARGET="legacy"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
#BOOT_FDT_FILE="rockchip/rk3588-bananapi-w3.dtb"
#BOOT_SCENARIO="spl-blobs"
#UEFI_FS_LABEL="BPI-BOOT"
WIREGUARD="no"
#
OFFSET="100"
BOOT_FS_LABEL="BPI-BOOT"
ROOT_FS_LABEL="BPI-ROOT"
#BOOT_SUPPORT_SPI="yes"
#BOOT_SPI_RKSPI_LOADER="yes"
BOOTSIZE="256"
#IMAGE_PARTITION_TABLE="gpt"
SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes
BOOTFS_TYPE="fat"

function post_family_tweaks__bananapim6_naming_audios() {
display_alert "$BOARD" "Renaming bananapim6 audios" "info"

mkdir -p $SDCARD/etc/udev/rules.d/
echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi0-sound", ENV{SOUND_DESCRIPTION}="HDMI0 Audio"' > $SDCARD/etc/udev/rules.d/90-naming-audios.rules
echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi1-sound", ENV{SOUND_DESCRIPTION}="HDMI1 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmiin-sound", ENV{SOUND_DESCRIPTION}="HDMI-In Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-dp0-sound", ENV{SOUND_DESCRIPTION}="DP0 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-es8316-sound", ENV{SOUND_DESCRIPTION}="ES8316 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules

return 0
}

# Override family config for this board; let's avoid conditionals in family config.
function post_family_config__bananapim6_use_vendor_uboot() {
BOOTSOURCE='https://github.com/BPI-SINOVOIP/pi-u-boot.git'
#BOOTBRANCH='branch:v2019.10-vs680'
#BOOTBRANCH='branch:v2019.10-vs680-hdmi'
#BOOTBRANCH='branch:v2019.10-vs680'
BOOTBRANCH='branch:v2019.10-vs680-hdmi-rx'
BOOTPATCHDIR="legacy"
}

function post_family_config__bananapim6_use_vendor_kernel() {
declare -g KERNEL_MAJOR_MINOR="5.4" # Major and minor versions of this kernel.
KERNELSOURCE='https://github.com/BPI-SINOVOIP/pi-linux.git'
#KERNELBRANCH='branch:pi-5.4-vs680-hdmi-231224'
KERNELBRANCH='branch:pi-5.4-vs680-hdmi-rx'
KERNELPATCHDIR="legacy"
}
47 changes: 47 additions & 0 deletions config/boards/bananapim6pro.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Synaptics SL1680 SoC quad core A73(2.1Ghz) 4GB SoC eMMC USB3
BOARD_NAME="Banana Pi M6PRO"
BOARDFAMILY="sl1680"
VENDOR="Armbian-bpi-senarytech"
BOOTCONFIG="vs680_oemboot_c05_defconfig"
KERNEL_TARGET="legacy"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
WIREGUARD="no"
#
USE_HOOK_FOR_PARTITION="yes"
rootpart=12
FIXED_IMAGE_SIZE=9137
IMAGE_PARTITION_TABLE="gpt"
#OFFSET="100"
#BOOT_FS_LABEL="BPI-BOOT"
ROOT_FS_LABEL="rootfs_a"
#BOOTSIZE="256"
SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes
#BOOTFS_TYPE="fat"

function post_family_tweaks__bananapim6_naming_audios() {
display_alert "$BOARD" "Renaming bananapim6 audios" "info"

mkdir -p $SDCARD/etc/udev/rules.d/
echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi0-sound", ENV{SOUND_DESCRIPTION}="HDMI0 Audio"' > $SDCARD/etc/udev/rules.d/90-naming-audios.rules
echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi1-sound", ENV{SOUND_DESCRIPTION}="HDMI1 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmiin-sound", ENV{SOUND_DESCRIPTION}="HDMI-In Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-dp0-sound", ENV{SOUND_DESCRIPTION}="DP0 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-es8316-sound", ENV{SOUND_DESCRIPTION}="ES8316 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules

return 0
}

# Override family config for this board; let's avoid conditionals in family config.
function post_family_config__bananapim6_use_vendor_uboot() {
BOOTSOURCE='https://github.com/BPI-SINOVOIP/pi-u-boot.git'
BOOTBRANCH='branch:v2019.10-vs680-hdmi-rx'
BOOTPATCHDIR="legacy"
}

function post_family_config__bananapim6_use_vendor_kernel() {
declare -g KERNEL_MAJOR_MINOR="5.4" # Major and minor versions of this kernel.
KERNELSOURCE='https://github.com/BPI-SINOVOIP/pi-linux.git'
KERNELBRANCH='branch:pi-5.4-vs680-hdmi-rx'
KERNELPATCHDIR="legacy"
}
64 changes: 64 additions & 0 deletions config/bootscripts/boot-vs680-evk.cmd
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
# DO NOT EDIT THIS FILE
#
# Please edit /boot/armbianEnv.txt to set supported parameters
#
setenv initrd_high 0xffffffffffffffff

setenv overlay_error "false"
# default values
setenv rootdev "/dev/mmcblk1p2"
setenv loglevel "1"
setenv verbosity "1"
setenv console "both"
setenv bootlogo "false"
setenv rootfstype "ext4"
setenv docker_optimizations "on"
setenv earlycon "off"

setenv devtype "mmc"
#setenv devnum "1:1"
echo "devnum=${devnum}"
setenv ramdisk_addr_r 0x0ca00000

echo "BPI:20240425 support SD/EMMC: Boot script loaded from ${devtype} ${devnum}"

if test -e ${devtype} ${devnum} ${prefix}armbianEnv.txt; then
echo "BPI: load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}armbianEnv.txt"
load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}armbianEnv.txt
env import -t ${ramdisk_addr_r} ${filesize}
echo loglevel=${verbosity}
echo bootlogo=${bootlogo}
echo rootdev=${rootdev}
echo rootfstype=${rootfstype}
echo usbstoragequirks=${usbstoragequirks}
else
echo "BPI: skip load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}armbianEnv.txt"
fi

setenv initrd_high 0xffffffffffffffff

#setenv bootargs 'rootfstype=ext4 root=/dev/mmcblk1p2 rw rootwait'
#setenv bootargs 'rootfstype=ext4 root=/dev/mmcblk1p2 rw rootwait board=bpi-m6 loglevel=8 tz_enable vppta chipid=43111a82aee08964 cma=343932928@1509949440'

setenv bootargs "console=ttyS0,115200n8 console=tty1 rootfstype=${rootfstype} root=${rootdev} rw rootwait board=bpi-m6 loglevel=${verbosity} tz_enable vppta chipid=43111a82aee08964 cma=343932928@1509949440 ${bootopts}"
echo bootargs=${bootargs}

mmc list

echo "load ${devtype} ${devnum} 0x15a00000 dtb/synaptics/vs680-a0-oemboot-evk.dtb"
load ${devtype} ${devnum} 0x15a00000 dtb/synaptics/vs680-a0-oemboot-evk.dtb

echo "load ${devtype} ${devnum} 0x0ca00000 uInitrd"
load ${devtype} ${devnum} 0x0ca00000 uInitrd

echo "load ${devtype} ${devnum} 0x04a80000 Image"
load ${devtype} ${devnum} 0x04a80000 Image

#booti 0x04a80000 - 0x15a00000
echo "booti 0x04a80000 0x0ca00000 0x15a00000"
booti 0x04a80000 0x0ca00000 0x15a00000


# Recompile with:
# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr
# mkimage -C none -A arm -T script -d boot.cmd boot.scr
1 change: 1 addition & 0 deletions config/cli/common/main/packages.additional
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ sudo
unattended-upgrades
unicode-data
unzip
vim
vnstat
wget
wireless-regdb
Loading

0 comments on commit 4056324

Please sign in to comment.