From patchwork Wed Mar 13 21:13:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Boibessot X-Patchwork-Id: 227355 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 41E0A2C0082 for ; Thu, 14 Mar 2013 08:13:58 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C4DF7A0248; Wed, 13 Mar 2013 21:13:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PSY9vesYI5Jb; Wed, 13 Mar 2013 21:13:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 656D5A022C; Wed, 13 Mar 2013 21:13:54 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id DC1D08F7A3 for ; Wed, 13 Mar 2013 21:13:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 387DE80BFB for ; Wed, 13 Mar 2013 21:13:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id L9QnQxdV3W+I for ; Wed, 13 Mar 2013 21:13:50 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp2-g21.free.fr (smtp2-g21.free.fr [212.27.42.2]) by whitealder.osuosl.org (Postfix) with ESMTP id 3B06E80820 for ; Wed, 13 Mar 2013 21:13:48 +0000 (UTC) Received: from localhost.localdomain (unknown [82.234.232.91]) by smtp2-g21.free.fr (Postfix) with ESMTP id 9BE164B010B; Wed, 13 Mar 2013 22:13:42 +0100 (CET) From: julien.boibessot@free.fr To: buildroot@busybox.net Date: Wed, 13 Mar 2013 22:13:24 +0100 Message-Id: <1363209204-3604-1-git-send-email-julien.boibessot@free.fr> X-Mailer: git-send-email 1.7.5.4 Cc: Julien Boibessot Subject: [Buildroot] [PATCH v1] Add a load address option for building uImage on 3.7+ multi-platform kernels. X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: Julien Boibessot Signed-off-by: Julien Boibessot Acked-by: Arnout Vandecappelle (Essensium/Mind) --- 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(-) 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..c8f7b57 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