diff options
Diffstat (limited to 'board/trab')
| -rw-r--r-- | board/trab/Makefile | 2 | ||||
| -rw-r--r-- | board/trab/flash.c | 2 | ||||
| -rw-r--r-- | board/trab/memsetup.S | 2 | ||||
| -rw-r--r-- | board/trab/trab.c | 8 | ||||
| -rw-r--r-- | board/trab/u-boot.lds | 25 |
5 files changed, 24 insertions, 15 deletions
diff --git a/board/trab/Makefile b/board/trab/Makefile index bb6930d..d58ac91 100644 --- a/board/trab/Makefile +++ b/board/trab/Makefile @@ -29,7 +29,7 @@ OBJS := trab.o flash.o vfd.o SOBJS := memsetup.o $(LIB): $(OBJS) $(SOBJS) - $(AR) crv $@ $^ + $(AR) crv $@ $(OBJS) $(SOBJS) clean: rm -f $(SOBJS) $(OBJS) diff --git a/board/trab/flash.c b/board/trab/flash.c index a2a21c6..aba0631 100644 --- a/board/trab/flash.c +++ b/board/trab/flash.c @@ -439,7 +439,7 @@ int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt) else { data = *((vu_long *) src); } - + if ((rc = write_word (info, wp, data)) != 0) { return (rc); } diff --git a/board/trab/memsetup.S b/board/trab/memsetup.S index ea4bccc..7914513 100644 --- a/board/trab/memsetup.S +++ b/board/trab/memsetup.S @@ -28,7 +28,6 @@ */ - #include <config.h> #include <version.h> @@ -165,4 +164,3 @@ SMRDATA: .word 0x17 /* BUSWIDTH=32, SCLK power saving mode, BANKSIZE 16M/16M */ .word 0x30 /* MRSR6, CL=3clk */ .word 0x30 /* MRSR7 */ - diff --git a/board/trab/trab.c b/board/trab/trab.c index dd4105d..1a4f5c5 100644 --- a/board/trab/trab.c +++ b/board/trab/trab.c @@ -24,9 +24,9 @@ /* #define DEBUG */ #include <common.h> -#include <cmd_bsp.h> #include <malloc.h> #include <s3c2400.h> +#include <command.h> /* ------------------------------------------------------------------------- */ @@ -298,6 +298,12 @@ int do_kbd (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) return 0; } +cmd_tbl_t U_BOOT_CMD(kbd) = MK_CMD_ENTRY( + "kbd", 1, 1, do_kbd, + "kbd - read keyboard status\n", + NULL +); + #ifdef CONFIG_MODEM_SUPPORT static int key_pressed(void) { diff --git a/board/trab/u-boot.lds b/board/trab/u-boot.lds index 5ea1829..ccffb19 100644 --- a/board/trab/u-boot.lds +++ b/board/trab/u-boot.lds @@ -27,9 +27,9 @@ OUTPUT_ARCH(arm) ENTRY(_start) SECTIONS { - . = 0x00000000; + . = 0x00000000; - . = ALIGN(4); + . = ALIGN(4); .text : { cpu/arm920t/start.o (.text) @@ -44,19 +44,24 @@ SECTIONS *(.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 = .; } |