| Message ID | 1294415633-21029-2-git-send-email-bocui107@gmail.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
Le 07/01/2011 16:53, seedshope a écrit : > From: seedshope<bocui107@gmail.com> > > 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<bocui107@googlemail.com> In the current u-boot-arm tree, board/samsung/smdk6400/u-boot-nand.lds and arch/arm/cpu/arm1176/u-boot.lds are identical; I am thus ok with the change in itself since the board lds file was useless, but I am not sure the description is valid. Can you double-check this change wrt to the link issue? Amicalement,
On 01/08/2011 02:04 PM, Albert ARIBAUD wrote: > Le 07/01/2011 16:53, seedshope a écrit : >> From: seedshope<bocui107@gmail.com> >> >> 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<bocui107@googlemail.com> > In the current u-boot-arm tree, board/samsung/smdk6400/u-boot-nand.lds > and arch/arm/cpu/arm1176/u-boot.lds are identical; I am thus ok with the > change in itself since the board lds file was useless, but I am not sure > the description is valid. Can you double-check this change wrt to the > link issue? I am sure the link issue. But I need to adjust the patch. I should be modify base on board/samsung/smdk6400/u-boot-nand.lds, Don't delete it. > Amicalement,
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, <garyj@denx.de> - * - * (C) Copyright 2008 - * Guennadi Liakhovetki, DENX Software Engineering, <lg@denx.de> - * - * 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 = .; -}