diff --git a/apps/module.mk b/apps/module.mk index e2d014d601074708d3ea31e12ef5daa9c9912042..b3df0fc21243f8c4b4c469b6fba9e2f3523d9c41 100644 --- a/apps/module.mk +++ b/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 diff --git a/arch/arm/arm/src/los_exc.c b/arch/arm/arm/src/los_exc.c index 06bbdb398c4d86a7dcca8ffc705327ee374eb1b1..5c1b10a732bc2fa23e523d7d93a51706aea0c5f5 100644 --- a/arch/arm/arm/src/los_exc.c +++ b/arch/arm/arm/src/los_exc.c @@ -1182,7 +1182,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) { diff --git a/fs/proc/os_adapt/kernel_trace_proc.c b/fs/proc/os_adapt/kernel_trace_proc.c index dbb7785308eda4aba5a583bac3cccd73e2651ff6..16445b811a265ba3e2e3482d43ce24878797664c 100644 --- a/fs/proc/os_adapt/kernel_trace_proc.c +++ b/fs/proc/os_adapt/kernel_trace_proc.c @@ -32,9 +32,9 @@ #include #include #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; diff --git a/kernel/base/core/los_task.c b/kernel/base/core/los_task.c index 0eadc9db63f39641b0397e2b9ebdc4b0243dd6aa..f7b3b1a9dca1064512f8264dc3f1b3df42fa3790 100644 --- a/kernel/base/core/los_task.c +++ b/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; diff --git a/kernel/base/include/los_task_pri.h b/kernel/base/include/los_task_pri.h index b19f74e875a9f31e412976fc1305fcbb1a7dec21..e2e33c02f0ba4541c919a0de60c581ecf24cdf9e 100644 --- a/kernel/base/include/los_task_pri.h +++ b/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 diff --git a/kernel/base/ipc/los_signal.c b/kernel/base/ipc/los_signal.c index 06fee68731ca440010d573798844a67c5e8b9967..5366e56e33c0fdefc43e5b89867d3de4f11b44b6 100644 --- a/kernel/base/ipc/los_signal.c +++ b/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); diff --git a/kernel/base/vm/los_vm_filemap.c b/kernel/base/vm/los_vm_filemap.c index 9a6ec2cecabf3b332ffd6d3debdc41eee743c2fd..c248d3de907b4e6877c2417aeffe8924ff753d08 100644 --- a/kernel/base/vm/los_vm_filemap.c +++ b/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 diff --git a/syscall/los_syscall.h b/syscall/los_syscall.h index 14995d43ee515519f1672c13a14d399bf4072f5a..37429b88a3cdc52db139a72edb27f2e7b47bf956 100644 --- a/syscall/los_syscall.h +++ b/syscall/los_syscall.h @@ -62,7 +62,9 @@ #endif #include #include "sys/resource.h" +#ifdef LOSCFG_FS_VFS #include "vnode.h" +#endif /* process */ extern unsigned int SysGetGroupId(void); diff --git a/tools/build/config/qemu_arm_virt_mini.config b/tools/build/config/debug/mini_qemu_liteos_a_clang.config similarity index 94% rename from tools/build/config/qemu_arm_virt_mini.config rename to tools/build/config/debug/mini_qemu_liteos_a_clang.config index 1300f151bd9a99c0b2381f053e07f3394a3545ea..6670fbb179facf723aaea4923576a77c42175269 100644 --- a/tools/build/config/qemu_arm_virt_mini.config +++ b/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 diff --git a/tools/build/config/mini_qemu_liteos_a_clang_release.config b/tools/build/config/mini_qemu_liteos_a_clang_release.config new file mode 100644 index 0000000000000000000000000000000000000000..6670fbb179facf723aaea4923576a77c42175269 --- /dev/null +++ b/tools/build/config/mini_qemu_liteos_a_clang_release.config @@ -0,0 +1,15 @@ +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 diff --git a/tools/build/mk/los_config.mk b/tools/build/mk/los_config.mk index ad304b7f002bb93444e861f33b8b08094e645c88..93f4e3b2ccfca349aad5ec182dca960809bedcef 100644 --- a/tools/build/mk/los_config.mk +++ b/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