From patchwork Sun Dec 17 13:59:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 849623 X-Patchwork-Delegate: openwrt@kresin.me Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="VNYlZk+F"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mW7+aPJs"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 3z05Ss3qHxz9t2Z for ; Mon, 18 Dec 2017 01:02:05 +1100 (AEDT) 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:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=fSg7jWFoNtmGB0g6p2wmh6syoMW1f0izJ0oKh5tZMMc=; b=VNYlZk+F/2vVLDJAXn23F7eih6 sV+iElwhRaL7b/60PpFbiSixkj4QXAkhD0yrY/sh9dSBOK/gHAlBM+F3aP1m11cKinZEAwRfy8yCQ sAoMZ7tz9Lj4zT4iwrv4eMEJNRMMBcO+gXRxSpJKejijI/v5FYOA63w8Z/CIrxABzSnnEzH/38Cun 6oLtroKonc8+mJW2W3uN752AK3mXV9p5It61AVSAdD5TFyb4QP2e/z3OA1lYFKFky5/KBiYzpEdQu CxDV99xgSeoEcOgX1auvDzA8dofGuEUuyWQcSg2UjiDCqiD2ojLDaCikSNcvxIQLC8TGYX7ESgcNP EWrTm9fg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eQZVz-0003He-Pj; Sun, 17 Dec 2017 14:02:03 +0000 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eQZUV-0002MZ-9r for lede-dev@lists.infradead.org; Sun, 17 Dec 2017 14:00:35 +0000 Received: by mail-wr0-x242.google.com with SMTP id q9so11803902wre.7 for ; Sun, 17 Dec 2017 06:00:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:in-reply-to :references; bh=Rhk/s4uDF4tUfNlafqOggBeUzr1oAC9MT+/g2eyoLys=; b=mW7+aPJsJDDZ6kUod1EapRmCQa1JDJq/v34RROllpvTFpAM63Nf9HHejurqcMclmNK QUV/S8wMqK3sOWxmT3tSSsveoKV3f8bi7OgeKNeynAIilCHpBn5L6MaWah3C/Dyx9UAg Co8l0lJ6hpGcCl5lrY4KK2RIeDhEK6l/zdFuFjOh+/I+eqUb7pQj4SGuGxZ/p8p4rp2v CRDJtmwh6UK2m3kkkKnQaPLE/ZrsRXzng9ZOaKvE/2kPDq5TLQjYFGPJgX1zqSjiHvkW Pmd/vEkzxCyMm35Yypvw9PFghF+VeX622f+ga0NTZFzz/Ql+uweSnl2Eg6qxrMYM+vHe nNow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=Rhk/s4uDF4tUfNlafqOggBeUzr1oAC9MT+/g2eyoLys=; b=tYEYJg84nC9D6uNsjl9147mHXAEI5CdOq69HsmIcL+lH0nF9f8UVOSq9r1Mq1KMgcn 73AiStAP6NaExawBrUIFszw2AsPosyIcgs+PV9IOq7/DRXUgL8TnclYEaKjamM3Hs8N0 3pT88tGo1tuDFuYZH24LlmJUwR8QlCtYYtyhulSddqYQnAZke9O58uk3hMBf4aZbvT3S p+gk+36A2E/8Y2ZL3NzykR58kAnD9wrzG44vF9LmACiO3Q+sn7cgG6fZpae2H21pw7qF 6bIcavxDrqFqY817qArBIsHBPKt4n8OnijL1fqija1F3tmCD93Jg3e4Aab6ue4E0uBAI ET/w== X-Gm-Message-State: AKGB3mLyNIvrxlyKq8KLn9x2xcOZo0JoPVpNSthauNZTLjI54aq0uYnk FF5EOxztABcx7guQOJjYoROZ0AqB X-Google-Smtp-Source: ACJfBos1nL8BXd0tChj+iiZzCDvQnZC+m/KbZeWO/e+P7MHqO5FkpBlpy0WJUagbPGwWc378Gbf9yw== X-Received: by 10.223.196.71 with SMTP id a7mr1460683wrg.158.1513519207893; Sun, 17 Dec 2017 06:00:07 -0800 (PST) Received: from debian64.daheim (p200300D5FBDD4AFC0000000000000830.dip0.t-ipconnect.de. [2003:d5:fbdd:4afc::830]) by smtp.gmail.com with ESMTPSA id u5sm3724520wmf.47.2017.12.17.06.00.01 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 17 Dec 2017 06:00:02 -0800 (PST) Received: from chuck by debian64.daheim with local (Exim 4.90_RC4) (envelope-from ) id 1eQZU1-0001mC-DP for lede-dev@lists.infradead.org; Sun, 17 Dec 2017 15:00:01 +0100 From: Christian Lamparter To: lede-dev@lists.infradead.org Date: Sun, 17 Dec 2017 14:59:59 +0100 Message-Id: X-Mailer: git-send-email 2.15.1 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171217_060031_549666_87AB2EDA X-CRM114-Status: UNSURE ( 7.35 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c0c:0:0:0:242 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (chunkeey[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [LEDE-DEV] [PATCH 7/9] apm821xx: align device names with vendor_device format X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Currently, the device name handle does not include the manufacturer. This can make it hard do differentiate between products from different vendors that have the same product name. As the handle is used to derive the image name. Signed-off-by: Christian Lamparter --- target/linux/apm821xx/image/Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile index 6efd3886d2..bff3947039 100644 --- a/target/linux/apm821xx/image/Makefile +++ b/target/linux/apm821xx/image/Makefile @@ -66,7 +66,7 @@ define Build/MerakiNAND @cp $@.new $@ endef -define Device/mr24 +define Device/meraki_mr24 DEVICE_TITLE := Cisco Meraki MR24 DEVICE_PACKAGES := kmod-spi-gpio BOARD_NAME := mr24 @@ -84,9 +84,9 @@ define Device/mr24 IMAGE/sysupgrade.tar := sysupgrade-tar UBINIZE_OPTS := -E 5 endef -TARGET_DEVICES += mr24 +TARGET_DEVICES += meraki_mr24 -define Device/mx60 +define Device/meraki_mx60 DEVICE_TITLE := Cisco Meraki MX60/MX60W DEVICE_PACKAGES := kmod-spi-gpio kmod-usb-ledtrig-usbport kmod-usb-dwc2 \ kmod-usb-storage block-mount @@ -109,7 +109,7 @@ define Device/mx60 IMAGE/sysupgrade.tar := sysupgrade-tar UBINIZE_OPTS := -E 5 endef -TARGET_DEVICES += mx60 +TARGET_DEVICES += meraki_mx60 define Build/create-uImage-dtb # flat_dt target expect FIT image - which WNDR4700's uboot doesn't support @@ -149,7 +149,7 @@ define Build/wndr4700-specialImage rm -rf $@.fakerd endef -define Device/WNDR4700 +define Device/netgear_wndr4700 DEVICE_TITLE := Netgear Centria N900 WNDR4700/WNDR4720 DEVICE_PACKAGES := badblocks block-mount e2fsprogs \ kmod-dm kmod-fs-ext4 kmod-fs-vfat kmod-usb-ledtrig-usbport \ @@ -176,7 +176,7 @@ define Device/WNDR4700 NETGEAR_HW_ID := 29763875+128+256 UBINIZE_OPTS := -E 5 endef -TARGET_DEVICES += WNDR4700 +TARGET_DEVICES += netgear_wndr4700 endif @@ -222,22 +222,22 @@ define Device/MyBookLiveDefault IMAGE/rootfs.img.gz := boot-script | boot-img | hdd-img | gzip endef -define Device/MyBookLiveSingle +define Device/wd_mybooklive $(Device/MyBookLiveDefault) DEVICE_TITLE := Western Digital My Book Live DEVICE_DTS := wd-mybooklive endef -TARGET_DEVICES += MyBookLiveSingle +TARGET_DEVICES += wd_mybooklive -define Device/MyBookLiveDuo +define Device/wd_mybooklive_duo $(Device/MyBookLiveDefault) DEVICE_TITLE := Western Digital My Book Live Duo DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-fs-vfat wpad-mini DEVICE_DTS := wd-mybooklive-duo endef -TARGET_DEVICES += MyBookLiveDuo +TARGET_DEVICES += wd_mybooklive_duo endif