summaryrefslogtreecommitdiff
path: root/board/smdk2410
diff options
context:
space:
mode:
authorwdenk <wdenk>2003-06-27 21:31:46 +0000
committerwdenk <wdenk>2003-06-27 21:31:46 +0000
commit8bde7f776c77b343aca29b8c7b58464d915ac245 (patch)
tree20f1fd99975215e7c658454a15cdb4ed4694e2d4 /board/smdk2410
parent993cad9364c6b87ae429d1ed1130d8153f6f027e (diff)
downloadu-boot-imx-8bde7f776c77b343aca29b8c7b58464d915ac245.zip
u-boot-imx-8bde7f776c77b343aca29b8c7b58464d915ac245.tar.gz
u-boot-imx-8bde7f776c77b343aca29b8c7b58464d915ac245.tar.bz2
* 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)
Diffstat (limited to 'board/smdk2410')
-rw-r--r--board/smdk2410/Makefile2
-rw-r--r--board/smdk2410/flash.c4
-rw-r--r--board/smdk2410/memsetup.S1
-rw-r--r--board/smdk2410/u-boot.lds26
4 files changed, 19 insertions, 14 deletions
diff --git a/board/smdk2410/Makefile b/board/smdk2410/Makefile
index 79ab33a..af1e6e6 100644
--- a/board/smdk2410/Makefile
+++ b/board/smdk2410/Makefile
@@ -29,7 +29,7 @@ OBJS := smdk2410.o flash.o
SOBJS := memsetup.o
$(LIB): $(OBJS) $(SOBJS)
- $(AR) crv $@ $^
+ $(AR) crv $@ $(OBJS) $(SOBJS)
clean:
rm -f $(SOBJS) $(OBJS)
diff --git a/board/smdk2410/flash.c b/board/smdk2410/flash.c
index 5d04ed4..d7479f0 100644
--- a/board/smdk2410/flash.c
+++ b/board/smdk2410/flash.c
@@ -313,7 +313,7 @@ volatile static int write_hword (flash_info_t *info, ulong dest, ushort data)
*/
result = *addr;
if ((result & data) != data)
- return ERR_NOT_ERASED;
+ return ERR_NOT_ERASED;
/*
@@ -366,7 +366,7 @@ volatile static int write_hword (flash_info_t *info, ulong dest, ushort data)
*addr = CMD_READ_ARRAY;
if (chip == ERR || *addr != data)
- rc = ERR_PROG_ERROR;
+ rc = ERR_PROG_ERROR;
if (iflag)
enable_interrupts();
diff --git a/board/smdk2410/memsetup.S b/board/smdk2410/memsetup.S
index 3a84be5..c00e772 100644
--- a/board/smdk2410/memsetup.S
+++ b/board/smdk2410/memsetup.S
@@ -28,7 +28,6 @@
*/
-
#include <config.h>
#include <version.h>
diff --git a/board/smdk2410/u-boot.lds b/board/smdk2410/u-boot.lds
index 8c9c218..0cf076a 100644
--- a/board/smdk2410/u-boot.lds
+++ b/board/smdk2410/u-boot.lds
@@ -27,28 +27,34 @@ OUTPUT_ARCH(arm)
ENTRY(_start)
SECTIONS
{
- . = 0x00000000;
+ . = 0x00000000;
- . = ALIGN(4);
+ . = ALIGN(4);
.text :
{
cpu/arm920t/start.o (.text)
*(.text)
}
- . = ALIGN(4);
- .rodata : { *(.rodata) }
+ . = ALIGN(4);
+ .rodata : { *(.rodata) }
- . = ALIGN(4);
- .data : { *(.data) }
+ . = ALIGN(4);
+ .data : { *(.data) }
+
+ . = ALIGN(4);
+ .got : { *(.got) }
+
+ __u_boot_cmd_start = .;
+ .u_boot_cmd : { *(.u_boot_cmd) }
+ __u_boot_cmd_end = .;
- . = ALIGN(4);
- .got : { *(.got) }
armboot_end_data = .;
- . = ALIGN(4);
- .bss : { *(.bss) }
+ . = ALIGN(4);
+ .bss : { *(.bss) }
armboot_end = .;
+
}