use -include option instead of including menuconfig manually

Change-Id: Ie48b96fe9c8ab036d7234b56a169d6668171a895

.gitignore

@@ -1,23 +1,27 @@
-/out
-/test
-/include
-.config*
-cscope*
-tags
-.vscode
+# General ignored file types
 *.o
-.idea
-*.img
+*.a
+*.so
 *.swp
 *.rej
 *.orig
-*.a
-*.so
-.config.cmd
+
+# IDE settings
+.vscode
+.idea
 .settings
 .cproject
 .project
-platform/include/menuconfig.h
-platform/board.ld
-apps/init/init
-apps/shell/shell
+
+# VIM files
+cscope*
+tags
+
+# Menuconfig temp files
+/include/config
+/include/generated
+.config*
+
+# Build temp files
+/platform/board.ld
+/out

Makefile

@@ -49,7 +49,6 @@ LITEOS_TARGET = liteos
 LITEOS_LIBS_TARGET = libs_target
 LITEOS_MENUCONFIG_H = $(LITEOSTOPDIR)/include/generated/autoconf.h
 LITEOS_PLATFORM_BASE = $(LITEOSTOPDIR)/platform
-LITEOS_PLATFORM_MENUCONFIG_H = $(LITEOS_PLATFORM_BASE)/include/menuconfig.h
 
 export CONFIG_=LOSCFG_
 MENUCONFIG_PATH = $(LITEOSTOPDIR)/tools/menuconfig
@@ -124,7 +123,7 @@ $(__LIBS): $(OUT) $(CXX_INCLUDE)
 $(OUT): $(LITEOS_MENUCONFIG_H)
 	$(HIDE)mkdir -p $(OUT)/lib
 	$(HIDE)$(CC) -I$(LITEOSTOPDIR)/kernel/base/include -I$(LITEOSTOPDIR)/../../$(LOSCFG_BOARD_CONFIG_PATH) \
-		-I$(LITEOS_PLATFORM_BASE)/include -E $(LITEOS_PLATFORM_BASE)/board.ld.S \
+		-I$(LITEOS_PLATFORM_BASE)/include -imacros $< -E $(LITEOS_PLATFORM_BASE)/board.ld.S \
 		-o $(LITEOS_PLATFORM_BASE)/board.ld -P
 
 $(BUILD):
@@ -141,14 +140,13 @@ menuconfig:$(MENUCONFIG_MCONF)
 	$< $(KCONFIG_FILE_PATH)
 
 genconfig:$(MENUCONFIG_CONF)
-	$(HIDE)mkdir -p include/config include/generated platform/include
+	$(HIDE)mkdir -p include/config include/generated
 	$< --olddefconfig $(KCONFIG_FILE_PATH)
 	$< --silentoldconfig $(KCONFIG_FILE_PATH)
-	-mv -f $(LITEOS_MENUCONFIG_H) $(LITEOS_PLATFORM_MENUCONFIG_H)
 ##### menuconfig end #######
 
 $(LITEOS_MENUCONFIG_H):
-ifneq ($(LITEOS_PLATFORM_MENUCONFIG_H), $(wildcard $(LITEOS_PLATFORM_MENUCONFIG_H)))
+ifneq ($(LITEOS_MENUCONFIG_H), $(wildcard $(LITEOS_MENUCONFIG_H)))
 	$(HIDE)$(MAKE) genconfig
 endif
 $(LITEOS_TARGET): $(__LIBS)
@@ -197,16 +195,13 @@ clean:
 	done
 	$(HIDE)$(MAKE) -C apps clean
 	$(HIDE)$(RM) $(__OBJS) $(LITEOS_TARGET) $(BUILD) $(LITEOS_MENUCONFIG_H) *.bak *~
-	$(HIDE)$(RM) $(LITEOS_PLATFORM_MENUCONFIG_H)
-	$(HIDE)$(RM) include
+	$(HIDE)$(RM) include/config include/generated
 	$(HIDE)$(MAKE) cleanrootfs
 	$(HIDE)echo "clean $(LITEOS_PLATFORM) finish"
 
-cleanall:
-	$(HIDE)$(RM) $(LITEOSTOPDIR)/out
-	$(HIDE)find $(LITEOS_PLATFORM_BASE)/ -name board.ld -exec rm -rf {} \;
-	$(HIDE)cd sample/sample_osdrv;make clean;cd ../..;
-	$(HIDE)echo "clean all"
+cleanall: clean
+	$(HIDE)$(RM) $(LITEOSTOPDIR)/out $(LITEOS_PLATFORM_BASE)/board.ld
+	$(HIDE)echo "clean all done"
 
 cleanrootfs:
 	$(HIDE)$(RM) $(OUT)/rootfs

arch/arm/arm/include/arch_config.h

@@ -32,7 +32,6 @@
 #ifndef _ARCH_CONFIG_H
 #define _ARCH_CONFIG_H
 
-#include "menuconfig.h"
 
 #define CPSR_INT_DISABLE         0xC0 /* Disable both FIQ and IRQ */
 #define CPSR_IRQ_DISABLE         0x80 /* IRQ disabled when =1 */

arch/arm/arm/include/los_tlb_v6.h

@@ -37,7 +37,6 @@
 #define __LOS_TLB_V6_H__
 
 #include "los_typedef.h"
-#include "menuconfig.h"
 #include "arm.h"
 
 #ifdef __cplusplus

fs/zpfs/vfs_zpfs.h

@@ -37,7 +37,6 @@
 #include "compiler.h"
 #include "los_base.h"
 #include "los_typedef.h"
-#include "menuconfig.h"
 
 #ifdef LOSCFG_FS_ZPFS
 

kernel/base/vm/los_vm_scan.c

@@ -29,7 +29,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "menuconfig.h"
 #ifdef LOSCFG_FS_VFS
 
 #include "fs/file.h"

kernel/common/patchfs/los_partition_utils.h

@@ -31,7 +31,6 @@
 #ifndef _LOS_PARTITION_UTILS_H
 #define _LOS_PARTITION_UTILS_H
 
-#include "menuconfig.h"
 #include "los_typedef.h"
 #include "los_base.h"
 

kernel/common/sys_config.h

@@ -32,7 +32,6 @@
 #ifndef _SYS_CONFIG_H
 #define _SYS_CONFIG_H
 
-#include "menuconfig.h"
 
 #ifdef __cplusplus
 #if __cplusplus

net/lwip-2.1/porting/include/lwip/lwipopts.h

@@ -32,7 +32,6 @@
 #ifndef _LWIP_PORTING_LWIPOPTS_H_
 #define _LWIP_PORTING_LWIPOPTS_H_
 
-#include "menuconfig.h"
 
 // lwIP debug options, comment the ones you don't want
 #if LWIP_DEBUG

syscall/fs_syscall.c

@@ -29,7 +29,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "menuconfig.h"
 #ifdef LOSCFG_FS_VFS
 #include "errno.h"
 #include "unistd.h"

syscall/los_syscall.c

@@ -30,7 +30,6 @@
  */
 
 #define _GNU_SOURCE
-#include "menuconfig.h"
 #ifdef LOSCFG_FS_VFS
 #include "fs/fs.h"
 #include "fs/file.h"

tools/build/mk/los_config.mk

@@ -119,6 +119,7 @@ CXX_PATH  = $(LITEOSTOPDIR)/lib/cxxstl
 JFFS_PATH  = $(LITEOSTOPDIR)/fs/jffs2
 LITEOS_SCRIPTPATH ?= $(LITEOSTOPDIR)/tools/scripts
 LITEOS_LIB_BIGODIR  = $(OUT)/lib/obj
+LITEOS_MENUCONFIG_H = $(LITEOSTOPDIR)/include/generated/autoconf.h
 LOSCFG_ENTRY_SRC    = $(LITEOSTOPDIR)/kernel/common/los_config.c
 
 ### include variable
@@ -670,6 +671,9 @@ LITEOS_COPTS_EXTRA_INTERWORK := $(LITEOS_COPTS_EXTRA)
 #-fno-inline
 endif
 
+# kernel configuration macros
+LITEOS_CMACRO     += -imacros $(LITEOS_MENUCONFIG_H)
+
 ifneq ($(LOSCFG_COMPILER_CLANG_LLVM), y)
 LITEOS_LD_OPTS += -nostartfiles
 endif