diff --git a/target/linux/ramips/dts/VOCORE-16M.dts b/target/linux/ramips/dts/VOCORE-16M.dts new file mode 100644 index 0000000000..464c137825 --- /dev/null +++ b/target/linux/ramips/dts/VOCORE-16M.dts @@ -0,0 +1,41 @@ +/dts-v1/; + +/include/ "VOCORE.dtsi" + +/ { + palmbus@10000000 { + spi@b00 { + m25p80@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "w25q128"; + reg = <0>; + linux,modalias = "m25p80", "w25q128"; + spi-max-frequency = <10000000>; + + partition@0 { + label = "uboot"; + reg = <0x0 0x30000>; + read-only; + }; + + partition@30000 { + label = "uboot-env"; + reg = <0x30000 0x10000>; + read-only; + }; + + factory: partition@40000 { + label = "factory"; + reg = <0x40000 0x10000>; + read-only; + }; + + partition@50000 { + label = "firmware"; + reg = <0x50000 0xfb0000>; + }; + }; + }; + }; +}; diff --git a/target/linux/ramips/dts/VOCORE-8M.dts b/target/linux/ramips/dts/VOCORE-8M.dts new file mode 100644 index 0000000000..8a081edf6c --- /dev/null +++ b/target/linux/ramips/dts/VOCORE-8M.dts @@ -0,0 +1,41 @@ +/dts-v1/; + +/include/ "VOCORE.dtsi" + +/ { + palmbus@10000000 { + spi@b00 { + m25p80@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "s25fl064k"; + reg = <0>; + linux,modalias = "m25p80", "s25fl064k"; + spi-max-frequency = <10000000>; + + partition@0 { + label = "uboot"; + reg = <0x0 0x30000>; + read-only; + }; + + partition@30000 { + label = "uboot-env"; + reg = <0x30000 0x10000>; + read-only; + }; + + factory: partition@40000 { + label = "factory"; + reg = <0x40000 0x10000>; + read-only; + }; + + partition@50000 { + label = "firmware"; + reg = <0x50000 0x7b0000>; + }; + }; + }; + }; +}; diff --git a/target/linux/ramips/dts/VOCORE.dts b/target/linux/ramips/dts/VOCORE.dtsi similarity index 85% rename from target/linux/ramips/dts/VOCORE.dts rename to target/linux/ramips/dts/VOCORE.dtsi index 5e386e46bb..ff031fab41 100644 --- a/target/linux/ramips/dts/VOCORE.dts +++ b/target/linux/ramips/dts/VOCORE.dtsi @@ -1,5 +1,3 @@ -/dts-v1/; - /include/ "rt5350.dtsi" / { @@ -18,38 +16,6 @@ spi@b00 { status = "okay"; - m25p80@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "s25fl064k"; - reg = <0>; - linux,modalias = "m25p80", "s25fl064k"; - spi-max-frequency = <10000000>; - - partition@0 { - label = "uboot"; - reg = <0x0 0x30000>; - read-only; - }; - - partition@30000 { - label = "uboot-env"; - reg = <0x30000 0x10000>; - read-only; - }; - - factory: partition@40000 { - label = "factory"; - reg = <0x40000 0x10000>; - read-only; - }; - - partition@50000 { - label = "firmware"; - reg = <0x50000 0x7b0000>; - }; - }; - spidev@1 { compatible = "linux,spidev"; spi-max-frequency = <10000000>; diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index 372fe3b166..117e07d4ef 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -598,7 +598,17 @@ Image/Build/Profile/SL-R7205=$(call BuildFirmware/Default4M/$(1),$(1),sl-r7205,S Image/Build/Profile/V22RW-2X2=$(call BuildFirmware/Default4M/$(1),$(1),v22rw-2x2,V22RW-2X2) -Image/Build/Profile/VOCORE=$(call BuildFirmware/Default8M/$(1),$(1),vocore,VOCORE) +vocore_8mb_mtd_size=8060928 +vocore_16mb_mtd_size=16449536 +define BuildFirmware/VOCORE/squashfs + $(call BuildFirmware/CustomFlash/$(1),$(1),$(2)-8M,$(3)-8M,$(vocore_8mb_mtd_size)) + $(call BuildFirmware/CustomFlash/$(1),$(1),$(2)-16M,$(3)-16M,$(vocore_16mb_mtd_size)) +endef +define BuildFirmware/VOCORE/initramfs + $(call BuildFirmware/OF/initramfs,$(1),$(2)-8M,$(3)-8M) + $(call BuildFirmware/OF/initramfs,$(1),$(2)-16M,$(3)-16M) +endef +Image/Build/Profile/VOCORE=$(call BuildFirmware/VOCORE/$(1),$(1),vocore,VOCORE) Image/Build/Profile/W150M=$(call BuildFirmware/CustomFlashFactory/$(1),$(1),w150m,W150M,$(ralink_default_fw_size_4M),W150M Kernel Image,factory)