JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

rk3399: legacy .config for rk3399 was removed long ago; completely drop rk3399 family, move boards to rockchip64 and remove their legacy KERNEL_TARGET

Browse Source 
- also drop hooks referring to `legacy`
This commit is contained in:
Ricardo Pardini
2023-07-25 14:10:04 +02:00
committed by Igor
parent a6f1ca06f5
commit 148510f405
12 changed files with 30 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/boards/fe-som-rk3399.eos
View File

@@ -1,10 +1,10 @@
# Rockchip RK3399 hexa core 2GB/4GB RAM SoC GBE USB3 USB-C WiFi/BT eMMC NVMe PCI-e i2c
BOARD_NAME="FE SOM RK3399"
BOARDFAMILY="rk3399"
BOARDFAMILY="rockchip64"
BOARD_MAINTAINER=""
BOOTCONFIG="nanopc-t4-rk3399_defconfig"
HAS_VIDEO_OUTPUT="no"
KERNEL_TARGET="legacy,current,edge"
KERNEL_TARGET="current,edge"
ASOUND_STATE="asound.state.rt5651"
BOOT_LOGO="desktop"
#BOOT_FDT_FILE="rockchip/fe-som-rk3399.dtb"

6
config/boards/helios64.csc
View File

@@ -1,6 +1,6 @@
# RK3399 hexa core 4GB SoC 2.5GbE eMMC USB3 SATA M.2 UPS
BOARD_NAME="Helios64"
BOARDFAMILY="rk3399"
BOARDFAMILY="rockchip64" # Used to be rk3399
BOARD_MAINTAINER=""
BOOTCONFIG="helios64-rk3399_defconfig"
BOOT_SCENARIO="blobless"
@@ -13,7 +13,7 @@ PACKAGE_LIST_BOARD_REMOVE="fake-hwclock"
CPUMAX="1800000"
function post_family_tweaks__helios64_enable_heartbeat() {
display_alert "$BOARD" "Installing board tweaks" "info"
display_alert "$BOARD" "Installing board tweaks" "info"
chroot $SDCARD /bin/bash -c "systemctl --no-reload enable helios64-heartbeat-led.service >/dev/null 2>&1"
@@ -21,7 +21,7 @@ function post_family_tweaks__helios64_enable_heartbeat() {
}
function post_family_tweaks_bsp__helios64() {
display_alert "Installing BSP firmware and fixups"
display_alert "Installing BSP firmware and fixups"
mkdir -p $destination/etc/udev/rules.d/
mkdir -p $destination/etc/systemd/system/fancontrol.service.d/

19
config/boards/nanopi-r4s.conf
View File

@@ -1,6 +1,6 @@
# Rockchip RK3399 hexa core 1GB/4GB RAM SoC 2 x GBE USB3 USB-C
BOARD_NAME="NanoPi R4S"
BOARDFAMILY="rk3399"
BOARDFAMILY="rockchip64" # Used to be rk3399
BOARD_MAINTAINER="Manouchehri"
BOOTCONFIG="nanopi-r4s-rk3399_defconfig"
KERNEL_TARGET="current,edge"
@@ -9,20 +9,3 @@ MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima ha
HAS_VIDEO_OUTPUT="no"
BOOTBRANCH_BOARD="tag:v2022.04"
BOOTPATCHDIR="u-boot-rockchip64-v2022.04"
function post_family_tweaks_bsp__nanopi-r4s_BSP() {
display_alert "Installing BSP firmware and fixups"
if [[ $BRANCH == legacy ]]; then
# Bluetooth for most of others (custom patchram is needed only in legacy)
install -m 755 $SRC/packages/bsp/rk3399/brcm_patchram_plus_rk3399 $destination/usr/bin
cp $SRC/packages/bsp/rk3399/rk3399-bluetooth.service $destination/lib/systemd/system/
# need to swap chips in the service
sed -i s%BCM4345C5%BCM4356A2%g $destination/lib/systemd/system/rk3399-bluetooth.service
fi
return 0
}

2
config/boards/nanopi-r4se.csc
View File

@@ -1,6 +1,6 @@
# Rockchip RK3399 hexa core 4GB RAM SoC 2 x GBE 32GB eMMC USB3 USB-C
BOARD_NAME="NanoPi R4SE"
BOARDFAMILY="rk3399"
BOARDFAMILY="rockchip64" # Used to be rk3399
BOARD_MAINTAINER=""
BOOTCONFIG="nanopi-r4se-rk3399_defconfig"
KERNEL_TARGET="current,edge"

18
config/boards/nanopim4.csc
View File

@@ -1,9 +1,9 @@
# Rockchip RK3399 hexa core 2GB/4GB RAM SoC GBE eMMC USB3 USB-C WiFi/BT
BOARD_NAME="NanoPi M4"
BOARDFAMILY="rk3399"
BOARDFAMILY="rockchip64" # Used to be rk3399
BOARD_MAINTAINER=""
BOOTCONFIG="nanopi-m4-rk3399_defconfig"
KERNEL_TARGET="legacy,current,edge"
KERNEL_TARGET="current,edge"
FULL_DESKTOP="yes"
ASOUND_STATE="asound.state.rt5651"
BOOT_LOGO="desktop"
@@ -11,7 +11,7 @@ BOOTBRANCH_BOARD="tag:v2022.04"
BOOTPATCHDIR="u-boot-rockchip64-v2022.04"
function post_family_tweaks__m4() {
display_alert "$BOARD" "Installing board tweaks" "info"
display_alert "$BOARD" "Installing board tweaks" "info"
# enable fan support
chroot $SDCARD /bin/bash -c "systemctl --no-reload enable nanopim4-pwm-fan.service >/dev/null 2>&1"
@@ -20,14 +20,14 @@ function post_family_tweaks__m4() {
}
function post_family_tweaks_bsp__M4() {
display_alert "Installing BSP firmware and fixups"
display_alert "Installing BSP firmware and fixups"
# Bluetooth for most of others (custom patchram is needed only in legacy)
install -m 755 $SRC/packages/bsp/rk3399/brcm_patchram_plus_rk3399 $destination/usr/bin
cp $SRC/packages/bsp/rk3399/rk3399-bluetooth.service $destination/lib/systemd/system/
# Bluetooth for most of others (custom patchram is needed only in legacy)
install -m 755 $SRC/packages/bsp/rk3399/brcm_patchram_plus_rk3399 $destination/usr/bin
cp $SRC/packages/bsp/rk3399/rk3399-bluetooth.service $destination/lib/systemd/system/
# Swap out the chip for some boards
sed -i s%BCM4345C5%BCM4356A2%g $destination/lib/systemd/system/rk3399-bluetooth.service
# Swap out the chip for some boards
sed -i s%BCM4345C5%BCM4356A2%g $destination/lib/systemd/system/rk3399-bluetooth.service
# Fan support
cp $SRC/packages/bsp/nanopim4/nanopim4-pwm-fan.service $destination/lib/systemd/system/

9
config/boards/nanopim4v2.csc
View File

@@ -1,15 +1,15 @@
# Rockchip RK3399 hexa core 4GB RAM SoC GBE eMMC USB3 USB-C WiFi/BT
BOARD_NAME="NanoPi M4V2"
BOARDFAMILY="rk3399"
BOARDFAMILY="rockchip64" # Used to be rk3399
BOARD_MAINTAINER=""
BOOTCONFIG="nanopi-m4v2-rk3399_defconfig"
KERNEL_TARGET="legacy,current,edge"
KERNEL_TARGET="current,edge"
FULL_DESKTOP="yes"
ASOUND_STATE="asound.state.rt5651"
BOOT_LOGO="desktop"
function post_family_tweaks__m4v2() {
display_alert "$BOARD" "Installing board tweaks" "info"
display_alert "$BOARD" "Installing board tweaks" "info"
# enable fan support
chroot $SDCARD /bin/bash -c "systemctl --no-reload enable nanopim4-pwm-fan.service >/dev/null 2>&1"
@@ -17,7 +17,7 @@ function post_family_tweaks__m4v2() {
return 0
}
function post_family_tweaks_bsp__M4V2() {
display_alert "Installing BSP firmware and fixups"
display_alert "Installing BSP firmware and fixups"
# Bluetooth for most of others (custom patchram is needed only in legacy)
install -m 755 $SRC/packages/bsp/rk3399/brcm_patchram_plus_rk3399 $destination/usr/bin
@@ -32,4 +32,3 @@ function post_family_tweaks_bsp__M4V2() {
return 0
}

20
config/boards/nanopineo4.csc
View File

@@ -1,25 +1,9 @@
# Rockchip RK3399 hexa core 1GB RAM SoC GBE eMMC USB3 USB-C WiFi/BT
BOARD_NAME="NanoPi Neo 4"
BOARDFAMILY="rk3399"
BOARDFAMILY="rockchip64" # Used to be rk3399
BOARD_MAINTAINER=""
BOOTCONFIG="nanopi-neo4-rk3399_defconfig"
KERNEL_TARGET="legacy,current,edge"
KERNEL_TARGET="current,edge"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
function post_family_tweaks_bsp__nanopineo4_BSP() {
display_alert "Installing BSP firmware and fixups"
if [[ $BRANCH == legacy ]]; then
# Bluetooth for most of others (custom patchram is needed only in legacy)
install -m 755 $SRC/packages/bsp/rk3399/brcm_patchram_plus_rk3399 $destination/usr/bin
cp $SRC/packages/bsp/rk3399/rk3399-bluetooth.service $destination/lib/systemd/system/
# need to swap chips in the service
sed -i s%BCM4345C5%BCM4356A2%g $destination/lib/systemd/system/rk3399-bluetooth.service
fi
return 0
}

21
config/boards/orangepi-rk3399.csc
View File

@@ -1,25 +1,8 @@
# Rockchip RK3399 hexa core 2G/4GB RAM SoC GBE eMMC mPCI USB3 WiFi/BT
BOARD_NAME="Orange Pi RK3399"
BOARDFAMILY="rk3399"
BOARDFAMILY="rockchip64" # Used to be rk3399
BOARD_MAINTAINER=""
BOOTCONFIG="orangepi-rk3399_defconfig"
KERNEL_TARGET="legacy,current,edge"
KERNEL_TARGET="current,edge"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
function post_family_tweaks_bsp__orangepi-rk3399_BSP() {
display_alert "Installing BSP firmware and fixups"
if [[ $BRANCH == legacy ]]; then
# Bluetooth for most of others (custom patchram is needed only in legacy)
install -m 755 $SRC/packages/bsp/rk3399/brcm_patchram_plus_rk3399 $destination/usr/bin
cp $SRC/packages/bsp/rk3399/rk3399-bluetooth.service $destination/lib/systemd/system/
# need to swap chips in the service
sed -i s%BCM4345C5%BCM4356A2%g $destination/lib/systemd/system/rk3399-bluetooth.service
fi
return 0
}

13
config/boards/orangepi4-lts.conf
View File

@@ -2,7 +2,7 @@
# Uses the same u-boot dtb from Orangepi4 original board, but sets
# specific kernel DTB with BOOT_FDT_FILE directive
BOARD_NAME="Orange Pi 4 LTS"
BOARDFAMILY="rk3399"
BOARDFAMILY="rockchip64" # Used to be rk3399
BOARD_MAINTAINER="paolosabatino"
BOOTCONFIG="orangepi-4-rk3399_defconfig"
BOOT_FDT_FILE="rockchip/rk3399-orangepi-4-lts.dtb"
@@ -16,15 +16,7 @@ BOOTBRANCH_BOARD="tag:v2022.04"
BOOTPATCHDIR="u-boot-rockchip64-v2022.04"
function post_family_tweaks_bsp__OPi4lts() {
display_alert "Installing BSP firmware and fixups"
if [[ $BRANCH == legacy ]]; then
# Bluetooth for most of others (custom patchram is needed only in legacy)
install -m 755 $SRC/packages/bsp/rk3399/brcm_patchram_plus_rk3399 $destination/usr/bin
cp $SRC/packages/bsp/rk3399/rk3399-bluetooth.service $destination/lib/systemd/system/
fi
display_alert "Installing BSP firmware and fixups"
# Bluetooth on orangepi 4 LTS board is handled by a Spreadtrum (sprd) chip and requires
# a custom hciattach_opi binary, plus a systemd service to run it at boot time
@@ -33,4 +25,3 @@ function post_family_tweaks_bsp__OPi4lts() {
return 0
}

17
config/boards/orangepi4.conf
View File

@@ -1,25 +1,12 @@
# Rockchip RK3399 hexa core 4GB RAM SoC GBE eMMC USB3 USB-C WiFi/BT
BOARD_NAME="Orange Pi 4"
BOARDFAMILY="rk3399"
BOARDFAMILY="rockchip64" # Used to be rk3399
BOARD_MAINTAINER="paolosabatino"
BOOTCONFIG="orangepi-4-rk3399_defconfig"
KERNEL_TARGET="legacy,current,edge"
KERNEL_TARGET="current,edge"
FULL_DESKTOP="yes"
ASOUND_STATE="asound.state.rt5651"
BOOT_LOGO="desktop"
BOOTBRANCH_BOARD="tag:v2022.04"
BOOTPATCHDIR="u-boot-rockchip64-v2022.04"
function post_family_tweaks_bsp__orangepi4_BSP() {
display_alert "Installing BSP firmware and fixups"
if [[ $BRANCH == legacy ]]; then
# Bluetooth for most of others (custom patchram is needed only in legacy)
install -m 755 $SRC/packages/bsp/rk3399/brcm_patchram_plus_rk3399 $destination/usr/bin
cp $SRC/packages/bsp/rk3399/rk3399-bluetooth.service $destination/lib/systemd/system/
fi
return 0
}

4
config/boards/roc-rk3399-pc.csc
View File

@@ -1,9 +1,9 @@
# Rockchip RK3399 hexa core 4GB DDR4 SoC eMMC GBE USB3
BOARD_NAME="Renegade Elite"
BOARDFAMILY="rk3399"
BOARDFAMILY="rockchip64" # Used to be rk3399
BOARD_MAINTAINER=""
BOOTCONFIG="roc-pc-mezzanine-rk3399_defconfig"
KERNEL_TARGET="legacy,current,edge"
KERNEL_TARGET="current,edge"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3399-roc-pc-mezzanine.dtb"

29
config/sources/families/rk3399.conf
View File

@@ -1,29 +0,0 @@
#
# SPDX-License-Identifier: GPL-2.0
#
# Copyright (c) 2013-2023 Igor Pecovnik, igor@armbian.com
#
# This file is a part of the Armbian Build Framework
# https://github.com/armbian/build/
#
source "${BASH_SOURCE%/*}/include/rockchip64_common.inc"
case $BRANCH in
legacy)
KERNELSOURCE='https://github.com/friendlyarm/kernel-rockchip'
declare -g KERNEL_MAJOR_MINOR="4.4" # Major and minor versions of this kernel.
KERNELBRANCH='branch:nanopi4-linux-v4.4.y'
KERNELDIR='linux-rockchip64'
KERNELCONFIG='linux-rockchip64'
;;
esac
prepare_boot_configuration
atf_custom_postprocess() {
:
}