summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorHeiko Schocher <hs@pollux.denx.de>2007-01-11 15:44:44 +0100
committerHeiko Schocher <hs@pollux.denx.de>2007-01-11 15:44:44 +0100
commitca43ba18e910206ef8063e4b22d282630bff3fd2 (patch)
tree36362debec5396606d0ef02f34b46c02fc9893ea /cpu
parent92eb729bad876725aeea908d2addba0800620840 (diff)
downloadu-boot-imx-ca43ba18e910206ef8063e4b22d282630bff3fd2.zip
u-boot-imx-ca43ba18e910206ef8063e4b22d282630bff3fd2.tar.gz
u-boot-imx-ca43ba18e910206ef8063e4b22d282630bff3fd2.tar.bz2
Added support for the SOLIDCARD III board from Eurodesign
Signed-off-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'cpu')
-rw-r--r--cpu/ppc4xx/405gp_pci.c4
-rw-r--r--cpu/ppc4xx/cpu_init.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/cpu/ppc4xx/405gp_pci.c b/cpu/ppc4xx/405gp_pci.c
index 9b711e2..38a1305 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))
+#if !(defined(CONFIG_PIP405) || defined (CONFIG_MIP405)) || defined (CONFIG_SOLIDCARD3)
/*
*As is these functs get called out of flash Not a horrible
@@ -406,6 +406,7 @@ 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)*/
@@ -413,6 +414,7 @@ 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 4b746b0..9e24b33 100644
--- a/cpu/ppc4xx/cpu_init.c
+++ b/cpu/ppc4xx/cpu_init.c
@@ -31,7 +31,6 @@
DECLARE_GLOBAL_DATA_PTR;
#endif
-
#define mtebc(reg, data) mtdcr(ebccfga,reg);mtdcr(ebccfgd,data)
#ifdef CFG_INIT_DCACHE_CS
@@ -312,6 +311,10 @@ cpu_init_f (void)
mtebc(pb7cr, CFG_EBC_PB7CR);
#endif
+#if defined (CONFIG_SOLIDCARD3)
+mtebc(epcr, 0xb84ef000);
+*(unsigned long *)0x79000080 = 0x0001;
+#endif
#if defined(CONFIG_WATCHDOG)
unsigned long val;