aboutsummaryrefslogtreecommitdiffstats
path: root/Config.mk
diff options
context:
space:
mode:
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>2007-08-31 12:05:07 +0100
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>2007-08-31 12:05:07 +0100
commit61c6564d34361efda2d134145f3ce39796b23ed1 (patch)
tree4d6f5196f90c41ce349193d09c99a2e3a48177da /Config.mk
parent670a6002b949ebb60f7cb3e5d950e163d9314859 (diff)
downloadxen-61c6564d34361efda2d134145f3ce39796b23ed1.tar.gz
xen-61c6564d34361efda2d134145f3ce39796b23ed1.tar.bz2
xen-61c6564d34361efda2d134145f3ce39796b23ed1.zip
Cleanups after XSM checkin.
Signed-off-by: Keir Fraser <keir@xensource.com> --HG-- rename : xen/include/public/acm.h => xen/include/public/xsm/acm.h rename : xen/include/public/acm_ops.h => xen/include/public/xsm/acm_ops.h rename : xen/include/acm/acm_core.h => xen/include/xsm/acm/acm_core.h rename : xen/include/acm/acm_endian.h => xen/include/xsm/acm/acm_endian.h rename : xen/include/acm/acm_hooks.h => xen/include/xsm/acm/acm_hooks.h
Diffstat (limited to 'Config.mk')
-rw-r--r--Config.mk12
1 files changed, 1 insertions, 11 deletions
diff --git a/Config.mk b/Config.mk
index 52cad41db3..909e21787e 100644
--- a/Config.mk
+++ b/Config.mk
@@ -79,19 +79,9 @@ LDFLAGS += $(foreach i, $(EXTRA_LIB), -L$(i))
CFLAGS += $(foreach i, $(EXTRA_INCLUDES), -I$(i))
# Enable XSM security module. Enabling XSM requires selection of an
-# XSM security module.
+# XSM security module (FLASK_ENABLE or ACM_SECURITY).
XSM_ENABLE ?= n
-ifeq ($(XSM_ENABLE),y)
FLASK_ENABLE ?= n
-ifeq ($(FLASK_ENABLE),y)
-FLASK_DEVELOP ?= y
-FLASK_BOOTPARAM ?= y
-FLASK_AVC_STATS ?= y
-endif
-endif
-
-# If ACM_SECURITY = y, then the access control module is compiled
-# into Xen and the policy type can be set by the boot policy file
ACM_SECURITY ?= n
# Optional components