diff options
| author | wdenk <wdenk> | 2004-10-10 22:44:24 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-10-10 22:44:24 +0000 |
| commit | c15f3120eca5359ed7ec1a359085312bbafca169 (patch) | |
| tree | 46ca2ff3275513348b742298ec715677112f1737 /board | |
| parent | 656658dd1577b62d5192ba2db4d9b8a3be1dbee3 (diff) | |
| download | u-boot-imx-c15f3120eca5359ed7ec1a359085312bbafca169.zip u-boot-imx-c15f3120eca5359ed7ec1a359085312bbafca169.tar.gz u-boot-imx-c15f3120eca5359ed7ec1a359085312bbafca169.tar.bz2 | |
* Patch by Michael Bendzick, 30 Aug 2004:
- Improve platform.S code for omap1510inn that detects whether code
is running from SDRAM or not. Patch allows SDRAM to be configured
if code is running out of SRAM at 0x20000000.
* Patch by Frederick Klatt, 30 Aug 2004:
Add support for the Wind River SBC8540/SBC8560 boards
Diffstat (limited to 'board')
| -rw-r--r-- | board/omap1510inn/platform.S | 11 | ||||
| -rw-r--r-- | board/sbc8560/config.mk | 1 | ||||
| -rw-r--r-- | board/sbc8560/sbc8560.c | 4 |
3 files changed, 13 insertions, 3 deletions
diff --git a/board/omap1510inn/platform.S b/board/omap1510inn/platform.S index 709fe04..40b067e 100644 --- a/board/omap1510inn/platform.S +++ b/board/omap1510inn/platform.S @@ -159,8 +159,15 @@ lock_end: */ mov r0, #0x10000000 /* Load physical SDRAM base. */ mov r1, pc /* Get current execution location. */ - cmp r1, r0 /* Compare. */ - bge skip_sdram /* Skip over EMIF-fast initialization if running from SDRAM. */ + /* Zero all but top 6 bits of PC, as they alone detect whether an + * address is in the range 0x1000:0000-0x13ff:ffff, the 64M sized + * valid range for SDRAM on the OMAP 1510/5910. + */ + and r1, r1, #0xfc000000 + cmp r1, r0 /* Compare. */ + beq skip_sdram /* Skip over EMIF-fast initialization + * if running from SDRAM. + */ /* * Delay for SDRAM initialization. diff --git a/board/sbc8560/config.mk b/board/sbc8560/config.mk index c025a0e..3c8cfbe 100644 --- a/board/sbc8560/config.mk +++ b/board/sbc8560/config.mk @@ -22,7 +22,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA # - # # based on mpc8560ads board # default CCARBAR is at 0xff700000 diff --git a/board/sbc8560/sbc8560.c b/board/sbc8560/sbc8560.c index 1aed61b..7f7272d 100644 --- a/board/sbc8560/sbc8560.c +++ b/board/sbc8560/sbc8560.c @@ -235,7 +235,11 @@ int checkboard (void) get_sys_info (&sysinfo); +#ifdef CONFIG_SBC8560 printf ("Board: Wind River SBC8560 Board\n"); +#else + printf ("Board: Wind River SBC8540 Board\n"); +#endif printf ("\tCPU: %lu MHz\n", sysinfo.freqProcessor / 1000000); printf ("\tCCB: %lu MHz\n", sysinfo.freqSystemBus / 1000000); printf ("\tDDR: %lu MHz\n", sysinfo.freqSystemBus / 2000000); |