diff options
Diffstat (limited to 'target/linux')
3 files changed, 65 insertions, 12 deletions
diff --git a/target/linux/ramips/dts/mt7620n_ravpower_rp-wd03.dts b/target/linux/ramips/dts/mt7620n_ravpower_rp-wd03.dts index 31ecd4dd85..407697a5e3 100644 --- a/target/linux/ramips/dts/mt7620n_ravpower_rp-wd03.dts +++ b/target/linux/ramips/dts/mt7620n_ravpower_rp-wd03.dts @@ -36,6 +36,24 @@ linux,code = <KEY_RESTART>; }; }; + + virtual_flash { + compatible = "mtd-concat"; + + devices = <&firmware1 &firmware2 &firmware3>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + compatible = "openwrt,okli"; + label = "firmware"; + reg = <0x0 0x0>; + }; + }; + }; }; &gpio2 { @@ -56,7 +74,8 @@ flash@0 { compatible = "jedec,spi-nor"; reg = <0>; - spi-max-frequency = <10000000>; + spi-max-frequency = <50000000>; + m25p,fast-read; partitions { compatible = "fixed-partitions"; @@ -70,7 +89,7 @@ }; partition@30000 { - label = "u-boot-env"; + label = "config"; reg = <0x30000 0x10000>; read-only; }; @@ -82,9 +101,29 @@ }; partition@50000 { - compatible = "denx,uimage"; - label = "firmware"; - reg = <0x50000 0x7b0000>; + label = "loader"; + reg = <0x50000 0x10000>; + read-only; + }; + + firmware2: partition@60000 { + label = "firmware2"; + reg = <0x60000 0x170000>; + }; + + partition@1d0000 { + label = "u-boot-env"; + reg = <0x1d0000 0x10000>; + }; + + firmware3: partition@1e0000 { + label = "firmware3"; + reg = <0x1e0000 0x20000>; + }; + + firmware1: partition@200000 { + label = "firmware1"; + reg = <0x200000 0x600000>; }; }; }; diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk index a3a468324b..d9725c9e69 100644 --- a/target/linux/ramips/image/mt7620.mk +++ b/target/linux/ramips/image/mt7620.mk @@ -488,11 +488,9 @@ define Device/hnet_c108 endef TARGET_DEVICES += hnet_c108 -define Device/hootoo_ht-tm05 +define Device/sunvalley_filehub_common SOC := mt7620n IMAGE_SIZE := 6144k - DEVICE_VENDOR := HooToo - DEVICE_MODEL := HT-TM05 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-i2c-ralink LOADER_TYPE := bin LOADER_FLASH_OFFS := 0x200000 @@ -505,6 +503,12 @@ define Device/hootoo_ht-tm05 IMAGE/kernel.bin := append-loader-okli $(1) | check-size 64k IMAGE/rootfs.bin := $$(sysupgrade_bin) | check-size endef + +define Device/hootoo_ht-tm05 + $(Device/sunvalley_filehub_common) + DEVICE_VENDOR := HooToo + DEVICE_MODEL := HT-TM05 +endef TARGET_DEVICES += hootoo_ht-tm05 define Device/iodata_wn-ac1167gr @@ -925,13 +929,13 @@ endef TARGET_DEVICES += ralink_mt7620a-v22sg-evb define Device/ravpower_rp-wd03 - SOC := mt7620n - IMAGE_SIZE := 7872k + $(Device/sunvalley_filehub_common) DEVICE_VENDOR := RAVPower DEVICE_MODEL := RP-WD03 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci SUPPORTED_DEVICES += ravpower,wd03 - DEFAULT := n + DEVICE_COMPAT_VERSION := 2.0 + DEVICE_COMPAT_MESSAGE := Partition design has changed compared to older versions (up to 19.07) due to kernel size restrictions. \ + Upgrade via sysupgrade mechanism is not possible, so new installation via TFTP is required. endef TARGET_DEVICES += ravpower_rp-wd03 diff --git a/target/linux/ramips/mt7620/base-files/etc/uci-defaults/05_fix-compat-version b/target/linux/ramips/mt7620/base-files/etc/uci-defaults/05_fix-compat-version new file mode 100644 index 0000000000..9f981dfb83 --- /dev/null +++ b/target/linux/ramips/mt7620/base-files/etc/uci-defaults/05_fix-compat-version @@ -0,0 +1,10 @@ +. /lib/functions.sh + +case "$(board_name)" in + ravpower,rp-wd03) + uci set system.@system[0].compat_version="2.0" + uci commit system + ;; +esac + +exit 0 |