From 83cf87922b93cb27e03a59e6c4121c7d99bb41c4 Mon Sep 17 00:00:00 2001 From: Piotr Szczepanik Date: Fri, 7 Feb 2020 21:27:14 +0100 Subject: [PATCH] FDT file configurable per board --- config/boards/lafrite.conf | 1 + config/boards/nanopim4v2.conf | 2 -- config/boards/orangepi4.wip | 2 -- config/boards/pinebook-pro.wip | 1 + config/boards/roc-rk3399-pc.csc | 10 +--------- config/boards/xt-q8l-v10.tvb | 1 + config/boards/z28pro.tvb | 2 +- .../sources/families/include/rockchip64_common.inc | 12 ------------ config/sources/families/meson-gxl.conf | 6 +----- config/sources/families/rockchip.conf | 1 - lib/distributions.sh | 3 +++ .../u-boot/u-boot-rk3399/add-board-nanopi-m4v2.patch | 2 +- 12 files changed, 10 insertions(+), 33 deletions(-) diff --git a/config/boards/lafrite.conf b/config/boards/lafrite.conf index b2c0fe417..1ba94a984 100644 --- a/config/boards/lafrite.conf +++ b/config/boards/lafrite.conf @@ -2,5 +2,6 @@ BOARD_NAME="La Frite" BOARDFAMILY="meson-gxl" BOOTCONFIG="libretech-ac_defconfig" +BOOT_FDT_FILE="amlogic/meson-gxl-s805x-libretech-ac.dtb" KERNEL_TARGET="current,dev" FULL_DESKTOP="yes" diff --git a/config/boards/nanopim4v2.conf b/config/boards/nanopim4v2.conf index 2b9bcdf21..2428c894e 100644 --- a/config/boards/nanopim4v2.conf +++ b/config/boards/nanopim4v2.conf @@ -2,7 +2,5 @@ BOARD_NAME="NanoPi M4V2" BOARDFAMILY="rk3399" BOOTCONFIG="nanopi-m4v2-rk3399_defconfig" -MODULES="" -MODULES_NEXT="" KERNEL_TARGET="legacy,current,dev" FULL_DESKTOP="yes" diff --git a/config/boards/orangepi4.wip b/config/boards/orangepi4.wip index 23408f6e4..7633d0a78 100644 --- a/config/boards/orangepi4.wip +++ b/config/boards/orangepi4.wip @@ -2,7 +2,5 @@ BOARD_NAME="OrangePi 4" BOARDFAMILY="rk3399" BOOTCONFIG="orangepi-4-rk3399_defconfig" -MODULES="" -MODULES_NEXT="" KERNEL_TARGET="legacy,current,dev" FULL_DESKTOP="yes" diff --git a/config/boards/pinebook-pro.wip b/config/boards/pinebook-pro.wip index e548a834e..71d2339bc 100644 --- a/config/boards/pinebook-pro.wip +++ b/config/boards/pinebook-pro.wip @@ -2,6 +2,7 @@ BOARD_NAME="Pinebook Pro" BOARDFAMILY="rockchip64" BOOTCONFIG="pinebook_pro-rk3399_defconfig" +BOOT_FDT_FILE="rockchip/rk3399-pinebook-pro.dtb" DESKTOP_AUTOLOGIN="no" KERNEL_TARGET="legacy,current,dev" FULL_DESKTOP="yes" diff --git a/config/boards/roc-rk3399-pc.csc b/config/boards/roc-rk3399-pc.csc index b470f9deb..4932c5f4b 100644 --- a/config/boards/roc-rk3399-pc.csc +++ b/config/boards/roc-rk3399-pc.csc @@ -2,13 +2,5 @@ BOARD_NAME="ROC-RK3399-PC" BOARDFAMILY="rk3399" BOOTCONFIG="roc-pc-rk3399_defconfig" -# -MODULES="" -MODULES_NEXT="" -# KERNEL_TARGET="legacy,current,dev" -CLI_TARGET="buster,bionic:default" -DESKTOP_TARGET="buster,bionic:default" -# -CLI_BETA_TARGET="buster,bionic:dev" -DESKTOP_BETA_TARGET="" +FULL_DESKTOP="yes" diff --git a/config/boards/xt-q8l-v10.tvb b/config/boards/xt-q8l-v10.tvb index 0b1f1b3df..fa513e622 100644 --- a/config/boards/xt-q8l-v10.tvb +++ b/config/boards/xt-q8l-v10.tvb @@ -2,5 +2,6 @@ BOARD_NAME="xt-q8l-v10" BOARDFAMILY="rockchip" BOOTCONFIG="xt-q8l-v10-rk3288_defconfig" +BOOT_FDT_FILE="rk3288-xt-q8l-v10.dtb" MODULES_LEGACY="hci_uart rfcomm hidp" KERNEL_TARGET="legacy,current,dev" diff --git a/config/boards/z28pro.tvb b/config/boards/z28pro.tvb index 320ac0f41..d2c9f1b5f 100644 --- a/config/boards/z28pro.tvb +++ b/config/boards/z28pro.tvb @@ -2,6 +2,6 @@ BOARD_NAME="Z28 PRO" BOARDFAMILY="rockchip64" BOOTCONFIG="rock64-rk3328_defconfig" -MODULES_LEGACY="" +BOOT_FDT_FILE="rockchip/rk3328-z28pro.dtb" KERNEL_TARGET="legacy,current" FULL_DESKTOP="yes" diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc index e03ff5351..464ea1963 100644 --- a/config/sources/families/include/rockchip64_common.inc +++ b/config/sources/families/include/rockchip64_common.inc @@ -105,20 +105,8 @@ atf_custom_postprocess() family_tweaks() { - [[ $BOARD == firefly-rk3399 ]] && echo "fdtfile=rockchip/rk3399-firefly.dtb" >> $SDCARD/boot/armbianEnv.txt - [[ $BOARD == nanopct4 ]] && echo "fdtfile=rockchip/rk3399-nanopc-t4.dtb" >> $SDCARD/boot/armbianEnv.txt - [[ $BOARD == nanopim4 ]] && echo "fdtfile=rockchip/rk3399-nanopi-m4.dtb" >> $SDCARD/boot/armbianEnv.txt - [[ $BOARD == nanopim4v2 ]] && echo "fdtfile=rockchip/rk3399-nanopi-m4v2.dtb" >> $SDCARD/boot/armbianEnv.txt - [[ $BOARD == nanopineo4 ]] && echo "fdtfile=rockchip/rk3399-nanopi-neo4.dtb" >> $SDCARD/boot/armbianEnv.txt - [[ $BOARD == orangepi-rk3399 ]] && echo "fdtfile=rockchip/rk3399-orangepi.dtb" >> $SDCARD/boot/armbianEnv.txt - [[ $BOARD == orangepi4 ]] && echo "fdtfile=rockchip/rk3399-orangepi-4.dtb" >> $SDCARD/boot/armbianEnv.txt - [[ $BOARD == pinebook-pro ]] && echo "fdtfile=rockchip/rk3399-pinebook-pro.dtb" >> $SDCARD/boot/armbianEnv.txt - [[ $BOARD == roc-rk3399-pc ]] && echo "fdtfile=rockchip/rk3399-roc-pc.dtb" >> $SDCARD/boot/armbianEnv.txt - [[ $BOARD == rockpi-4* ]] && echo "fdtfile=rockchip/rk3399-rock-pi-4.dtb" >> $SDCARD/boot/armbianEnv.txt - if [[ $BOARD == z28pro ]]; then - echo "fdtfile=rockchip/rk3328-z28pro.dtb" >> $SDCARD/boot/armbianEnv.txt chroot $SDCARD /bin/bash -c "systemctl --no-reload enable z28pro-bluetooth.service >/dev/null 2>&1" elif [[ -f $SDCARD/lib/systemd/system/rk3399-bluetooth.service ]]; then diff --git a/config/sources/families/meson-gxl.conf b/config/sources/families/meson-gxl.conf index c9287e4ad..dadaf9d88 100644 --- a/config/sources/families/meson-gxl.conf +++ b/config/sources/families/meson-gxl.conf @@ -8,11 +8,7 @@ fi family_tweaks() { - - if [[ $BOARD == lafrite ]]; then - echo "fdtfile=amlogic/meson-gxl-s805x-libretech-ac.dtb" >> $SDCARD/boot/armbianEnv.txt - fi - + : } uboot_custom_postprocess() diff --git a/config/sources/families/rockchip.conf b/config/sources/families/rockchip.conf index 3f38bddf9..c7f7c2f8d 100644 --- a/config/sources/families/rockchip.conf +++ b/config/sources/families/rockchip.conf @@ -75,7 +75,6 @@ family_tweaks() fi if [[ $BOARD == xt-q8l-v10 ]]; then - echo "fdtfile=rk3288-xt-q8l-v10.dtb" >> $SDCARD/boot/armbianEnv.txt mkdir -p $SDCARD/etc/firmware/ ln -sf /lib/firmware/brcm/BCM4330B1.hcd $SDCARD/etc/firmware chroot $SDCARD /bin/bash -c "systemctl --no-reload enable ap6330-bluetooth.service >/dev/null 2>&1" diff --git a/lib/distributions.sh b/lib/distributions.sh index 8531828f9..e408d8ae2 100644 --- a/lib/distributions.sh +++ b/lib/distributions.sh @@ -177,6 +177,9 @@ install_common() [[ -n $DEFAULT_OVERLAYS && -f $SDCARD/boot/armbianEnv.txt ]] && \ echo "overlays=${DEFAULT_OVERLAYS//,/ }" >> "${SDCARD}"/boot/armbianEnv.txt + [[ -n $BOOT_FDT_FILE && -f $SDCARD/boot/armbianEnv.txt ]] && \ + echo "fdtfile=${BOOT_FDT_FILE}" >> "${SDCARD}/boot/armbianEnv.txt" + # initial date for fake-hwclock date -u '+%Y-%m-%d %H:%M:%S' > "${SDCARD}"/etc/fake-hwclock.data diff --git a/patch/u-boot/u-boot-rk3399/add-board-nanopi-m4v2.patch b/patch/u-boot/u-boot-rk3399/add-board-nanopi-m4v2.patch index dbfb02ee8..40436a482 100644 --- a/patch/u-boot/u-boot-rk3399/add-board-nanopi-m4v2.patch +++ b/patch/u-boot/u-boot-rk3399/add-board-nanopi-m4v2.patch @@ -119,7 +119,7 @@ index 00000000..ff4d32e2 +CONFIG_DEBUG_UART_BASE=0xFF1A0000 +CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_DEBUG_UART=y -+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-m4.dtb" ++CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-m4v2.dtb" +CONFIG_MISC_INIT_R=y +# CONFIG_DISPLAY_CPUINFO is not set +CONFIG_DISPLAY_BOARDINFO_LATE=y