From a0a6f7a375a315a10a8ed68710a2118b7e943263 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Tue, 15 Jan 2019 03:33:20 +0100 Subject: [PATCH] riscv: update config Signed-off-by: David Abdurachmanov --- configs/fedora/generic/riscv/CONFIG_DEFAULT_SECURITY_DAC | 1 - configs/fedora/generic/riscv/CONFIG_NETWORK_SECMARK | 1 - configs/fedora/generic/riscv/CONFIG_OF | 1 + kernel-riscv64-debug.config | 5 ++--- kernel-riscv64.config | 5 ++--- 5 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 configs/fedora/generic/riscv/CONFIG_DEFAULT_SECURITY_DAC delete mode 100644 configs/fedora/generic/riscv/CONFIG_NETWORK_SECMARK create mode 100644 configs/fedora/generic/riscv/CONFIG_OF diff --git a/configs/fedora/generic/riscv/CONFIG_DEFAULT_SECURITY_DAC b/configs/fedora/generic/riscv/CONFIG_DEFAULT_SECURITY_DAC deleted file mode 100644 index c415b5650..000000000 --- a/configs/fedora/generic/riscv/CONFIG_DEFAULT_SECURITY_DAC +++ /dev/null @@ -1 +0,0 @@ -CONFIG_DEFAULT_SECURITY_DAC=y diff --git a/configs/fedora/generic/riscv/CONFIG_NETWORK_SECMARK b/configs/fedora/generic/riscv/CONFIG_NETWORK_SECMARK deleted file mode 100644 index e120dcbf3..000000000 --- a/configs/fedora/generic/riscv/CONFIG_NETWORK_SECMARK +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_NETWORK_SECMARK is not set diff --git a/configs/fedora/generic/riscv/CONFIG_OF b/configs/fedora/generic/riscv/CONFIG_OF new file mode 100644 index 000000000..b7345dd59 --- /dev/null +++ b/configs/fedora/generic/riscv/CONFIG_OF @@ -0,0 +1 @@ +CONFIG_OF=y diff --git a/kernel-riscv64-debug.config b/kernel-riscv64-debug.config index 062fb02d7..aeab1eab7 100644 --- a/kernel-riscv64-debug.config +++ b/kernel-riscv64-debug.config @@ -982,7 +982,7 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFAULT_RENO is not set -CONFIG_DEFAULT_SECURITY_DAC=y +# CONFIG_DEFAULT_SECURITY_DAC is not set CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set CONFIG_DETECT_HUNG_TASK=y @@ -3277,7 +3277,6 @@ CONFIG_NET_VENDOR_XIRCOM=y CONFIG_NET_VRF=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NETWORK_PHY_TIMESTAMPING=y -# CONFIG_NETWORK_SECMARK is not set CONFIG_NETXEN_NIC=m CONFIG_NET=y CONFIG_NEW_LEDS=y @@ -3525,9 +3524,9 @@ CONFIG_OCFS2_FS_O2CB=m # CONFIG_OCFS2_FS_STATS is not set CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m CONFIG_OF_FPGA_REGION=m -# CONFIG_OF is not set # CONFIG_OF_OVERLAY is not set # CONFIG_OF_UNITTEST is not set +CONFIG_OF=y # CONFIG_OMFS_FS is not set CONFIG_OPENVSWITCH_GENEVE=m CONFIG_OPENVSWITCH_GRE=m diff --git a/kernel-riscv64.config b/kernel-riscv64.config index c5d5eda7f..22169275b 100644 --- a/kernel-riscv64.config +++ b/kernel-riscv64.config @@ -974,7 +974,7 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFAULT_RENO is not set -CONFIG_DEFAULT_SECURITY_DAC=y +# CONFIG_DEFAULT_SECURITY_DAC is not set CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set # CONFIG_DETECT_HUNG_TASK is not set @@ -3256,7 +3256,6 @@ CONFIG_NET_VENDOR_XIRCOM=y CONFIG_NET_VRF=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NETWORK_PHY_TIMESTAMPING=y -# CONFIG_NETWORK_SECMARK is not set CONFIG_NETXEN_NIC=m CONFIG_NET=y CONFIG_NEW_LEDS=y @@ -3504,9 +3503,9 @@ CONFIG_OCFS2_FS_O2CB=m # CONFIG_OCFS2_FS_STATS is not set CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m CONFIG_OF_FPGA_REGION=m -# CONFIG_OF is not set # CONFIG_OF_OVERLAY is not set # CONFIG_OF_UNITTEST is not set +CONFIG_OF=y # CONFIG_OMFS_FS is not set CONFIG_OPENVSWITCH_GENEVE=m CONFIG_OPENVSWITCH_GRE=m