* [meta-handheld 01/12] linux.inc: drop a part of the file for the devices we don't care about
2011-09-07 14:02 [meta-handheld 00/12] linux.inc cleanup Dmitry Eremin-Solenikov
@ 2011-09-07 14:02 ` Dmitry Eremin-Solenikov
2011-09-07 14:02 ` [meta-handheld 02/12] linux.inc: drop a hack for kernels <= 2.6.29 Dmitry Eremin-Solenikov
` (11 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Dmitry Eremin-Solenikov @ 2011-09-07 14:02 UTC (permalink / raw)
To: openembedded-devel; +Cc: Dmitry Eremin-Solenikov
meta-hh doesn't care about n900, om-gta0x or eee701, so drop the
respective hook.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
recipes-kernel/linux/linux.inc | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
index 2304135..a30ea70 100644
--- a/recipes-kernel/linux/linux.inc
+++ b/recipes-kernel/linux/linux.inc
@@ -65,15 +65,11 @@ python __anonymous () {
import bb
devicetree = bb.data.getVar('KERNEL_DEVICETREE', d, 1) or ''
- machine = bb.data.getVar('MACHINE', d, 1)
if devicetree:
depends = bb.data.getVar("DEPENDS", d, 1)
bb.data.setVar("DEPENDS", "%s dtc-native" % depends, d)
packages = bb.data.getVar("PACKAGES", d, 1)
bb.data.setVar("PACKAGES", "%s kernel-devicetree" % packages, d)
- if 'nokia900' in machine or 'om-gta0' in machine or 'eee701' in machine:
- depends = bb.data.getVar("DEPENDS", d, 1)
- bb.data.setVar("DEPENDS", "%s lzma-native" % depends, d)
}
do_configure_prepend() {
--
1.7.2.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [meta-handheld 02/12] linux.inc: drop a hack for kernels <= 2.6.29
2011-09-07 14:02 [meta-handheld 00/12] linux.inc cleanup Dmitry Eremin-Solenikov
2011-09-07 14:02 ` [meta-handheld 01/12] linux.inc: drop a part of the file for the devices we don't care about Dmitry Eremin-Solenikov
@ 2011-09-07 14:02 ` Dmitry Eremin-Solenikov
2011-09-07 14:02 ` [meta-handheld 03/12] linux.inc: drop at91sam9263ek cmdline setting Dmitry Eremin-Solenikov
` (10 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Dmitry Eremin-Solenikov @ 2011-09-07 14:02 UTC (permalink / raw)
To: openembedded-devel; +Cc: Dmitry Eremin-Solenikov
linux.inc isn't used with such old kernels anymore, drop the hack.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
recipes-kernel/linux/linux.inc | 12 ------------
1 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
index a30ea70..09dee86 100644
--- a/recipes-kernel/linux/linux.inc
+++ b/recipes-kernel/linux/linux.inc
@@ -73,18 +73,6 @@ python __anonymous () {
}
do_configure_prepend() {
-
- # Rename getline in ./scripts/unifdef.c
- # Kernels up to 2.6.29 are currently failing to build unifdef.c,
- # clashing with exposed getline() from <stdio.h>
- # see https://patchwork.kernel.org/patch/11166/
- # committed in 2.6.29 (commit d15bd1067b1fcb2b7250d22bc0c7c7fea0b759f7)
-
- if [ -e ${S}/scripts/unifdef.c ]; then
- sed -i -e 's/getline/parseline/g' ${S}/scripts/unifdef.c
- fi
-
-
echo "" > ${S}/.config
#
--
1.7.2.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [meta-handheld 03/12] linux.inc: drop at91sam9263ek cmdline setting
2011-09-07 14:02 [meta-handheld 00/12] linux.inc cleanup Dmitry Eremin-Solenikov
2011-09-07 14:02 ` [meta-handheld 01/12] linux.inc: drop a part of the file for the devices we don't care about Dmitry Eremin-Solenikov
2011-09-07 14:02 ` [meta-handheld 02/12] linux.inc: drop a hack for kernels <= 2.6.29 Dmitry Eremin-Solenikov
@ 2011-09-07 14:02 ` Dmitry Eremin-Solenikov
2011-09-07 14:02 ` [meta-handheld 04/12] linux.inc: drop RPSRC - it's unused now Dmitry Eremin-Solenikov
` (9 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Dmitry Eremin-Solenikov @ 2011-09-07 14:02 UTC (permalink / raw)
To: openembedded-devel; +Cc: Dmitry Eremin-Solenikov
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
recipes-kernel/linux/linux.inc | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
index 09dee86..a37308d 100644
--- a/recipes-kernel/linux/linux.inc
+++ b/recipes-kernel/linux/linux.inc
@@ -14,13 +14,6 @@ ARM_KEEP_OABI ?= "1"
# Quirk for udev greater or equal 141
UDEV_GE_141 ?= "0"
-# Specify the commandline for your device
-
-# Boot from mmc
-CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=/dev/mmcblk0p1 rootfstype=ext2 rootdelay=5"
-# Boot from nfs
-#CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=301 root=/dev/nfs nfsroot=172.20.3.1:/data/at91 ip=172.20.0.5:::255.255.0.0"
-
# Set the verbosity of kernel messages during runtime
# You can define CMDLINE_DEBUG in your local.conf or distro.conf to override this behaviour
CMDLINE_DEBUG ?= '${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "loglevel=3", d)}'
--
1.7.2.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [meta-handheld 04/12] linux.inc: drop RPSRC - it's unused now
2011-09-07 14:02 [meta-handheld 00/12] linux.inc cleanup Dmitry Eremin-Solenikov
` (2 preceding siblings ...)
2011-09-07 14:02 ` [meta-handheld 03/12] linux.inc: drop at91sam9263ek cmdline setting Dmitry Eremin-Solenikov
@ 2011-09-07 14:02 ` Dmitry Eremin-Solenikov
2011-09-07 14:03 ` [meta-handheld 05/12] linux.inc: drop devicetree settings Dmitry Eremin-Solenikov
` (8 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Dmitry Eremin-Solenikov @ 2011-09-07 14:02 UTC (permalink / raw)
To: openembedded-devel; +Cc: Dmitry Eremin-Solenikov
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
recipes-kernel/linux/linux.inc | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
index a37308d..eba11fa 100644
--- a/recipes-kernel/linux/linux.inc
+++ b/recipes-kernel/linux/linux.inc
@@ -6,8 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
inherit kernel siteinfo
-RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"
-
# Enable OABI compat for people stuck with obsolete userspace
ARM_KEEP_OABI ?= "1"
--
1.7.2.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [meta-handheld 05/12] linux.inc: drop devicetree settings
2011-09-07 14:02 [meta-handheld 00/12] linux.inc cleanup Dmitry Eremin-Solenikov
` (3 preceding siblings ...)
2011-09-07 14:02 ` [meta-handheld 04/12] linux.inc: drop RPSRC - it's unused now Dmitry Eremin-Solenikov
@ 2011-09-07 14:03 ` Dmitry Eremin-Solenikov
2011-09-07 14:03 ` [meta-handheld 06/12] linux.inc: devicetree is used on hh boxes, drop dt handling Dmitry Eremin-Solenikov
` (7 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Dmitry Eremin-Solenikov @ 2011-09-07 14:03 UTC (permalink / raw)
To: openembedded-devel; +Cc: Dmitry Eremin-Solenikov
Device tree names should go to machine conf files, not to kernel recipe
or linux.inc. Also for now they are unused, as none of this machines
is supported by meta-hh/linux.inc. Drop them accordingly.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
recipes-kernel/linux/linux.inc | 19 -------------------
1 files changed, 0 insertions(+), 19 deletions(-)
diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
index eba11fa..ad4510b 100644
--- a/recipes-kernel/linux/linux.inc
+++ b/recipes-kernel/linux/linux.inc
@@ -27,25 +27,6 @@ LOGO_SIZE ?= "."
FILES_kernel-devicetree = "/boot/devicetree*"
-KERNEL_DEVICETREE_boc01 = "${WORKDIR}/boc01.dts"
-KERNEL_DEVICETREE_calamari = "arch/${ARCH}/boot/dts/mpc8536ds.dts"
-KERNEL_DEVICETREE_canyonlands = "arch/${ARCH}/boot/dts/canyonlands.dts"
-KERNEL_DEVICETREE_kilauea = "arch/${ARCH}/boot/dts/kilauea.dts"
-KERNEL_DEVICETREE_lite5200 = "arch/${ARCH}/boot/dts/lite5200.dts"
-KERNEL_DEVICETREE_lsppchd = "arch/${ARCH}/boot/dts/kuroboxHD.dts"
-KERNEL_DEVICETREE_lsppchg = "arch/${ARCH}/boot/dts/kuroboxHG.dts"
-KERNEL_DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
-KERNEL_DEVICETREE_mpc8315e-rdb = "arch/${ARCH}/boot/dts/mpc8315erdb.dts"
-KERNEL_DEVICETREE_mpc8323e-rdb = "arch/${ARCH}/boot/dts/mpc832x_rdb.dts"
-KERNEL_DEVICETREE_mpc8544ds = "arch/${ARCH}/boot/dts/mpc8544ds.dts"
-KERNEL_DEVICETREE_mpc8641-hpcn = "arch/${ARCH}/boot/dts/mpc8641_hpcn.dts"
-KERNEL_DEVICETREE_p1020rdb = "arch/${ARCH}/boot/dts/p1020rdb.dts"
-KERNEL_DEVICETREE_p2020rdb = "arch/${ARCH}/boot/dts/p2020rdb.dts"
-KERNEL_DEVICETREE_p2020ds = "arch/${ARCH}/boot/dts/p2020ds.dts"
-KERNEL_DEVICETREE_sequoia = "arch/${ARCH}/boot/dts/sequoia.dts"
-KERNEL_DEVICETREE_tqm8540 = "arch/${ARCH}/boot/dts/tqm8540.dts"
-KERNEL_DEVICETREE_xilinx-ml507 = "arch/${ARCH}/boot/dts/virtex440-ml507.dts"
-
KERNEL_DEVICETREE_FLAGS = "-R 8 -S 0x3000"
CORTEXA8FIXUP ?= "yes"
--
1.7.2.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [meta-handheld 06/12] linux.inc: devicetree is used on hh boxes, drop dt handling
2011-09-07 14:02 [meta-handheld 00/12] linux.inc cleanup Dmitry Eremin-Solenikov
` (4 preceding siblings ...)
2011-09-07 14:03 ` [meta-handheld 05/12] linux.inc: drop devicetree settings Dmitry Eremin-Solenikov
@ 2011-09-07 14:03 ` Dmitry Eremin-Solenikov
2011-09-07 14:03 ` [meta-handheld 07/12] linux.inc: drop savedefconfig, it is provided by kernel.bbclass Dmitry Eremin-Solenikov
` (6 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Dmitry Eremin-Solenikov @ 2011-09-07 14:03 UTC (permalink / raw)
To: openembedded-devel; +Cc: Dmitry Eremin-Solenikov
If later required, we should add an extra kernel-dtb.bbclass for generic
handling of dt.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
recipes-kernel/linux/linux.inc | 43 ----------------------------------------
1 files changed, 0 insertions(+), 43 deletions(-)
diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
index ad4510b..e81d0ca 100644
--- a/recipes-kernel/linux/linux.inc
+++ b/recipes-kernel/linux/linux.inc
@@ -23,27 +23,9 @@ LOGO_SIZE ?= "."
# to your kernel recipe, and then structure your logos for each resolution
# accordingly.
-# Support for binary device tree generation
-
-FILES_kernel-devicetree = "/boot/devicetree*"
-
-KERNEL_DEVICETREE_FLAGS = "-R 8 -S 0x3000"
-
CORTEXA8FIXUP ?= "yes"
LOCALVERSION ?= ""
-python __anonymous () {
-
- import bb
-
- devicetree = bb.data.getVar('KERNEL_DEVICETREE', d, 1) or ''
- if devicetree:
- depends = bb.data.getVar("DEPENDS", d, 1)
- bb.data.setVar("DEPENDS", "%s dtc-native" % depends, d)
- packages = bb.data.getVar("PACKAGES", d, 1)
- bb.data.setVar("PACKAGES", "%s kernel-devicetree" % packages, d)
-}
-
do_configure_prepend() {
echo "" > ${S}/.config
@@ -198,34 +180,9 @@ do_install_append() {
PACKAGES =+ "kernel-headers"
FILES_kernel-headers = "${exec_prefix}/src/linux*"
-do_devicetree_image() {
- if test -n "${KERNEL_DEVICETREE}" ; then
- dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o devicetree ${KERNEL_DEVICETREE}
- install -d ${D}/boot
- install -m 0644 devicetree ${D}/boot/devicetree-${KERNEL_VERSION}
- install -d ${DEPLOY_DIR_IMAGE}
- install -m 0644 devicetree ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb
- package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb
- cd ${DEPLOY_DIR_IMAGE}
- rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
- ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
- package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_SYMLINK_NAME}.dtb
- fi
-}
-
-addtask devicetree_image after do_install before do_package do_deploy
-
do_savedefconfig() {
oe_runmake savedefconfig
}
addtask savedefconfig after do_configure
-pkg_postinst_kernel-devicetree () {
- cd /${KERNEL_IMAGEDEST}; update-alternatives --install /${KERNEL_IMAGEDEST}/devicetree devicetree devicetree-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
-}
-
-pkg_postrm_kernel-devicetree () {
- cd /${KERNEL_IMAGEDEST}; update-alternatives --remove devicetree devicetree-${KERNEL_VERSION} || true
-}
-
--
1.7.2.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [meta-handheld 07/12] linux.inc: drop savedefconfig, it is provided by kernel.bbclass
2011-09-07 14:02 [meta-handheld 00/12] linux.inc cleanup Dmitry Eremin-Solenikov
` (5 preceding siblings ...)
2011-09-07 14:03 ` [meta-handheld 06/12] linux.inc: devicetree is used on hh boxes, drop dt handling Dmitry Eremin-Solenikov
@ 2011-09-07 14:03 ` Dmitry Eremin-Solenikov
2011-09-07 14:03 ` [meta-handheld 08/12] linux.inc: drop old udev check Dmitry Eremin-Solenikov
` (5 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Dmitry Eremin-Solenikov @ 2011-09-07 14:03 UTC (permalink / raw)
To: openembedded-devel; +Cc: Dmitry Eremin-Solenikov
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
recipes-kernel/linux/linux.inc | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
index e81d0ca..51231db 100644
--- a/recipes-kernel/linux/linux.inc
+++ b/recipes-kernel/linux/linux.inc
@@ -179,10 +179,3 @@ do_install_append() {
PACKAGES =+ "kernel-headers"
FILES_kernel-headers = "${exec_prefix}/src/linux*"
-
-do_savedefconfig() {
- oe_runmake savedefconfig
-}
-
-addtask savedefconfig after do_configure
-
--
1.7.2.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [meta-handheld 08/12] linux.inc: drop old udev check
2011-09-07 14:02 [meta-handheld 00/12] linux.inc cleanup Dmitry Eremin-Solenikov
` (6 preceding siblings ...)
2011-09-07 14:03 ` [meta-handheld 07/12] linux.inc: drop savedefconfig, it is provided by kernel.bbclass Dmitry Eremin-Solenikov
@ 2011-09-07 14:03 ` Dmitry Eremin-Solenikov
2011-09-07 14:03 ` [meta-handheld 09/12] linux.inc: drop OABI-only support Dmitry Eremin-Solenikov
` (4 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Dmitry Eremin-Solenikov @ 2011-09-07 14:03 UTC (permalink / raw)
To: openembedded-devel; +Cc: Dmitry Eremin-Solenikov
We have udev 145, 164, 173 in oe-core/meta-oe and the check was
for udev < 141.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
recipes-kernel/linux/linux.inc | 39 +++++++++++++++------------------------
1 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
index 51231db..03b9811 100644
--- a/recipes-kernel/linux/linux.inc
+++ b/recipes-kernel/linux/linux.inc
@@ -9,9 +9,6 @@ inherit kernel siteinfo
# Enable OABI compat for people stuck with obsolete userspace
ARM_KEEP_OABI ?= "1"
-# Quirk for udev greater or equal 141
-UDEV_GE_141 ?= "0"
-
# Set the verbosity of kernel messages during runtime
# You can define CMDLINE_DEBUG in your local.conf or distro.conf to override this behaviour
CMDLINE_DEBUG ?= '${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "loglevel=3", d)}'
@@ -87,13 +84,8 @@ do_configure_prepend() {
echo 'CONFIG_LOCALVERSION="${LOCALVERSION}"' >>${S}/.config
echo '# CONFIG_LOCALVERSION_AUTO is not set' >>${S}/.config
- #
- # Udev quirks
- #
-
# Newer versions of udev mandate that sysfs doesn't have deprecated entries
- if [ "${UDEV_GE_141}" = "1" ] ; then
- sed -e /CONFIG_SYSFS_DEPRECATED/d \
+ sed -e /CONFIG_SYSFS_DEPRECATED/d \
-e /CONFIG_SYSFS_DEPRECATED_V2/d \
-e /CONFIG_HOTPLUG/d \
-e /CONFIG_UEVENT_HELPER_PATH/d \
@@ -107,21 +99,20 @@ do_configure_prepend() {
-e /CONFIG_BLK_DEV_BSG/d \
-i '${S}/.config'
- echo '# CONFIG_SYSFS_DEPRECATED is not set' >> ${S}/.config
- echo '# CONFIG_SYSFS_DEPRECATED_V2 is not set' >> ${S}/.config
- echo 'CONFIG_HOTPLUG=y' >> ${S}/.config
- echo 'CONFIG_UEVENT_HELPER_PATH=""' >> ${S}/.config
- echo 'CONFIG_UNIX=y' >> ${S}/.config
- echo 'CONFIG_SYSFS=y' >> ${S}/.config
- echo 'CONFIG_PROC_FS=y' >> ${S}/.config
- echo 'CONFIG_TMPFS=y' >> ${S}/.config
- echo 'CONFIG_INOTIFY_USER=y' >> ${S}/.config
- echo 'CONFIG_SIGNALFD=y' >> ${S}/.config
- echo 'CONFIG_TMPFS_POSIX_ACL=y' >> ${S}/.config
- echo 'CONFIG_BLK_DEV_BSG=y' >> ${S}/.config
- echo 'CONFIG_DEVTMPFS=y' >> ${S}/.config
- echo 'CONFIG_DEVTMPFS_MOUNT=y' >> ${S}/.config
- fi
+ echo '# CONFIG_SYSFS_DEPRECATED is not set' >> ${S}/.config
+ echo '# CONFIG_SYSFS_DEPRECATED_V2 is not set' >> ${S}/.config
+ echo 'CONFIG_HOTPLUG=y' >> ${S}/.config
+ echo 'CONFIG_UEVENT_HELPER_PATH=""' >> ${S}/.config
+ echo 'CONFIG_UNIX=y' >> ${S}/.config
+ echo 'CONFIG_SYSFS=y' >> ${S}/.config
+ echo 'CONFIG_PROC_FS=y' >> ${S}/.config
+ echo 'CONFIG_TMPFS=y' >> ${S}/.config
+ echo 'CONFIG_INOTIFY_USER=y' >> ${S}/.config
+ echo 'CONFIG_SIGNALFD=y' >> ${S}/.config
+ echo 'CONFIG_TMPFS_POSIX_ACL=y' >> ${S}/.config
+ echo 'CONFIG_BLK_DEV_BSG=y' >> ${S}/.config
+ echo 'CONFIG_DEVTMPFS=y' >> ${S}/.config
+ echo 'CONFIG_DEVTMPFS_MOUNT=y' >> ${S}/.config
# Newer inits like systemd need cgroup support
if [ "${KERNEL_ENABLE_CGROUPS}" = "1" ] ; then
--
1.7.2.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [meta-handheld 09/12] linux.inc: drop OABI-only support
2011-09-07 14:02 [meta-handheld 00/12] linux.inc cleanup Dmitry Eremin-Solenikov
` (7 preceding siblings ...)
2011-09-07 14:03 ` [meta-handheld 08/12] linux.inc: drop old udev check Dmitry Eremin-Solenikov
@ 2011-09-07 14:03 ` Dmitry Eremin-Solenikov
2011-09-07 14:03 ` [meta-handheld 10/12] linux.inc: drop cortex-a8 fixup, none of meta-hh machines uses A8 Dmitry Eremin-Solenikov
` (3 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Dmitry Eremin-Solenikov @ 2011-09-07 14:03 UTC (permalink / raw)
To: openembedded-devel; +Cc: Dmitry Eremin-Solenikov
It's not logical to support OABI-only config with current kernel/userspace. Drop support
for OABI configurations. If necessary one can enable OABI compat.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
recipes-kernel/linux/linux.inc | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
index 03b9811..a31669f 100644
--- a/recipes-kernel/linux/linux.inc
+++ b/recipes-kernel/linux/linux.inc
@@ -38,17 +38,12 @@ do_configure_prepend() {
#
# oabi / eabi support
#
- if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibceabi" ]; then
- echo "CONFIG_AEABI=y" >> ${S}/.config
- if [ "${ARM_KEEP_OABI}" = "1" ] ; then
- echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config
- else
- echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config
- fi
- else
- echo "# CONFIG_AEABI is not set" >> ${S}/.config
- echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config
- fi
+ echo "CONFIG_AEABI=y" >> ${S}/.config
+ if [ "${ARM_KEEP_OABI}" = "1" ] ; then
+ echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config
+ else
+ echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config
+ fi
# When enabling thumb for userspace we also need thumb support in the kernel
if [ "${ARM_INSTRUCTION_SET}" = "thumb" ] ; then
--
1.7.2.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [meta-handheld 10/12] linux.inc: drop cortex-a8 fixup, none of meta-hh machines uses A8
2011-09-07 14:02 [meta-handheld 00/12] linux.inc cleanup Dmitry Eremin-Solenikov
` (8 preceding siblings ...)
2011-09-07 14:03 ` [meta-handheld 09/12] linux.inc: drop OABI-only support Dmitry Eremin-Solenikov
@ 2011-09-07 14:03 ` Dmitry Eremin-Solenikov
2011-09-07 14:03 ` [meta-handheld 11/12] linux.inc: drop bigendian support Dmitry Eremin-Solenikov
` (2 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Dmitry Eremin-Solenikov @ 2011-09-07 14:03 UTC (permalink / raw)
To: openembedded-devel; +Cc: Dmitry Eremin-Solenikov
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
recipes-kernel/linux/linux.inc | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
index a31669f..477726c 100644
--- a/recipes-kernel/linux/linux.inc
+++ b/recipes-kernel/linux/linux.inc
@@ -20,7 +20,6 @@ LOGO_SIZE ?= "."
# to your kernel recipe, and then structure your logos for each resolution
# accordingly.
-CORTEXA8FIXUP ?= "yes"
LOCALVERSION ?= ""
do_configure_prepend() {
@@ -51,12 +50,6 @@ do_configure_prepend() {
echo "CONFIG_ARM_THUMB=y" >> ${S}/.config
fi
- # Enable thumb2 fixup for specific issue in angstrom toolchains when used on A8 r1p[012] silicon
- if [ "${DISTRO_NAME}" = "Angstrom" -a "${CORTEXA8FIXUP}" = "yes" ] ; then
- sed -i -e /CONFIG_ARM_ERRATA_430973/d ${WORKDIR}/defconfig
- echo "CONFIG_ARM_ERRATA_430973=y" >> ${S}/.config
- fi
-
#
# endian support
#
--
1.7.2.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [meta-handheld 11/12] linux.inc: drop bigendian support
2011-09-07 14:02 [meta-handheld 00/12] linux.inc cleanup Dmitry Eremin-Solenikov
` (9 preceding siblings ...)
2011-09-07 14:03 ` [meta-handheld 10/12] linux.inc: drop cortex-a8 fixup, none of meta-hh machines uses A8 Dmitry Eremin-Solenikov
@ 2011-09-07 14:03 ` Dmitry Eremin-Solenikov
2011-09-07 14:03 ` [meta-handheld 12/12] linux.inc: clean up handling of config variables Dmitry Eremin-Solenikov
2011-09-15 0:00 ` [meta-handheld 00/12] linux.inc cleanup Paul Eggleton
12 siblings, 0 replies; 14+ messages in thread
From: Dmitry Eremin-Solenikov @ 2011-09-07 14:03 UTC (permalink / raw)
To: openembedded-devel; +Cc: Dmitry Eremin-Solenikov
None of meta-hh boxes uses bigendian mode. Drop support for it.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
recipes-kernel/linux/linux.inc | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
index 477726c..d08cf5a 100644
--- a/recipes-kernel/linux/linux.inc
+++ b/recipes-kernel/linux/linux.inc
@@ -50,13 +50,6 @@ do_configure_prepend() {
echo "CONFIG_ARM_THUMB=y" >> ${S}/.config
fi
- #
- # endian support
- #
- if [ "${SITEINFO_ENDIANNESS}" = "be" ]; then
- echo "CONFIG_CPU_BIG_ENDIAN=y" >> ${S}/.config
- fi
-
echo "CONFIG_CMDLINE=\"${CMDLINE} ${CMDLINE_DEBUG}\"" >> ${S}/.config
sed -e '/CONFIG_AEABI/d' \
--
1.7.2.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [meta-handheld 12/12] linux.inc: clean up handling of config variables
2011-09-07 14:02 [meta-handheld 00/12] linux.inc cleanup Dmitry Eremin-Solenikov
` (10 preceding siblings ...)
2011-09-07 14:03 ` [meta-handheld 11/12] linux.inc: drop bigendian support Dmitry Eremin-Solenikov
@ 2011-09-07 14:03 ` Dmitry Eremin-Solenikov
2011-09-15 0:00 ` [meta-handheld 00/12] linux.inc cleanup Paul Eggleton
12 siblings, 0 replies; 14+ messages in thread
From: Dmitry Eremin-Solenikov @ 2011-09-07 14:03 UTC (permalink / raw)
To: openembedded-devel; +Cc: Dmitry Eremin-Solenikov
Provide a simple way to set a kernel config variable, ignore original
value from defconfig, etc.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
recipes-kernel/linux/linux.inc | 141 +++++++++++++++++-----------------------
1 files changed, 59 insertions(+), 82 deletions(-)
diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
index d08cf5a..7a25b59 100644
--- a/recipes-kernel/linux/linux.inc
+++ b/recipes-kernel/linux/linux.inc
@@ -22,94 +22,76 @@ LOGO_SIZE ?= "."
LOCALVERSION ?= ""
+#kernel_conf_variable CMDLINE "\"${CMDLINE} ${CMDLINE_DEBUG}\""
+kernel_conf_variable() {
+ CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1/d;"
+ if test "$2" = "n"
+ then
+ echo "# CONFIG_$1 is not set" >> ${S}/.config
+ else
+ echo "CONFIG_$1=$2" >> ${S}/.config
+ fi
+}
+
do_configure_prepend() {
echo "" > ${S}/.config
+ CONF_SED_SCRIPT=""
#
# logo support, if you supply logo_linux_clut224.ppm in SRC_URI, then it's going to be used
#
if [ -e ${WORKDIR}/logo_linux_clut224.ppm ]; then
install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
- echo "CONFIG_LOGO=y" >> ${S}/.config
- echo "CONFIG_LOGO_LINUX_CLUT224=y" >> ${S}/.config
+ kernel_conf_variable LOGO y
+ kernel_conf_variable LOGO_LINUX_CLUT224 y
fi
#
# oabi / eabi support
#
- echo "CONFIG_AEABI=y" >> ${S}/.config
+ kernel_conf_variable AEABI y
if [ "${ARM_KEEP_OABI}" = "1" ] ; then
- echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config
+ kernel_conf_variable OABI_COMPAT y
else
- echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config
+ kernel_conf_variable OABI_COMPAT n
fi
# When enabling thumb for userspace we also need thumb support in the kernel
if [ "${ARM_INSTRUCTION_SET}" = "thumb" ] ; then
- sed -i -e /CONFIG_ARM_THUMB/d ${WORKDIR}/defconfig
- echo "CONFIG_ARM_THUMB=y" >> ${S}/.config
+ kernel_conf_variable ARM_THUMB y
fi
- echo "CONFIG_CMDLINE=\"${CMDLINE} ${CMDLINE_DEBUG}\"" >> ${S}/.config
-
- sed -e '/CONFIG_AEABI/d' \
- -e '/CONFIG_OABI_COMPAT=/d' \
- -e '/CONFIG_CMDLINE=/d' \
- -e '/CONFIG_CPU_BIG_ENDIAN/d' \
- -e '/CONFIG_LOGO=/d' \
- -e '/CONFIG_LOGO_LINUX_CLUT224=/d' \
- -e '/CONFIG_LOCALVERSION/d' \
- -e '/CONFIG_LOCALVERSION_AUTO/d' \
- < '${WORKDIR}/defconfig' >>'${S}/.config'
-
- echo 'CONFIG_LOCALVERSION="${LOCALVERSION}"' >>${S}/.config
- echo '# CONFIG_LOCALVERSION_AUTO is not set' >>${S}/.config
-
- # Newer versions of udev mandate that sysfs doesn't have deprecated entries
- sed -e /CONFIG_SYSFS_DEPRECATED/d \
- -e /CONFIG_SYSFS_DEPRECATED_V2/d \
- -e /CONFIG_HOTPLUG/d \
- -e /CONFIG_UEVENT_HELPER_PATH/d \
- -e /CONFIG_UNIX/d \
- -e /CONFIG_SYSFS/d \
- -e /CONFIG_PROC_FS/d \
- -e /CONFIG_TMPFS/d \
- -e /CONFIG_INOTIFY_USER/d \
- -e /CONFIG_SIGNALFD/d \
- -e /CONFIG_TMPFS_POSIX_ACL/d \
- -e /CONFIG_BLK_DEV_BSG/d \
- -i '${S}/.config'
-
- echo '# CONFIG_SYSFS_DEPRECATED is not set' >> ${S}/.config
- echo '# CONFIG_SYSFS_DEPRECATED_V2 is not set' >> ${S}/.config
- echo 'CONFIG_HOTPLUG=y' >> ${S}/.config
- echo 'CONFIG_UEVENT_HELPER_PATH=""' >> ${S}/.config
- echo 'CONFIG_UNIX=y' >> ${S}/.config
- echo 'CONFIG_SYSFS=y' >> ${S}/.config
- echo 'CONFIG_PROC_FS=y' >> ${S}/.config
- echo 'CONFIG_TMPFS=y' >> ${S}/.config
- echo 'CONFIG_INOTIFY_USER=y' >> ${S}/.config
- echo 'CONFIG_SIGNALFD=y' >> ${S}/.config
- echo 'CONFIG_TMPFS_POSIX_ACL=y' >> ${S}/.config
- echo 'CONFIG_BLK_DEV_BSG=y' >> ${S}/.config
- echo 'CONFIG_DEVTMPFS=y' >> ${S}/.config
- echo 'CONFIG_DEVTMPFS_MOUNT=y' >> ${S}/.config
+ kernel_conf_variable CMDLINE "\"${CMDLINE} ${CMDLINE_DEBUG}\""
+
+ kernel_conf_variable LOCALVERSION "\"${LOCALVERSION}\""
+ kernel_conf_variable LOCALVERSION_AUTO n
+
+ kernel_conf_variable SYSFS_DEPRECATED n
+ kernel_conf_variable SYSFS_DEPRECATED_V2 n
+ kernel_conf_variable HOTPLUG y
+ kernel_conf_variable UEVENT_HELPER_PATH \"\"
+ kernel_conf_variable UNIX y
+ kernel_conf_variable SYSFS y
+ kernel_conf_variable PROC_FS y
+ kernel_conf_variable TMPFS y
+ kernel_conf_variable INOTIFY_USER y
+ kernel_conf_variable SIGNALFD y
+ kernel_conf_variable TMPFS_POSIX_ACL y
+ kernel_conf_variable BLK_DEV_BSG y
+ kernel_conf_variable DEVTMPFS y
+ kernel_conf_variable DEVTMPFS_MOUNT y
# Newer inits like systemd need cgroup support
if [ "${KERNEL_ENABLE_CGROUPS}" = "1" ] ; then
- sed -e /CONFIG_CGROUP_SCHED/d \
- -e /CONFIG_CGROUPS/d \
- -i '${S}/.config'
-
- echo 'CONFIG_CGROUP_SCHED=y' >> ${S}/.config
- echo 'CONFIG_CGROUPS=y' >> ${S}/.config
- echo 'CONFIG_CGROUP_NS=y' >> ${S}/.config
- echo 'CONFIG_CGROUP_FREEZER=y' >> ${S}/.config
- echo 'CONFIG_CGROUP_DEVICE=y' >> ${S}/.config
- echo 'CONFIG_CPUSETS=y' >> ${S}/.config
- echo 'CONFIG_PROC_PID_CPUSET=y' >> ${S}/.config
- echo 'CONFIG_CGROUP_CPUACCT=y' >> ${S}/.config
- echo 'CONFIG_RESOURCE_COUNTERS=y' >> ${S}/.config
+ kernel_conf_variable CGROUP_SCHED y
+ kernel_conf_variable CGROUPS y
+ kernel_conf_variable CGROUP_NS y
+ kernel_conf_variable CGROUP_FREEZER y
+ kernel_conf_variable CGROUP_DEVICE y
+ kernel_conf_variable CPUSETS y
+ kernel_conf_variable PROC_PID_CPUSET y
+ kernel_conf_variable CGROUP_CPUACCT y
+ kernel_conf_variable RESOURCE_COUNTERS y
fi
#
@@ -118,25 +100,20 @@ do_configure_prepend() {
#
if [ ! -z "${CMDLINE_NFSROOT_USB}" ]; then
bbnote "Configuring the kernel for root-over-nfs-over-usb-eth with CMDLINE ${CMDLINE_NFSROOT_USB}"
- sed -e '/CONFIG_INET/d' \
- -e '/CONFIG_IP_PNP=/d' \
- -e '/CONFIG_USB_GADGET=/d' \
- -e '/CONFIG_USB_GADGET_SELECTED=/d' \
- -e '/CONFIG_USB_ETH=/d' \
- -e '/CONFIG_NFS_FS=/d' \
- -e '/CONFIG_ROOT_NFS=/d' \
- -e '/CONFIG_CMDLINE=/d' \
- -i ${S}/.config
- echo "CONFIG_INET=y" >> ${S}/.config
- echo "CONFIG_IP_PNP=y" >> ${S}/.config
- echo "CONFIG_USB_GADGET=y" >> ${S}/.config
- echo "CONFIG_USB_GADGET_SELECTED=y" >> ${S}/.config
- echo "CONFIG_USB_ETH=y" >> ${S}/.config
- echo "CONFIG_NFS_FS=y" >> ${S}/.config
- echo "CONFIG_ROOT_NFS=y" >> ${S}/.config
- echo "CONFIG_CMDLINE=\"${CMDLINE_NFSROOT_USB} ${CMDLINE_DEBUG}\"" >> ${S}/.config
+ kernel_conf_variable INET y
+ kernel_conf_variable IP_PNP y
+ kernel_conf_variable USB_GADGET y
+ kernel_conf_variable USB_GADGET_SELECTED y
+ kernel_conf_variable USB_ETH y
+ kernel_conf_variable NFS_FS y
+ kernel_conf_variable ROOT_NFS y
+ kernel_conf_variable CMDLINE \"${CMDLINE_NFSROOT_USB} ${CMDLINE_DEBUG}\"
fi
- yes '' | oe_runmake oldconfig
+
+ sed -e "${CONF_SED_SCRIPT}" \
+ < '${WORKDIR}/defconfig' >>'${S}/.config'
+
+ yes '' | oe_runmake oldconfig
}
do_configure_append() {
--
1.7.2.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [meta-handheld 00/12] linux.inc cleanup
2011-09-07 14:02 [meta-handheld 00/12] linux.inc cleanup Dmitry Eremin-Solenikov
` (11 preceding siblings ...)
2011-09-07 14:03 ` [meta-handheld 12/12] linux.inc: clean up handling of config variables Dmitry Eremin-Solenikov
@ 2011-09-15 0:00 ` Paul Eggleton
12 siblings, 0 replies; 14+ messages in thread
From: Paul Eggleton @ 2011-09-15 0:00 UTC (permalink / raw)
To: Dmitry Eremin-Solenikov; +Cc: openembedded-devel
On Wednesday 07 September 2011 15:02:55 Dmitry Eremin-Solenikov wrote:
> The following changes since commit
> 6d2d70e158e70952e78ef8ff574fb2d53ed62a50:
>
> linux.inc: set debug level according to oe-core (2011-09-06 00:33:32
> +0100)
>
> are available in the git repository at:
> git://github.com/lumag/meta-handheld.git linux-inc
Merged to meta-handheld, thanks.
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 14+ messages in thread