* 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)
diff --git a/board/impa7/Makefile b/board/impa7/Makefile
index d936308..f8323e0 100644
--- a/board/impa7/Makefile
+++ b/board/impa7/Makefile
@@ -29,7 +29,7 @@
SOBJS := memsetup.o
$(LIB): $(OBJS) $(SOBJS)
- $(AR) crv $@ $^
+ $(AR) crv $@ $(OBJS) $(SOBJS)
clean:
rm -f $(SOBJS) $(OBJS)
diff --git a/board/impa7/flash.c b/board/impa7/flash.c
index 7db0b32..da4d31e 100644
--- a/board/impa7/flash.c
+++ b/board/impa7/flash.c
@@ -221,7 +221,7 @@
/* Check if Flash is (sufficiently) erased
*/
if ((*addr & data) != data)
- return ERR_NOT_ERASED;
+ return ERR_NOT_ERASED;
/*
* Disable interrupts which might cause a timeout
diff --git a/board/impa7/memsetup.S b/board/impa7/memsetup.S
index d1d1a57..5cb5fa8 100644
--- a/board/impa7/memsetup.S
+++ b/board/impa7/memsetup.S
@@ -21,7 +21,6 @@
*/
-
#include <config.h>
#include <version.h>
@@ -84,4 +83,3 @@
/* everything is fine now */
mov pc, lr
-
diff --git a/board/impa7/u-boot.lds b/board/impa7/u-boot.lds
index 0849648..36521b8 100644
--- a/board/impa7/u-boot.lds
+++ b/board/impa7/u-boot.lds
@@ -26,28 +26,33 @@
ENTRY(_start)
SECTIONS
{
- . = 0x00000000;
+ . = 0x00000000;
- . = ALIGN(4);
+ . = ALIGN(4);
.text :
{
cpu/arm720t/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 = .;
+
}