diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2007-01-19 12:06:32 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-01-19 12:06:32 +0100 |
| commit | 15e5025a7337df1ab94549bdd79db08083868b85 (patch) | |
| tree | 19bd9e410903a8a7e7a23f3dfe7262b28e09d3d9 /cpu/ppc4xx | |
| parent | 9d8d5a5bfb64768f29a0cb47fc37cd6f4c40e276 (diff) | |
| parent | cb4820725e9fc409c5cbc8e83054a6ed522d2111 (diff) | |
| download | u-boot-imx-15e5025a7337df1ab94549bdd79db08083868b85.zip u-boot-imx-15e5025a7337df1ab94549bdd79db08083868b85.tar.gz u-boot-imx-15e5025a7337df1ab94549bdd79db08083868b85.tar.bz2 | |
Merge with /home/hs/SC3/u-boot-dev
Diffstat (limited to 'cpu/ppc4xx')
| -rw-r--r-- | cpu/ppc4xx/405gp_pci.c | 4 | ||||
| -rw-r--r-- | cpu/ppc4xx/cpu_init.c | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/cpu/ppc4xx/405gp_pci.c b/cpu/ppc4xx/405gp_pci.c index 38a1305..7134355 100644 --- a/cpu/ppc4xx/405gp_pci.c +++ b/cpu/ppc4xx/405gp_pci.c @@ -380,7 +380,7 @@ void pci_405gp_setup_vga(struct pci_controller *hose, pci_dev_t dev, pci_hose_write_config_dword(hose, dev, PCI_COMMAND, cmdstat); } -#if !(defined(CONFIG_PIP405) || defined (CONFIG_MIP405)) || defined (CONFIG_SOLIDCARD3) +#if !(defined(CONFIG_PIP405) || defined (CONFIG_MIP405)) && !(defined (CONFIG_SOLIDCARD3)) /* *As is these functs get called out of flash Not a horrible @@ -406,7 +406,6 @@ static struct pci_controller hose = { config_table: pci_405gp_config_table, }; -#ifndef CONFIG_SOLIDCARD3 void pci_init_board(void) { /*we want the ptrs to RAM not flash (ie don't use init list)*/ @@ -414,7 +413,6 @@ void pci_init_board(void) hose.config_table = pci_405gp_config_table; pci_405gp_init(&hose); } -#endif #endif diff --git a/cpu/ppc4xx/cpu_init.c b/cpu/ppc4xx/cpu_init.c index e2aa867..ae24591 100644 --- a/cpu/ppc4xx/cpu_init.c +++ b/cpu/ppc4xx/cpu_init.c @@ -313,9 +313,8 @@ cpu_init_f (void) mtebc(pb7cr, CFG_EBC_PB7CR); #endif -#if defined (CONFIG_SOLIDCARD3) - mtebc(epcr, 0xb84ef000); - *(unsigned long *)0x79000080 = 0x0001; +#if defined (CFG_EBC_CFG) + mtebc(epcr, CFG_EBC_CFG); #endif #if defined(CONFIG_WATCHDOG) |