KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mvebu: clearfog: use partition uuid for root= bootarg

Browse source 
U-Boot already knows where it found the boot.scr, and
figuring out the partition UUID becomes trivial at this point.
This change allows booting OpenWrt from whatever storage it has been
flashed to: SD card, eMMC, USB disk or SATA disk.

Signed-off-by: Josua Mayer <josua.mayer97@gmail.com>
[replace lede with openwrt, redact commit message]
Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
This commit is contained in:
Josua Mayer 2017-10-19 09:22:11 +02:00 committed by Hauke Mehrtens
parent 98aa44ce79
commit 9a82076592
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
target/linux/mvebu/image/cfbase-boot.script
View file

@ -7,13 +7,14 @@
# removed once U-Boot is able to detect the board variant. # removed once U-Boot is able to detect the board variant.
setenv fdtfile armada-388-clearfog-base.dtb setenv fdtfile armada-388-clearfog-base.dtb
# generate bootargs for rootfs on MMC # rootfs is always on the next partition
if test "${devtype}" = "mmc"; then setexpr openwrt_rootpart ${distro_bootpart} + 1
setexpr openwrt_rootpart ${distro_bootpart} + 1
setenv bootargs ${bootargs} root=/dev/mmcblk${devnum}p${openwrt_rootpart} rootfstype=auto rootwait
fi
# here one could add logic for other rootfs device types such as scsi and usb # figure out partition uuid to pass to the kernel as root=
part uuid ${devtype} ${devnum}:${openwrt_rootpart} uuid
# generate bootargs (rootfs)
setenv bootargs ${bootargs} root=PARTUUID=${uuid} rootfstype=auto rootwait
# add console= option to bootargs, if any # add console= option to bootargs, if any
if test -n "${console}"; then if test -n "${console}"; then

13
target/linux/mvebu/image/cfpro-boot.script
View file

@ -3,13 +3,14 @@
# This script assumes that there is a boot partition, # This script assumes that there is a boot partition,
# and that the root partition is always the next one. # and that the root partition is always the next one.
# generate bootargs for rootfs on MMC # rootfs is always on the next partition
if test "${devtype}" = "mmc"; then setexpr openwrt_rootpart ${distro_bootpart} + 1
setexpr openwrt_rootpart ${distro_bootpart} + 1
setenv bootargs ${bootargs} root=/dev/mmcblk${devnum}p${openwrt_rootpart} rootfstype=auto rootwait
fi
# here one could add logic for other rootfs device types such as scsi and usb # figure out partition uuid to pass to the kernel as root=
part uuid ${devtype} ${devnum}:${openwrt_rootpart} uuid
# generate bootargs (rootfs)
setenv bootargs ${bootargs} root=PARTUUID=${uuid} rootfstype=auto rootwait
# add console= option to bootargs, if any # add console= option to bootargs, if any
if test -n "${console}"; then if test -n "${console}"; then