diff options
| author | Angelo Dureghello <angelo@sysam.it> | 2017-05-15 00:17:48 +0200 |
|---|---|---|
| committer | Angelo Dureghello <angelo@sysam.it> | 2017-08-18 01:26:39 +0200 |
| commit | 02a6eddabab9d2c4f53d633aacd73030bf113d78 (patch) | |
| tree | c2dc8045ecd085efc25dcbce529a07938d6aba64 /arch | |
| parent | c533cfcd93ba6c8b30b3e10b5abf41fda90f9cf8 (diff) | |
m68k: mcf5445x: allow CS0 to be undefined
On some boards, CONFIG_SYS_CS0_BASE can be undefined, since
CS0 is not connected to any signal.
Signed-off-by: Angelo Dureghello <angelo@sysam.it>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68k/cpu/mcf5445x/cpu_init.c | 2 | ||||
| -rw-r--r-- | arch/m68k/cpu/mcf5445x/start.S | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/m68k/cpu/mcf5445x/cpu_init.c b/arch/m68k/cpu/mcf5445x/cpu_init.c index b4a8eefa94..5d2b116be1 100644 --- a/arch/m68k/cpu/mcf5445x/cpu_init.c +++ b/arch/m68k/cpu/mcf5445x/cpu_init.c @@ -205,6 +205,7 @@ void cpu_init_f(void) /* FlexBus Chipselect */ init_fbcs(); +#ifdef CONFIG_SYS_CS0_BASE /* * now the flash base address is no longer at 0 (Newer ColdFire family * boot at address 0 instead of 0xFFnn_nnnn). The vector table must @@ -212,6 +213,7 @@ void cpu_init_f(void) */ if (CONFIG_SYS_CS0_BASE != 0) setvbr(CONFIG_SYS_CS0_BASE); +#endif icache_enable(); } diff --git a/arch/m68k/cpu/mcf5445x/start.S b/arch/m68k/cpu/mcf5445x/start.S index 41d9088b6a..4c09489bcb 100644 --- a/arch/m68k/cpu/mcf5445x/start.S +++ b/arch/m68k/cpu/mcf5445x/start.S @@ -159,6 +159,7 @@ asm_dram_init: move.l #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET), %sp clr.l %sp@- +#ifdef CONFIG_SYS_CS0_BASE /* Must disable global address */ move.l #0xFC008000, %a1 move.l #(CONFIG_SYS_CS0_BASE), (%a1) @@ -166,6 +167,7 @@ asm_dram_init: move.l #(CONFIG_SYS_CS0_CTRL), (%a1) move.l #0xFC008004, %a1 move.l #(CONFIG_SYS_CS0_MASK), (%a1) +#endif #endif /* CONFIG_CF_SBF */ #ifdef CONFIG_MCF5441x @@ -342,6 +344,7 @@ asm_nand_init: movec %d0, %ACR2 movec %d0, %ACR3 +#ifdef CONFIG_SYS_CS0_BASE /* Must disable global address */ move.l #0xFC008000, %a1 move.l #(CONFIG_SYS_CS0_BASE), (%a1) @@ -349,6 +352,7 @@ asm_nand_init: move.l #(CONFIG_SYS_CS0_CTRL), (%a1) move.l #0xFC008004, %a1 move.l #(CONFIG_SYS_CS0_MASK), (%a1) +#endif /* NAND port configuration */ move.l #0xEC094048, %a1 |