From 8bde7f776c77b343aca29b8c7b58464d915ac245 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Fri, 27 Jun 2003 21:31:46 +0000
Subject: * Code cleanup:   - 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)
---
 board/lart/Makefile   |  2 +-
 board/lart/flash.c    |  4 ++--
 board/lart/memsetup.S |  2 --
 board/lart/u-boot.lds | 24 ++++++++++++++----------
 4 files changed, 17 insertions(+), 15 deletions(-)

(limited to 'board/lart')

diff --git a/board/lart/Makefile b/board/lart/Makefile
index 12a0367..42ceb03 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 89ab62c..ad6134b 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 bebd697..635f2a0 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 f4b0ade..b3f34ca 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 = .;
 }
-- 
cgit v1.1