From patchwork Fri Mar 4 01:57:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kavin Lau X-Patchwork-Id: 85361 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id E2354B6F12 for ; Fri, 4 Mar 2011 12:57:42 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3308028083; Fri, 4 Mar 2011 02:57:41 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xOcFIPKcW8Y2; Fri, 4 Mar 2011 02:57:41 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3468528085; Fri, 4 Mar 2011 02:57:39 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 557F928085 for ; Fri, 4 Mar 2011 02:57:36 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UI2U7ST4cECg for ; Fri, 4 Mar 2011 02:57:33 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-px0-f172.google.com (mail-px0-f172.google.com [209.85.212.172]) by theia.denx.de (Postfix) with ESMTPS id 13E6228083 for ; Fri, 4 Mar 2011 02:57:31 +0100 (CET) Received: by pxi6 with SMTP id 6so265836pxi.3 for ; Thu, 03 Mar 2011 17:57:29 -0800 (PST) Received: by 10.142.128.18 with SMTP id a18mr10110wfd.162.1299203849267; Thu, 03 Mar 2011 17:57:29 -0800 (PST) Received: from ubuntu.localnet ([121.33.243.34]) by mx.google.com with ESMTPS id d35sm2230068wfj.21.2011.03.03.17.57.27 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 03 Mar 2011 17:57:28 -0800 (PST) From: Kavin Lau To: u-boot@lists.denx.de Date: Fri, 4 Mar 2011 09:57:12 +0800 User-Agent: KMail/1.13.5 (Linux/2.6.35-27-generic; KDE/4.5.1; i686; ; ) MIME-Version: 1.0 Message-Id: <4d704708.231a8f0a.1985.766c@mx.google.com> Subject: [U-Boot] add required macro X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de From a3fb0b578a6cbe57670c7363c0707fdb9e7e3bc4 Mon Sep 17 00:00:00 2001 From: Kavin Lau Date: Fri, 4 Mar 2011 09:52:36 +0800 Subject: [PATCH] arm1176: Added CONFIG_PRELOADER macro that is required The callers of those labels are under covered of CONFIG_PRELOADER macro, so those labels should be under covered too. --- arch/arm/cpu/arm1176/start.S | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/arm/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S index 363329a..624f71c 100644 --- a/arch/arm/cpu/arm1176/start.S +++ b/arch/arm/cpu/arm1176/start.S @@ -379,12 +379,14 @@ _board_init_r_ofs: .word board_init_r - _start #endif +#ifndef CONFIG_PRELOADER _rel_dyn_start_ofs: .word __rel_dyn_start - _start _rel_dyn_end_ofs: .word __rel_dyn_end - _start _dynsym_start_ofs: .word __dynsym_start - _start +#endif #ifdef CONFIG_ENABLE_MMU _mmu_table_base: