From fe582c9d7c2379710c13d3266d05307ff23c9aca Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 8 Oct 2021 12:05:36 +0000 Subject: [PATCH] u-boot: nanopi r2s: add bootcmd and 2nd mac address Signed-off-by: Arne Fitzenreiter --- config/rootfiles/common/aarch64/u-boot | 7 +++++-- lfs/u-boot | 2 ++ .../u-boot/rockchip/generate-2-ethaddr.diff | 18 ++++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 src/patches/u-boot/rockchip/generate-2-ethaddr.diff diff --git a/config/rootfiles/common/aarch64/u-boot b/config/rootfiles/common/aarch64/u-boot index 4b08707e3b..bef7b7986a 100644 --- a/config/rootfiles/common/aarch64/u-boot +++ b/config/rootfiles/common/aarch64/u-boot @@ -1,10 +1,13 @@ boot/boot.cmd boot/boot.mk boot/boot.scr -boot/uEnv.txt -boot/uboot.env boot/u-boot-rpi3.bin boot/u-boot-rpi4.bin +boot/uEnv.txt +boot/uboot.env +#usr/share/u-boot +#usr/share/u-boot/nanopi_r2s usr/share/u-boot/nanopi_r2s/u-boot-rockchip.bin +#usr/share/u-boot/rpi usr/share/u-boot/rpi/u-boot-rpi3.bin usr/share/u-boot/rpi/u-boot-rpi4.bin diff --git a/lfs/u-boot b/lfs/u-boot index 5f1ce5b15b..4fd6289d9f 100644 --- a/lfs/u-boot +++ b/lfs/u-boot @@ -183,6 +183,7 @@ else cd $(DIR_APP) && make distclean # Nanopi R2S + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/rockchip/generate-2-ethaddr.diff cd $(DIR_APP) && rm -rf arm-trusted-firmware-2.5 cd $(DIR_APP) && tar axf $(DIR_DL)/arm-trusted-firmware-2.5.tar.gz cd $(DIR_APP)/arm-trusted-firmware-2.5 && make PLAT=rk3328 ARCH=aarch64 DEBUG=0 bl31 @@ -191,6 +192,7 @@ else -mkdir -pv /usr/share/u-boot/nanopi_r2s cd $(DIR_APP) && make CROSS_COMPILE="" nanopi-r2s-rk3328_config cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" Nanopi R2S - IPFire.org"!' .config + cd $(DIR_APP) && sed -i -e 's!^CONFIG_BOOTCOMMAND=.*!CONFIG_BOOTCOMMAND="console=ttyS2,115200n8;run distro_bootcmd"!' .config cd $(DIR_APP) && sed -i -e 's!^CONFIG_BAUDRATE=.*!CONFIG_BAUDRATE=115200"!' .config cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" cd $(DIR_APP) && install -v -m 644 u-boot-rockchip.bin \ diff --git a/src/patches/u-boot/rockchip/generate-2-ethaddr.diff b/src/patches/u-boot/rockchip/generate-2-ethaddr.diff new file mode 100644 index 0000000000..067c8b503c --- /dev/null +++ b/src/patches/u-boot/rockchip/generate-2-ethaddr.diff @@ -0,0 +1,18 @@ +diff -Naur u-boot-2021.07.org/arch/arm/mach-rockchip/misc.c u-boot-2021.07/arch/arm/mach-rockchip/misc.c +--- u-boot-2021.07.org/arch/arm/mach-rockchip/misc.c 2021-07-05 15:11:28.000000000 +0000 ++++ u-boot-2021.07/arch/arm/mach-rockchip/misc.c 2021-10-08 10:47:13.704806367 +0000 +@@ -49,9 +49,12 @@ + memcpy(mac_addr, hash, 6); + + /* Make this a valid MAC address and set it */ +- mac_addr[0] &= 0xfe; /* clear multicast bit */ +- mac_addr[0] |= 0x02; /* set local assignment bit (IEEE802) */ ++ mac_addr[0] = 0x02; /* set local assignment bit (IEEE802) */ + eth_env_set_enetaddr("ethaddr", mac_addr); ++ if (env_get("eth1addr")) ++ return 0; ++ mac_addr[0] = 0x12; /* set local assignment bit (IEEE802) */ ++ eth_env_set_enetaddr("eth1addr", mac_addr); + #endif + return 0; + } -- 2.39.5