diff options
Diffstat (limited to 'board')
| -rw-r--r-- | board/sc520_cdp/Makefile | 2 | ||||
| -rw-r--r-- | board/sc520_cdp/flash.c | 2 | ||||
| -rw-r--r-- | board/sc520_cdp/sc520_cdp.c | 21 | ||||
| -rw-r--r-- | board/sc520_cdp/u-boot.lds | 2 | ||||
| -rw-r--r-- | board/tqm8xx/tqm8xx.c | 8 |
5 files changed, 30 insertions, 5 deletions
diff --git a/board/sc520_cdp/Makefile b/board/sc520_cdp/Makefile index f9a36f9f42..ab06ebc81a 100644 --- a/board/sc520_cdp/Makefile +++ b/board/sc520_cdp/Makefile @@ -29,7 +29,7 @@ OBJS := sc520_cdp.o flash.o SOBJS := sc520_cdp_asm.o sc520_cdp_asm16.o $(LIB): $(OBJS) $(SOBJS) - $(AR) crv $@ $(OBJS) + $(AR) crv $@ $(OBJS) $(SOBJS) clean: rm -f $(SOBJS) $(OBJS) diff --git a/board/sc520_cdp/flash.c b/board/sc520_cdp/flash.c index a4d37e5087..2f7ce5254a 100644 --- a/board/sc520_cdp/flash.c +++ b/board/sc520_cdp/flash.c @@ -325,7 +325,7 @@ void flash_print_info(flash_info_t *info) } printf ("\n"); - done: +done: ; } /*----------------------------------------------------------------------- diff --git a/board/sc520_cdp/sc520_cdp.c b/board/sc520_cdp/sc520_cdp.c index 0fc836c629..cd52324826 100644 --- a/board/sc520_cdp/sc520_cdp.c +++ b/board/sc520_cdp/sc520_cdp.c @@ -28,7 +28,7 @@ #include <asm/pci.h> #include <asm/ic/sc520.h> #include <asm/ic/ali512x.h> -#include <ssi.h> +#include <spi.h> #undef SC520_CDP_DEBUG @@ -557,6 +557,19 @@ void ssi_chip_select(int dev) } } +void spi_eeprom_probe(int x) +{ +} + +int spi_eeprom_read(int x, int offset, char *buffer, int len) +{ + return 0; +} + +int spi_eeprom_write(int x, int offset, char *buffer, int len) +{ + return 0; +} void spi_init_f(void) { @@ -586,6 +599,9 @@ ssize_t spi_read(uchar *addr, int alen, uchar *buffer, int len) #ifdef CONFIG_SC520_CDP_USE_MW res = mw_eeprom_read(2, offset, buffer, len); #endif +#if !defined(CONFIG_SC520_CDP_USE_SPI) && !defined(CONFIG_SC520_CDP_USE_MW) + res = 0; +#endif return res; } @@ -607,5 +623,8 @@ ssize_t spi_write(uchar *addr, int alen, uchar *buffer, int len) #ifdef CONFIG_SC520_CDP_USE_MW res = mw_eeprom_write(2, offset, buffer, len); #endif +#if !defined(CONFIG_SC520_CDP_USE_SPI) && !defined(CONFIG_SC520_CDP_USE_MW) + res = 0; +#endif return res; } diff --git a/board/sc520_cdp/u-boot.lds b/board/sc520_cdp/u-boot.lds index 1944a74aaa..9d2f71c33a 100644 --- a/board/sc520_cdp/u-boot.lds +++ b/board/sc520_cdp/u-boot.lds @@ -31,7 +31,7 @@ SECTIONS .text : { *(.text); } . = ALIGN(4); - .rodata : { *(.rodata) } + .rodata : { *(.rodata) *(.rodata.str1.1) *(.rodata.str1.32) } . = 0x400000; /* Ram data segment to use */ _i386boot_romdata_dest = ABSOLUTE(.); diff --git a/board/tqm8xx/tqm8xx.c b/board/tqm8xx/tqm8xx.c index 05004829bf..f9b04f8aa6 100644 --- a/board/tqm8xx/tqm8xx.c +++ b/board/tqm8xx/tqm8xx.c @@ -363,7 +363,13 @@ long int initdram (int board_type) memctl->memc_mcr = 0x011C | UPMB; #endif /* CONFIG_CAN_DRIVER */ - +#ifdef CONFIG_ISP1362_USB + /* Initialize OR5 / BR5 */ + memctl->memc_or5 = CFG_OR5_ISP1362; + memctl->memc_br5 = CFG_BR5_ISP1362; +#endif /* CONFIG_ISP1362_USB */ + + return (size_b0 + size_b1); } |
