diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-06-14 22:05:42 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-06-14 22:05:42 +0200 |
| commit | 92afd368bba7d98b2b7bfb51082c3639bb2119b3 (patch) | |
| tree | 74ffc8a3f4980f7c6bad6bf80bb41d3974eff685 /board/pxa255_idp | |
| parent | 6b1f78ae6ad037382ad430b07064105c88f7ac02 (diff) | |
| parent | 388517e4b745b00256c2fa201ce7bccb67b4f245 (diff) | |
Merge branch 'next' of ../master
Diffstat (limited to 'board/pxa255_idp')
| -rw-r--r-- | board/pxa255_idp/pxa_idp.c | 2 | ||||
| -rw-r--r-- | board/pxa255_idp/u-boot.lds | 56 |
2 files changed, 1 insertions, 57 deletions
diff --git a/board/pxa255_idp/pxa_idp.c b/board/pxa255_idp/pxa_idp.c index aa598aaa44..e9e479c4ba 100644 --- a/board/pxa255_idp/pxa_idp.c +++ b/board/pxa255_idp/pxa_idp.c @@ -129,7 +129,7 @@ int do_idpcmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(idpcmd, CONFIG_SYS_MAXARGS, 0, do_idpcmd, "custom IDP command", - "no args at this time\n" + "no args at this time" ); #endif diff --git a/board/pxa255_idp/u-boot.lds b/board/pxa255_idp/u-boot.lds deleted file mode 100644 index fb4358beea..0000000000 --- a/board/pxa255_idp/u-boot.lds +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2000-2005 - * Wolfgang Denk, DENX Software Engineering, wd@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 : - { - cpu/pxa/start.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); - __bss_start = .; - .bss (NOLOAD) : { *(.bss) . = ALIGN(4); } - _end = .; -} |