aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorPaul Spooren <mail@aparcar.org>2020-10-06 09:17:02 -1000
committerDaniel Golle <daniel@makrotopia.org>2020-10-09 01:48:47 +0100
commit32d7acc9c544bacdeccf6cf6ee260f8f8af7c31e (patch)
tree331667e43be3fcfd5acd02c245abe51de1768190 /target/linux
parentae12a747cae3df16d84b7dc92f39427948d4e8e2 (diff)
downloadupstream-32d7acc9c544bacdeccf6cf6ee260f8f8af7c31e.tar.gz
upstream-32d7acc9c544bacdeccf6cf6ee260f8f8af7c31e.tar.bz2
upstream-32d7acc9c544bacdeccf6cf6ee260f8f8af7c31e.zip
kernel: sort config-5.4 via kconfig.pl
The options were out of order which makes reviewing of changes harder. Sort it before applying an actual change. Signed-off-by: Paul Spooren <mail@aparcar.org>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic/config-5.451
1 files changed, 25 insertions, 26 deletions
diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4
index 1c28addff4..5938137bda 100644
--- a/target/linux/generic/config-5.4
+++ b/target/linux/generic/config-5.4
@@ -297,6 +297,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
# CONFIG_ARM64_CRYPTO is not set
# CONFIG_ARM64_ERRATUM_1024718 is not set
# CONFIG_ARM64_ERRATUM_1463225 is not set
+# CONFIG_ARM64_ERRATUM_1542419 is not set
# CONFIG_ARM64_ERRATUM_819472 is not set
# CONFIG_ARM64_ERRATUM_824069 is not set
# CONFIG_ARM64_ERRATUM_826319 is not set
@@ -306,7 +307,6 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
# CONFIG_ARM64_ERRATUM_843419 is not set
# CONFIG_ARM64_ERRATUM_845719 is not set
# CONFIG_ARM64_ERRATUM_858921 is not set
-# CONFIG_ARM64_ERRATUM_1542419 is not set
# CONFIG_ARM64_HW_AFDBM is not set
# CONFIG_ARM64_LSE_ATOMICS is not set
# CONFIG_ARM64_MODULE_PLTS is not set
@@ -1376,8 +1376,8 @@ CONFIG_DQL=y
# CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
-# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
+# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
# CONFIG_DRM_PANEL_TPO_TPG110 is not set
# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
# CONFIG_DRM_PANFROST is not set
@@ -1485,6 +1485,7 @@ CONFIG_EPOLL=y
CONFIG_ETHERNET=y
# CONFIG_ETHOC is not set
CONFIG_EVENTFD=y
+# CONFIG_EVM is not set
# CONFIG_EXFAT_FS is not set
CONFIG_EXPERT=y
CONFIG_EXPORTFS=y
@@ -1673,24 +1674,6 @@ CONFIG_FLAT_NODE_MEM_MAP=y
# CONFIG_FORCEDETH is not set
CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_FORTIFY_SOURCE=y
-# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set
-# CONFIG_SECURITY_SELINUX_DISABLE is not set
-# CONFIG_SECURITY_SELINUX_DEVELOP is not set
-# CONFIG_SECURITY_SELINUX_AVC_STATS is not set
-CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
-# CONFIG_SECURITY_SMACK is not set
-# CONFIG_SECURITY_TOMOYO is not set
-# CONFIG_SECURITY_APPARMOR is not set
-# CONFIG_SECURITY_LOADPIN is not set
-# CONFIG_SECURITY_YAMA is not set
-# CONFIG_SECURITY_SAFESETID is not set
-# CONFIG_SECURITY_LOCKDOWN_LSM is not set
-# CONFIG_INTEGRITY is not set
-# CONFIG_INTEGRITY_SIGNATURE is not set
-# CONFIG_INTEGRITY_AUDIT is not set
-# CONFIG_IMA is not set
-# CONFIG_EVM is not set
-# CONFIG_LSM is not set
# CONFIG_FPGA is not set
# CONFIG_FRAMEBUFFER_CONSOLE is not set
# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
@@ -2020,8 +2003,8 @@ CONFIG_HPET_MMAP_DEFAULT=y
# CONFIG_HTC_PASIC3 is not set
# CONFIG_HTS221 is not set
# CONFIG_HTU21 is not set
-# CONFIG_HUGETLB_PAGE is not set
# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
# CONFIG_HVC_DCC is not set
# CONFIG_HVC_UDBG is not set
# CONFIG_HWLAT_TRACER is not set
@@ -2204,6 +2187,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
# CONFIG_IKCONFIG is not set
# CONFIG_IKCONFIG_PROC is not set
# CONFIG_IKHEADERS is not set
+# CONFIG_IMA is not set
# CONFIG_IMAGE_CMDLINE_HACK is not set
# CONFIG_IMGPDC_WDT is not set
# CONFIG_IMG_MDC_DMA is not set
@@ -2336,6 +2320,9 @@ CONFIG_INPUT_MISC=y
# CONFIG_INPUT_WISTRON_BTNS is not set
# CONFIG_INPUT_YEALINK is not set
# CONFIG_INT340X_THERMAL is not set
+# CONFIG_INTEGRITY is not set
+# CONFIG_INTEGRITY_AUDIT is not set
+# CONFIG_INTEGRITY_SIGNATURE is not set
# CONFIG_INTEL_ATOMISP2_PM is not set
# CONFIG_INTEL_CHT_INT33FE is not set
# CONFIG_INTEL_HID_EVENT is not set
@@ -2759,6 +2746,7 @@ CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
# CONFIG_LP_CONSOLE is not set
# CONFIG_LSI_ET1011C_PHY is not set
CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity"
+CONFIG_LSM_MMAP_MIN_ADDR=65536
# CONFIG_LTC1660 is not set
# CONFIG_LTC2471 is not set
# CONFIG_LTC2485 is not set
@@ -2998,8 +2986,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MICROSEMI_PHY is not set
# CONFIG_MIGRATION is not set
CONFIG_MII=y
-# CONFIG_MIKROTIK_RB532 is not set
# CONFIG_MIKROTIK is not set
+# CONFIG_MIKROTIK_RB532 is not set
# CONFIG_MINIX_FS is not set
# CONFIG_MINIX_FS_NATIVE_ENDIAN is not set
# CONFIG_MINIX_SUBPARTITION is not set
@@ -3385,19 +3373,19 @@ CONFIG_NETDEVICES=y
# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
# CONFIG_NETFILTER_XT_TARGET_REDIRECT is not set
+# CONFIG_NETFILTER_XT_TARGET_SECMARK is not set
# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
# CONFIG_NETFILTER_XT_TARGET_TEE is not set
# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
-# CONFIG_NETFILTER_XT_TARGET_SECMARK is not set
# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETLABEL is not set
# CONFIG_NETLINK_DIAG is not set
# CONFIG_NETLINK_MMAP is not set
# CONFIG_NETPOLL is not set
# CONFIG_NETROM is not set
CONFIG_NETWORK_FILESYSTEMS=y
# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-# CONFIG_NETLABEL is not set
# CONFIG_NETWORK_SECMARK is not set
# CONFIG_NETXEN_NIC is not set
# CONFIG_NET_9P is not set
@@ -4595,9 +4583,20 @@ CONFIG_SCSI_PROC_FS=y
CONFIG_SECTION_MISMATCH_WARN_ONLY=y
# CONFIG_SECURITY is not set
# CONFIG_SECURITYFS is not set
-# CONFIG_SECURITY_PATH is not set
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+# CONFIG_SECURITY_APPARMOR is not set
CONFIG_SECURITY_DMESG_RESTRICT=y
+# CONFIG_SECURITY_LOADPIN is not set
+# CONFIG_SECURITY_LOCKDOWN_LSM is not set
+# CONFIG_SECURITY_PATH is not set
+# CONFIG_SECURITY_SAFESETID is not set
+# CONFIG_SECURITY_SELINUX_AVC_STATS is not set
+# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEVELOP is not set
+# CONFIG_SECURITY_SELINUX_DISABLE is not set
+# CONFIG_SECURITY_SMACK is not set
+# CONFIG_SECURITY_TOMOYO is not set
+# CONFIG_SECURITY_YAMA is not set
CONFIG_SELECT_MEMORY_MODEL=y
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSORS_ABITUGURU is not set