From patchwork Fri Jan 7 15:53:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: seedshope X-Patchwork-Id: 77891 X-Patchwork-Delegate: albert.aribaud@free.fr 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 ECE6CB7155 for ; Sat, 8 Jan 2011 02:54:51 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 75DC128081; Fri, 7 Jan 2011 16:54:50 +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 WMg4gVhqAkzA; Fri, 7 Jan 2011 16:54:50 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C14D028089; Fri, 7 Jan 2011 16:54:48 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 337F128089 for ; Fri, 7 Jan 2011 16:54:46 +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 goDTebcE3QNN for ; Fri, 7 Jan 2011 16:54:44 +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-pw0-f44.google.com (mail-pw0-f44.google.com [209.85.160.44]) by theia.denx.de (Postfix) with ESMTP id 04E292808C for ; Fri, 7 Jan 2011 16:54:41 +0100 (CET) Received: by pwi7 with SMTP id 7so2431864pwi.3 for ; Fri, 07 Jan 2011 07:54:41 -0800 (PST) Received: by 10.142.165.11 with SMTP id n11mr1837613wfe.380.1294415681110; Fri, 07 Jan 2011 07:54:41 -0800 (PST) Received: from localhost.localdomain ([114.249.229.9]) by mx.google.com with ESMTPS id w22sm2822664wfd.7.2011.01.07.07.54.37 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 07 Jan 2011 07:54:40 -0800 (PST) From: seedshope To: u-boot@lists.denx.de Date: Fri, 7 Jan 2011 23:53:52 +0800 Message-Id: <1294415633-21029-2-git-send-email-bocui107@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1294415633-21029-1-git-send-email-bocui107@gmail.com> References: <1294415633-21029-1-git-send-email-bocui107@gmail.com> Cc: seedshope Subject: [U-Boot] [PATCH 2/3] SMDK6400:use common arm1176 u-boot.lds of cpu layer 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: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de From: seedshope Remove u-boot-nand.lds from board/samsung/smdk6400 and use the common u-boot.lds of arm1176 cpu layer. This patch also fix the building errors: arch/arm/cpu/arm1176/s3c64xx/libs3c64xx.o: In function `mem_ctrl_asm_init': arch/arm/cpu/arm1176/s3c64xx/cpu_init.S:32: multiple definition of `mem_ctrl_asm_init' arch/arm/cpu/arm1176/s3c64xx/cpu_init.S:32: first defined here arch/arm/cpu/arm1176/start.o: In function `_rel_dyn_start_ofs': arch/arm/cpu/arm1176/start.S:379: undefined reference to `__rel_dyn_start' arch/arm/cpu/arm1176/start.o: In function `_rel_dyn_end_ofs': arch/arm/cpu/arm1176/start.S:379: undefined reference to `__rel_dyn_end' arch/arm/cpu/arm1176/start.o: In function `_dynsym_start_ofs': arch/arm/cpu/arm1176/start.S:379: undefined reference to `__dynsym_start' Signed-off-by: seedshope diff --git a/board/samsung/smdk6400/config.mk b/board/samsung/smdk6400/config.mk index 90cbcf2..0443f60 100644 --- a/board/samsung/smdk6400/config.mk +++ b/board/samsung/smdk6400/config.mk @@ -29,4 +29,3 @@ else CONFIG_SYS_TEXT_BASE = 0 endif -LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot-nand.lds diff --git a/board/samsung/smdk6400/u-boot-nand.lds b/board/samsung/smdk6400/u-boot-nand.lds deleted file mode 100644 index 29a4f61..0000000 --- a/board/samsung/smdk6400/u-boot-nand.lds +++ /dev/null @@ -1,62 +0,0 @@ -/* - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, - * - * (C) Copyright 2008 - * Guennadi Liakhovetki, DENX Software Engineering, - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") -OUTPUT_ARCH(arm) -ENTRY(_start) -SECTIONS -{ - . = 0x00000000; - - . = ALIGN(4); - .text : - { - arch/arm/cpu/arm1176/start.o (.text) - arch/arm/cpu/arm1176/s3c64xx/cpu_init.o (.text) - *(.text) - } - - . = ALIGN(4); - .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } - - . = ALIGN(4); - .data : { *(.data) } - - . = ALIGN(4); - .got : { *(.got) } - - __u_boot_cmd_start = .; - .u_boot_cmd : { *(.u_boot_cmd) } - __u_boot_cmd_end = .; - - . = ALIGN(4); - .mmudata : { *(.mmudata) } - - . = ALIGN(4); - __bss_start = .; - .bss : { *(.bss) . = ALIGN(4); } - _end = .; -}