nanopi-r5: board config housekeeping (#6124)

armbian · Jan 3, 2024 · 9c16c47 · 9c16c47
1 parent da96729
commit 9c16c47
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/config/boards/nanopi-r5c.csc b/config/boards/nanopi-r5c.csc
@@ -1,6 +1,6 @@
-# Rockchip RK3568 quad core 4GB eMMC USB3 2x 2.5GbE 
+# Rockchip RK3568 quad core 4GB eMMC USB3 2x 2.5GbE
 BOARD_NAME="NanoPi R5C"
-BOARDFAMILY="rockchip64" 
+BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER=""
 BOOT_SOC="rk3568"
 KERNEL_TARGET="edge"
@@ -18,11 +18,9 @@ BOOTPATCHDIR="v2023.10"
 BOOTCONFIG="nanopi-r5c-rk3568_defconfig"
 BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
 
+OVERLAY_PREFIX="rockchip-rk3568"
 DEFAULT_OVERLAYS="nanopi-r5c-leds"
 
-# Newer blobs...
-RKBIN_GIT_URL="https://github.com/rpardini/armbian-rkbin.git"
-RKBIN_GIT_BRANCH="update-3568-blobs"
 DDR_BLOB="rk35/rk3568_ddr_1560MHz_v1.18.bin"
 BL31_BLOB="rk35/rk3568_bl31_v1.43.elf"
 

diff --git a/config/boards/nanopi-r5s.wip b/config/boards/nanopi-r5s.wip
@@ -9,6 +9,7 @@ SRC_EXTLINUX="no"
 ASOUND_STATE="asound.state.station-m2" # TODO verify me
 IMAGE_PARTITION_TABLE="gpt"
 FULL_DESKTOP="yes"
+INSTALL_HEADERS="yes"
 BOOT_LOGO="desktop"
 
 BOOTSOURCE="https://github.com/Kwiboo/u-boot-rockchip.git" # also following kwiboo's uboot due to his rk3568 work
@@ -17,11 +18,9 @@ BOOTPATCHDIR="v2023.10"
 BOOTCONFIG="nanopi-r5s-rk3568_defconfig"
 BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
 
+OVERLAY_PREFIX="rockchip-rk3568"
 DEFAULT_OVERLAYS="nanopi-r5s-leds"
 
-# Newer blobs...
-RKBIN_GIT_URL="https://github.com/rpardini/armbian-rkbin.git"
-RKBIN_GIT_BRANCH="update-3568-blobs"
 DDR_BLOB="rk35/rk3568_ddr_1560MHz_v1.18.bin"
 BL31_BLOB="rk35/rk3568_bl31_v1.43.elf"