Revert "Build: Split kernel files for maintaining (#291)" (#293)

This reverts commit 615daddbf6.

buildroot-external/kernel/hassos-4_14.config

@@ -1,3 +1,9 @@
+CONFIG_KERNEL_LZ4=y
+CONFIG_CMDLINE=""
+
+CONFIG_ZRAM=y
+CONFIG_ZSMALLOC=y
+
 CONFIG_POSIX_MQUEUE=y
 CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_CFS_BANDWIDTH=y
@@ -6,7 +12,6 @@ CONFIG_RT_GROUP_SCHED=y
 CONFIG_NET_SCHED=y
 
 CONFIG_CGROUPS=y
-CONFIG_HUGETLB_PAGE=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_CGROUP_SCHED=y
@@ -16,7 +21,6 @@ CONFIG_CGROUP_HUGETLB=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_HUGETLB=y
 CONFIG_NET_CLS_CGROUP=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_BPF=y
@@ -32,15 +36,19 @@ CONFIG_IPC_NS=y
 CONFIG_UTS_NS=y
 
 CONFIG_NETDEVICES=y
-CONFIG_DUMMY=m
-CONFIG_MACVLAN=m
-CONFIG_IPVLAN=m
-CONFIG_VXLAN=m
+CONFIG_DUMMY=y
+CONFIG_MACVLAN=y
+CONFIG_IPVLAN=y
+CONFIG_VXLAN=y
+
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
 
 CONFIG_INET=y
 CONFIG_IPV6=y
-CONFIG_INET_ESP=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_ESP=y
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_NETCONSOLE=y
 CONFIG_VETH=y
 CONFIG_NETFILTER=y
@@ -48,6 +56,8 @@ CONFIG_NF_CONNTRACK=y
 CONFIG_NF_NAT=y
 CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_CONNTRACK_IPV4=y
+CONFIG_NF_CONNTRACK_FTP=y
+CONFIG_NF_CONNTRACK_TFTP=y
 CONFIG_NETFILTER_ADVANCED=y
 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
@@ -59,21 +69,40 @@ CONFIG_IP_NF_IPTABLES=y
 CONFIG_IP_NF_FILTER=y
 CONFIG_IP_NF_NAT=y
 CONFIG_IP_NF_TARGET_MASQUERADE=y
-CONFIG_IP_NF_TARGET_REDIRECT=y
 CONFIG_BRIDGE=y
 CONFIG_BRIDGE_NETFILTER=y
-CONFIG_XFRM=m
-CONFIG_XFRM_USER=m
-CONFIG_XFRM_ALGO=m
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+CONFIG_XFRM_ALGO=y
 CONFIG_NET_L3_MASTER_DEV=y
 
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_BLOCK=y
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_OVERLAY_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_LZ4=y
 
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_ARC4=m
+# CONFIG_SECCOMP is not set
+CONFIG_SECURITY=y
+CONFIG_SECURITY_APPARMOR=y
+CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
+CONFIG_KEYS=y
 
+CONFIG_CRYPTO_CCM=y
+CONFIG_CRYPTO_GCM=y
+CONFIG_CRYPTO_CMAC=y
+CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_LZ4=y
+
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_EFI_PARTITION=y
+
+# CONFIG_LOGO is not set
+# CONFIG_VIRTUALIZATION is not set
+# CONFIG_DEBUG_STACK_USAGE is not set

buildroot-external/kernel/hassos.config

@@ -1,30 +0,0 @@
-CONFIG_KERNEL_LZ4=y
-CONFIG_CMDLINE=""
-
-CONFIG_ZRAM=y
-CONFIG_ZSMALLOC=y
-
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_BLOCK=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_SQUASHFS=y
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_LZ4=y
-
-# CONFIG_SECCOMP is not set
-CONFIG_AUDIT=y
-CONFIG_SECURITY=y
-CONFIG_SECURITY_APPARMOR=y
-
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_LZ4=y
-
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_EFI_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-
-# CONFIG_LOGO is not set
-# CONFIG_VIRTUALIZATION is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_BTRFS_FS is not set

buildroot-external/kernel/misc.config

@@ -1,4 +0,0 @@
-CONFIG_VLAN_8021Q=m
-CONFIG_VLAN_8021Q_GVRP=y
-CONFIG_VLAN_8021Q_MVRP=y
-