From 148510f405b4678f0b2db181d44bf3fc9c7b3421 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Tue, 25 Jul 2023 14:10:04 +0200 Subject: [PATCH] `rk3399`: `legacy` .config for `rk3399` was removed long ago; completely drop `rk3399` family, move boards to `rockchip64` and remove their `legacy` KERNEL_TARGET - also drop hooks referring to `legacy` --- config/boards/fe-som-rk3399.eos | 4 ++-- config/boards/helios64.csc | 6 +++--- config/boards/nanopi-r4s.conf | 19 +------------------ config/boards/nanopi-r4se.csc | 2 +- config/boards/nanopim4.csc | 18 +++++++++--------- config/boards/nanopim4v2.csc | 9 ++++----- config/boards/nanopineo4.csc | 20 ++------------------ config/boards/orangepi-rk3399.csc | 21 ++------------------- config/boards/orangepi4-lts.conf | 13 ++----------- config/boards/orangepi4.conf | 17 ++--------------- config/boards/roc-rk3399-pc.csc | 4 ++-- config/sources/families/rk3399.conf | 29 ----------------------------- 12 files changed, 30 insertions(+), 132 deletions(-) delete mode 100644 config/sources/families/rk3399.conf diff --git a/config/boards/fe-som-rk3399.eos b/config/boards/fe-som-rk3399.eos index e6e8398674..1a7696de22 100644 --- a/config/boards/fe-som-rk3399.eos +++ b/config/boards/fe-som-rk3399.eos @@ -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" diff --git a/config/boards/helios64.csc b/config/boards/helios64.csc index e580c4e73f..b2f600b10f 100644 --- a/config/boards/helios64.csc +++ b/config/boards/helios64.csc @@ -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/ diff --git a/config/boards/nanopi-r4s.conf b/config/boards/nanopi-r4s.conf index d2764c597f..2586221eae 100644 --- a/config/boards/nanopi-r4s.conf +++ b/config/boards/nanopi-r4s.conf @@ -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 -} diff --git a/config/boards/nanopi-r4se.csc b/config/boards/nanopi-r4se.csc index a6de3c0bcf..61cf8aa0c9 100644 --- a/config/boards/nanopi-r4se.csc +++ b/config/boards/nanopi-r4se.csc @@ -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" diff --git a/config/boards/nanopim4.csc b/config/boards/nanopim4.csc index 8ea0566a27..5d210de006 100644 --- a/config/boards/nanopim4.csc +++ b/config/boards/nanopim4.csc @@ -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/ diff --git a/config/boards/nanopim4v2.csc b/config/boards/nanopim4v2.csc index e4403ab9c7..ba0cac1c17 100644 --- a/config/boards/nanopim4v2.csc +++ b/config/boards/nanopim4v2.csc @@ -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 } - diff --git a/config/boards/nanopineo4.csc b/config/boards/nanopineo4.csc index 60e439522c..54b672f170 100644 --- a/config/boards/nanopineo4.csc +++ b/config/boards/nanopineo4.csc @@ -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 -} \ No newline at end of file diff --git a/config/boards/orangepi-rk3399.csc b/config/boards/orangepi-rk3399.csc index a0f8145359..85d8b38a5c 100644 --- a/config/boards/orangepi-rk3399.csc +++ b/config/boards/orangepi-rk3399.csc @@ -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 -} \ No newline at end of file diff --git a/config/boards/orangepi4-lts.conf b/config/boards/orangepi4-lts.conf index 2f33dcd3a5..3e73352250 100644 --- a/config/boards/orangepi4-lts.conf +++ b/config/boards/orangepi4-lts.conf @@ -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 } - diff --git a/config/boards/orangepi4.conf b/config/boards/orangepi4.conf index 1c1b1bfc77..a3ad42881a 100644 --- a/config/boards/orangepi4.conf +++ b/config/boards/orangepi4.conf @@ -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 -} diff --git a/config/boards/roc-rk3399-pc.csc b/config/boards/roc-rk3399-pc.csc index 5c82619347..4d82f09493 100644 --- a/config/boards/roc-rk3399-pc.csc +++ b/config/boards/roc-rk3399-pc.csc @@ -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" diff --git a/config/sources/families/rk3399.conf b/config/sources/families/rk3399.conf deleted file mode 100644 index e2aaf05438..0000000000 --- a/config/sources/families/rk3399.conf +++ /dev/null @@ -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() { - : -}