From patchwork Fri Dec 5 15:06:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Pueyo Centelles X-Patchwork-Id: 418137 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 8DB7A140100 for ; Sat, 6 Dec 2014 02:07:19 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id C05C828C019; Fri, 5 Dec 2014 16:05:32 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 8683F280228 for ; Fri, 5 Dec 2014 16:05:26 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-wg0-f46.google.com (mail-wg0-f46.google.com [74.125.82.46]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Fri, 5 Dec 2014 16:05:24 +0100 (CET) Received: by mail-wg0-f46.google.com with SMTP id a1so1134968wgh.5 for ; Fri, 05 Dec 2014 07:07:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:cc:subject:date:message-id; bh=haQDGAzmFu+MdbPbTCV1edmNByme6BBSKq+msFE5Ol4=; b=fb/PV6oWhsjsJWcMn9bAu404dMMWTuFGFaL2pfllrfOwj7L3z8+tx9nHXTBrZzYDyz tGe0Mc2I8dXOKYLmKPjLtKvE2xqyKRkQBs3ty1gopas2RhYa69OKQFcJrwdivlJqDDZI jIyr2RrU0IAFOUt/yd68EZLlHQYJ6KtAg8v922uE+jZT1KLvtyCu+rwsYtEW4VucVFl6 tIoF167MwivExIQQ6dkn98lmMvGLf7hWK0mjOjWtN6TXakPfdUChhkslaY33CxE3kuvM QOIHpyjYK4OQcOoQpDKUl2iGEfWAk1oW9Vx+9pU2nZasaWUYGPrkRxX+ILA+amaRosKG IzgA== X-Received: by 10.180.103.38 with SMTP id ft6mr4862922wib.19.1417792024372; Fri, 05 Dec 2014 07:07:04 -0800 (PST) Received: from localhost.localdomain ([84.88.85.1]) by mx.google.com with ESMTPSA id w10sm45240348wje.10.2014.12.05.07.07.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 05 Dec 2014 07:07:03 -0800 (PST) From: openwrt@rogerpueyo.com To: openwrt-devel@lists.openwrt.org Date: Fri, 5 Dec 2014 16:06:48 +0100 Message-Id: <1417792008-1998-1-git-send-email-openwrt@rogerpueyo.com> X-Mailer: git-send-email 2.1.3 Cc: Roger Pueyo Centelles Subject: [OpenWrt-Devel] [PATCH] ramips: generate factory images for Nexx devices X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" From: Roger Pueyo Centelles --- target/linux/ramips/dts/WT1520-4M.dts | 83 +++++++++++++++++++++++++++++++++++ target/linux/ramips/dts/WT1520-8M.dts | 83 +++++++++++++++++++++++++++++++++++ target/linux/ramips/dts/WT1520.dts | 83 ----------------------------------- target/linux/ramips/image/Makefile | 9 +--- tools/firmware-utils/src/mkporayfw.c | 32 ++++++++++---- 5 files changed, 191 insertions(+), 99 deletions(-) create mode 100644 target/linux/ramips/dts/WT1520-4M.dts create mode 100644 target/linux/ramips/dts/WT1520-8M.dts delete mode 100644 target/linux/ramips/dts/WT1520.dts diff --git a/target/linux/ramips/dts/WT1520-4M.dts b/target/linux/ramips/dts/WT1520-4M.dts new file mode 100644 index 0000000..dc0ad32 --- /dev/null +++ b/target/linux/ramips/dts/WT1520-4M.dts @@ -0,0 +1,83 @@ +/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"; + }; +}; diff --git a/target/linux/ramips/dts/WT1520-8M.dts b/target/linux/ramips/dts/WT1520-8M.dts new file mode 100644 index 0000000..d526149 --- /dev/null +++ b/target/linux/ramips/dts/WT1520-8M.dts @@ -0,0 +1,83 @@ +/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 = "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>; + }; + }; + }; + }; + + 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"; + }; +}; diff --git a/target/linux/ramips/dts/WT1520.dts b/target/linux/ramips/dts/WT1520.dts deleted file mode 100644 index dc0ad32..0000000 --- a/target/linux/ramips/dts/WT1520.dts +++ /dev/null @@ -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"; - }; -}; diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index 491a44d..e0eb8c2 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -596,12 +596,7 @@ Image/Build/Profile/WNCE2001=$(call BuildFirmware/WNCE2001/$(1),$(1),wnce2001,WN 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/WT1520/$(1),$(1),wt1520,WT1520,WT1520) +Image/Build/Profile/WT1520=$(call BuildFirmware/PorayDualSize/$(1),$(1),wt1520,WT1520) Image/Build/Profile/UR-326N4G=$(call BuildFirmware/Default4M/$(1),$(1),ur-326n4g,UR-326N4G) @@ -793,7 +788,7 @@ Image/Build/Profile/WMR300=$(call BuildFirmware/Default8M/$(1),$(1),wmr-300,WMR3 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) diff --git a/tools/firmware-utils/src/mkporayfw.c b/tools/firmware-utils/src/mkporayfw.c index 960c604..6ec4f32 100644 --- a/tools/firmware-utils/src/mkporayfw.c +++ b/tools/firmware-utils/src/mkporayfw.c @@ -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 @@ static struct board_info boards[] = { .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 */ } };