From patchwork Sun Jan 13 20:29:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Maciej Nowak X-Patchwork-Id: 1024149 X-Patchwork-Delegate: hauke@hauke-m.de 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=none (p=none dis=none) header.from=o2.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="I3asouT/"; 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 43d7Vf1HG6z9sD4 for ; Mon, 14 Jan 2019 07:29:14 +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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version: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:In-Reply-To:References: List-Owner; bh=71yMST1oCPD8HoidUlf94BM+X90cCQyy3zm+jsyxNxQ=; b=I3asouT/mjfGZ9 c52XMZDtN4/+zSE5dw8tsy0TjFqlTU0g0r3qEKwkkcmlFQKsmEjvyHUNyaEzR6bgQYYohPxMk1Ubh uflUK0Qrz1w0F6BoWcm5LZCRqjM0oW2UROoi5WJ7505n1dSq3n+lZbDSgfv/W5+dF+ctSATZFOARJ BHA7q7j+ZoU7olVWIpxMTaJGrXc6xXthP1ajxklJ2/3TAaqferwB5A+pd/M5RBieJkPI7sfOEjoPb 57QFGDOMwyo/GnW/s9Y1gVTzHOTghOxlrKFL3NUJ0R/amywndHsjdkJegEZMFV+tAWFJhkfuQfiC7 /W5SBnUvJnoTQDDIDThQ==; 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 1gimNS-0008Jw-FF; Sun, 13 Jan 2019 20:29:02 +0000 Received: from mx-out.tlen.pl ([193.222.135.145]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gimNF-00088p-4Z for openwrt-devel@lists.openwrt.org; Sun, 13 Jan 2019 20:28:51 +0000 Received: (wp-smtpd smtp.tlen.pl 5187 invoked from network); 13 Jan 2019 21:28:43 +0100 Received: from 131.ip-164-132-48.eu (HELO localhost.localdomain) (tomek_n@o2.pl@[164.132.48.131]) (envelope-sender ) by smtp.tlen.pl (WP-SMTPD) with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP for ; 13 Jan 2019 21:28:43 +0100 From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Date: Sun, 13 Jan 2019 21:29:22 +0100 Message-Id: <20190113202923.13481-1-tomek_n@o2.pl> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-WP-MailID: a0a1cd26a5035672cf01327050617161 X-WP-AV: skaner antywirusowy Poczty o2 X-WP-SPAM: NO 000000A [ASPU] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190113_122849_348145_1B29569D X-CRM114-Status: UNSURE ( 8.35 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tomek_n[at]o2.pl) Subject: [OpenWrt-Devel] [PATCH 1/2] mvebu: move HARDEN_BRANCH_PREDICTOR to common config 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: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This symbol is enabled in all subtargets, move it to common kernel config. Signed-off-by: Tomasz Maciej Nowak Acked-by: Rosen Penev --- target/linux/mvebu/config-4.14 | 1 + target/linux/mvebu/cortexa53/config-default | 1 - target/linux/mvebu/cortexa72/config-default | 1 - target/linux/mvebu/cortexa9/config-default | 1 - 4 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 target/linux/mvebu/cortexa9/config-default diff --git a/target/linux/mvebu/config-4.14 b/target/linux/mvebu/config-4.14 index 296da5a109..cb26a927f9 100644 --- a/target/linux/mvebu/config-4.14 +++ b/target/linux/mvebu/config-4.14 @@ -212,6 +212,7 @@ CONFIG_GPIO_PCA953X_IRQ=y CONFIG_GPIO_SYSFS=y # CONFIG_GRO_CELLS is not set CONFIG_HANDLE_DOMAIN_IRQ=y +CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y diff --git a/target/linux/mvebu/cortexa53/config-default b/target/linux/mvebu/cortexa53/config-default index b631c30f5f..c5fcc0f3f8 100644 --- a/target/linux/mvebu/cortexa53/config-default +++ b/target/linux/mvebu/cortexa53/config-default @@ -65,7 +65,6 @@ CONFIG_GENERIC_CSUM=y CONFIG_GENERIC_IRQ_MIGRATION=y CONFIG_GENERIC_PINCONF=y CONFIG_GENERIC_TIME_VSYSCALL=y -CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_ARCH_HUGE_VMAP=y CONFIG_HAVE_ARCH_KASAN=y diff --git a/target/linux/mvebu/cortexa72/config-default b/target/linux/mvebu/cortexa72/config-default index 50b8d21c32..b855aa21d1 100644 --- a/target/linux/mvebu/cortexa72/config-default +++ b/target/linux/mvebu/cortexa72/config-default @@ -63,7 +63,6 @@ CONFIG_GENERIC_CSUM=y CONFIG_GENERIC_IRQ_MIGRATION=y CONFIG_GENERIC_PINCONF=y CONFIG_GENERIC_TIME_VSYSCALL=y -CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_ARCH_HUGE_VMAP=y CONFIG_HAVE_ARCH_KASAN=y diff --git a/target/linux/mvebu/cortexa9/config-default b/target/linux/mvebu/cortexa9/config-default deleted file mode 100644 index c9f039ba96..0000000000 --- a/target/linux/mvebu/cortexa9/config-default +++ /dev/null @@ -1 +0,0 @@ -CONFIG_HARDEN_BRANCH_PREDICTOR=y From patchwork Sun Jan 13 20:29:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Maciej Nowak X-Patchwork-Id: 1024148 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=none (p=none dis=none) header.from=o2.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="BI3NerY4"; 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 43d7VN0pLLz9s7T for ; Mon, 14 Jan 2019 07:28:59 +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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version: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=PUm2Zi+lCLPdlZeK1xlJ3pzLJZPIVzvm6OrO/palMjQ=; b=BI3NerY4/m5GYqQ3pBOnbcLgVR S3QVKvZeFmEwesP97qWt5WPH1Yw8xaGR1uQcHt57v/AJbTFoKS9EBvrsAvq5+QY1+uSdI3FAZZAKU 8V5FZ0hUQChDVdWF5nR/842xHdTNcVXWoff6eMunOwgnje2L9X6Ym95NJjeRthFLsdO6QrM2PDGUT vHUbw5TwGZWQBb69g60h6REIBtJfg6AMBeKncvrhLu+ZhQSApKT8Xv0QADE3FD4wx9O4OoW42eqIj aw7srv3KWNERugjZLorWhHjJuaPNUYFU0xElKeAuU6h6c1ecC0tPbNVzeOGGMcqb1+L7UEDTwP4pw Os2HXqYw==; 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 1gimNJ-00089X-1e; Sun, 13 Jan 2019 20:28:53 +0000 Received: from mx-out.tlen.pl ([193.222.135.145]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gimNF-00088q-4Y for openwrt-devel@lists.openwrt.org; Sun, 13 Jan 2019 20:28:51 +0000 Received: (wp-smtpd smtp.tlen.pl 6235 invoked from network); 13 Jan 2019 21:28:44 +0100 Received: from 131.ip-164-132-48.eu (HELO localhost.localdomain) (tomek_n@o2.pl@[164.132.48.131]) (envelope-sender ) by smtp.tlen.pl (WP-SMTPD) with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP for ; 13 Jan 2019 21:28:44 +0100 From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Date: Sun, 13 Jan 2019 21:29:23 +0100 Message-Id: <20190113202923.13481-2-tomek_n@o2.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190113202923.13481-1-tomek_n@o2.pl> References: <20190113202923.13481-1-tomek_n@o2.pl> MIME-Version: 1.0 X-WP-MailID: 0dd22b4b7e5e7aaed20a1593a17d98a2 X-WP-AV: skaner antywirusowy Poczty o2 X-WP-SPAM: NO 000000A [UWNU] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190113_122849_345812_E866A0E3 X-CRM114-Status: UNSURE ( 6.13 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tomek_n[at]o2.pl) Subject: [OpenWrt-Devel] [PATCH 2/2] mvebu: remove default profile 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: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org When using Image Builder and building image for Cortex A53 or A72 subtargets, it'll fail with following message: Collected errors: * opkg_install_cmd: Cannot install package mwlwifi-firmware-88w8864. * opkg_install_cmd: Cannot install package mwlwifi-firmware-88w8964. make[2]: *** [Makefile:153: package_install] Error 255 make[1]: *** [Makefile:114: _call_image] Error 2 This is beacuse both packages are available only for Cortex A9 subtarget and are included in PACKAGES array in default profile. Instead patching this, let's remove profiles completely, since all necessary packages are specified in DEVICE_PACKAGES array for each device. Signed-off-by: Tomasz Maciej Nowak --- target/linux/mvebu/image/Makefile | 1 - target/linux/mvebu/profiles/000-Default.mk | 18 ------------------ 2 files changed, 19 deletions(-) delete mode 100644 target/linux/mvebu/profiles/000-Default.mk diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile index be01623e86..22519bd9d0 100644 --- a/target/linux/mvebu/image/Makefile +++ b/target/linux/mvebu/image/Makefile @@ -81,7 +81,6 @@ define Build/omnia-medkit-initramfs endef define Device/Default - PROFILES := Default DEVICE_DTS := $(1) BOARD_NAME = $$(DEVICE_DTS) KERNEL_NAME := zImage diff --git a/target/linux/mvebu/profiles/000-Default.mk b/target/linux/mvebu/profiles/000-Default.mk deleted file mode 100644 index 8690dd8da5..0000000000 --- a/target/linux/mvebu/profiles/000-Default.mk +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright (C) 2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Default - NAME:=Default Profile (all drivers) - PACKAGES:= kmod-mwlwifi wpad-basic swconfig mkf2fs e2fsprogs \ - mwlwifi-firmware-88w8864 mwlwifi-firmware-88w8964 -endef - -define Profile/Default/Description - Default package set compatible with most boards. -endef - -$(eval $(call Profile,Default))