From patchwork Sat Jul 18 14:07:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1331574 X-Patchwork-Delegate: freifunk@adrianschmutzler.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.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=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=zAFUzuXQ; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B88yp32x7z9sR4 for ; Sun, 19 Jul 2020 00:10:25 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=/xqOS3sslqLHIwI9Vf69mQOkp12V24J5jjx5oRNyabQ=; b=zAFUzuXQqRbkH500mDiWy+8eMP YeYS+cU+0OT2qo4EtN9IQ9R1eDvcZPMuzHJscLn+nv2Tm9Q51IMP86XuIFbhbG2WtI/+yQDXBJirD CFDMUqrdh/cxSlJ63DE5J3jubkSoRZFz3t/2TN+mo6MNNXaEUS0CZvI8o3P9RnEzREnpVysG44jBw AoRm6/XLzkGltnZZr5eplRsUrI0dNYw3hBjJhYn8PeKDwZWJtfXtPnjq8BMrCFZbI3H3dvToCG90/ eM5b0seRlPvLiXk7qQYreYSPGIAnWy3hZs7XpLYuxgsVcJOIM6FcwOePCeVSk4dRtcYsHBGQ2Y2Bd /4VVWmLA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jwnW7-0000D2-Ui; Sat, 18 Jul 2020 14:08:43 +0000 Received: from mout.kundenserver.de ([212.227.126.134]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jwnW5-0000Ci-BG for openwrt-devel@lists.openwrt.org; Sat, 18 Jul 2020 14:08:42 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M1YtP-1jyBE93dxz-0039Dx for ; Sat, 18 Jul 2020 16:08:34 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH] archs38: use generic 02_sysinfo Date: Sat, 18 Jul 2020 16:07:41 +0200 Message-Id: <20200718140741.3288-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:7k9uocgIFFFk7dS37/uYZj7mc74ONGWV4Kmx4K2Boh+PeDuE7/B +db/GuwYQXYR9NcIcdIQ5wPBAAlCc964swjdqFhiNQBym08LbXl+ua7DSA17RXFF4xErjoQ V1Tu2qj7YprIJjRcZWZGHaSgV/8Hd7nGwVDHctv187hb1jZdc4xk7aEJL/Tsj/7DQo4kh12 z8VsyfWQMco6Gz6DJixwQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:uJtCefRU8uA=:GI7hi0oJGeseIXwBMMWN16 L3tKy5E1qjbWsIyH1vz8xpad8pFqQQ3eU8G3LFVjp1ME6duZQwbESbvFI1U6u3G0BWXIendmw WJtiJM3z84EfMsj4bQKGTvq3vTHg5h8m/rXAQ/JThZidgOJYj0tgZKJhc97NG6UsWV6cSam3N 6YqRfofH2w/p4JQhCYOaacHoDa42K6Lo0DkQAE5/5NMl3sWycQ2rfIPOpwzRJek4+78gq6mQF 2wHvswEjIJIx4egCrwSOCZAORMFMA2xVpm127QLaIDJOIuucHZw1EQ785hrGrcF9+6vY0FYQQ DVq3ziFmzIK0S5b3L0LhCN5eb44lRdcEhmT7Uwgbn3DNviatIeTwkAZYbPzhusRrJbralm4Hc gXBuGu8HnM86zrk5DylX8LTyW05eEjHUkH7gxwrt8Yl6WByUmksMje7HAhZRtRvwlaDBMW7wP HmrrQZUDWa+0iWDIMHe7fIdlBu4g2Pww2uN0uUzTY246Mx3IfVkAuyBVO9odu3Acy9BRmf/1Z 4ZRVu07W9twG28CaxdunwB++3c4oAr6fKd+Mh5HVuKy1VIaGSB+30rYuJNteM5LFO9cF9Yym+ 6tJRwpaOcafWhIoC7HOoLU3Lhgy0IX8Nl5yNHcb7VBIMeycwfySYPHadJ1h1SuQ5PcLybAgB7 tU8qsLwLgX2NV7OUVEGbZfrkPpoMign1CIqQnEDd0SF3RK13KaZJ1UUKNY0TGFjIvVQgMYgHa aA1DadLwXiP7QPu5esipDIRM2tY9bbtqgb6eSpXMwibfUJF49VQ2qusoWrrjPofs5Hjy0E9uS 7QvQtEmGC6Y3asVs2LosAEfbDEZJ7PfqOFXo8oFdhrOsdfsdv2LIMv1JMke5rt024kEdfDFFd sKhwSIC9eIBQGXTY2KmQ== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200718_100841_646387_898066C9 X-CRM114-Status: GOOD ( 10.27 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.126.134 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.134 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Currently archs38 sets a board name from compatible for no apparent reason. Just use the compatible directly instead. This theoretically removes a board name "generic" when no compatible was present, however, there is no case where this "generic" board name was actually used. This also fixes an issue where snps,axs103 would not have been properly detected anyway, as its case was not set up syntactically correct. Fixes: 73015c4cb378 ("linux: add support of Synopsys ARCHS38-based boards") Signed-off-by: Adrian Schmutzler --- .../archs38/base-files/etc/board.d/02_network | 3 +- target/linux/archs38/base-files/lib/arc.sh | 43 ------------------- .../base-files/lib/preinit/01_preinit_arc.sh | 7 --- 3 files changed, 2 insertions(+), 51 deletions(-) delete mode 100644 target/linux/archs38/base-files/lib/arc.sh delete mode 100644 target/linux/archs38/base-files/lib/preinit/01_preinit_arc.sh diff --git a/target/linux/archs38/base-files/etc/board.d/02_network b/target/linux/archs38/base-files/etc/board.d/02_network index 60a2602316..dcf33788c5 100755 --- a/target/linux/archs38/base-files/etc/board.d/02_network +++ b/target/linux/archs38/base-files/etc/board.d/02_network @@ -8,7 +8,8 @@ board_config_update case "$(board_name)" in -"arc-sdp"*|"arc-hsdk"*) +snps,axs103|\ +snps,hsdk) ucidef_set_interface_lan "eth0" "dhcp" ;; esac diff --git a/target/linux/archs38/base-files/lib/arc.sh b/target/linux/archs38/base-files/lib/arc.sh deleted file mode 100644 index 50aaaa2d27..0000000000 --- a/target/linux/archs38/base-files/lib/arc.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2016 OpenWrt.org -# - -# defaults -ARC_BOARD_NAME="generic" -ARC_BOARD_MODEL="Generic ARC board" - -arc_board_detect() { - local board - local model - local compatible - - [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/" - - model="$( cat /proc/device-tree/model )" - compatible="$( cat /proc/device-tree/compatible )" - - case "$compatible" in - "snps,axs103""snps,arc-sdp") - board="arc-sdp"; - ;; - "snps,hsdk") - board="arc-hsdk"; - ;; - "snps,nsim_hs") - board="arc-nsim"; - ;; - esac - - if [ "$board" != "" ]; then - ARC_BOARD_NAME="$board" - fi - - if [ "$model" != "" ]; then - ARC_BOARD_MODEL="$model" - fi - - echo "$ARC_BOARD_NAME" > /tmp/sysinfo/board_name - echo "$ARC_BOARD_MODEL" > /tmp/sysinfo/model - echo "Detected $ARC_BOARD_NAME // $ARC_BOARD_MODEL" -} diff --git a/target/linux/archs38/base-files/lib/preinit/01_preinit_arc.sh b/target/linux/archs38/base-files/lib/preinit/01_preinit_arc.sh deleted file mode 100644 index c5cd905828..0000000000 --- a/target/linux/archs38/base-files/lib/preinit/01_preinit_arc.sh +++ /dev/null @@ -1,7 +0,0 @@ -do_arc() { - . /lib/arc.sh - - arc_board_detect -} - -boot_hook_add preinit_main do_arc