diff options
Diffstat (limited to 'board/wepep250')
| -rw-r--r-- | board/wepep250/Makefile | 2 | ||||
| -rw-r--r-- | board/wepep250/flash.c | 2 | ||||
| -rw-r--r-- | board/wepep250/intel.h | 1 | ||||
| -rw-r--r-- | board/wepep250/memsetup.S | 10 | ||||
| -rw-r--r-- | board/wepep250/u-boot.lds | 24 | ||||
| -rw-r--r-- | board/wepep250/wepep250.c | 9 |
6 files changed, 24 insertions, 24 deletions
diff --git a/board/wepep250/Makefile b/board/wepep250/Makefile index d4314d76afa..802ccb950fb 100644 --- a/board/wepep250/Makefile +++ b/board/wepep250/Makefile @@ -29,7 +29,7 @@ OBJS := wepep250.o flash.o SOBJS := memsetup.o $(LIB): $(OBJS) $(SOBJS) - $(AR) crv $@ $^ + $(AR) crv $@ $(OBJS) $(SOBJS) clean: rm -f $(SOBJS) $(OBJS) diff --git a/board/wepep250/flash.c b/board/wepep250/flash.c index 5c9d346da03..2a322903d5f 100644 --- a/board/wepep250/flash.c +++ b/board/wepep250/flash.c @@ -201,7 +201,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) } else { printf ("Erasing sector %2d ... ", sector); } - + address = (FLASH_BUS *) (info->start[sector]); *address = FLASH_CMD (CFI_INTEL_CMD_BLOCK_ERASE); diff --git a/board/wepep250/intel.h b/board/wepep250/intel.h index f6225901077..77498b6e1df 100644 --- a/board/wepep250/intel.h +++ b/board/wepep250/intel.h @@ -97,4 +97,3 @@ #define CFI_CHIPN_INTEL_28F256K18 "28F256K18" #endif /* FLASH_INTEL_H */ - diff --git a/board/wepep250/memsetup.S b/board/wepep250/memsetup.S index 8a5d42fc4b6..26fc0eaf254 100644 --- a/board/wepep250/memsetup.S +++ b/board/wepep250/memsetup.S @@ -5,17 +5,17 @@ * 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. - * + * * Written by Marcel Telka <marcel@telka.sk>, 2001, 2002. * Changes for U-Boot Peter Figuli <peposh@etc.sk>, 2003. * @@ -28,7 +28,7 @@ * Revision 1.0, February 2002 * [3] Samsung Electronics, "16Mx16 SDRAM 54CSP K4S561633C-RL(N)", * Revision 1.0, February 2002 - * + * */ #include <config.h> @@ -51,7 +51,6 @@ memsetup: ldr r0, =0x48000000 /* MC_BASE */ - /* step 1.a - setup MSCx */ ldr r1, =0x000012B3 /* MSC0_RRR0(1) | MSC0_RDN0(2) | MSC0_RDF0(11) | MSC0_RT0(3) */ @@ -144,4 +143,3 @@ memsetup: /* Step 11 - optional (TODO) */ mov pc,r10 - diff --git a/board/wepep250/u-boot.lds b/board/wepep250/u-boot.lds index 46beb152c77..38ec25f3fb8 100644 --- a/board/wepep250/u-boot.lds +++ b/board/wepep250/u-boot.lds @@ -26,29 +26,33 @@ OUTPUT_ARCH(arm) ENTRY(_start) SECTIONS { - . = 0x00000000; + . = 0x00000000; - . = ALIGN(4); + . = ALIGN(4); .text : { cpu/pxa/start.o (.text) *(.text) } - . = ALIGN(4); - .rodata : { *(.rodata) } + . = ALIGN(4); + .rodata : { *(.rodata) } - . = ALIGN(4); - .data : { *(.data) } + . = ALIGN(4); + .data : { *(.data) } - . = ALIGN(4); - .got : { *(.got) } + . = ALIGN(4); + .got : { *(.got) } + + __u_boot_cmd_start = .; + .u_boot_cmd : { *(.u_boot_cmd) } + __u_boot_cmd_end = .; armboot_end_data = .; - . = ALIGN(4); + . = ALIGN(4); bss_start = .; - .bss : { *(.bss) } + .bss : { *(.bss) } bss_end = .; armboot_end = .; diff --git a/board/wepep250/wepep250.c b/board/wepep250/wepep250.c index ebf75d745d0..08b1bfde72a 100644 --- a/board/wepep250/wepep250.c +++ b/board/wepep250/wepep250.c @@ -26,7 +26,7 @@ int board_init( void ){ DECLARE_GLOBAL_DATA_PTR; - gd->bd->bi_arch_number = 288; + gd->bd->bi_arch_number = 288; gd->bd->bi_boot_params = 0xa0000000; /* * Setup GPIO stuff to get serial working @@ -59,11 +59,11 @@ int dram_init( void ){ gd->bd->bi_dram[0].start = WEP_SDRAM_1; gd->bd->bi_dram[0].size = WEP_SDRAM_1_SIZE; #endif -#if ( CONFIG_NR_DRAM_BANKS > 1 ) +#if ( CONFIG_NR_DRAM_BANKS > 1 ) gd->bd->bi_dram[1].start = WEP_SDRAM_2; gd->bd->bi_dram[1].size = WEP_SDRAM_2_SIZE; #endif -#if ( CONFIG_NR_DRAM_BANKS > 2 ) +#if ( CONFIG_NR_DRAM_BANKS > 2 ) gd->bd->bi_dram[2].start = WEP_SDRAM_3; gd->bd->bi_dram[2].size = WEP_SDRAM_3_SIZE; #endif @@ -71,7 +71,6 @@ int dram_init( void ){ gd->bd->bi_dram[3].start = WEP_SDRAM_4; gd->bd->bi_dram[3].size = WEP_SDRAM_4_SIZE; #endif - + return 0; } - |