[OpenWrt-Devel] [PATCH 7/8] brcm63xx: Translate the build all profiles profile to new multi-profile config

[openwrt at daniel.thecshore.com]

From: Daniel Dickinson <openwrt at daniel.thecshore.com>

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 <openwrt at daniel.thecshore.com>
---
 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.
-- 
2.4.3
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel