From patchwork Tue Jan 19 06:07:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Dickinson X-Patchwork-Id: 569807 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 5C7731402E2 for ; Tue, 19 Jan 2016 17:13:31 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 2220A28C77C; Tue, 19 Jan 2016 07:09:20 +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=-1.5 required=5.0 tests=BAYES_00 autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 8720228BCE0 for ; Tue, 19 Jan 2016 07:07:24 +0100 (CET) X-policyd-weight: using cached result; rate:hard: -8.5 Received: from s1.neomailbox.net (s1.neomailbox.net [5.148.176.57]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Tue, 19 Jan 2016 07:07:20 +0100 (CET) From: openwrt@daniel.thecshore.com To: openwrt-devel@lists.openwrt.org Date: Tue, 19 Jan 2016 01:07:45 -0500 Message-Id: <1453183670-67000-9-git-send-email-openwrt@daniel.thecshore.com> In-Reply-To: <1453183670-67000-1-git-send-email-openwrt@daniel.thecshore.com> References: <1453171813-36623-1-git-send-email-openwrt@daniel.thecshore.com> <1453183670-67000-1-git-send-email-openwrt@daniel.thecshore.com> Subject: [OpenWrt-Devel] [PATCH 08/13] 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 former 'Default' profile (now All) not only builds all profiles but acts correctly in the new multi-profile build machinery/menuconfig Signed-off-by: Daniel Dickinson --- target/linux/brcm63xx/image/Makefile | 2 +- target/linux/brcm63xx/profiles/00-default.mk | 1 + target/linux/brcm63xx/profiles/01-all.mk | 14 +++ target/linux/brcm63xx/profiles/01-generic.mk | 123 --------------------------- target/linux/brcm63xx/profiles/02-generic.mk | 123 +++++++++++++++++++++++++++ 5 files changed, 139 insertions(+), 124 deletions(-) create mode 100644 target/linux/brcm63xx/profiles/01-all.mk delete mode 100644 target/linux/brcm63xx/profiles/01-generic.mk create mode 100644 target/linux/brcm63xx/profiles/02-generic.mk diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile index 81a9dc7..3175b5d 100644 --- a/target/linux/brcm63xx/image/Makefile +++ b/target/linux/brcm63xx/image/Makefile @@ -167,7 +167,7 @@ endef # Shared device definition: applies to every defined device define Device/Default - PROFILES = Default $$(DEVICE_PROFILE) + PROFILES = All $$(DEVICE_PROFILE) KERNEL_DEPENDS = $$(wildcard ../dts/$$(DEVICE_DTS).dts) KERNEL_INITRAMFS_IMAGE = $$(KERNEL_INITRAMFS_PREFIX).elf DEVICE_PROFILE := diff --git a/target/linux/brcm63xx/profiles/00-default.mk b/target/linux/brcm63xx/profiles/00-default.mk index a25be92..f7cd1ac 100644 --- a/target/linux/brcm63xx/profiles/00-default.mk +++ b/target/linux/brcm63xx/profiles/00-default.mk @@ -8,6 +8,7 @@ define Profile/Default NAME:=Default Profile PACKAGES:=kmod-b43 wpad-mini + PROFILE_SKIP_DEFAULT:=1 endef define Profile/Default/description Package set compatible with most boards. diff --git a/target/linux/brcm63xx/profiles/01-all.mk b/target/linux/brcm63xx/profiles/01-all.mk new file mode 100644 index 0000000..12966b5 --- /dev/null +++ b/target/linux/brcm63xx/profiles/01-all.mk @@ -0,0 +1,14 @@ +# +# Copyright (C) 2014 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/All + NAME:=All Profiles +endef +define Profile/All/description + Builds images for all profiles +endef +$(eval $(call Profile,All)) diff --git a/target/linux/brcm63xx/profiles/01-generic.mk b/target/linux/brcm63xx/profiles/01-generic.mk deleted file mode 100644 index 2a9eb15..0000000 --- a/target/linux/brcm63xx/profiles/01-generic.mk +++ /dev/null @@ -1,123 +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/963281TAN - NAME:=Generic 963281TAN - PACKAGES:= -endef -define Profile/963281TAN/Description - Package set optimized for 963281TAN. -endef -$(eval $(call Profile,963281TAN)) - -define Profile/96328avng - NAME:=Generic 96328avng - PACKAGES:= -endef -define Profile/96328avng/Description - Package set optimized for 96328avng. -endef -$(eval $(call Profile,96328avng)) - -define Profile/96338GW - NAME:=Generic 96338GW - PACKAGES:= -endef -define Profile/96338GW/Description - Package set optimized for 96338GW. -endef -$(eval $(call Profile,96338GW)) - -define Profile/96338W - NAME:=Generic 96338W - PACKAGES:= -endef -define Profile/96338W/Description - Package set optimized for 96338W. -endef -$(eval $(call Profile,96338W)) - -define Profile/96345GW2 - NAME:=Generic 96345GW2 - PACKAGES:= -endef -define Profile/96345GW2/Description - Package set optimized for 96345GW2. -endef -$(eval $(call Profile,96345GW2)) - -define Profile/96348GW - NAME:=Generic 96348GW - PACKAGES:= -endef -define Profile/96348GW/Description - Package set optimized for 96348GW. -endef -$(eval $(call Profile,96348GW)) - -define Profile/96348GW_10 - NAME:=Generic 96348GW-10 - PACKAGES:= -endef -define Profile/96348GW_10/Description - Package set optimized for 96348GW-10. -endef -$(eval $(call Profile,96348GW_10)) - -define Profile/96348GW_11 - NAME:=Generic 96348GW-11 - PACKAGES:= -endef -define Profile/96348GW_11/Description - Package set optimized for 96348GW-11. -endef -$(eval $(call Profile,96348GW_11)) - -define Profile/96348R - NAME:=Generic 96348R - PACKAGES:= -endef -define Profile/96348R/Description - Package set optimized for 96348R. -endef -$(eval $(call Profile,96348R)) - -define Profile/96358VW - NAME:=Generic 96358VW - PACKAGES:= -endef -define Profile/96358VW/Description - Package set optimized for 96358VW. -endef -$(eval $(call Profile,96358VW)) - -define Profile/96358VW2 - NAME:=Generic 96358VW2 - PACKAGES:= -endef -define Profile/96358VW2/Description - Package set optimized for 96358VW2. -endef -$(eval $(call Profile,96358VW2)) - -define Profile/96368MVNgr - NAME:=Generic 96368MVNgr - PACKAGES:= -endef -define Profile/96368MVNgr/Description - Package set optimized for 96368MVNgr. -endef -$(eval $(call Profile,96368MVNgr)) - -define Profile/96368MVWG - NAME:=Generic 96368MVWG - PACKAGES:= -endef -define Profile/96368MVWG/Description - Package set optimized for 96368MVWG. -endef -$(eval $(call Profile,96368MVWG)) diff --git a/target/linux/brcm63xx/profiles/02-generic.mk b/target/linux/brcm63xx/profiles/02-generic.mk new file mode 100644 index 0000000..2a9eb15 --- /dev/null +++ b/target/linux/brcm63xx/profiles/02-generic.mk @@ -0,0 +1,123 @@ +# +# Copyright (C) 2014 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/963281TAN + NAME:=Generic 963281TAN + PACKAGES:= +endef +define Profile/963281TAN/Description + Package set optimized for 963281TAN. +endef +$(eval $(call Profile,963281TAN)) + +define Profile/96328avng + NAME:=Generic 96328avng + PACKAGES:= +endef +define Profile/96328avng/Description + Package set optimized for 96328avng. +endef +$(eval $(call Profile,96328avng)) + +define Profile/96338GW + NAME:=Generic 96338GW + PACKAGES:= +endef +define Profile/96338GW/Description + Package set optimized for 96338GW. +endef +$(eval $(call Profile,96338GW)) + +define Profile/96338W + NAME:=Generic 96338W + PACKAGES:= +endef +define Profile/96338W/Description + Package set optimized for 96338W. +endef +$(eval $(call Profile,96338W)) + +define Profile/96345GW2 + NAME:=Generic 96345GW2 + PACKAGES:= +endef +define Profile/96345GW2/Description + Package set optimized for 96345GW2. +endef +$(eval $(call Profile,96345GW2)) + +define Profile/96348GW + NAME:=Generic 96348GW + PACKAGES:= +endef +define Profile/96348GW/Description + Package set optimized for 96348GW. +endef +$(eval $(call Profile,96348GW)) + +define Profile/96348GW_10 + NAME:=Generic 96348GW-10 + PACKAGES:= +endef +define Profile/96348GW_10/Description + Package set optimized for 96348GW-10. +endef +$(eval $(call Profile,96348GW_10)) + +define Profile/96348GW_11 + NAME:=Generic 96348GW-11 + PACKAGES:= +endef +define Profile/96348GW_11/Description + Package set optimized for 96348GW-11. +endef +$(eval $(call Profile,96348GW_11)) + +define Profile/96348R + NAME:=Generic 96348R + PACKAGES:= +endef +define Profile/96348R/Description + Package set optimized for 96348R. +endef +$(eval $(call Profile,96348R)) + +define Profile/96358VW + NAME:=Generic 96358VW + PACKAGES:= +endef +define Profile/96358VW/Description + Package set optimized for 96358VW. +endef +$(eval $(call Profile,96358VW)) + +define Profile/96358VW2 + NAME:=Generic 96358VW2 + PACKAGES:= +endef +define Profile/96358VW2/Description + Package set optimized for 96358VW2. +endef +$(eval $(call Profile,96358VW2)) + +define Profile/96368MVNgr + NAME:=Generic 96368MVNgr + PACKAGES:= +endef +define Profile/96368MVNgr/Description + Package set optimized for 96368MVNgr. +endef +$(eval $(call Profile,96368MVNgr)) + +define Profile/96368MVWG + NAME:=Generic 96368MVWG + PACKAGES:= +endef +define Profile/96368MVWG/Description + Package set optimized for 96368MVWG. +endef +$(eval $(call Profile,96368MVWG))