diff options
| author | Heiko Schocher <hs@denx.de> | 2009-03-12 07:37:15 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-03-18 20:48:29 +0100 |
| commit | 506f391888b82d1b83bdd749c3cea9eb2fd64df8 (patch) | |
| tree | 4bdebce633040d272570c03126a1ad31a2956a75 | |
| parent | cabf7b9c83bd780a5805ddbb4c0ce431d5b9f9f3 (diff) | |
8xx, icache: enabling ICache not before running from RAM
with the new CONFIG_SYS_DELAYED_ICACHE config option, ICache
is not enabled before code runs from RAM.
Signed-off-by: Heiko Schocher <hs@denx.de>
| -rw-r--r-- | README | 5 | ||||
| -rw-r--r-- | cpu/mpc8xx/start.S | 2 | ||||
| -rw-r--r-- | include/configs/FLAGADM.h | 3 | ||||
| -rw-r--r-- | include/configs/IP860.h | 3 | ||||
| -rw-r--r-- | include/configs/pcu_e.h | 3 | ||||
| -rw-r--r-- | lib_ppc/board.c | 3 |
6 files changed, 16 insertions, 3 deletions
@@ -318,6 +318,11 @@ The following options need to be configured: that this requires a (stable) reference clock (32 kHz RTC clock or CONFIG_SYS_8XX_XIN) + CONFIG_SYS_DELAYED_ICACHE + + Define this option if you want to enable the + ICache only when Code runs from RAM. + - Intel Monahans options: CONFIG_SYS_MONAHANS_RUN_MODE_OSC_RATIO diff --git a/cpu/mpc8xx/start.S b/cpu/mpc8xx/start.S index 45c902e7c6..8864c37cf6 100644 --- a/cpu/mpc8xx/start.S +++ b/cpu/mpc8xx/start.S @@ -142,7 +142,7 @@ boot_warm: lis r3, IDC_DISABLE@h /* Disable data cache */ mtspr DC_CST, r3 -#if !(defined(CONFIG_IP860) || defined(CONFIG_PCU_E) || defined (CONFIG_FLAGADM)) +#if !defined(CONFIG_SYS_DELAYED_ICACHE) /* On IP860 and PCU E, * we cannot enable IC yet */ diff --git a/include/configs/FLAGADM.h b/include/configs/FLAGADM.h index d8312384df..0f4277c4e3 100644 --- a/include/configs/FLAGADM.h +++ b/include/configs/FLAGADM.h @@ -173,6 +173,9 @@ #if defined(CONFIG_CMD_KGDB) #define CONFIG_SYS_CACHELINE_SHIFT 4 /* log base 2 of the above value */ #endif +#define CONFIG_SYS_DELAYED_ICACHE 1 /* enable ICache not before + * running in RAM. + */ /*----------------------------------------------------------------------- * SYPCR - System Protection Control 11-9 diff --git a/include/configs/IP860.h b/include/configs/IP860.h index b9c57132d7..125aa6c802 100644 --- a/include/configs/IP860.h +++ b/include/configs/IP860.h @@ -209,6 +209,9 @@ #if defined(CONFIG_CMD_KGDB) #define CONFIG_SYS_CACHELINE_SHIFT 4 /* log base 2 of the above value */ #endif +#define CONFIG_SYS_DELAYED_ICACHE 1 /* enable ICache not before + * running in RAM. + */ /*----------------------------------------------------------------------- * SYPCR - System Protection Control 11-9 diff --git a/include/configs/pcu_e.h b/include/configs/pcu_e.h index 921451927b..7c2bf1b0f4 100644 --- a/include/configs/pcu_e.h +++ b/include/configs/pcu_e.h @@ -246,6 +246,9 @@ */ #define CONFIG_SYS_CACHELINE_SIZE 16 /* For all MPC8xx CPUs */ #define CONFIG_SYS_CACHELINE_SHIFT 4 /* log base 2 of the above value */ +#define CONFIG_SYS_DELAYED_ICACHE 1 /* enable ICache not before + * running in RAM. + */ /*----------------------------------------------------------------------- * SYPCR - System Protection Control 11-9 diff --git a/lib_ppc/board.c b/lib_ppc/board.c index 6d2930376e..f69c5f4f1f 100644 --- a/lib_ppc/board.c +++ b/lib_ppc/board.c @@ -736,8 +736,7 @@ void board_init_r (gd_t *id, ulong dest_addr) WATCHDOG_RESET(); -#if defined(CONFIG_IP860) || defined(CONFIG_PCU_E) || \ - defined (CONFIG_FLAGADM) || defined(CONFIG_MPC83XX) +#if defined(CONFIG_SYS_DELAYED_ICACHE) || defined(CONFIG_MPC83XX) icache_enable (); /* it's time to enable the instruction cache */ #endif |