From patchwork Thu Jan 21 12:08:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Marko X-Patchwork-Id: 1429758 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; 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=P1utV0zY; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sartura-hr.20150623.gappssmtp.com header.i=@sartura-hr.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=Z4S8JoeL; 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 4DM1Sp40Hpz9sS8 for ; Thu, 21 Jan 2021 23:11:06 +1100 (AEDT) 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: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:In-Reply-To:References:List-Owner; bh=VtWU+p2zB5a8DmZj3CC1YI/7kojFSU2to+3HrO814iE=; b=P1utV0zYz7XIJp9CfmFctAZpFz t+N8OK18L/DW4GBgQbzNJ29R+W3UwldFQuN6fSbtBcu/x86fIG929lWQntdUCX5CT749UdvT1zgYA ayfX9/8xwfxVxWCBU5hM6oBDrv7biU8vQJT/S+MaOszgRKnGvEvrcYe8nhKIpBuuTnZn8v5G8CoBL FJ2k4SP2NcltQrdXInmVcSXel6v/Eq6B4RXCO1r+RktR8wbNao+/4O8LLqSCWhPA611caAFr3xQZ4 Bi4E9DUOuft3RIORCikzn9mKlkvb5+9g1HKhXv1OsTtHeC+M+/cVkhXfgUdheAc+gon6EC80w0oWq cg54WbMQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2Ylw-0008Dl-KD; Thu, 21 Jan 2021 12:09:08 +0000 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2Ylt-0008Cz-Q5 for openwrt-devel@lists.openwrt.org; Thu, 21 Jan 2021 12:09:06 +0000 Received: by mail-ed1-x52b.google.com with SMTP id b2so2179840edm.3 for ; Thu, 21 Jan 2021 04:09:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sartura-hr.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=TCw9q164ScN3m/UOtA+9NxCrvqO7xQl+NrSqckRaxRY=; b=Z4S8JoeLtrFwtCXnNQ9z3KlGhvqlTtvAG8lePnA12mQ7Fxo2HLBXNVv6YZHSZyL0cR 3V5g44Xb/F5KvWYWnIEhxZj684TsMvHuJQsDok983cIA1Gtq3n4cJWEYhWmlKbuPB9P3 Og4wj7i4KyFqUObPwL+0GakvIuSucXz34fYDZVbSx/aE5JZ1rhZpWtKrCJCCSsnwVemQ O9KZ8S+IbATWG6Fa31CoRq1h0U9TVlyCboxYG/sZPHHJkD0qCcUHg5z2InOO3oda8FNP Z5hzXa4xHwPNCw09lJHZ/mp86hPlzwlT2Y2QiPoycnKUm9hqVnbi5M9aHW5q0tMuqfM1 Q0Mw== 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:mime-version :content-transfer-encoding; bh=TCw9q164ScN3m/UOtA+9NxCrvqO7xQl+NrSqckRaxRY=; b=BSmKubG7VCEjoVBr1vJva1IVTT8RkCA8HbVvWm4HW8+r1Q0fMeBcNqXk38tWcifOcz H9bVLb2EK0JXN3Hp2KfZISYw4DGC34x+l7dDvV3qRpWmk9ggjnvC1Ane3nsRluWFlOf1 0itWRS/oUgLCjpZUjxINV1cm1wD6Qfcm77tRjmgonYhMzdmZQzIeEUbcF0Rq4s97E4Gd 8NSRaJtmUPWvV1ryHtLf/avp3K/GTNcS1CU1nNQHgBpw6PsmPq2IW6VqbQ9cjMOCFGOh wg6PFfjsTfLf6Bi3QyPMo7r8fw2dk3EvXXL05M4xjLlNFUQcoowFurNjhu2VVdsijJKR fZgw== X-Gm-Message-State: AOAM530hR3aoQsbH0Ebzxkk4NFi97u6PhdtRwOUJdAIApf1+qrlg0b1y GHBFywdvEH0PgG0TmsvtDNnEjn/ZVKUlW7SrY4qY3J0HDrHDwo+1qTh9y9lABPAnENnMedJTghu WGmH0v75TfEI+ZV+mIe/0VhTzKDVVfDAujn8yerTlkzxMro/EzyLiLhU3a2/dCpP8clCYwi3ehj J2y3eKkOn363s= X-Google-Smtp-Source: ABdhPJyfZPkNZlO5uC3wPonB+6ViUgk62J4M0AfPGQBehQ65EsetW97+LOT6v+6ltq+ElchwCzkgQQ== X-Received: by 2002:aa7:d8c6:: with SMTP id k6mr10976598eds.265.1611230942475; Thu, 21 Jan 2021 04:09:02 -0800 (PST) Received: from localhost.localdomain (dh207-99-51.xnet.hr. [88.207.99.51]) by smtp.googlemail.com with ESMTPSA id gt12sm2137987ejb.38.2021.01.21.04.09.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jan 2021 04:09:01 -0800 (PST) From: Robert Marko To: openwrt-devel@lists.openwrt.org Subject: [PATCH] ipq40xx: fix boards being shown twice Date: Thu, 21 Jan 2021 13:08:57 +0100 Message-Id: <20210121120857.1364918-1-robert.marko@sartura.hr> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210121_070905_848065_304ACF1D X-CRM114-Status: UNSURE ( 9.40 ) X-CRM114-Notice: Please train this message. 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 [2a00:1450:4864:20:0:0:0:52b listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 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: Robert Marko Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Since generic images have been split to their own Makefile boards are showing up twice in menuconfig as $(eval $(call BuildImage)) was not dropped from the new generic.mk. Hence $(eval $(call BuildImage)) was being called twice. So, lets simply drop it from generic.mk. Fixes: 378c7ff28210 ("ipq40xx: split generic images into own file") Signed-off-by: Robert Marko --- target/linux/ipq40xx/image/generic.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk index 9cd50e23ff..4e40b8be50 100644 --- a/target/linux/ipq40xx/image/generic.mk +++ b/target/linux/ipq40xx/image/generic.mk @@ -805,5 +805,3 @@ define Device/zyxel_wre6606 DEVICE_PACKAGES := -kmod-ath10k-ct kmod-ath10k-ct-smallbuffers endef TARGET_DEVICES += zyxel_wre6606 - -$(eval $(call BuildImage))