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

FDT file configurable per board

Browse Source
This commit is contained in:
Piotr Szczepanik
2020-02-07 21:27:14 +01:00
parent 992d0aa88c
commit 83cf87922b
12 changed files with 10 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/boards/lafrite.conf
View File

@@ -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"

2
config/boards/nanopim4v2.conf
View File

@@ -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"

2
config/boards/orangepi4.wip
View File

@@ -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"

1
config/boards/pinebook-pro.wip
View File

@@ -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"

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

@@ -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"

1
config/boards/xt-q8l-v10.tvb
View File

@@ -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"

2
config/boards/z28pro.tvb
View File

@@ -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"

12
config/sources/families/include/rockchip64_common.inc
View File

@@ -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

6
config/sources/families/meson-gxl.conf
View File

@@ -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()

1
config/sources/families/rockchip.conf
View File

@@ -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"

3
lib/distributions.sh
View File

@@ -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

2
patch/u-boot/u-boot-rk3399/add-board-nanopi-m4v2.patch
View File

@@ -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