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/at91rm9200dk/Makefile   |  2 +-
 board/at91rm9200dk/config.mk  |  1 -
 board/at91rm9200dk/flash.c    |  8 ++++----
 board/at91rm9200dk/u-boot.lds | 24 ++++++++++++++----------
 4 files changed, 19 insertions(+), 16 deletions(-)

(limited to 'board/at91rm9200dk')

diff --git a/board/at91rm9200dk/Makefile b/board/at91rm9200dk/Makefile
index d925d33..93ba699 100644
--- a/board/at91rm9200dk/Makefile
+++ b/board/at91rm9200dk/Makefile
@@ -29,7 +29,7 @@ OBJS	:= at91rm9200dk.o flash.o
 SOBJS	:=
 
 $(LIB):	$(OBJS) $(SOBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS) $(SOBJS)
 
 clean:
 	rm -f $(SOBJS) $(OBJS)
diff --git a/board/at91rm9200dk/config.mk b/board/at91rm9200dk/config.mk
index 009b4d7..9ce161e 100644
--- a/board/at91rm9200dk/config.mk
+++ b/board/at91rm9200dk/config.mk
@@ -1,2 +1 @@
 TEXT_BASE = 0x21f00000
-
diff --git a/board/at91rm9200dk/flash.c b/board/at91rm9200dk/flash.c
index 4d4524f..ebbd6f4 100644
--- a/board/at91rm9200dk/flash.c
+++ b/board/at91rm9200dk/flash.c
@@ -43,14 +43,14 @@ typedef struct OrgDef
 OrgDef OrgAT49BV16x4[] =
 {
 	{ 8, 8*1024 }, /* 8 * 8kBytes sectors */
-	{ 2, 32*1024 }, /* 2 * 32kBytes sectors */	
-	{ 30, 64*1024 } /* 30 * 64kBytes sectors */	
+	{ 2, 32*1024 }, /* 2 * 32kBytes sectors */
+	{ 30, 64*1024 } /* 30 * 64kBytes sectors */
 };
 
 OrgDef OrgAT49BV16x4A[] =
 {
-	{ 8, 8*1024 }, /* 8 * 8kBytes sectors */	
-	{ 31, 64*1024 } /* 31 * 64kBytes sectors */	
+	{ 8, 8*1024 }, /* 8 * 8kBytes sectors */
+	{ 31, 64*1024 } /* 31 * 64kBytes sectors */
 };
 
 
diff --git a/board/at91rm9200dk/u-boot.lds b/board/at91rm9200dk/u-boot.lds
index 2447bca..17a85b8 100644
--- a/board/at91rm9200dk/u-boot.lds
+++ b/board/at91rm9200dk/u-boot.lds
@@ -27,28 +27,32 @@ OUTPUT_ARCH(arm)
 ENTRY(_start)
 SECTIONS
 {
-        . = 0x00000000;
+	. = 0x00000000;
 
-        . = ALIGN(4);
+	. = ALIGN(4);
 	.text      :
 	{
 	  cpu/at91rm9200/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