From 49f1a945120ede2273c02388d54059b7eee57e5e Mon Sep 17 00:00:00 2001 From: Paul Barker Date: Fri, 8 Sep 2017 09:52:29 +0000 Subject: linux-raspberrypi: Move LOADADDR setting to inc file There is no reason to continue supporting pre-4.8 series kernels so we can move the setting of LOADADDR to the common inc file. Signed-off-by: Paul Barker --- recipes-kernel/linux/linux-raspberrypi-dev.bb | 5 ----- recipes-kernel/linux/linux-raspberrypi.inc | 5 +++++ recipes-kernel/linux/linux-raspberrypi_4.9.bb | 5 ----- 3 files changed, 5 insertions(+), 10 deletions(-) (limited to 'recipes-kernel') diff --git a/recipes-kernel/linux/linux-raspberrypi-dev.bb b/recipes-kernel/linux/linux-raspberrypi-dev.bb index 05a7ea2..0fecccb 100644 --- a/recipes-kernel/linux/linux-raspberrypi-dev.bb +++ b/recipes-kernel/linux/linux-raspberrypi-dev.bb @@ -16,11 +16,6 @@ SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=${LINUX_RP " require linux-raspberrypi.inc -# A LOADADDR is needed when building a uImage format kernel. This value is not -# set by default in rpi-4.8.y and later branches so we need to provide it -# manually. This value unused if KERNEL_IMAGETYPE is not uImage. -KERNEL_EXTRA_ARGS += "LOADADDR=0x00008000" - # Disable version check so that we don't have to edit this recipe every time # upstream bumps the version KERNEL_VERSION_SANITY_SKIP = "1" diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc index 9f401d0..37cf0bb 100644 --- a/recipes-kernel/linux/linux-raspberrypi.inc +++ b/recipes-kernel/linux/linux-raspberrypi.inc @@ -41,6 +41,11 @@ KERNEL_INITRAMFS ?= '${@base_conditional("INITRAMFS_IMAGE_BUNDLE", "1", "1", "", KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains("MACHINE_FEATURES", "pitft28r", "stmpe-ts", "", d)}" +# A LOADADDR is needed when building a uImage format kernel. This value is not +# set by default in rpi-4.8.y and later branches so we need to provide it +# manually. This value unused if KERNEL_IMAGETYPE is not uImage. +KERNEL_EXTRA_ARGS += "LOADADDR=0x00008000" + # Set a variable in .configure # $1 - Configure variable to be set # $2 - value [n/y/value] diff --git a/recipes-kernel/linux/linux-raspberrypi_4.9.bb b/recipes-kernel/linux/linux-raspberrypi_4.9.bb index 068965f..dd9afe2 100644 --- a/recipes-kernel/linux/linux-raspberrypi_4.9.bb +++ b/recipes-kernel/linux/linux-raspberrypi_4.9.bb @@ -6,8 +6,3 @@ SRCREV = "46e2d4d1bd2c17e2f84dd90768321ee0bbaa6b8a" SRC_URI = "git://github.com/raspberrypi/linux.git;branch=rpi-4.9.y" require linux-raspberrypi.inc - -# A LOADADDR is needed when building a uImage format kernel. This value is not -# set by default in rpi-4.8.y and later branches so we need to provide it -# manually. This value unused if KERNEL_IMAGETYPE is not uImage. -KERNEL_EXTRA_ARGS += "LOADADDR=0x00008000" -- cgit v1.2.3-54-g00ecf