Skip to contentSkip to conversation

Add a load address option for building uImage on 3.7+ multi-platform kernels.

PATCH New julien.boibessot at free.fr 3 participants 3 messages Mar 13, 2013 – Mar 15, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Add a load address option for building uImage on 3.7+ multi-platform kernels.

From: Julien Boibessot <[email protected]>

---
Changes since RFC:
* Took Daniel Price and Arnout Vandecappelle remarks into account to be more explicit in the description of the option + add ARM dependancy.
* Changed the way option is used in linux.mk to prevent empty LOADADDR=

 linux/Config.in |   13 +++++++++++++
 linux/linux.mk  |    5 +++++
 2 files changed, 18 insertions(+), 0 deletions(-)
linux/Config.in +13 -0
index 94ce951..a44880f 100644
@@ -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
linux/linux.mk +5 -0
index 0352acd..c8f7b57 100644
@@ -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
Signature · 1 line
1.7.5.4
#1 lore raw

PATCH 1/1 Add a load address option for building uImage on 3.7+ multi-platform kernels.

Quoted 3 lines · julien.boibessot at free.fr

From: Julien Boibessot <[email protected]>

(visual inspection only)

Quoted 39 lines

---
Changes since RFC:
* Took Daniel Price and Arnout Vandecappelle remarks into account to be more explicit in the description of the option + add ARM dependancy.
* Changed the way option is used in linux.mk to prevent empty LOADADDR=

  linux/Config.in |   13 +++++++++++++
  linux/linux.mk  |    5 +++++
  2 files changed, 18 insertions(+), 0 deletions(-)
linux/Config.in +13 -0
index 94ce951..a44880f 100644
@@ -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
linux/linux.mk +0 -0
index 0352acd..c8f7b57 100644

linux/linux.mk LINUX_IMAGE_NAME=vmlinuz · line 100

Quoted 6 lines
linux/linux.mk +3 -0
@@ -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)

I would put quotes around the value, just in case the user was so
stupid to insert a space. Alternatively, add an explicit check here:

ifneq ($(words $(LINUX_KERNEL_UIMAGE_LOADDR)),1) $(error Multiple load addresses specified, please check \
BR2_LINUX_KERNEL_UIMAGE_LOADADDR)
endif

But honestly I think that is going a bit too far.

linux/linux.mk LINUX_IMAGE_NAME=vmlinuz · line 102

Quoted 2 lines
linux/linux.mk +2 -0
+endif
+

Coding style question: the rest of the linux.mk doesn't comply with the
buildroot coding style to put spaces around assignment operators. Should patches against linux.mk follow the buildroot coding style or the local linux.mk coding style? Or maybe even accept whatever the contributor fancies?

I have no preference either way, I guess it's just Peter's executive
decision.

Regards,
Arnout

Quoted 4 lines
linux/linux.mk +0 -0
  ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB),y)
  LINUX_IMAGE_TARGET=zImage
  else
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#2 lore raw

PATCH 1/1 Add a load address option for building uImage on 3.7+ multi-platform kernels.

In reply to julien.boibessot at free.fr
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"julien" == julien boibessot <[email protected]> writes:

julien> From: Julien Boibessot <[email protected]> julien> Signed-off-by: Julien Boibessot <[email protected]>

Committed with the quotes added as suggested by Arnout - Thanks.

Signature · 1 line
Bye, Peter Korsgaard