Author: blogic Date: 2014-12-07 17:53:22 +0100 (Sun, 07 Dec 2014) New Revision: 43541
Added: trunk/target/linux/ramips/dts/WT1520-4M.dts trunk/target/linux/ramips/dts/WT1520-8M.dts trunk/target/linux/ramips/dts/WT1520.dtsi Removed: trunk/target/linux/ramips/dts/WT1520.dts Modified: trunk/target/linux/ramips/image/Makefile trunk/tools/firmware-utils/src/mkporayfw.c Log: ramips: generate factory images for Nexx devices Signed-off-by: Roger Pueyo Centelles <[email protected]> Copied: trunk/target/linux/ramips/dts/WT1520-4M.dts (from rev 43540, trunk/target/linux/ramips/dts/WT1520.dts) =================================================================== --- trunk/target/linux/ramips/dts/WT1520-4M.dts (rev 0) +++ trunk/target/linux/ramips/dts/WT1520-4M.dts 2014-12-07 16:53:22 UTC (rev 43541) @@ -0,0 +1,42 @@ +/dts-v1/; + +/include/ "WT1520.dtsi" + +/ { + palmbus@10000000 { + spi@b00 { + status = "okay"; + m25p80@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "w25q32"; + reg = <0 0>; + linux,modalias = "m25p80", "s25fl064k"; + spi-max-frequency = <10000000>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x30000>; + read-only; + }; + + partition@30000 { + label = "u-boot-env"; + reg = <0x30000 0x10000>; + read-only; + }; + + factory: partition@40000 { + label = "factory"; + reg = <0x40000 0x10000>; + read-only; + }; + + partition@50000 { + label = "firmware"; + reg = <0x50000 0x3b0000>; + }; + }; + }; + }; +}; Added: trunk/target/linux/ramips/dts/WT1520-8M.dts =================================================================== --- trunk/target/linux/ramips/dts/WT1520-8M.dts (rev 0) +++ trunk/target/linux/ramips/dts/WT1520-8M.dts 2014-12-07 16:53:22 UTC (rev 43541) @@ -0,0 +1,42 @@ +/dts-v1/; + +/include/ "WT1520.dtsi" + +/ { + palmbus@10000000 { + spi@b00 { + status = "okay"; + m25p80@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "w25q64"; + reg = <0 0>; + linux,modalias = "m25p80", "s25fl064k"; + spi-max-frequency = <10000000>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x30000>; + read-only; + }; + + partition@30000 { + label = "u-boot-env"; + reg = <0x30000 0x10000>; + read-only; + }; + + factory: partition@40000 { + label = "factory"; + reg = <0x40000 0x10000>; + read-only; + }; + + partition@50000 { + label = "firmware"; + reg = <0x50000 0x7b0000>; + }; + }; + }; + }; +}; Deleted: trunk/target/linux/ramips/dts/WT1520.dts =================================================================== --- trunk/target/linux/ramips/dts/WT1520.dts 2014-12-07 16:53:15 UTC (rev 43540) +++ trunk/target/linux/ramips/dts/WT1520.dts 2014-12-07 16:53:22 UTC (rev 43541) @@ -1,83 +0,0 @@ -/dts-v1/; - -/include/ "rt5350.dtsi" - -/ { - compatible = "NEXXWT1520", "ralink,rt5350-soc"; - model = "Nexx WT1520"; - - memory@0 { - device_type = "memory"; - reg = <0x0 0x2000000>; - }; - - chosen { - bootargs = "console=ttyS1,57600"; - }; - - palmbus@10000000 { - uart@500 { - status = "okay"; - }; - - spi@b00 { - status = "okay"; - m25p80@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "w25q32"; - reg = <0 0>; - linux,modalias = "m25p80", "s25fl064k"; - spi-max-frequency = <10000000>; - - partition@0 { - label = "u-boot"; - reg = <0x0 0x30000>; - read-only; - }; - - partition@30000 { - label = "u-boot-env"; - reg = <0x30000 0x10000>; - read-only; - }; - - factory: partition@40000 { - label = "factory"; - reg = <0x40000 0x10000>; - read-only; - }; - - partition@50000 { - label = "firmware"; - reg = <0x50000 0x3b0000>; - }; - }; - }; - }; - - pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "jtag"; - ralink,function = "gpio"; - }; - }; - }; - - ethernet@10100000 { - mtd-mac-address = <&factory 0x4>; - }; - - wmac@10180000 { - ralink,mtd-eeprom = <&factory 0>; - }; - - ehci@101c0000 { - status = "okay"; - }; - - ohci@101c1000 { - status = "okay"; - }; -}; Added: trunk/target/linux/ramips/dts/WT1520.dtsi =================================================================== --- trunk/target/linux/ramips/dts/WT1520.dtsi (rev 0) +++ trunk/target/linux/ramips/dts/WT1520.dtsi 2014-12-07 16:53:22 UTC (rev 43541) @@ -0,0 +1,46 @@ +/include/ "rt5350.dtsi" + +/ { + compatible = "NEXXWT1520", "ralink,rt5350-soc"; + model = "Nexx WT1520"; + + memory@0 { + device_type = "memory"; + reg = <0x0 0x2000000>; + }; + + chosen { + bootargs = "console=ttyS1,57600"; + }; + + palmbus@10000000 { + uart@500 { + status = "okay"; + }; + }; + + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "jtag"; + ralink,function = "gpio"; + }; + }; + }; + + ethernet@10100000 { + mtd-mac-address = <&factory 0x4>; + }; + + wmac@10180000 { + ralink,mtd-eeprom = <&factory 0>; + }; + + ehci@101c0000 { + status = "okay"; + }; + + ohci@101c1000 { + status = "okay"; + }; +}; Modified: trunk/target/linux/ramips/image/Makefile =================================================================== --- trunk/target/linux/ramips/image/Makefile 2014-12-07 16:53:15 UTC (rev 43540) +++ trunk/target/linux/ramips/image/Makefile 2014-12-07 16:53:22 UTC (rev 43541) @@ -596,13 +596,8 @@ Image/Build/Profile/WR512-3GN=$(call BuildFirmware/DefaultDualSize/$(1),$(1),wr512-3ng,WR512-3GN) -define BuildFirmware/WT1520/initramfs - $(call BuildFirmware/OF/initramfs,$(1),$(2),$(3),$(4)) -endef -BuildFirmware/WT1520/squashfs=$(call BuildFirmware/Default4M/squashfs,$(1),$(2),$(3),$(4)) +Image/Build/Profile/WT1520=$(call BuildFirmware/PorayDualSize/$(1),$(1),wt1520,WT1520) -Image/Build/Profile/WT1520=$(call BuildFirmware/WT1520/$(1),$(1),wt1520,WT1520,WT1520) - Image/Build/Profile/UR-326N4G=$(call BuildFirmware/Default4M/$(1),$(1),ur-326n4g,UR-326N4G) Image/Build/Profile/UR-336UN=$(call BuildFirmware/Default8M/$(1),$(1),ur-336un,UR-336UN) @@ -793,7 +788,7 @@ Image/Build/Profile/RT-N14U=$(call BuildFirmware/Default8M/$(1),$(1),rt-n14u,RT-N14U) Image/Build/Profile/WR8305RT=$(call BuildFirmware/Default8M/$(1),$(1),wr8305rt,WR8305RT) Image/Build/Profile/WRTNODE=$(call BuildFirmware/Default16M/$(1),$(1),wrtnode,WRTNODE) -Image/Build/Profile/WT3020=$(call BuildFirmware/DefaultDualSize/$(1),$(1),wt3020,WT3020) +Image/Build/Profile/WT3020=$(call BuildFirmware/PorayDualSize/$(1),$(1),wt3020,WT3020) Image/Build/Profile/ZBT-WA05=$(call BuildFirmware/Default8M/$(1),$(1),zbt-wa05,ZBT-WA05) Modified: trunk/tools/firmware-utils/src/mkporayfw.c =================================================================== --- trunk/tools/firmware-utils/src/mkporayfw.c 2014-12-07 16:53:15 UTC (rev 43540) +++ trunk/tools/firmware-utils/src/mkporayfw.c 2014-12-07 16:53:22 UTC (rev 43541) @@ -58,8 +58,8 @@ #define HWID_PORAY_X5_X6 0x35353335 #define HWID_PORAY_X8 0x36353335 #define HWID_PORAY_X1 0x38353335 -#define HWID_NEXX_WT15XXX 0x30353332 -#define HWID_NEXX_WT3020A 0x30323033 +#define HWID_NEXX_WT1520 0x30353332 +#define HWID_NEXX_WT3020 0x30323033 #define HWID_A5_V11 0x32473352 /* Recognized XOR obfuscation keys */ @@ -212,16 +212,30 @@ .layout_id = "8M", .key = KEY_PORAY_1, }, { - .id = "WT15XXX", - .hw_id = HWID_NEXX_WT15XXX, + .id = "WT1520", + .hw_id = HWID_NEXX_WT1520, .layout_id = "4M", .key = KEY_NEXX_1, }, { - .id = "WT3020A", - .hw_id = HWID_NEXX_WT3020A, - .layout_id = "4M", - .key = KEY_NEXX_2, - }, { + .id = "WT1520", + .hw_id = HWID_NEXX_WT1520, + .layout_id = "8M", + .key = KEY_NEXX_1, + }, { + .id = "WT3020", + .hw_id = HWID_NEXX_WT3020, + .layout_id = "4M", + .key = KEY_NEXX_2, + }, { + .id = "WT3020", + .hw_id = HWID_NEXX_WT3020, + .layout_id = "8M", + .key = KEY_NEXX_2, + }, { + + + + /* terminating entry */ } }; _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
