From patchwork Wed Jan 20 18:20:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Dickinson X-Patchwork-Id: 570853 X-Patchwork-Delegate: nbd@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id CBE2D1402F0 for ; Thu, 21 Jan 2016 05:26:25 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 5021C28C0D5; Wed, 20 Jan 2016 19:21:41 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-0.3 required=5.0 tests=BAYES_00,RDNS_NONE autolearn=no version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 2F88A28BFF6 for ; Wed, 20 Jan 2016 19:19:53 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from s2.neomailbox.net (unknown [5.148.176.60]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Wed, 20 Jan 2016 19:19:51 +0100 (CET) From: openwrt@daniel.thecshore.com To: openwrt-devel@lists.openwrt.org Date: Wed, 20 Jan 2016 13:20:08 -0500 Message-Id: <1453314009-5602-7-git-send-email-openwrt@daniel.thecshore.com> In-Reply-To: <1453314009-5602-1-git-send-email-openwrt@daniel.thecshore.com> References: <1453314009-5602-1-git-send-email-openwrt@daniel.thecshore.com> Subject: [OpenWrt-Devel] [PATCH 7/8] brcm63xx: Translate the build all profiles profile to new multi-profile config X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" From: Daniel Dickinson Minor fixes so that the 'Default' profile (build all images profile) not only builds all images but acts correctly in the new multi-profile build machinery/menuconfig. Signed-off-by: Daniel Dickinson --- target/linux/brcm63xx/generic/target.mk | 1 + target/linux/brcm63xx/profiles/00-default.mk | 14 -------------- target/linux/brcm63xx/profiles/00-unified.mk | 17 +++++++++++++++++ target/linux/brcm63xx/profiles/000-default.mk | 17 +++++++++++++++++ target/linux/brcm63xx/smp/target.mk | 1 + 5 files changed, 36 insertions(+), 14 deletions(-) delete mode 100644 target/linux/brcm63xx/profiles/00-default.mk create mode 100644 target/linux/brcm63xx/profiles/00-unified.mk create mode 100644 target/linux/brcm63xx/profiles/000-default.mk diff --git a/target/linux/brcm63xx/generic/target.mk b/target/linux/brcm63xx/generic/target.mk index d43a37c..9dc1016 100644 --- a/target/linux/brcm63xx/generic/target.mk +++ b/target/linux/brcm63xx/generic/target.mk @@ -1,4 +1,5 @@ BOARDNAME:=generic +TARGET_MULTI_SELECT:=1 define Target/Description Build firmware images for BCM63XX boards without SMP support. diff --git a/target/linux/brcm63xx/profiles/00-default.mk b/target/linux/brcm63xx/profiles/00-default.mk deleted file mode 100644 index bbb02ed..0000000 --- a/target/linux/brcm63xx/profiles/00-default.mk +++ /dev/null @@ -1,14 +0,0 @@ -# -# Copyright (C) 2014 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 -endef -define Profile/Default/description - Package set compatible with most boards. -endef -$(eval $(call Profile,Default)) diff --git a/target/linux/brcm63xx/profiles/00-unified.mk b/target/linux/brcm63xx/profiles/00-unified.mk new file mode 100644 index 0000000..1c55897 --- /dev/null +++ b/target/linux/brcm63xx/profiles/00-unified.mk @@ -0,0 +1,17 @@ +# +# Copyright (C) 2013 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/Unified + NAME:=Unified Profile (merge of all selected profiles) + PROFILE_TYPE:=unified +endef + +define Profile/Unified/Description + Build all selected images with a profile that is the merge of all selected profiles. +endef + +$(eval $(call Profile,Unified)) diff --git a/target/linux/brcm63xx/profiles/000-default.mk b/target/linux/brcm63xx/profiles/000-default.mk new file mode 100644 index 0000000..6ba2a1b --- /dev/null +++ b/target/linux/brcm63xx/profiles/000-default.mk @@ -0,0 +1,17 @@ +# +# Copyright (C) 2014 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 + PROFILE_TYPE:=meta + PROFILE_DEFAULT:=1 + PROFILE_IMAGES_TYPE:=1all +endef +define Profile/Default/description + Package set compatible with most boards. +endef +$(eval $(call Profile,Default)) diff --git a/target/linux/brcm63xx/smp/target.mk b/target/linux/brcm63xx/smp/target.mk index b0ccf97..5f74e47 100644 --- a/target/linux/brcm63xx/smp/target.mk +++ b/target/linux/brcm63xx/smp/target.mk @@ -1,4 +1,5 @@ BOARDNAME:=smp +TARGET_MULTI_SELECT:=1 define Target/Description Build firmware images for BCM63XX boards with SMP support.