uboot-envtools: filogic: add support for BananaPi R4

Add environment settings for the BananaPi BPI-R4 router board which
can boot from (and store its bootloader environment on) micro SD card,
SPI-NAND and eMMC.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/package/boot/uboot-envtools/files/mediatek_filogic b/package/boot/uboot-envtools/files/mediatek_filogic
index 01d816d99132135c13a06f550980058384759fe3..1050277292a2c9789c4efe61ce28c18a55dcc747 100644 (file)
--- a/package/boot/uboot-envtools/files/mediatek_filogic
+++ b/package/boot/uboot-envtools/files/mediatek_filogic
@@ -52,6 +52,19 @@ bananapi,bpi-r3)
                ;;
        esac
        ;;
+bananapi,bpi-r4)
+       . /lib/upgrade/platform.sh
+
+       bootdev="$(platform_get_bootdev)"
+       case "$bootdev" in
+       ubi*)
+               ubootenv_add_ubi_default
+               ;;
+       mmc*)
+               ubootenv_add_mmc_default "${bootdev%%p[0-9]*}"
+               ;;
+       esac
+       ;;
 cmcc,rax3000m)
        case "$(cmdline_get_var root)" in
        /dev/mmc*)

diff --git a/target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dts b/target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dts
index b4bf3400ffdc692673b38ebb7983f2e463aaf798..416958428f3c9cbe54108fab2389990cf221c7fe 100644 (file)
--- a/target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dts
+++ b/target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dts
@@ -386,6 +386,18 @@
        status = "okay";
 };
 
+&uart1 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&uart1_2_lite_pins>;
+};
+
+&uart2 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&uart2_3_pins>;
+};
+
 &watchdog {
        status = "okay";
 };