From patchwork Sun May 27 00:26:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 921022 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="RkqIqew5"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Jo2XKs5d"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40tgmY58L0z9ryk for ; Sun, 27 May 2018 10:27:22 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=9a3QkvsXQp2bouYDzEf2oRtIK4RvvGhnkAsnW+2wgmQ=; b=RkqIqew5SKRBkz 5SKwFlsKKhC3NR4weHZsjCYnJdsohXBVeCq5xjD+h/E3YlNoGOXAzW+gmWNWrESfHtDGDMehFk3a9 eeyR4gqB3F8neUBpY5cFaenDKONCVAuYUQU2rnTL6RxTh5GBfn/pILwGV8hf80FPtwhDl0pzCz/EX u+/G0Yeqjw3aWC6gf94NhgnRczIr6E9GeZELPx56QyD6rgaDxvVwNHWMkE9dcCw91cvk+cCourkD2 Xw37spltm9vGuJt+SIS16jayYycLoi/6TkAfEgaMsXUuKNehkt3+ogphas6SbokQRHW2Zl0wUy5qg kyn143AkFHqReqOo69Qw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fMjWa-00067a-3h; Sun, 27 May 2018 00:27:04 +0000 Received: from mail-pg0-x22f.google.com ([2607:f8b0:400e:c05::22f]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fMjWW-00066S-TJ for lede-dev@lists.infradead.org; Sun, 27 May 2018 00:27:02 +0000 Received: by mail-pg0-x22f.google.com with SMTP id d14-v6so3785998pgv.8 for ; Sat, 26 May 2018 17:26:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tPM9xbBlQOp1RR2t3QFQOeat18HMREuTa2YMzXndHzo=; b=Jo2XKs5djz+qBnlSsUDtLomZYLcK2A8jLSW8kyXPXBmXzAryE/+QeDioGLx6z0CAhu kTYygFi+AnRkUkRiSmrS1Nru556+nRAONRWrWfJtIw5BJIsf5DKHayzVGsEqXsm0zxBG jIp2VhuOdpWM7uG7zhApEYdGjlq0h9ESyDjIiSRZmDMJpqfp0+GCzsxn5GKlgp7VEXCi kDNbHXaY3DmzBDw8nS816h6ow6Q9JtgvszqaZCFmmqza7vpoa55nGGNetdelk4FRpgqR 7nRkohu9C4kk9ziKA8I3LzKr83M8uzxkkN+qy2C+9kbtPuMD7OnFGKV4IF7oIkf6WHc+ bhPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tPM9xbBlQOp1RR2t3QFQOeat18HMREuTa2YMzXndHzo=; b=lexCfaL0/0WzUsgR16UXfL2nemt15DUAnkbVcwFPslLDpyO5fVMCwmCS/LW6YJ51Pg CFswBq7B+WQQje3e5awrr3NKzWZMMA+wIiqmZ5ydrXp4gd92KhBgyB/1qvzbTsTTin8k NqAoL7t65X3c1YXl9nheZQ7eI9fTlwF2pmDoREtHM+wcE5otcqz4cRu+xLVF14nFDskG eGd7XFQsyFDlzN8cYtfSs95FEQHuOJwBUtde4GtBvvBtuSys6TsdAM2BrU61JK5SZEYy Eun4Nz3B2ZI5TGlsY2KT6UcqfyEr0yFHm+5IsvrlAXl580QpQ/y0buigZ85AcBqnyP6z b6iA== X-Gm-Message-State: ALKqPwcz8xvrbiV+cnghEKjFDh0feXvevVTfRDPXPtat25ZbZeL15ETv VYExP0L6I9qiZRvZSdO1aDfsTJ5V X-Google-Smtp-Source: AB8JxZr9ln3mx2gHaXyubdAOx0ySIc52duMLRpDd+vyqdP+UwSSKQX0t9WmYGhPG66MnmDINmcapAQ== X-Received: by 2002:a65:57ca:: with SMTP id q10-v6mr6098727pgr.279.1527380807097; Sat, 26 May 2018 17:26:47 -0700 (PDT) Received: from clevo-mangix.lan (astound-69-42-5-101.ca.astound.net. [69.42.5.101]) by smtp.gmail.com with ESMTPSA id o70-v6sm47694692pfo.49.2018.05.26.17.26.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 26 May 2018 17:26:46 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Date: Sat, 26 May 2018 17:26:14 -0700 Message-Id: <20180527002614.2730-1-rosenp@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180525034346.13708-1-rosenp@gmail.com> References: <20180525034346.13708-1-rosenp@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180526_172700_970935_36A4C173 X-CRM114-Status: GOOD ( 11.61 ) X-Spam-Score: 2.4 (++) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (2.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 DKIM_ADSP_CUSTOM_MED No valid author signature, adsp_override is CUSTOM_MED 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (rosenp[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:400e:c05:0:0:0:22f listed in] [list.dnswl.org] 1.1 TRACKER_ID BODY: Incorporates a tracking ID number 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 T_DKIM_INVALID DKIM-Signature header exists but is not valid 1.2 NML_ADSP_CUSTOM_MED ADSP custom_med hit, and not from a mailing list Subject: [OpenWrt-Devel] [PATCHv2] ramips: Use generic board detect for GnuBee devices X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rosen Penev MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This is a port of an old commit from mkresin's tree: 09260cdf3e9332978c2a474a58e93a6f2b55f4a8 This has the potential to break sysupgrade but it should be fine as there is no stable release of LEDE or OpenWrt that support these devices. Signed-off-by: Rosen Penev --- v2: Change the GB-PC1 stuff only. target/linux/ramips/base-files/etc/board.d/01_leds | 2 +- target/linux/ramips/base-files/etc/board.d/02_network | 2 +- target/linux/ramips/base-files/etc/diag.sh | 2 +- target/linux/ramips/base-files/lib/ramips.sh | 3 --- target/linux/ramips/base-files/lib/upgrade/platform.sh | 2 +- target/linux/ramips/image/mt7621.mk | 4 ++-- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds index 88e4c2b7fe..ae5ac77b5e 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -196,7 +196,7 @@ fonera20n) set_usb_led "$boardname:orange:usb" set_wifi_led "$boardname:orange:wifi" ;; -gb-pc1|\ +gnubee,gb-pc1|\ gnubee,gb-pc2) ucidef_set_led_switch "lan1" "lan1" "$boardname:green:lan1" "switch0" "0x01" ucidef_set_led_switch "lan2" "lan2" "$boardname:green:lan2" "switch0" "0x10" diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network index 3fc5e55df1..3a744bda0c 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -228,7 +228,7 @@ ramips_setup_interfaces() ucidef_add_switch "switch0" \ "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "0:wan" "6@eth0" ;; - gb-pc1|\ + gnubee,gb-pc1|\ gnubee,gb-pc2) ucidef_add_switch "switch0" \ "0:lan" "4:lan" "6@eth0" diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index 6a51778726..b4118358b4 100644 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -95,7 +95,7 @@ get_status_led() { dir-620-d1|\ dwr-512-b|\ dlink,dwr-116-a1|\ - gb-pc1|\ + gnubee,gb-pc1|\ gnubee,gb-pc2|\ hpm|\ hw550-3g|\ diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index edccfcd4a8..5741cbd2ee 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -205,9 +205,6 @@ ramips_board_detect() { *"FreeStation5") name="freestation5" ;; - *"GB-PC1") - name="gb-pc1" - ;; *"GL-MT300A") name="gl-mt300a" ;; diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index 7aa14770ca..95cb7c33a9 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -62,7 +62,7 @@ platform_check_image() { firewrt|\ fonera20n|\ freestation5|\ - gb-pc1|\ + gnubee,gb-pc1|\ gnubee,gb-pc2|\ gl-mt300a|\ gl-mt300n|\ diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index b84b74a5b0..b20f35976b 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -83,13 +83,13 @@ define Device/firewrt endef TARGET_DEVICES += firewrt -define Device/gb-pc1 +define Device/gnubee_gb-pc1 DTS := GB-PC1 DEVICE_TITLE := GnuBee Personal Cloud One DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-usb3 kmod-sdhci-mt7620 IMAGE_SIZE := $(ralink_default_fw_size_32M) endef -TARGET_DEVICES += gb-pc1 +TARGET_DEVICES += gnubee_gb-pc1 define Device/gnubee_gb-pc2 DTS := GB-PC2