summaryrefslogtreecommitdiff
path: root/board/impa7
diff options
context:
space:
mode:
Diffstat (limited to 'board/impa7')
-rw-r--r--board/impa7/Makefile2
-rw-r--r--board/impa7/flash.c2
-rw-r--r--board/impa7/memsetup.S2
-rw-r--r--board/impa7/u-boot.lds25
4 files changed, 17 insertions, 14 deletions
diff --git a/board/impa7/Makefile b/board/impa7/Makefile
index d936308160..f8323e0b97 100644
--- a/board/impa7/Makefile
+++ b/board/impa7/Makefile
@@ -29,7 +29,7 @@ OBJS := impa7.o flash.o
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 7db0b3289d..da4d31eb1e 100644
--- a/board/impa7/flash.c
+++ b/board/impa7/flash.c
@@ -221,7 +221,7 @@ static int write_word (flash_info_t *info, ulong dest, ulong data)
/* 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 d1d1a57000..5cb5fa899d 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 @@ memsetup:
/* everything is fine now */
mov pc, lr
-
diff --git a/board/impa7/u-boot.lds b/board/impa7/u-boot.lds
index 084964858b..36521b8ef7 100644
--- a/board/impa7/u-boot.lds
+++ b/board/impa7/u-boot.lds
@@ -26,28 +26,33 @@ OUTPUT_ARCH(arm)
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 = .;
+
}