diff options
| author | wdenk | 2003-08-31 18:37:54 +0000 |
|---|---|---|
| committer | wdenk | 2003-08-31 18:37:54 +0000 |
| commit | 326428cc8bbdddb30920a96b672abd0d59833ce4 (patch) | |
| tree | a972f5b1cd0188096f8b13670f2c32bd7a9a14d0 /include | |
| parent | 0cb61d7dddb0d8c087f6df46a74815950668c97b (diff) | |
Patch by Yuli Barcohen, 7 Aug 2003:
According to the MPC8260 User's Manual, PCI_MODE signal should be
reflected in SCCR register, and local bus pins configuration is taken
from HRCW and appears in SIUMCR. For some reason it does not work
this way, so the only possibility to detect if the board is
configured in PCI mode is to check the BCSR. This patch sets SCCR and
SIUMCR according to the BCSR.
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/MPC8260ADS.h | 9 | ||||
| -rw-r--r-- | include/version.h | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h index 5960b302528..254ec46f175 100644 --- a/include/configs/MPC8260ADS.h +++ b/include/configs/MPC8260ADS.h @@ -206,6 +206,8 @@ /* * Miscellaneous configurable options */ +#define CFG_HUSH_PARSER +#define CFG_PROMPT_HUSH_PS2 "> " #define CFG_LONGHELP /* undef to save memory */ #define CFG_PROMPT "=> " /* Monitor Command Prompt */ #if (CONFIG_COMMANDS & CFG_CMD_KGDB) @@ -247,7 +249,7 @@ #define CFG_IMMR 0xF0000000 #define CFG_BCSR 0xF4500000 #define CFG_SDRAM_BASE 0x00000000 -#define CFG_LSDRAM_BASE 0xD0000000 +#define CFG_LSDRAM_BASE 0xFD000000 #define RS232EN_1 0x02000002 #define RS232EN_2 0x01000001 @@ -255,6 +257,7 @@ #define FETH1_RST 0x04000004 #define FETHIEN2 0x01000000 #define FETH2_RST 0x08000000 +#define BCSR_PCI_MODE 0x01000000 #define CFG_INIT_RAM_ADDR CFG_IMMR #define CFG_INIT_RAM_END 0x4000 /* End of used area in DPRAM */ @@ -327,6 +330,10 @@ #define CFG_PISCR (PISCR_PS|PISCR_PTF|PISCR_PTE) #define CFG_RCCR 0 +#if CONFIG_ADSTYPE == CFG_8266ADS +#undef CFG_LSDRAM_BASE /* No local bus SDRAM on MPC8266ADS */ +#endif /* CONFIG_ADSTYPE == CFG_8266ADS */ + #if CONFIG_ADSTYPE == CFG_PQ2FADS #define CFG_PSDMR 0x824B36A3 #define CFG_PSRT 0x13 diff --git a/include/version.h b/include/version.h index d295c2a3c79..f0e19d5bf2f 100644 --- a/include/version.h +++ b/include/version.h @@ -24,6 +24,6 @@ #ifndef __VERSION_H__ #define __VERSION_H__ -#define U_BOOT_VERSION "U-Boot 0.4.7" +#define U_BOOT_VERSION "U-Boot 0.4.8" #endif /* __VERSION_H__ */ |