diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-03-02 22:06:48 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-03-02 22:06:48 +0300 |
| commit | 9600a7403ba2848c8751280077503a3e0f2f3481 (patch) | |
| tree | 996726918f255cc9686dec34628fab410ac8f550 /meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc | |
| parent | b11bad1ba28f79c08266efb9cc265d89103e5939 (diff) | |
| parent | 5ec7af7413906b500cce396255bde69c9770f6d8 (diff) | |
| download | openbmc-9600a7403ba2848c8751280077503a3e0f2f3481.tar.xz | |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc')
| -rw-r--r-- | meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc index ea7f77837..3c3a8e534 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc @@ -16,12 +16,15 @@ SRC_URI += "file://rpi-kernel-misc.cfg" KCONFIG_MODE = "--alldefconfig" KBUILD_DEFCONFIG_raspberrypi0-wifi ?= "bcmrpi_defconfig" KBUILD_DEFCONFIG_raspberrypi ?= "bcmrpi_defconfig" +KBUILD_DEFCONFIG_raspberrypi-cm3 ?= "bcm2709_defconfig" KBUILD_DEFCONFIG_raspberrypi2 ?= "bcm2709_defconfig" KBUILD_DEFCONFIG_raspberrypi3 ?= "bcm2709_defconfig" KBUILD_DEFCONFIG_raspberrypi3-64 ?= "bcmrpi3_defconfig" KBUILD_DEFCONFIG_raspberrypi4 ?= "bcm2711_defconfig" KBUILD_DEFCONFIG_raspberrypi4-64 ?= "bcm2711_defconfig" +LINUX_VERSION_EXTENSION ?= "" + # CMDLINE for raspberrypi SERIAL = "${@oe.utils.conditional("ENABLE_UART", "1", "console=serial0,115200", "", d)}" CMDLINE ?= "dwc_otg.lpm_enable=0 ${SERIAL} root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" @@ -98,9 +101,6 @@ do_configure_prepend() { mv -f ${B}/.config ${B}/.config.patched CONF_SED_SCRIPT="" - # Localversion - kernel_configure_variable LOCALVERSION "\"\"" - if [ "${INITRAMFS_IMAGE_BUNDLE}" = "1" ]; then kernel_configure_variable OVERLAY_FS y kernel_configure_variable SQUASHFS y |