From patchwork Sat Aug 22 11:07:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1349646 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=Eu7nWIWL; 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 4BYbKQ4vBtz9sRK for ; Sat, 22 Aug 2020 21:10:50 +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:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=rVb2537LVN7l6g/VpZyV2ILNwg53qGdg3G2ObsbloNc=; b=Eu7nWIWLd1kl34YtWU6/i5dMq lnBvW0dW/meRoKLw17hk998Y9Z9TkccWyPUWD7Cz9LK5YIuqD+A6prcCLZzzXqBYK+GM6JGKS+dhh n/QCkqua5sAyqIhSsf3Rkg2DitqS5nU/IxCej3OeECIsXPYfDRsEsqkCpDTCUp5sgxYFaQrz0u17N oj49rDpD2CIdwt7mxLOJpHdMfW9lJWFNl/nRwzqpjsKUONDv4pGPeVbk4q/Zkid2LUkKbiAsmYjoB dFQ25jkd2ql0M6qzi+lREmP1nY9opYViKErViSfF2M6peoefommt6ZoiYvwUoFo6Cuug8FaVWs2uS aLv5Op3oA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k9ROS-0003AO-Ej; Sat, 22 Aug 2020 11:09:04 +0000 Received: from mout.kundenserver.de ([212.227.126.131]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k9ROI-00036v-W1 for openwrt-devel@lists.openwrt.org; Sat, 22 Aug 2020 11:08:57 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MKsSj-1jvKt305Ph-00LEtP; Sat, 22 Aug 2020 13:08:48 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH 5/6] rb532: use vendor_model scheme Date: Sat, 22 Aug 2020 13:07:51 +0200 Message-Id: <20200822110752.32600-6-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200822110752.32600-1-freifunk@adrianschmutzler.de> References: <20200822110752.32600-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:yu58X2o2OTkj0rFBHnMG3yry+GcGX0TRurc5QjMXl212WIhP3bW 0EPDq6LcpCbI5WbAe/wSoePIx6Aq4HEgqToDxkNqBmcPSak7ZME9VPDg9cHK/hAYHQM0RMn jAjvt0xbSNPajhPKUPfA6PX6xsfcZlTPS/CDs5/XXbtbCLlCSnsmsd8+oEWoZMoZUOR8+Mv hUl0rSKLDUmLJK4a3uC7Q== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:e2Hd7pN6tKM=:9qexGqSfgYjbG+xqH7rNm7 91DOYCMexY0siE5fb2QmU0UPzMyBOnXcCPSxi1OPfPOtsZ8yx4Ke0kehUJ2w5trR1qg7smRSN EQutMY+mz5qaGe5Y/i9Clt+07Vkvoy8y1J79IdLeeUjf6Fct0Ayz5oE/r4kaNTb+Mon+eA1pg DK5Hb6pov0C7XB9yZrHqj83An61lPK5UM3QV2u8PH+armsiazO1vhkXtATWmg2LBOvqInrrmA DpHMSM2fe8tQLZXU0jvYrxoSMDeovcZYcjkKft0cwc8T+cbckKJEvrWPwmJmrfpNbLRAvP3u2 yQTVcT9u5mpRjWFL0s4uGxcEGau9sNW2P2Jt/d8llK6+HZN9mYX7nPWj+0dfDSSxMKUklqU9y 2XmGFjx1xDX6RVghXv/ONSK54oqylBPVYxC2Ur13bFXC5bKH3cbUwPTRepL0uGDcJ97KbbjIF EFB/Mk1H1HMGvXkkl4j28+7vz7fOlLqhTh2BfpSeI4tVOy62HDzTGZze+U+9AVMZZVZiiqpzI lUhQJa7g6AiyUzkkr3ir47UvkXIP/bDtCoZ2MVRKMwcu8F/EsSGuWMMXIvdznXE6y6DdRrGK0 +5BVDRFqBh8J3XQJ/uwLUrh8wXnJzv2QpWVv0GR6sqXxLHveCg10MrVHgQyWtp6stdphZAl4w z2BTeEffgv7KAr1DlqviDxRc5bRqhGBQAU8ACyzyRr5svCxftW0fqFWbLO3atJB6bujQiR246 UfGY3XlY6UZGn6B4GS2BFwtwcu/4VmbSWRex+6gXSfKYnIhOJt1NM6vPTA3Z92xTB6TRD3ZWJ VU9uq44tFyn2En8deJZkjXR1UFuuejIBamGX0mwu0fwS12NTRy+5MyipQ2QwzjhrVMyEEF3aB l2YYsPsMxCD8LQ8VKzwQ== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200822_070855_294933_AC25EC41 X-CRM114-Status: GOOD ( 10.81 ) 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.131 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.131 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an 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: , Cc: roman@advem.lv Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This applies the vendor_model scheme used in most targets to rb532. Also update the board name based on how a matching compatible would look like. Signed-off-by: Adrian Schmutzler --- target/linux/rb532/base-files/lib/preinit/01_sysinfo | 2 +- target/linux/rb532/image/Makefile | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/target/linux/rb532/base-files/lib/preinit/01_sysinfo b/target/linux/rb532/base-files/lib/preinit/01_sysinfo index 4c932fde19..d74f160935 100644 --- a/target/linux/rb532/base-files/lib/preinit/01_sysinfo +++ b/target/linux/rb532/base-files/lib/preinit/01_sysinfo @@ -4,7 +4,7 @@ get_model_rb532() { do_sysinfo_rb532() { mkdir -p /tmp/sysinfo - echo rb532 > /tmp/sysinfo/board_name + echo "mikrotik,routerboard-532" > /tmp/sysinfo/board_name get_model_rb532 > /tmp/sysinfo/model } diff --git a/target/linux/rb532/image/Makefile b/target/linux/rb532/image/Makefile index a6f8a6beaf..ab0dd77aa3 100644 --- a/target/linux/rb532/image/Makefile +++ b/target/linux/rb532/image/Makefile @@ -35,20 +35,19 @@ define Build/lzma-loader-elf rm -rf $@.loader endef -define Device/nand +define Device/mikrotik_routerboard-532 DEVICE_VENDOR := MikroTik DEVICE_MODEL := RouterBOARD 532 CMDLINE := ubi.mtd=1 ubi.block=0,rootfs root=/dev/ubiblock0_1 BOARD_NAME := rb532 - SUPPORTED_DEVICES := rb532 + SUPPORTED_DEVICES := $(subst _,$(comma),$(1)) rb532 KERNEL_INITRAMFS := append-kernel | patch-cmdline | lzma | lzma-loader-elf KERNEL := $$(KERNEL_INITRAMFS) | kernel2minor -s 2048 -i 0 -c IMAGES := sysupgrade.bin FILESYSTEMS := squashfs IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef - -TARGET_DEVICES := nand +TARGET_DEVICES := mikrotik_routerboard-532 define Build/Clean $(MAKE) -C $(GENERIC_PLATFORM_DIR)/image/lzma-loader $(LOADER_MAKEOPTS) clean