diff options
| author | wdenk <wdenk> | 2003-06-27 21:31:46 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-06-27 21:31:46 +0000 |
| commit | 8bde7f776c77b343aca29b8c7b58464d915ac245 (patch) | |
| tree | 20f1fd99975215e7c658454a15cdb4ed4694e2d4 /board/ml2 | |
| parent | 993cad9364c6b87ae429d1ed1130d8153f6f027e (diff) | |
| download | blackbird-obmc-uboot-8bde7f776c77b343aca29b8c7b58464d915ac245.tar.gz blackbird-obmc-uboot-8bde7f776c77b343aca29b8c7b58464d915ac245.zip | |
* 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/ml2')
| -rw-r--r-- | board/ml2/Makefile | 2 | ||||
| -rw-r--r-- | board/ml2/flash.c | 1 | ||||
| -rw-r--r-- | board/ml2/init.S | 8 | ||||
| -rw-r--r-- | board/ml2/ml2.c | 1 | ||||
| -rw-r--r-- | board/ml2/serial.c | 4 | ||||
| -rw-r--r-- | board/ml2/u-boot.lds | 5 | ||||
| -rw-r--r-- | board/ml2/u-boot.lds.debug | 6 |
7 files changed, 17 insertions, 10 deletions
diff --git a/board/ml2/Makefile b/board/ml2/Makefile index dd93ded710..40c60b1b34 100644 --- a/board/ml2/Makefile +++ b/board/ml2/Makefile @@ -29,7 +29,7 @@ OBJS = $(BOARD).o flash.o serial.o SOBJS = init.o $(LIB): $(OBJS) $(SOBJS) - $(AR) crv $@ $^ + $(AR) crv $@ $(OBJS) clean: rm -f $(SOBJS) $(OBJS) diff --git a/board/ml2/flash.c b/board/ml2/flash.c index 77e0931bcd..090725df1d 100644 --- a/board/ml2/flash.c +++ b/board/ml2/flash.c @@ -298,4 +298,3 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt) { return write_word(info, wp, data); } - diff --git a/board/ml2/init.S b/board/ml2/init.S index 2386c2ac80..80f98c5bd9 100644 --- a/board/ml2/init.S +++ b/board/ml2/init.S @@ -25,10 +25,10 @@ #include <asm/mmu.h> - .globl ext_bus_cntlr_init + .globl ext_bus_cntlr_init ext_bus_cntlr_init: - blr + blr - .globl sdram_init + .globl sdram_init sdram_init: - blr + blr diff --git a/board/ml2/ml2.c b/board/ml2/ml2.c index a89a8f9b41..6cc1bec066 100644 --- a/board/ml2/ml2.c +++ b/board/ml2/ml2.c @@ -22,7 +22,6 @@ #include <asm/processor.h> - int board_pre_init (void) { return 0; diff --git a/board/ml2/serial.c b/board/ml2/serial.c index dc9a8ea537..92baba9275 100644 --- a/board/ml2/serial.c +++ b/board/ml2/serial.c @@ -35,7 +35,7 @@ #if (defined CFG_INIT_CHAN1) || (defined CFG_INIT_CHAN2) const NS16550_t COM_PORTS[] = { (NS16550_t) CFG_NS16550_COM1, - (NS16550_t) CFG_NS16550_COM2 }; + (NS16550_t) CFG_NS16550_COM2 }; #endif int @@ -59,7 +59,7 @@ void serial_putc(const char c) { if (c == '\n') - NS16550_putc(COM_PORTS[CFG_DUART_CHAN], '\r'); + NS16550_putc(COM_PORTS[CFG_DUART_CHAN], '\r'); NS16550_putc(COM_PORTS[CFG_DUART_CHAN], c); } diff --git a/board/ml2/u-boot.lds b/board/ml2/u-boot.lds index 9685f8912c..07275d3bd7 100644 --- a/board/ml2/u-boot.lds +++ b/board/ml2/u-boot.lds @@ -116,6 +116,11 @@ SECTIONS _edata = .; PROVIDE (edata = .); + __u_boot_cmd_start = .; + .u_boot_cmd : { *(.u_boot_cmd) } + __u_boot_cmd_end = .; + + __start___ex_table = .; __ex_table : { *(__ex_table) } __stop___ex_table = .; diff --git a/board/ml2/u-boot.lds.debug b/board/ml2/u-boot.lds.debug index f4f9743457..d483424ad6 100644 --- a/board/ml2/u-boot.lds.debug +++ b/board/ml2/u-boot.lds.debug @@ -106,6 +106,11 @@ SECTIONS _edata = .; PROVIDE (edata = .); + __u_boot_cmd_start = .; + .u_boot_cmd : { *(.u_boot_cmd) } + __u_boot_cmd_end = .; + + __start___ex_table = .; __ex_table : { *(__ex_table) } __stop___ex_table = .; @@ -128,4 +133,3 @@ SECTIONS _end = . ; PROVIDE (end = .); } - |
