summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Barker <pbarker@toganlabs.com>2018-04-16 16:22:47 +0000
committerPaul Barker <pbarker@toganlabs.com>2018-04-20 17:40:24 +0000
commitac0ace1c8916d295d78aa660f15408f3446ba9cd (patch)
treef13cd2329ab6ca5c90d9d3a1f7f2f45dfdf2e63f
parentf10e0fcdf3bfd1c74150669bf50d3d16f64d73f0 (diff)
downloadmeta-raspberrypi-ac0ace1c8916d295d78aa660f15408f3446ba9cd.tar.gz
linux-raspberrypi: Drop unnecessary configurations
KERNEL_ENABLE_CGROUPS: This is obsolete, all required config options for cgroups are enabled by default. KERNEL_INITRAMFS: Some of the config options we set are already enabled by default. UDEV_GE_141: This is long obsolete and all the required config options are already set in the defconfig. ARM_KEEP_OABI: AEABI=y and OABI_COMPAT=n are already set in the defconfig. CONFIG_LOCALVERSION_AUTO: This setting is already disabled in the defconfig. Signed-off-by: Paul Barker <pbarker@toganlabs.com>
-rw-r--r--recipes-kernel/linux/linux-raspberrypi.inc42
1 files changed, 0 insertions, 42 deletions
diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc
index 2e62986..00f2df5 100644
--- a/recipes-kernel/linux/linux-raspberrypi.inc
+++ b/recipes-kernel/linux/linux-raspberrypi.inc
@@ -32,9 +32,6 @@ CMDLINE_append += ' ${@oe.utils.conditional("DISABLE_RPI_BOOT_LOGO", "1", "logo.
32CMDLINE_DEBUG ?= "" 32CMDLINE_DEBUG ?= ""
33CMDLINE_append = " ${CMDLINE_DEBUG}" 33CMDLINE_append = " ${CMDLINE_DEBUG}"
34 34
35# Quirk for udev greater or equal 141
36UDEV_GE_141 ?= "1"
37
38# Enable OABI compat for people stuck with obsolete userspace 35# Enable OABI compat for people stuck with obsolete userspace
39ARM_KEEP_OABI ?= "1" 36ARM_KEEP_OABI ?= "1"
40 37
@@ -102,11 +99,8 @@ do_configure_prepend() {
102 CONF_SED_SCRIPT="" 99 CONF_SED_SCRIPT=""
103 100
104 # oabi / eabi support 101 # oabi / eabi support
105 kernel_configure_variable AEABI y
106 if [ "${ARM_KEEP_OABI}" = "1" ] ; then 102 if [ "${ARM_KEEP_OABI}" = "1" ] ; then
107 kernel_configure_variable OABI_COMPAT y 103 kernel_configure_variable OABI_COMPAT y
108 else
109 kernel_configure_variable OABI_COMPAT n
110 fi 104 fi
111 105
112 # Set cmdline 106 # Set cmdline
@@ -114,39 +108,6 @@ do_configure_prepend() {
114 108
115 # Localversion 109 # Localversion
116 kernel_configure_variable LOCALVERSION "\"\"" 110 kernel_configure_variable LOCALVERSION "\"\""
117 kernel_configure_variable LOCALVERSION_AUTO n
118
119 # Udev quirks
120 # Newer versions of udev mandate that sysfs doesn't have deprecated entries
121 if [ "${UDEV_GE_141}" = "1" ] ; then
122 kernel_configure_variable SYSFS_DEPRECATED n
123 kernel_configure_variable SYSFS_DEPRECATED_V2 n
124 kernel_configure_variable HOTPLUG y
125 kernel_configure_variable UEVENT_HELPER_PATH "\"\""
126 kernel_configure_variable UNIX y
127 kernel_configure_variable SYSFS y
128 kernel_configure_variable PROC_FS y
129 kernel_configure_variable TMPFS y
130 kernel_configure_variable INOTIFY_USER y
131 kernel_configure_variable SIGNALFD y
132 kernel_configure_variable TMPFS_POSIX_ACL y
133 kernel_configure_variable BLK_DEV_BSG y
134 kernel_configure_variable DEVTMPFS y
135 kernel_configure_variable DEVTMPFS_MOUNT y
136 fi
137
138 # Newer inits like systemd need cgroup support
139 if [ "${KERNEL_ENABLE_CGROUPS}" = "1" ] ; then
140 kernel_configure_variable CGROUP_SCHED y
141 kernel_configure_variable CGROUPS y
142 kernel_configure_variable CGROUP_NS y
143 kernel_configure_variable CGROUP_FREEZER y
144 kernel_configure_variable CGROUP_DEVICE y
145 kernel_configure_variable CPUSETS y
146 kernel_configure_variable PROC_PID_CPUSET y
147 kernel_configure_variable CGROUP_CPUACCT y
148 kernel_configure_variable RESOURCE_COUNTERS y
149 fi
150 111
151 # root-over-nfs-over-usb-eth support. Limited, but should cover some cases 112 # root-over-nfs-over-usb-eth support. Limited, but should cover some cases
152 # Enable this by setting a proper CMDLINE_NFSROOT_USB. 113 # Enable this by setting a proper CMDLINE_NFSROOT_USB.
@@ -163,9 +124,6 @@ do_configure_prepend() {
163 kernel_configure_variable CMDLINE "\"${CMDLINE_NFSROOT_USB}\"" 124 kernel_configure_variable CMDLINE "\"${CMDLINE_NFSROOT_USB}\""
164 fi 125 fi
165 if [ ! -z "${KERNEL_INITRAMFS}" ]; then 126 if [ ! -z "${KERNEL_INITRAMFS}" ]; then
166 kernel_configure_variable BLK_DEV_INITRD y
167 kernel_configure_variable INITRAMFS_SOURCE ""
168 kernel_configure_variable RD_GZIP y
169 kernel_configure_variable OVERLAY_FS y 127 kernel_configure_variable OVERLAY_FS y
170 kernel_configure_variable SQUASHFS y 128 kernel_configure_variable SQUASHFS y
171 kernel_configure_variable UBIFS_FS y 129 kernel_configure_variable UBIFS_FS y