diff options
author | jmbills <42755197+jmbills@users.noreply.github.com> | 2019-10-25 19:18:16 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-25 19:18:16 +0300 |
commit | 0dbb60593ebb5a62190c0e6cff7f1770493303a2 (patch) | |
tree | 0df2ce67404dbca3ddc4ee063dbfd9ae455be682 /meta-raspberrypi/recipes-kernel/linux | |
parent | 34a3942845ac3264ce27c648ae5486d302c3e6d8 (diff) | |
parent | cc9cea46d74d280de03c713c8b555153fd811f09 (diff) | |
download | openbmc-0dbb60593ebb5a62190c0e6cff7f1770493303a2.tar.xz |
Merge branch 'intel' into intel2
Diffstat (limited to 'meta-raspberrypi/recipes-kernel/linux')
7 files changed, 34 insertions, 16 deletions
diff --git a/meta-raspberrypi/recipes-kernel/linux/files/raspberrypi4-64/rpi4-64-kernel-misc.cfg b/meta-raspberrypi/recipes-kernel/linux/files/raspberrypi4-64/rpi4-64-kernel-misc.cfg new file mode 100644 index 000000000..fd97ed71f --- /dev/null +++ b/meta-raspberrypi/recipes-kernel/linux/files/raspberrypi4-64/rpi4-64-kernel-misc.cfg @@ -0,0 +1,2 @@ +# see emmc node +CONFIG_MMC_SDHCI_IPROC=y diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-rt_4.14.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-rt_4.14.bb index 1a990fe0f..224bc6ddb 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-rt_4.14.bb +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-rt_4.14.bb @@ -1,6 +1,6 @@ -LINUX_VERSION ?= "4.14.81" +LINUX_VERSION ?= "4.14.91" -SRCREV = "acf578d07d57480674d5361df9171fe9528765cb" +SRCREV = "0b520d5f1f580d36a742a9457a5673fa1578fff3" SRC_URI = " \ git://github.com/raspberrypi/linux.git;branch=rpi-4.14.y-rt \ file://0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch \ diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-rt_4.19.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-rt_4.19.bb new file mode 100644 index 000000000..17791b091 --- /dev/null +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-rt_4.19.bb @@ -0,0 +1,6 @@ +LINUX_VERSION ?= "4.19.59" +LINUX_RPI_BRANCH ?= "rpi-4.19.y-rt" + +SRCREV = "1dae1f0521d69bfd22454180c40fe85fdd80ffc6" + +require linux-raspberrypi_4.19.inc diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc index 01f2425ed..ea7f77837 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc @@ -19,6 +19,8 @@ KBUILD_DEFCONFIG_raspberrypi ?= "bcmrpi_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" # CMDLINE for raspberrypi SERIAL = "${@oe.utils.conditional("ENABLE_UART", "1", "console=serial0,115200", "", d)}" @@ -120,9 +122,11 @@ do_configure_prepend() { rm -f ${B}/.config.patched } -do_compile_append_raspberrypi3-64() { - cc_extra=$(get_cc_option) - oe_runmake dtbs CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} +do_compile_append() { + if [ "${SITEINFO_BITS}" = "64" ]; then + cc_extra=$(get_cc_option) + oe_runmake dtbs CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} + fi } do_deploy_append() { diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.14.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.14.bb index 6563918cc..03710edf1 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.14.bb +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.14.bb @@ -1,6 +1,6 @@ -LINUX_VERSION ?= "4.14.112" +LINUX_VERSION ?= "4.14.114" -SRCREV = "6b5c4a2508403839af29ef44059d04acbe0ee204" +SRCREV = "7688b39276ff9952df381d79de63b258e73971ce" SRC_URI = " \ git://github.com/raspberrypi/linux.git;branch=rpi-4.14.y \ file://0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch \ diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.bb index 396dd6f75..900570de1 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.bb +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.bb @@ -1,12 +1,6 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-raspberrypi:" - -LINUX_VERSION ?= "4.19.44" +LINUX_VERSION ?= "4.19.71" LINUX_RPI_BRANCH ?= "rpi-4.19.y" -SRCREV = "b45a32b47b76cb64225d19841c20ee85ea97874d" -SRC_URI = " \ - git://github.com/raspberrypi/linux.git;protocol=git;branch=${LINUX_RPI_BRANCH} \ - " -require linux-raspberrypi.inc +SRCREV = "13ce09db830e0c2fe524460b0673afb974359bc2" -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" +require linux-raspberrypi_4.19.inc diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.inc b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.inc new file mode 100644 index 000000000..d6c1223c7 --- /dev/null +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.inc @@ -0,0 +1,12 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/linux-raspberrypi:" + +SRC_URI = " \ + git://github.com/raspberrypi/linux.git;branch=${LINUX_RPI_BRANCH} \ + " +SRC_URI_append_raspberrypi4-64 = " file://rpi4-64-kernel-misc.cfg" + +require linux-raspberrypi.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" + +KERNEL_EXTRA_ARGS_append_rpi = " DTC_FLAGS='-@ -H epapr'" |