diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2021-03-05 19:07:54 +0000 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2021-03-05 20:13:54 +0000 |
| commit | 51ef823f95dbe1ffed1456a739a98bc07cd9a5c9 (patch) | |
| tree | 6f77887f04c55768dc6baf4b8385fd8c3447861d | |
| parent | 3a187fa71835051d71dcc47ef151e4e61c12b6b0 (diff) | |
| download | upstream-51ef823f95dbe1ffed1456a739a98bc07cd9a5c9.tar.gz upstream-51ef823f95dbe1ffed1456a739a98bc07cd9a5c9.tar.bz2 upstream-51ef823f95dbe1ffed1456a739a98bc07cd9a5c9.zip | |
uboot-mediatek: improve BPi-R64 support
* allow MAC address from U-Boot env to be inhertied
* allow eMMC installation to succeed also without recovery present
on the SD Card.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
| -rw-r--r-- | package/boot/uboot-mediatek/patches/015-update-bananapi-bpi-r64-device-tree.patch | 18 | ||||
| -rw-r--r-- | package/boot/uboot-mediatek/patches/017-add-bananapi_bpi-r64_defconfigs.patch | 2 |
2 files changed, 14 insertions, 6 deletions
diff --git a/package/boot/uboot-mediatek/patches/015-update-bananapi-bpi-r64-device-tree.patch b/package/boot/uboot-mediatek/patches/015-update-bananapi-bpi-r64-device-tree.patch index 8010107a65..dd4b94e2e1 100644 --- a/package/boot/uboot-mediatek/patches/015-update-bananapi-bpi-r64-device-tree.patch +++ b/package/boot/uboot-mediatek/patches/015-update-bananapi-bpi-r64-device-tree.patch @@ -1,6 +1,14 @@ --- a/arch/arm/dts/mt7622-bananapi-bpi-r64.dts +++ b/arch/arm/dts/mt7622-bananapi-bpi-r64.dts -@@ -27,6 +27,42 @@ +@@ -20,6 +20,7 @@ + + aliases { + spi0 = &snfi; ++ ethernet0 = ð + }; + + memory@40000000 { +@@ -27,6 +29,42 @@ reg = <0x40000000 0x40000000>; }; @@ -43,7 +51,7 @@ reg_1p8v: regulator-1p8v { compatible = "regulator-fixed"; regulator-name = "fixed-1.8V"; -@@ -139,11 +163,12 @@ +@@ -139,11 +177,12 @@ }; @@ -58,7 +66,7 @@ /* "I2S2_OUT, "I2S4_IN"", "I2S3_IN", "I2S2_IN", * "I2S4_OUT", "I2S3_OUT" are used as DAT0, DAT1, * DAT2, DAT3, CMD, CLK for SD respectively. -@@ -164,7 +189,6 @@ +@@ -164,7 +203,6 @@ pins = "TXD3"; bias-pull-up; }; @@ -66,7 +74,7 @@ }; }; -@@ -199,7 +223,7 @@ +@@ -199,7 +237,7 @@ status = "okay"; bus-width = <8>; max-frequency = <50000000>; @@ -75,7 +83,7 @@ vmmc-supply = <®_3p3v>; vqmmc-supply = <®_3p3v>; non-removable; -@@ -207,14 +231,15 @@ +@@ -207,14 +245,15 @@ &mmc1 { pinctrl-names = "default"; diff --git a/package/boot/uboot-mediatek/patches/017-add-bananapi_bpi-r64_defconfigs.patch b/package/boot/uboot-mediatek/patches/017-add-bananapi_bpi-r64_defconfigs.patch index dd3e252acb..3624c0102a 100644 --- a/package/boot/uboot-mediatek/patches/017-add-bananapi_bpi-r64_defconfigs.patch +++ b/package/boot/uboot-mediatek/patches/017-add-bananapi_bpi-r64_defconfigs.patch @@ -164,7 +164,7 @@ +emmc_write_hdr=mmc dev 0 0 && mmc erase 0x0 0x40 && mmc write $loadaddr 0x0 0x40 +emmc_write_bl3=mmc dev 0 0 && mmc erase 0x1000 0x800 && mmc write $loadaddr 0x1000 0x800 +emmc_write_recovery=iminfo $loadaddr && mmc dev 0 && part start mmc 0 $part_recovery part_addr && part size mmc 0 $part_recovery part_size && run mmc_write_vol -+emmc_init=run sdmmc_read_emmc_hdr && run emmc_write_hdr && run sdmmc_read_emmc_bl3 && run emmc_write_bl3 && run sdmmc_read_recovery && run emmc_write_recovery && run sdmmc_read_emmc_bl2 && run emmc_write_bl2 ; env default bootcmd ; saveenv ; saveenv ++emmc_init=run sdmmc_read_emmc_bl2 && run emmc_write_bl2 && run sdmmc_read_emmc_hdr && run emmc_write_hdr && run sdmmc_read_emmc_bl3 && run emmc_write_bl3 && run sdmmc_read_recovery && run emmc_write_recovery ; env default bootcmd ; saveenv ; saveenv +sdmmc_write_production=iminfo $fileaddr && mmc dev 1 && part start mmc 1 $part_default part_addr && part size mmc 1 $part_default part_size && run mmc_write_vol +sdmmc_write_recovery=iminfo $fileaddr && mmc dev 1 && part start mmc 1 $part_recovery part_addr && part size mmc 1 $part_recovery part_size && run mmc_write_vol +sdmmc_read_production=mmc dev 1 && part start mmc 1 $part_default part_addr && part size mmc 1 $part_default part_size && run mmc_read_vol |