u-boot: add/fix NanoPi R2S and R4S

-update arm-trusted firmware to 2.6
-fix mac address generation on R2S because the CPUID fuses are not uniqe
-add support for NanoPi R4S

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2022-01-29 20:32:02 +00:00
parent 75ccf29897
commit 75c9d8c20c
3 changed files with 47 additions and 14 deletions

View File

@@ -51,17 +51,29 @@ case "${1}" in
scon="on"
fi
# Install AP6112 wlan config on NanoPi R1
mount /boot > /dev/null
case "$(< /proc/device-tree/model )" in
"FriendlyElec NanoPi-R1")
"FriendlyElec NanoPi-R1" )
# Install AP6112 wlan config on NanoPi R1
cp -f /lib/firmware/brcm/brcmfmac43430-sdio.AP6212.txt \
/lib/firmware/brcm/brcmfmac43430-sdio.txt
cp -f /lib/firmware/brcm/brcmfmac43430a0-sdio.ONDA-V80_PLUS.txt \
/lib/firmware/brcm/brcmfmac43430a0-sdio.txt
;;
"FriendlyElec NanoPi R2*" )
# Generate MAC address at first boot
SWMAC=`printf "%1x2:%02x:%02x:%02x:%02x" $[RANDOM%16] $[RANDOM%256] $[RANDOM%256] $[RANDOM%256] $[RANDOM%256]`
echo ethaddr=$SWMAC:00 >> /boot/uEnv.txt
echo eth1addr=$SWMAC:01 >> /boot/uEnv.txt
;;
"FriendlyElec NanoPi R4S" )
# Generate MAC address at first boot
SWMAC=`printf "%1x2:%02x:%02x:%02x:%02x" $[RANDOM%16] $[RANDOM%256] $[RANDOM%256] $[RANDOM%256] $[RANDOM%256]`
echo ethaddr=$SWMAC:00 >> /boot/uEnv.txt
echo eth1addr=$SWMAC:01 >> /boot/uEnv.txt
;;
esac 2>/dev/null
mount /boot > /dev/null
if [ -e /boot/grub/grub.cfg ]; then
# swtich permanent to serial console if it was selected on first boot
if [ "${scon}" = "on" ]; then