Remove nodes naming when using sysgen

Change-Id: I8914c25ad18d3c294f398f98efca04c3ac371f44
Signed-off-by: Anas Nashif <anas.nashif@intel.com>

Makefile

@@ -382,7 +382,7 @@ CFLAGS_GCOV	= -fprofile-arcs -ftest-coverage
 # Use USERINCLUDE when you must reference the UAPI directories only.
 USERINCLUDE    := -include $(CURDIR)/include/generated/autoconf.h
 PROJECTINCLUDE := $(strip -I$(srctree)/include/microkernel \
-		-I$(CURDIR)/misc/generated/nodes) \
+		-I$(CURDIR)/misc/generated/sysgen) \
 		$(USERINCLUDE)
 
 # Use TIMOINCLUDE when you must reference the include/ directory.
@@ -942,7 +942,7 @@ archprepare_common = $(strip \
 		include/generated/offsets.h \
 		)
 
-archprepare_microkernel-y = misc/generated/nodes/microkernel_objects.h
+archprepare_microkernel-y = misc/generated/sysgen/kernel_main.c
 
 archprepare_prereq = $(strip \
 		$(archprepare_common) \
@@ -1066,10 +1066,9 @@ kselftest:
 # Directories & files removed with 'make clean'
 CLEAN_DIRS  += $(MODVERDIR)
 
-CLEAN_FILES += misc/generated/nodes/kernel_main.c \
-		misc/generated/nodes/microkernel_objects.h \
-		misc/generated/nodes/vxmicro.h \
-		misc/generated/nodes/prj.vpf
+CLEAN_FILES += 	misc/generated/sysgen/kernel_main.c \
+		misc/generated/sysgen/vxmicro.h \
+		misc/generated/sysgen/prj.vpf
 
 # Directories & files removed with 'make mrproper'
 MRPROPER_DIRS  += include/config usr/include include/generated          \

misc/generated/Makefile

@@ -1,2 +1,2 @@
 obj-y = configs.o
-obj-$(SYSGEN_EXEC) += nodes/
+obj-$(SYSGEN_EXEC) += sysgen/

misc/generated/sysgen/Makefile

@@ -1,4 +1,4 @@
 EXTRA_CFLAGS += -I$(srctree)/include/microkernel
-EXTRA_CFLAGS += -I$(CURDIR)/misc/generated/nodes
+EXTRA_CFLAGS += -I$(CURDIR)/misc/generated/sysgen
 
 obj-y = kernel_main.o

samples/microkernel/benchmark/app_kernel/src/Makefile

@@ -1,4 +1,4 @@
-EXTRA_CFLAGS += -I$(CURDIR)/misc/generated/nodes
+EXTRA_CFLAGS += -I$(CURDIR)/misc/generated/sysgen
 EXTRA_CFLAGS += -I$(CURDIR)/../../latency_measure/src
 
 obj-y := fifo_b.o mailbox_b.o master.o mempool_b.o \

samples/microkernel/benchmark/boot_time/src/Makefile

@@ -1,4 +1,4 @@
-EXTRA_CFLAGS += -I$(CURDIR)/misc/generated/nodes
+EXTRA_CFLAGS += -I$(CURDIR)/misc/generated/sysgen
 EXTRA_CFLAGS += -I$(srctree)/samples/include
 
 obj-y=boot_time.o

samples/microkernel/benchmark/latency_measure/src/Makefile

@@ -1,4 +1,4 @@
-EXTRA_CFLAGS += -I$(CURDIR)/misc/generated/nodes
+EXTRA_CFLAGS += -I$(CURDIR)/misc/generated/sysgen
 EXTRA_CFLAGS += -I$(srctree)/samples/include
 
 obj-y = main.o \

samples/nanokernel/benchmark/sys_kernel/src/Makefile

@@ -1,5 +1,5 @@
 EXTRA_CFLAGS = -I$(srctree)/samples/microkernel/benchmark/latency_measure/src
-EXTRA_CFLAGS += -I$(CURDIR)/misc/generated/nodes
+EXTRA_CFLAGS += -I$(CURDIR)/misc/generated/sysgen
 
 obj-y = lifo.o \
 	mwfifo.o \

scripts/Makefile.preparch

@@ -33,13 +33,13 @@ define filechk_prj.vpf
 endef
 
 #Specific source code generation for Viper
-misc/generated/nodes/prj.vpf:	$(srctree)/config/$(CONFIG_BSP_DIR)/ukernel/config1p.vpf \
+misc/generated/sysgen/prj.vpf:	$(srctree)/config/$(CONFIG_BSP_DIR)/ukernel/config1p.vpf \
 				$(PROJECT_BASE)/$(VPFILE) \
 				include/config/auto.conf FORCE
 	$(call filechk,prj.vpf)
 
-misc/generated/nodes/microkernel_objects.h: misc/generated/nodes/prj.vpf FORCE
-	$(Q)$(srctree)/scripts/sysgen.py $(CURDIR)/misc/generated/nodes/prj.vpf $(CURDIR)/misc/generated/nodes/
+misc/generated/sysgen/kernel_main.c: misc/generated/sysgen/prj.vpf FORCE
+	$(Q)$(srctree)/scripts/sysgen.py $(CURDIR)/misc/generated/sysgen/prj.vpf $(CURDIR)/misc/generated/sysgen/
 
 define filechk_configs.c
 	(echo "/* file is auto-generated, do not modify ! */"; \