summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorBenjamin Walsh <benjamin.walsh@windriver.com>2016-09-02 19:19:17 -0400
committerBenjamin Walsh <benjamin.walsh@windriver.com>2016-09-13 17:12:55 -0400
commit7e6dacd65fd432f0e3594d4e3680425a2b25aaee (patch)
tree53d38c324fdd7cbac8e17e0b579c6066a8d0465a /misc
parent456c6daa9f0c706131cff4eedcf3290fdfcf98e9 (diff)
unified/build: allow building the unified kernel
Added needed kconfig options. KERNEL_V2 selects MICROKERNEL to allow middleware and application that differentiate between NANOKERNEL and MICROKERNEL to run unmodified. Build the unified/ kernel directory: do not touch the nanokernel/microkernel directories. Invoke sysgen for both microkernel and unified kernel. Only have sysgen reference include/microkernel if building an original microkernel. Change-Id: If74779146143434f7ee274bbef32d6c894b9f1a1 Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>
Diffstat (limited to 'misc')
-rw-r--r--misc/generated/Makefile2
-rw-r--r--misc/generated/sysgen/Makefile4
2 files changed, 4 insertions, 2 deletions
diff --git a/misc/generated/Makefile b/misc/generated/Makefile
index bad4661cc..47e693721 100644
--- a/misc/generated/Makefile
+++ b/misc/generated/Makefile
@@ -1,2 +1,2 @@
obj-y = configs.o
-obj-$(CONFIG_MICROKERNEL) += sysgen/
+obj-$(CONFIG_MDEF) += sysgen/
diff --git a/misc/generated/sysgen/Makefile b/misc/generated/sysgen/Makefile
index dbe983e12..c35883f38 100644
--- a/misc/generated/sysgen/Makefile
+++ b/misc/generated/sysgen/Makefile
@@ -1,4 +1,6 @@
-ccflags-y += -I$(srctree)/include/microkernel
+ifneq ($(CONFIG_KERNEL_V2),y)
+ccflags-$(CONFIG_MICROKERNEL) += -I$(srctree)/include/microkernel
+endif
ccflags-y += -I$(CURDIR)/misc/generated/sysgen
obj-y = kernel_main.o