diff --git a/Kconfig b/Kconfig index 9086736499ebf210671cbb1d700191ec8efbef09..8bce98607d0747d8992bae69abdeab6c2628441b 100644 --- a/Kconfig +++ b/Kconfig @@ -42,11 +42,9 @@ choice config COMPILER_HIMIX_32 bool "arm-linux-ohoseabi" - depends on PLATFORM_HI3518EV300 || PLATFORM_HI3516DV300 || PLATFORM_QEMU_ARM_VIRT_CA7 config COMPILER_CLANG_LLVM bool "clang-llvm" - depends on PLATFORM_HI3518EV300 || PLATFORM_HI3516DV300 || PLATFORM_QEMU_ARM_VIRT_CA7 endchoice endmenu @@ -282,13 +280,6 @@ config VM_OVERLAP_CHECK help 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 ######################## config options os drivers ######################## diff --git a/tools/build/config/debug/hispark_aries.config b/tools/build/config/debug/hispark_aries.config index 772b3f04d4eed15c0d311c4d15987eed84f96be3..132357898a4a4111574b87520b4d56202bfcc4f9 100644 --- a/tools/build/config/debug/hispark_aries.config +++ b/tools/build/config/debug/hispark_aries.config @@ -12,7 +12,6 @@ LOSCFG_DEBUG_VERSION=y LOSCFG_SHELL_DMESG=y LOSCFG_USER_INIT_DEBUG=y LOSCFG_SHELL_CMD_DEBUG=y -LOSCFG_NULL_ADDRESS_PROTECT=y LOSCFG_DRIVERS_USB_HOST_XHCI=y LOSCFG_DRIVERS_USB_ETHERNET=y LOSCFG_DRIVERS_USB_WIRELESS=y diff --git a/tools/build/config/debug/hispark_aries_clang.config b/tools/build/config/debug/hispark_aries_clang.config index ad900b693774565778f7d3392b26f0fb1531fbb5..f5e566fc94796affe182e23c0ee3e4f6d76de9c7 100644 --- a/tools/build/config/debug/hispark_aries_clang.config +++ b/tools/build/config/debug/hispark_aries_clang.config @@ -11,7 +11,6 @@ LOSCFG_DEBUG_VERSION=y LOSCFG_SHELL_DMESG=y LOSCFG_USER_INIT_DEBUG=y LOSCFG_SHELL_CMD_DEBUG=y -LOSCFG_NULL_ADDRESS_PROTECT=y LOSCFG_DRIVERS_USB_HOST_XHCI=y LOSCFG_DRIVERS_USB_ETHERNET=y LOSCFG_DRIVERS_USB_WIRELESS=y diff --git a/tools/build/config/debug/ipcamera_hi3518ev300_liteos.config b/tools/build/config/debug/ipcamera_hi3518ev300_liteos.config index 655891d1fdbedb12769796877d51f1240f639141..6402dc33798ff934d5abb4a1667536db2c535e74 100644 --- a/tools/build/config/debug/ipcamera_hi3518ev300_liteos.config +++ b/tools/build/config/debug/ipcamera_hi3518ev300_liteos.config @@ -12,7 +12,6 @@ LOSCFG_DEBUG_VERSION=y LOSCFG_SHELL_DMESG=y LOSCFG_USER_INIT_DEBUG=y LOSCFG_SHELL_CMD_DEBUG=y -LOSCFG_NULL_ADDRESS_PROTECT=y LOSCFG_DRIVERS_USB_HOST_XHCI=y LOSCFG_DRIVERS_USB_ETHERNET=y LOSCFG_DRIVERS_USB_WIRELESS=y diff --git a/tools/build/config/debug/ipcamera_hi3518ev300_liteos_clang.config b/tools/build/config/debug/ipcamera_hi3518ev300_liteos_clang.config index 5c9f45350bd1666032f8744e11da963611321c70..fb7eb2948fa8aab9fd24f789ff0efe1c87cda32b 100644 --- a/tools/build/config/debug/ipcamera_hi3518ev300_liteos_clang.config +++ b/tools/build/config/debug/ipcamera_hi3518ev300_liteos_clang.config @@ -10,7 +10,6 @@ LOSCFG_DEBUG_VERSION=y LOSCFG_SHELL_DMESG=y LOSCFG_USER_INIT_DEBUG=y LOSCFG_SHELL_CMD_DEBUG=y -LOSCFG_NULL_ADDRESS_PROTECT=y LOSCFG_DRIVERS_USB_HOST_XHCI=y LOSCFG_DRIVERS_USB_ETHERNET=y LOSCFG_DRIVERS_USB_WIRELESS=y diff --git a/tools/build/config/hispark_aries_debug_shell.config b/tools/build/config/hispark_aries_debug_shell.config index 772b3f04d4eed15c0d311c4d15987eed84f96be3..132357898a4a4111574b87520b4d56202bfcc4f9 100644 --- a/tools/build/config/hispark_aries_debug_shell.config +++ b/tools/build/config/hispark_aries_debug_shell.config @@ -12,7 +12,6 @@ LOSCFG_DEBUG_VERSION=y LOSCFG_SHELL_DMESG=y LOSCFG_USER_INIT_DEBUG=y LOSCFG_SHELL_CMD_DEBUG=y -LOSCFG_NULL_ADDRESS_PROTECT=y LOSCFG_DRIVERS_USB_HOST_XHCI=y LOSCFG_DRIVERS_USB_ETHERNET=y LOSCFG_DRIVERS_USB_WIRELESS=y diff --git a/tools/build/config/ipcamera_hi3518ev300_liteos_debug_shell.config b/tools/build/config/ipcamera_hi3518ev300_liteos_debug_shell.config index 6c0ea04f7df04033d3350259dee18f6988b2f3e2..b8c6883e9e9b2ae344e228f56f4d658af80274ff 100644 --- a/tools/build/config/ipcamera_hi3518ev300_liteos_debug_shell.config +++ b/tools/build/config/ipcamera_hi3518ev300_liteos_debug_shell.config @@ -12,7 +12,6 @@ LOSCFG_DEBUG_VERSION=y LOSCFG_SHELL_DMESG=y LOSCFG_USER_INIT_DEBUG=y LOSCFG_SHELL_CMD_DEBUG=y -LOSCFG_NULL_ADDRESS_PROTECT=y LOSCFG_DRIVERS_USB_HOST_XHCI=y LOSCFG_DRIVERS_USB_ETHERNET=y LOSCFG_DRIVERS_USB_WIRELESS=y diff --git a/tools/build/mk/los_config.mk b/tools/build/mk/los_config.mk index 563c73ba2a9f4e53e71bae8b229606fd7cc81162..5fc43ce784463f7b4cab6f588b12ff085d4b1bc8 100644 --- a/tools/build/mk/los_config.mk +++ b/tools/build/mk/los_config.mk @@ -492,10 +492,6 @@ ifeq ($(LOSCFG_3RDPARTY), y) -include $(LITEOSTOPDIR)/3rdParty/3rdParty.mk endif -ifeq ($(LOSCFG_NULL_ADDRESS_PROTECT), y) - LITEOS_CMACRO += -DLOSCFG_NULL_ADDRESS_PROTECT -endif - ifeq ($(LOSCFG_KERNEL_SYSCALL), y) LITEOS_BASELIB += -lsyscall LIB_SUBDIRS += syscall