diff mbox

[OpenWrt-Devel,8/8] kirkwood: Translate the build all profiles profile to new multi-profile config

Message ID 1455608874-97994-9-git-send-email-openwrt@daniel.thecshore.com
State Changes Requested
Delegated to: Felix Fietkau
Headers show

Commit Message

Daniel Dickinson Feb. 16, 2016, 7:47 a.m. UTC 
From: Daniel Dickinson <openwrt@daniel.thecshore.com>

Minor fixes so that that kirkwood acts correctly in the
new multi-profile build machinery/menuconfig (allowing multi-profile
selection).

Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>
---
 target/linux/kirkwood/Makefile                |  1 +
 target/linux/kirkwood/image/Makefile          | 12 ++++++++++--
 target/linux/kirkwood/profiles/050-unified.mk | 17 +++++++++++++++++
 target/linux/kirkwood/profiles/100-generic.mk |  1 +
 4 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 target/linux/kirkwood/profiles/050-unified.mk
diff mbox

Patch

diff --git a/target/linux/kirkwood/Makefile b/target/linux/kirkwood/Makefile
index 2db7e39..7bc7dbb 100644
--- a/target/linux/kirkwood/Makefile
+++ b/target/linux/kirkwood/Makefile
@@ -12,6 +12,7 @@  BOARDNAME:=Marvell Kirkwood
 FEATURES:=targz usb jffs2_nand nand ubifs squashfs
 CPU_TYPE:=xscale
 MAINTAINER:=Luka Perkov <luka@openwrt.org>
+TARGET_MULTI_SELECT:=1
 
 KERNEL_PATCHVER:=3.18
 
diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile
index 24cb317..5cd52f7 100644
--- a/target/linux/kirkwood/image/Makefile
+++ b/target/linux/kirkwood/image/Makefile
@@ -182,12 +182,20 @@  Image/InstallKernel/Template/GuruplugServerPlus=$(call Image/InstallKernel/Templ
 Image/BuildKernel/Template/Topkick1281P2=$(call Image/BuildKernel/Template,topkick)
 Image/InstallKernel/Template/Topkick1281P2=$(call Image/InstallKernel/Template,topkick)
 
+define Image/BuildKernel/Template/Unified
+	true
+endef
+
+define Image/InstallKernel/Template/Unified
+	true
+endef
+
 define Image/BuildKernel
-	$(call Image/BuildKernel/Template/$(PROFILE))
+	$(foreach profile,$(PROFILES_BUILD),$(call Image/BuildKernel/Template/$(profile)))
 endef
 
 define Image/InstallKernel
-	$(call Image/InstallKernel/Template/$(PROFILE))
+	$(foreach profile,$(PROFILES_BUILD),$(call Image/InstallKernel/Template/$(profile)))
 endef
 
 define Image/Build
diff --git a/target/linux/kirkwood/profiles/050-unified.mk b/target/linux/kirkwood/profiles/050-unified.mk
new file mode 100644
index 0000000..1c55897
--- /dev/null
+++ b/target/linux/kirkwood/profiles/050-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/kirkwood/profiles/100-generic.mk b/target/linux/kirkwood/profiles/100-generic.mk
index f07cea8..6f8a0a8 100644
--- a/target/linux/kirkwood/profiles/100-generic.mk
+++ b/target/linux/kirkwood/profiles/100-generic.mk
@@ -13,6 +13,7 @@  define Profile/Generic
 	kmod-ata-core kmod-ata-marvell-sata \
 	kmod-rtc-marvell kmod-thermal-kirkwood \
 	kmod-mwl8k swconfig wpad-mini
+  PROFILE_DEFAULT:=1
 endef
 
 define Profile/Generic/Description