From patchwork Wed Nov 9 16:14:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 4976 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 3F45A23E0E for ; Wed, 9 Nov 2011 16:14:29 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 34052A18132 for ; Wed, 9 Nov 2011 16:14:29 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id n26so2568780faa.11 for ; Wed, 09 Nov 2011 08:14:29 -0800 (PST) Received: by 10.152.109.199 with SMTP id hu7mr2000248lab.16.1320855269003; Wed, 09 Nov 2011 08:14:29 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.10.72 with SMTP id g8cs176162lab; Wed, 9 Nov 2011 08:14:28 -0800 (PST) Received: by 10.205.112.6 with SMTP id eq6mr2306230bkc.16.1320855267457; Wed, 09 Nov 2011 08:14:27 -0800 (PST) Received: from mail.df.lth.se (mail.df.lth.se. [194.47.250.12]) by mx.google.com with ESMTPS id s11si3110430bke.4.2011.11.09.08.14.26 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 09 Nov 2011 08:14:27 -0800 (PST) Received-SPF: neutral (google.com: 194.47.250.12 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=194.47.250.12; Authentication-Results: mx.google.com; spf=neutral (google.com: 194.47.250.12 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) smtp.mail=linus.walleij@linaro.org Received: from Fecusia (c83-249-208-177.bredband.comhem.se [83.249.208.177]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.df.lth.se (Postfix) with ESMTPSA id 6659D65D5B; Wed, 9 Nov 2011 17:14:26 +0100 (CET) Received: by Fecusia (sSMTP sendmail emulation); Wed, 9 Nov 2011 17:14:25 +0100 From: Linus Walleij To: Albert ARIBAUD Cc: u-boot@lists.denx.de, Linus Walleij Subject: [PATCH 2/7 v3] integrator: move text offset to config Date: Wed, 9 Nov 2011 17:14:20 +0100 Message-Id: <1320855260-4131-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.7.6.4 Do away with the config.mk file and move the text offset to the config files to make things easier. Signed-off-by: Linus Walleij --- ChangeLog v1->v2: - Rebased to U-Boot ARM HEAD at Alberts request, see message 4EA1C8E7.7090105@aribaud.net ChangeLog v2->v3: - Rebased to U-Boot ARM HEAD at Alberts request, see message 4EB84700.1030109@aribaud.net --- board/armltd/integrator/config.mk | 5 ----- include/configs/integratorap.h | 1 + include/configs/integratorcp.h | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 board/armltd/integrator/config.mk diff --git a/board/armltd/integrator/config.mk b/board/armltd/integrator/config.mk deleted file mode 100644 index 8b57af1..0000000 --- a/board/armltd/integrator/config.mk +++ /dev/null @@ -1,5 +0,0 @@ -# -# image should be loaded at 0x01000000 -# - -CONFIG_SYS_TEXT_BASE = 0x01000000 diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index 61b8761..a1fdbb8 100644 --- a/include/configs/integratorap.h +++ b/include/configs/integratorap.h @@ -37,6 +37,7 @@ * High Level Configuration Options * (easy to change) */ +#define CONFIG_SYS_TEXT_BASE 0x01000000 #define CONFIG_SYS_MEMTEST_START 0x100000 #define CONFIG_SYS_MEMTEST_END 0x10000000 #define CONFIG_SYS_HZ 1000 diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h index 7ae34b7..ccbdf44 100644 --- a/include/configs/integratorcp.h +++ b/include/configs/integratorcp.h @@ -37,6 +37,7 @@ * High Level Configuration Options * (easy to change) */ +#define CONFIG_SYS_TEXT_BASE 0x01000000 #define CONFIG_SYS_MEMTEST_START 0x100000 #define CONFIG_SYS_MEMTEST_END 0x10000000 #define CONFIG_SYS_HZ 1000