diff options
| author | wdenk <wdenk> | 2003-06-27 21:31:46 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-06-27 21:31:46 +0000 |
| commit | 8bde7f776c77b343aca29b8c7b58464d915ac245 (patch) | |
| tree | 20f1fd99975215e7c658454a15cdb4ed4694e2d4 /board/lart | |
| parent | 993cad9364c6b87ae429d1ed1130d8153f6f027e (diff) | |
* Code cleanup:LABEL_2003_06_27_2340
- remove trailing white space, trailing empty lines, C++ comments, etc.
- split cmd_boot.c (separate cmd_bdinfo.c and cmd_load.c)
* Patches by Kenneth Johansson, 25 Jun 2003:
- major rework of command structure
(work done mostly by Michal Cendrowski and Joakim Kristiansen)
Diffstat (limited to 'board/lart')
| -rw-r--r-- | board/lart/Makefile | 2 | ||||
| -rw-r--r-- | board/lart/flash.c | 4 | ||||
| -rw-r--r-- | board/lart/memsetup.S | 2 | ||||
| -rw-r--r-- | board/lart/u-boot.lds | 24 |
4 files changed, 17 insertions, 15 deletions
diff --git a/board/lart/Makefile b/board/lart/Makefile index 12a0367f3..42ceb03b7 100644 --- a/board/lart/Makefile +++ b/board/lart/Makefile @@ -29,7 +29,7 @@ OBJS := lart.o flash.o SOBJS := flashasm.o memsetup.o $(LIB): $(OBJS) $(SOBJS) - $(AR) crv $@ $^ + $(AR) crv $@ $(OBJS) $(SOBJS) clean: rm -f $(SOBJS) $(OBJS) diff --git a/board/lart/flash.c b/board/lart/flash.c index 89ab62c53..ad6134be7 100644 --- a/board/lart/flash.c +++ b/board/lart/flash.c @@ -317,7 +317,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last) *addr = PUZZLE_TO_FLASH(CMD_READ_ARRAY); if ((rc = flash_error(result)) != ERR_OK) - goto outahere; + goto outahere; printf("ok.\n"); } @@ -358,7 +358,7 @@ volatile static int write_word (flash_info_t *info, ulong dest, ulong data) */ result = PUZZLE_FROM_FLASH(*addr); if ((result & data) != data) - return ERR_NOT_ERASED; + return ERR_NOT_ERASED; /* * Disable interrupts which might cause a timeout diff --git a/board/lart/memsetup.S b/board/lart/memsetup.S index bebd697a8..635f2a001 100644 --- a/board/lart/memsetup.S +++ b/board/lart/memsetup.S @@ -24,7 +24,6 @@ */ - #include <config.h> #include <version.h> @@ -93,4 +92,3 @@ memsetup: /* everything is fine now */ mov pc, lr - diff --git a/board/lart/u-boot.lds b/board/lart/u-boot.lds index f4b0ade27..b3f34ca90 100644 --- a/board/lart/u-boot.lds +++ b/board/lart/u-boot.lds @@ -26,28 +26,32 @@ OUTPUT_ARCH(arm) ENTRY(_start) SECTIONS { - . = 0x00000000; + . = 0x00000000; - . = ALIGN(4); + . = ALIGN(4); .text : { cpu/sa1100/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); - .bss : { *(.bss) } + . = ALIGN(4); + .bss : { *(.bss) } armboot_end = .; } |