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

Use initrd in FEL/NFS scenarios

Browse Source 
Remove redundant check in patching code
This commit is contained in:
zador-blood-stained
2016-04-29 14:06:00 +03:00
parent bd58ee6bb8
commit ea30495343
5 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common.sh
View File

@@ -338,7 +338,7 @@ advanced_patch () {
# apply patches
for name in "${names_s[@]}"; do
for dir in "${dirs[@]}"; do
if [[ -f $dir/$name || -L $dir/$name ]]; then
if [[ -f $dir/$name ]]; then
if [[ -s $dir/$name ]]; then
process_patch_file "$dir/$name" "$description"
else

2
debootstrap-ng.sh
View File

@@ -393,6 +393,8 @@ prepare_partitions()
if [[ $ROOTFS_TYPE != nfs ]]; then
mount ${LOOP}p2 $CACHEDIR/mount/
echo "/dev/mmcblk0p2 / ${mkfs[$ROOTFS_TYPE]} defaults,noatime,nodiratime${mountopts[$ROOTFS_TYPE]} 0 1" >> $CACHEDIR/sdcard/etc/fstab
else
echo "/dev/nfs / nfs defaults 0 0" >> $CACHEDIR/sdcard/etc/fstab
fi
# create /boot on rootfs after it is mounted
mkdir -p $CACHEDIR/mount/boot/

5
fel-load.sh
View File

@@ -40,7 +40,11 @@ fel_prepare_target()
# kill /etc/fstab on target
echo > $FEL_ROOTFS/etc/fstab
echo "/dev/nfs / nfs defaults 0 0" >> $FEL_ROOTFS/etc/fstab
echo "tmpfs /tmp tmpfs defaults,rw,nosuid 0 0" >> $FEL_ROOTFS/etc/fstab
# if for some reason uInitrd doesn't exist
[[ ! -f $FEL_ROOTFS/boot/uInitrd ]] && touch $FEL_ROOTFS/boot/uInitrd
}
fel_load()
@@ -70,6 +74,7 @@ fel_load()
sunxi-fel $FEL_EXTRA_ARGS -p uboot $FEL_ROOTFS/usr/lib/${CHOSEN_UBOOT}_${REVISION}_armhf/u-boot-sunxi-with-spl.bin \
write 0x42000000 $FEL_ROOTFS/boot/zImage \
write 0x43000000 $FEL_ROOTFS/$dtb_file \
write 0x43300000 $FEL_ROOTFS/boot/uInitrd \
write 0x43100000 $FEL_ROOTFS/boot/boot.scr
}

6
scripts/fel-boot.cmd.template
View File

@@ -2,9 +2,11 @@ setenv nfs_ip FEL_LOCAL_IP
setenv nfs_root FEL_ROOTFS
setenv branch BRANCH
setenv bootargs "console=tty1 console=ttyS0,115200 root=/dev/nfs nfsroot=${nfs_ip}:${nfs_root} ip=dhcp rw panic=10 consoleblank=0 enforcing=0 loglevel=6 rootflags=noatime,nodiratime"
# uncomment to disable initrd
# setenv ramdisk_addr_r "-"
if test ${branch} != default; then
setenv fdt_high ffffffff
bootz ${kernel_addr_r} - ${fdt_addr_r}
bootz ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
else
bootz ${kernel_addr_r}
bootz ${kernel_addr_r} ${ramdisk_addr_r}
fi

6
scripts/nfs-boot.cmd.template
View File

@@ -20,12 +20,14 @@ fi
if ext4load mmc 0 0x00000000 .next || fatload mmc 0 0x00000000 .next; then
ext4load mmc 0 ${fdt_addr_r} /dtb/${fdtfile} || fatload mmc 0 ${fdt_addr_r} /dtb/${fdtfile}
ext4load mmc 0 ${kernel_addr_r} zImage || fatload mmc 0 ${kernel_addr_r} zImage
ext4load mmc 0 ${ramdisk_addr_r} uInitrd || fatload mmc 0 ${ramdisk_addr_r} uInitrd || setenv ramdisk_addr_r "-"
setenv fdt_high ffffffff
bootz ${kernel_addr_r} - ${fdt_addr_r}
bootz ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
else
ext4load mmc 0 ${fdt_addr_r} script.bin || fatload mmc 0 ${fdt_addr_r} script.bin
ext4load mmc 0 ${kernel_addr_r} zImage || fatload mmc 0 ${kernel_addr_r} zImage
bootz ${kernel_addr_r}
ext4load mmc 0 ${ramdisk_addr_r} uInitrd || fatload mmc 0 ${ramdisk_addr_r} uInitrd || setenv ramdisk_addr_r "-"
bootz ${kernel_addr_r} ${ramdisk_addr_r}
fi
# Recompile with: