!406 修正最小编译时的错误

Merge pull request !406 from Caoruihong/qemu_mini

apps/module.mk

@@ -45,6 +45,8 @@ endif
 
 #only enable for qemu now
 ifeq ($(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7), y)
+ifeq ($(LOSCFG_SHELL), y)
 APP_SUBDIRS += mksh
 APP_SUBDIRS += toybox
 endif
+endif

arch/arm/arm/src/los_exc.c

@@ -1168,7 +1168,7 @@ __attribute__((noinline)) VOID LOS_Panic(const CHAR *fmt, ...)
 }
 
 /* stack protector */
-UINT32 __stack_chk_guard = 0xd00a0dff;
+USED UINT32 __stack_chk_guard = 0xd00a0dff;
 
 VOID __stack_chk_fail(VOID)
 {

fs/proc/os_adapt/kernel_trace_proc.c

@@ -32,9 +32,9 @@
 #include <sys/statfs.h>
 #include <sys/mount.h>
 #include "proc_fs.h"
-#include "los_trace.h"
 
 #ifdef LOSCFG_KERNEL_TRACE
+#include "los_trace.h"
 static int KernelTraceProcFill(struct SeqBuf *m, void *v)
 {
     (void)v;

kernel/base/core/los_task.c

@@ -1413,6 +1413,7 @@ STATIC VOID OsExitGroupActiveTaskKilled(LosProcessCB *processCB, LosTaskCB *task
         LOS_MpSchedule(taskCB->currCpu);
     } else
 #endif
+#ifdef LOSCFG_KERNEL_VM
     {
         ret = OsTaskKillUnsafe(taskCB->taskID, SIGKILL);
         if (ret != LOS_OK) {
@@ -1420,6 +1421,7 @@ STATIC VOID OsExitGroupActiveTaskKilled(LosProcessCB *processCB, LosTaskCB *task
                       taskCB->processID, OsCurrTaskGet()->taskID, taskCB->taskID, ret);
         }
     }
+#endif
 
     if (!(taskCB->taskStatus & OS_TASK_FLAG_PTHREAD_JOIN)) {
         taskCB->taskStatus |= OS_TASK_FLAG_PTHREAD_JOIN;

kernel/base/include/los_task_pri.h

@@ -45,7 +45,9 @@
 #include "los_cpup_pri.h"
 #endif
 
+#ifdef LOSCFG_KERNEL_TRACE
 #include "los_trace.h"
+#endif
 
 #ifdef __cplusplus
 #if __cplusplus

kernel/base/ipc/los_signal.c

@@ -101,11 +101,13 @@ STATIC UINT32 OsPendingTaskWake(LosTaskCB *taskCB, INT32 signo)
         case OS_TASK_WAIT_SIGNAL:
             OsSigWaitTaskWake(taskCB, signo);
             break;
+#ifdef LOSCFG_KERNEL_LITEIPC
         case OS_TASK_WAIT_LITEIPC:
             taskCB->ipcStatus &= ~IPC_THREAD_STATUS_PEND;
             OsTaskWakeClearPendMask(taskCB);
             OsSchedTaskWake(taskCB);
             break;
+#endif
         case OS_TASK_WAIT_FUTEX:
             OsFutexNodeDeleteFromFutexHash(&taskCB->futex, TRUE, NULL, NULL);
             OsTaskWakeClearPendMask(taskCB);

kernel/base/vm/los_vm_filemap.c

@@ -41,7 +41,9 @@
 #include "los_vm_fault.h"
 #include "los_process_pri.h"
 #include "los_vm_lock.h"
+#ifdef LOSCFG_FS_VFS
 #include "vnode.h"
+#endif
 
 #ifndef UNUSED
 #define UNUSED(x)          (VOID)x

syscall/los_syscall.h

@@ -62,7 +62,9 @@
 #endif
 #include <sys/wait.h>
 #include "sys/resource.h"
+#ifdef LOSCFG_FS_VFS
 #include "vnode.h"
+#endif
 
 /* process */
 extern unsigned int SysGetGroupId(void);

tools/build/config/qemu_arm_virt_mini.config → tools/build/config/debug/mini_qemu_liteos_a_clang.config

@@ -2,6 +2,7 @@ LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7=y
 LOSCFG_BOARD_CONFIG_PATH="device/qemu/arm_virt/liteos_a/config/board"
 # LOSCFG_HRTIMER_ENABLE is not set
 # LOSCFG_IRQ_USE_STANDALONE_STACK is not set
+# LOSCFG_BLACKBOX is not set
 # LOSCFG_KERNEL_MMU is not set
 # LOSCFG_KERNEL_EXTKERNEL is not set
 # LOSCFG_BASE_CORE_HILOG is not set

tools/build/config/mini_qemu_liteos_a_clang_release.config

+LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7=y
+LOSCFG_BOARD_CONFIG_PATH="device/qemu/arm_virt/liteos_a/config/board"
+# LOSCFG_HRTIMER_ENABLE is not set
+# LOSCFG_IRQ_USE_STANDALONE_STACK is not set
+# LOSCFG_BLACKBOX is not set
+# LOSCFG_KERNEL_MMU is not set
+# LOSCFG_KERNEL_EXTKERNEL is not set
+# LOSCFG_BASE_CORE_HILOG is not set
+# LOSCFG_LIB_ZLIB is not set
+# LOSCFG_FS_VFS is not set
+# LOSCFG_NET_LWIP_SACK is not set
+# LOSCFG_PLATFORM_ADAPT is not set
+# LOSCFG_ENABLE_MAGICKEY is not set
+# LOSCFG_DRIVERS is not set
+# LOSCFG_SECURITY is not set

tools/build/mk/los_config.mk

@@ -198,9 +198,11 @@ ifeq ($(LOSCFG_KERNEL_VDSO), y)
     LITEOS_VDSO_INCLUDE   += -I $(LITEOSTOPDIR)/kernel/extended/vdso/include
 endif
 
+ifeq ($(LOSCFG_KERNEL_TRACE), y)
     LITEOS_BASELIB += -ltrace
     LIB_SUBDIRS       += kernel/extended/trace
     LITEOS_TRACE_INCLUDE   += -I $(LITEOSTOPDIR)/kernel/extended/trace
+endif
 
 ifeq ($(LOSCFG_KERNEL_LITEIPC), y)
     LITEOS_BASELIB     += -lliteipc