summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Boibessot <julien.boibessot@armadeus.com>2013-03-13 11:13:24 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-03-15 09:58:13 (GMT)
commit8215e19b5343387db0714bcc373030ee4a565e68 (patch)
tree1942136d2d213eeb0cf728c3094e65456766c19f
parent87854c12d1c81bade3522405ce1ac42d45475263 (diff)
downloadbuildroot-8215e19b5343387db0714bcc373030ee4a565e68.tar.gz
buildroot-8215e19b5343387db0714bcc373030ee4a565e68.tar.bz2
linux: Add a load address option for building uImage on 3.7+ multi-platform kernels
[Peter: add quotes as suggested by Arnout] Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--linux/Config.in13
-rw-r--r--linux/linux.mk5
2 files changed, 18 insertions, 0 deletions
diff --git a/linux/Config.in b/linux/Config.in
index 94ce951..a44880f 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -213,6 +213,19 @@ config BR2_LINUX_KERNEL_IMAGE_TARGET_NAME
Specify the kernel make target to build the kernel that you
need.
+config BR2_LINUX_KERNEL_UIMAGE_LOADADDR
+ string "load address (for 3.7+ multi-platform image)"
+ depends on BR2_arm || BR2_armeb
+ depends on BR2_LINUX_KERNEL_UIMAGE || BR2_LINUX_KERNEL_APPENDED_UIMAGE
+ help
+ If your ARM system's Linux kernel is configured with the new (3.7+)
+ multi-architecture support (CONFIG_ARCH_MULTIPLATFORM=y in your
+ kernel config), then it is necessary to specify a kernel load address
+ when building the uImage. This should be a hexadecimal string
+ beginning with 0x, for example: 0x00008000.
+
+ If unsure, let this option empty.
+
config BR2_LINUX_KERNEL_DTS_SUPPORT
bool "Device tree support"
help
diff --git a/linux/linux.mk b/linux/linux.mk
index 0352acd..8a73767 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -95,6 +95,11 @@ LINUX_IMAGE_NAME=vmlinuz
endif
endif
+LINUX_KERNEL_UIMAGE_LOADADDR=$(call qstrip,$(BR2_LINUX_KERNEL_UIMAGE_LOADADDR))
+ifneq ($(LINUX_KERNEL_UIMAGE_LOADADDR),)
+LINUX_MAKE_FLAGS+=LOADADDR="$(LINUX_KERNEL_UIMAGE_LOADADDR)"
+endif
+
ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB),y)
LINUX_IMAGE_TARGET=zImage
else