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

bootscript: Set path without $vendor folder for the 2 iteration.

Browse Source 
In the second iteration, we check the path that does not
contain the vendor folder. But this will also be done if
the real path contains the vendor's folder and the vendor's
name is contained in the DTB file name as
    fdtfile=allwinner/sun50i-*-bananapi-*.dtb.
However, overlays will not be available.
Remove "allwinner/" from all board configurations that
use the boot script mechanism so that the script works
correctly.

Signed-off-by: The-going <48602507+The-going@users.noreply.github.com>
This commit is contained in:
The-going
2024-12-01 22:13:45 +03:00
committed by Igor
parent c30669cc91
commit a49cee27ad
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/boards/bananapim4zero.conf
View File

@@ -4,7 +4,7 @@ BOARDFAMILY="sun50iw9-bpi"
BOARD_MAINTAINER="pyavitz"
BOOTCONFIG="bananapi_m4zero_defconfig"
OVERLAY_PREFIX="sun50i-h616"
BOOT_FDT_FILE="allwinner/sun50i-h618-bananapi-m4-zero.dtb"
BOOT_FDT_FILE="sun50i-h618-bananapi-m4-zero.dtb"
BOOT_LOGO="desktop"
KERNEL_TARGET="current,edge"
KERNEL_TEST_TARGET="current"

2
config/boards/bigtreetech-cb1.conf
View File

@@ -10,4 +10,4 @@ FORCE_BOOTSCRIPT_UPDATE="yes"
BOOTFS_TYPE="fat"
BOOT_FS_LABEL="BOOT"
OVERLAY_PREFIX="sun50i-h616"
BOOT_FDT_FILE="allwinner/sun50i-h616-bigtreetech-cb1-sd.dtb"
BOOT_FDT_FILE="sun50i-h616-bigtreetech-cb1-sd.dtb"

2
config/boards/pineh64-b.csc
View File

@@ -5,5 +5,5 @@ BOARD_MAINTAINER=""
BOOTCONFIG="pine_h64_defconfig"
KERNEL_TARGET="legacy,current,edge"
KERNEL_TEST_TARGET="current"
BOOT_FDT_FILE="allwinner/sun50i-h6-pine-h64-model-b.dtb"
BOOT_FDT_FILE="sun50i-h6-pine-h64-model-b.dtb"
CRUSTCONFIG="h6_defconfig"

5
config/bootscripts/boot-sun50i-next.cmd
View File

@@ -41,8 +41,9 @@ if test -e ${devtype} ${devnum} "${fdtdir}/${fdtfile}"; then
echo "Load fdt: ${fdtdir}/${fdtfile}"
else
echo "The file ${fdtfile} was not found in the path ${fdtdir}"
if test -e ${devtype} ${devnum} "${deffdt_dir}/${vendor}/${fdtfile}"; then
setenv fdtdir "${deffdt_dir}/${vendor}"
if test -e ${devtype} ${devnum} "${deffdt_dir}/${fdtfile}"; then
setenv fdtdir "${deffdt_dir}"
echo "Load fdt: ${fdtdir}/${fdtfile}"
else
if test -e ${devtype} ${devnum} "${deffdt_dir}/${fdtfile}"; then
setenv fdtdir "${deffdt_dir}"