summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-kernel/linux/linux-rpi.inc22
1 files changed, 13 insertions, 9 deletions
diff --git a/recipes-kernel/linux/linux-rpi.inc b/recipes-kernel/linux/linux-rpi.inc
index fae78b7..1755685 100644
--- a/recipes-kernel/linux/linux-rpi.inc
+++ b/recipes-kernel/linux/linux-rpi.inc
@@ -18,6 +18,8 @@ UDEV_GE_141 ?= "1"
18CMDLINE_DEBUG ?= '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug", d)}' 18CMDLINE_DEBUG ?= '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug", d)}'
19CMDLINE_append = " ${CMDLINE_DEBUG}" 19CMDLINE_append = " ${CMDLINE_DEBUG}"
20 20
21KERNEL_INITRAMFS ?= '${@base_conditional("INITRAMFS_IMAGE_BUNDLE", "1", "1", "", d)}'
22
21# Set a variable in .configure 23# Set a variable in .configure
22# $1 - Configure variable to be set 24# $1 - Configure variable to be set
23# $2 - value [n/y/value] 25# $2 - value [n/y/value]
@@ -38,15 +40,10 @@ do_configure_prepend() {
38 CONF_SED_SCRIPT="" 40 CONF_SED_SCRIPT=""
39 41
40 # oabi / eabi support 42 # oabi / eabi support
41 if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibceabi" ]; then 43 kernel_configure_variable AEABI y
42 kernel_configure_variable AEABI y 44 if [ "${ARM_KEEP_OABI}" = "1" ] ; then
43 if [ "${ARM_KEEP_OABI}" = "1" ] ; then 45 kernel_configure_variable OABI_COMPAT y
44 kernel_configure_variable OABI_COMPAT y
45 else
46 kernel_configure_variable OABI_COMPAT n
47 fi
48 else 46 else
49 kernel_configure_variable AEABI n
50 kernel_configure_variable OABI_COMPAT n 47 kernel_configure_variable OABI_COMPAT n
51 fi 48 fi
52 49
@@ -103,7 +100,14 @@ do_configure_prepend() {
103 kernel_configure_variable ROOT_NFS y 100 kernel_configure_variable ROOT_NFS y
104 kernel_configure_variable CMDLINE "\"${CMDLINE_NFSROOT_USB}\"" 101 kernel_configure_variable CMDLINE "\"${CMDLINE_NFSROOT_USB}\""
105 fi 102 fi
106 103 if [ ! -z "${KERNEL_INITRAMFS}" ]; then
104 kernel_configure_variable BLK_DEV_INITRD y
105 kernel_configure_variable INITRAMFS_SOURCE ""
106 kernel_configure_variable RD_GZIP y
107 kernel_configure_variable OVERLAY_FS y
108 kernel_configure_variable SQUASHFS y
109 kernel_configure_variable UBIFS_FS y
110 fi
107 # Activate CONFIG_LEGACY_PTYS 111 # Activate CONFIG_LEGACY_PTYS
108 kernel_configure_variable LEGACY_PTYS y 112 kernel_configure_variable LEGACY_PTYS y
109 113