yystopf
/
openharmony_kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!263 fix(build): 去除冗余单板相关的宏配置 

Merge pull request !263 from SimonLi/fix-redundant-macro
This commit is contained in:
openharmony_ci 2021-06-09 14:02:52 +08:00 committed by Gitee
parent 3bf8cbc728 471de3663e
commit 8c5b358bb1
8 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Kconfig
View File

@ -42,11 +42,9 @@ choice
config COMPILER_HIMIX_32 config COMPILER_HIMIX_32
bool "arm-linux-ohoseabi" bool "arm-linux-ohoseabi"
depends on PLATFORM_HI3518EV300 || PLATFORM_HI3516DV300 || PLATFORM_QEMU_ARM_VIRT_CA7
config COMPILER_CLANG_LLVM config COMPILER_CLANG_LLVM
bool "clang-llvm" bool "clang-llvm"
depends on PLATFORM_HI3518EV300 || PLATFORM_HI3516DV300 || PLATFORM_QEMU_ARM_VIRT_CA7
endchoice endchoice
endmenu endmenu
@ -282,13 +280,6 @@ config VM_OVERLAP_CHECK
help help
Answer Y to enable vm overlap check. Answer Y to enable vm overlap check.
config NULL_ADDRESS_PROTECT
bool "Enable NULL Address protect"
default n
depends on (PLATFORM_HI3518EV200 || PLATFORM_HI3516CV300 || PLATFORM_HI3518EV300 || PLATFORM_HI3516DV300 || PLATFORM_QEMU_ARM_VIRT_CA7) && DEBUG_VERSION
help
Answer Y to set mem address 0~1M prohibit to access, read or write will trigger exception.
endmenu endmenu
######################## config options os drivers ######################## ######################## config options os drivers ########################

1
tools/build/config/debug/hispark_aries.config
View File

@ -12,7 +12,6 @@ LOSCFG_DEBUG_VERSION=y
LOSCFG_SHELL_DMESG=y LOSCFG_SHELL_DMESG=y
LOSCFG_USER_INIT_DEBUG=y LOSCFG_USER_INIT_DEBUG=y
LOSCFG_SHELL_CMD_DEBUG=y LOSCFG_SHELL_CMD_DEBUG=y
LOSCFG_NULL_ADDRESS_PROTECT=y
LOSCFG_DRIVERS_USB_HOST_XHCI=y LOSCFG_DRIVERS_USB_HOST_XHCI=y
LOSCFG_DRIVERS_USB_ETHERNET=y LOSCFG_DRIVERS_USB_ETHERNET=y
LOSCFG_DRIVERS_USB_WIRELESS=y LOSCFG_DRIVERS_USB_WIRELESS=y

1
tools/build/config/debug/hispark_aries_clang.config
View File

@ -11,7 +11,6 @@ LOSCFG_DEBUG_VERSION=y
LOSCFG_SHELL_DMESG=y LOSCFG_SHELL_DMESG=y
LOSCFG_USER_INIT_DEBUG=y LOSCFG_USER_INIT_DEBUG=y
LOSCFG_SHELL_CMD_DEBUG=y LOSCFG_SHELL_CMD_DEBUG=y
LOSCFG_NULL_ADDRESS_PROTECT=y
LOSCFG_DRIVERS_USB_HOST_XHCI=y LOSCFG_DRIVERS_USB_HOST_XHCI=y
LOSCFG_DRIVERS_USB_ETHERNET=y LOSCFG_DRIVERS_USB_ETHERNET=y
LOSCFG_DRIVERS_USB_WIRELESS=y LOSCFG_DRIVERS_USB_WIRELESS=y

1
tools/build/config/debug/ipcamera_hi3518ev300_liteos.config
View File

@ -12,7 +12,6 @@ LOSCFG_DEBUG_VERSION=y
LOSCFG_SHELL_DMESG=y LOSCFG_SHELL_DMESG=y
LOSCFG_USER_INIT_DEBUG=y LOSCFG_USER_INIT_DEBUG=y
LOSCFG_SHELL_CMD_DEBUG=y LOSCFG_SHELL_CMD_DEBUG=y
LOSCFG_NULL_ADDRESS_PROTECT=y
LOSCFG_DRIVERS_USB_HOST_XHCI=y LOSCFG_DRIVERS_USB_HOST_XHCI=y
LOSCFG_DRIVERS_USB_ETHERNET=y LOSCFG_DRIVERS_USB_ETHERNET=y
LOSCFG_DRIVERS_USB_WIRELESS=y LOSCFG_DRIVERS_USB_WIRELESS=y

1
tools/build/config/debug/ipcamera_hi3518ev300_liteos_clang.config
View File

@ -10,7 +10,6 @@ LOSCFG_DEBUG_VERSION=y
LOSCFG_SHELL_DMESG=y LOSCFG_SHELL_DMESG=y
LOSCFG_USER_INIT_DEBUG=y LOSCFG_USER_INIT_DEBUG=y
LOSCFG_SHELL_CMD_DEBUG=y LOSCFG_SHELL_CMD_DEBUG=y
LOSCFG_NULL_ADDRESS_PROTECT=y
LOSCFG_DRIVERS_USB_HOST_XHCI=y LOSCFG_DRIVERS_USB_HOST_XHCI=y
LOSCFG_DRIVERS_USB_ETHERNET=y LOSCFG_DRIVERS_USB_ETHERNET=y
LOSCFG_DRIVERS_USB_WIRELESS=y LOSCFG_DRIVERS_USB_WIRELESS=y

1
tools/build/config/hispark_aries_debug_shell.config
View File

@ -12,7 +12,6 @@ LOSCFG_DEBUG_VERSION=y
LOSCFG_SHELL_DMESG=y LOSCFG_SHELL_DMESG=y
LOSCFG_USER_INIT_DEBUG=y LOSCFG_USER_INIT_DEBUG=y
LOSCFG_SHELL_CMD_DEBUG=y LOSCFG_SHELL_CMD_DEBUG=y
LOSCFG_NULL_ADDRESS_PROTECT=y
LOSCFG_DRIVERS_USB_HOST_XHCI=y LOSCFG_DRIVERS_USB_HOST_XHCI=y
LOSCFG_DRIVERS_USB_ETHERNET=y LOSCFG_DRIVERS_USB_ETHERNET=y
LOSCFG_DRIVERS_USB_WIRELESS=y LOSCFG_DRIVERS_USB_WIRELESS=y

1
tools/build/config/ipcamera_hi3518ev300_liteos_debug_shell.config
View File

@ -12,7 +12,6 @@ LOSCFG_DEBUG_VERSION=y
LOSCFG_SHELL_DMESG=y LOSCFG_SHELL_DMESG=y
LOSCFG_USER_INIT_DEBUG=y LOSCFG_USER_INIT_DEBUG=y
LOSCFG_SHELL_CMD_DEBUG=y LOSCFG_SHELL_CMD_DEBUG=y
LOSCFG_NULL_ADDRESS_PROTECT=y
LOSCFG_DRIVERS_USB_HOST_XHCI=y LOSCFG_DRIVERS_USB_HOST_XHCI=y
LOSCFG_DRIVERS_USB_ETHERNET=y LOSCFG_DRIVERS_USB_ETHERNET=y
LOSCFG_DRIVERS_USB_WIRELESS=y LOSCFG_DRIVERS_USB_WIRELESS=y

4
tools/build/mk/los_config.mk
View File

@ -492,10 +492,6 @@ ifeq ($(LOSCFG_3RDPARTY), y)
-include $(LITEOSTOPDIR)/3rdParty/3rdParty.mk -include $(LITEOSTOPDIR)/3rdParty/3rdParty.mk
endif endif
ifeq ($(LOSCFG_NULL_ADDRESS_PROTECT), y)
LITEOS_CMACRO += -DLOSCFG_NULL_ADDRESS_PROTECT
endif
ifeq ($(LOSCFG_KERNEL_SYSCALL), y) ifeq ($(LOSCFG_KERNEL_SYSCALL), y)
LITEOS_BASELIB += -lsyscall LITEOS_BASELIB += -lsyscall
LIB_SUBDIRS += syscall LIB_SUBDIRS += syscall