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/cogent | |
parent | 993cad9364c6b87ae429d1ed1130d8153f6f027e (diff) | |
download | bootable_bootloader_goldelico_gta04-8bde7f776c77b343aca29b8c7b58464d915ac245.zip bootable_bootloader_goldelico_gta04-8bde7f776c77b343aca29b8c7b58464d915ac245.tar.gz bootable_bootloader_goldelico_gta04-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/cogent')
-rw-r--r-- | board/cogent/Makefile | 2 | ||||
-rw-r--r-- | board/cogent/lcd.c | 22 | ||||
-rw-r--r-- | board/cogent/u-boot.lds | 6 | ||||
-rw-r--r-- | board/cogent/u-boot.lds.debug | 6 |
4 files changed, 22 insertions, 14 deletions
diff --git a/board/cogent/Makefile b/board/cogent/Makefile index 0cf6411..4084c7e 100644 --- a/board/cogent/Makefile +++ b/board/cogent/Makefile @@ -29,7 +29,7 @@ OBJS := mb.o flash.o dipsw.o lcd.o serial.o # pci.o rtc.o par.o kbm.o SOBJS := $(LIB): $(OBJS) - $(AR) crv $@ $^ + $(AR) crv $@ $(OBJS) clean: rm -f $(SOBJS) $(OBJS) diff --git a/board/cogent/lcd.c b/board/cogent/lcd.c index 941ea65..c1b4d11 100644 --- a/board/cogent/lcd.c +++ b/board/cogent/lcd.c @@ -112,7 +112,7 @@ lcd_dis(int addr, char *string) lcd_write_command(clp, LCD_CMD_ADD + addr); for (pos = 0; *string != '\0' && pos < linelen; pos++) - lcd_write_data(clp, *string++); + lcd_write_data(clp, *string++); } void @@ -131,7 +131,7 @@ lcd_init(void) linepos = 0; for (i = 0; i < LCD_LINE_LENGTH; i++) { - lines[0][i] = init_line0[i]; + lines[0][i] = init_line0[i]; lines[1][i] = init_line1[i]; } @@ -157,25 +157,25 @@ lcd_write_char(const char c) linelen--; if (c == '\n') { - lcd_dis(LCD_LINE0, &lines[curline^1][0]); - lcd_dis(LCD_LINE1, &lines[curline][0]); + lcd_dis(LCD_LINE0, &lines[curline^1][0]); + lcd_dis(LCD_LINE1, &lines[curline][0]); - /* Do a line feed */ - curline ^= 1; + /* Do a line feed */ + curline ^= 1; linelen = LCD_LINE_LENGTH; if (heartbeat_active && curline == 0) linelen--; - linepos = 0; + linepos = 0; - for (i = 0; i < linelen; i++) - lines[curline][i] = ' '; + for (i = 0; i < linelen; i++) + lines[curline][i] = ' '; - return; + return; } /* Only allow to be output if there is room on the LCD line */ if (linepos < linelen) - lines[curline][linepos++] = c; + lines[curline][linepos++] = c; } void diff --git a/board/cogent/u-boot.lds b/board/cogent/u-boot.lds index c3474b4..d9a1b68 100644 --- a/board/cogent/u-boot.lds +++ b/board/cogent/u-boot.lds @@ -96,6 +96,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 = .; @@ -118,4 +123,3 @@ SECTIONS _end = . ; PROVIDE (end = .); } - diff --git a/board/cogent/u-boot.lds.debug b/board/cogent/u-boot.lds.debug index 22138f8..c0ee849 100644 --- a/board/cogent/u-boot.lds.debug +++ b/board/cogent/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 = .); } - |