domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mvebu: Add bootscript for espressobin to support mainline firmware

Browse Source 
The generic bootscript is tailored around a downstream firmware and
doesn't work on a firmware built from mainline components.

Add a bootscript which:
* sets $console since mainline u-boot doesn't do that
* uses distro boot variables, so OpenWRT can be booted off any supported
  device when using a mainline firmware
* sets missing distro boot variables for the downstream firmware

Booting with a downstream firmware is unchanged.
Booting with a mainline firmware now works.

Signed-off-by: Andre Heider <a.heider@gmail.com>
This commit is contained in:
Andre Heider
2020-09-12 09:32:41 +02:00
committed by Hauke Mehrtens
parent 7c0496f29b
commit c43b45863e
2 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/mvebu/image/cortexa53.mk
View File

@@ -15,6 +15,7 @@ define Device/globalscale_espressobin
DEVICE_ALT0_MODEL := Armada 3700 Community Board DEVICE_ALT0_MODEL := Armada 3700 Community Board
DEVICE_ALT0_VARIANT := Non-eMMC DEVICE_ALT0_VARIANT := Non-eMMC
SOC := armada-3720 SOC := armada-3720
BOOT_SCRIPT := espressobin
endef endef
TARGET_DEVICES += globalscale_espressobin TARGET_DEVICES += globalscale_espressobin
@@ -27,6 +28,7 @@ define Device/globalscale_espressobin-emmc
DEVICE_ALT0_MODEL := Armada 3700 Community Board DEVICE_ALT0_MODEL := Armada 3700 Community Board
DEVICE_ALT0_VARIANT := eMMC DEVICE_ALT0_VARIANT := eMMC
SOC := armada-3720 SOC := armada-3720
BOOT_SCRIPT := espressobin
endef endef
TARGET_DEVICES += globalscale_espressobin-emmc TARGET_DEVICES += globalscale_espressobin-emmc
@@ -39,6 +41,7 @@ define Device/globalscale_espressobin-v7
DEVICE_ALT0_MODEL := Armada 3700 Community Board DEVICE_ALT0_MODEL := Armada 3700 Community Board
DEVICE_ALT0_VARIANT := V7 Non-eMMC DEVICE_ALT0_VARIANT := V7 Non-eMMC
SOC := armada-3720 SOC := armada-3720
BOOT_SCRIPT := espressobin
endef endef
TARGET_DEVICES += globalscale_espressobin-v7 TARGET_DEVICES += globalscale_espressobin-v7
@@ -51,6 +54,7 @@ define Device/globalscale_espressobin-v7-emmc
DEVICE_ALT0_MODEL := Armada 3700 Community Board DEVICE_ALT0_MODEL := Armada 3700 Community Board
DEVICE_ALT0_VARIANT := V7 eMMC DEVICE_ALT0_VARIANT := V7 eMMC
SOC := armada-3720 SOC := armada-3720
BOOT_SCRIPT := espressobin
endef endef
TARGET_DEVICES += globalscale_espressobin-v7-emmc TARGET_DEVICES += globalscale_espressobin-v7-emmc

34
target/linux/mvebu/image/espressobin.bootscript Normal file
View File

@@ -0,0 +1,34 @@
# Bootscript for Globalscale ESPRESSOBin Board
# Set distro variables if necessary for compability with downstream firmware
if test -z "${kernel_addr_r}"; then
setenv kernel_addr_r 0x7000000
fi
if test -z "${fdt_add_r}"; then
setenv fdt_addr_r 0x6f00000
fi
if test -z "${devtype}"; then
setenv devtype mmc
fi
if test -z "${devnum}"; then
if mmc dev 0; then
setenv devnum 0
elif mmc dev 1; then
setenv devnum 1
fi
fi
# figure out partition uuid to pass to the kernel as root=
part uuid ${devtype} ${devnum}:2 uuid
setenv console "console=ttyMV0,115200 earlycon=ar3700_uart,0xd0012000"
setenv bootargs "root=PARTUUID=${uuid} rw rootwait ${console}"
echo "Booting Linux from ${devtype} ${devnum} with args: ${bootargs}"
load ${devtype} ${devnum}:1 ${fdt_addr_r} @DTB@.dtb
load ${devtype} ${devnum}:1 ${kernel_addr_r} Image
booti ${kernel_addr_r} - ${fdt_addr_r}