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

begin to support u-boot distroboot (#3675)

Browse Source
This commit is contained in:
Derek
2022-04-23 06:33:01 -04:00
committed by GitHub
parent 283d7f38ae
commit 63a6593336
4 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/bootenv/mvebu64.txt
View File

@@ -1,6 +1 @@
verbosity=1
emmc_fix=off
spi_workaround=off
#eth1addr=fa:ad:4e:25:fb:84
#eth2addr=fa:ad:4e:84:25:2f
#eth3addr=00:50:43:0d:19:18

21
config/bootscripts/boot-espressobin.cmd
View File

@@ -3,22 +3,15 @@
# Please edit /boot/armbianEnv.txt to set supported parameters
#
# default values
setenv rootdev "/dev/mmcblk0p1"
setenv verbosity "7"
setenv rootfstype "ext4"
setenv fdt_name_a dtb/marvell/armada-3720-community.dtb
setenv fdt_name_b dtb/marvell/armada-3720-espressobin.dtb
load ${boot_interface} ${devnum}:1 ${scriptaddr} ${prefix}armbianEnv.txt
load ${devtype} ${devnum}:${distro_bootpart} ${scriptaddr} ${prefix}armbianEnv.txt
env import -t ${scriptaddr} ${filesize}
setenv bootargs "$console root=${rootdev} rootfstype=${rootfstype} rootwait loglevel=${verbosity} usb-storage.quirks=${usbstoragequirks} ${extraargs}"
ext4load $boot_interface 0:1 $kernel_addr ${prefix}$image_name
ext4load $boot_interface 0:1 $initrd_addr ${prefix}$initrd_image
ext4load $boot_interface 0:1 $fdt_addr ${prefix}$fdt_name_a
ext4load $boot_interface 0:1 $fdt_addr ${prefix}$fdt_name_b
load $devtype ${devnum}:${distro_bootpart} $kernel_addr_r ${prefix}Image
load $devtype ${devnum}:${distro_bootpart} $ramdisk_addr_r ${prefix}uInitrd
load $devtype ${devnum}:${distro_bootpart} $fdt_addr_r ${prefix}dtb/$fdtfile
booti $kernel_addr $initrd_addr $fdt_addr
# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr
booti $kernel_addr_r $ramdisk_addr_r $fdt_addr_r
# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr.uimg

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

@@ -2,6 +2,7 @@ enable_extension "marvell-tools"
ARCH=arm64
BOOTBRANCH='branch:v2022.04'
BOOTENV_FILE='mvebu64.txt'
BOOTSCRIPT_OUTPUT='boot.scr.uimg'
ATFSOURCE='https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git'
ATFDIR='arm-trusted-firmware-espressobin'
ATFBRANCH='branch:master'

8
lib/debootstrap.sh
View File

@@ -736,8 +736,12 @@ PREPARE_IMAGE_SIZE
fi
# recompile .cmd to .scr if boot.cmd exists
[[ -f $SDCARD/boot/boot.cmd ]] && \
mkimage -C none -A arm -T script -d $SDCARD/boot/boot.cmd $SDCARD/boot/boot.scr > /dev/null 2>&1
if [[ -f $SDCARD/boot/boot.cmd ]]; then
if [ -z $BOOTSCRIPT_OUTPUT ]; then BOOTSCRIPT_OUTPUT=boot.scr; fi
mkimage -C none -A arm -T script -d $SDCARD/boot/boot.cmd $SDCARD/boot/$BOOTSCRIPT_OUTPUT > /dev/null 2>&1
fi
# create extlinux config
if [[ -f $SDCARD/boot/extlinux/extlinux.conf ]]; then