qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Angelo Dureghello 2017-05-15 00:17:48 +02:00
parent c533cfcd93
commit 02a6eddaba
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/m68k/cpu/mcf5445x/cpu_init.c
View File

@ -205,6 +205,7 @@ void cpu_init_f(void)
/* FlexBus Chipselect */ /* FlexBus Chipselect */
init_fbcs(); init_fbcs();
#ifdef CONFIG_SYS_CS0_BASE
/* /*
* now the flash base address is no longer at 0 (Newer ColdFire family * 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 * 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) if (CONFIG_SYS_CS0_BASE != 0)
setvbr(CONFIG_SYS_CS0_BASE); setvbr(CONFIG_SYS_CS0_BASE);
#endif
icache_enable(); icache_enable();
} }

4
arch/m68k/cpu/mcf5445x/start.S
View File

@ -159,6 +159,7 @@ asm_dram_init:
move.l #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET), %sp move.l #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET), %sp
clr.l %sp@- clr.l %sp@-
#ifdef CONFIG_SYS_CS0_BASE
/* Must disable global address */ /* Must disable global address */
move.l #0xFC008000, %a1 move.l #0xFC008000, %a1
move.l #(CONFIG_SYS_CS0_BASE), (%a1) move.l #(CONFIG_SYS_CS0_BASE), (%a1)
@ -166,6 +167,7 @@ asm_dram_init:
move.l #(CONFIG_SYS_CS0_CTRL), (%a1) move.l #(CONFIG_SYS_CS0_CTRL), (%a1)
move.l #0xFC008004, %a1 move.l #0xFC008004, %a1
move.l #(CONFIG_SYS_CS0_MASK), (%a1) move.l #(CONFIG_SYS_CS0_MASK), (%a1)
#endif
#endif /* CONFIG_CF_SBF */ #endif /* CONFIG_CF_SBF */
#ifdef CONFIG_MCF5441x #ifdef CONFIG_MCF5441x
@ -342,6 +344,7 @@ asm_nand_init:
movec %d0, %ACR2 movec %d0, %ACR2
movec %d0, %ACR3 movec %d0, %ACR3
#ifdef CONFIG_SYS_CS0_BASE
/* Must disable global address */ /* Must disable global address */
move.l #0xFC008000, %a1 move.l #0xFC008000, %a1
move.l #(CONFIG_SYS_CS0_BASE), (%a1) move.l #(CONFIG_SYS_CS0_BASE), (%a1)
@ -349,6 +352,7 @@ asm_nand_init:
move.l #(CONFIG_SYS_CS0_CTRL), (%a1) move.l #(CONFIG_SYS_CS0_CTRL), (%a1)
move.l #0xFC008004, %a1 move.l #0xFC008004, %a1
move.l #(CONFIG_SYS_CS0_MASK), (%a1) move.l #(CONFIG_SYS_CS0_MASK), (%a1)
#endif
/* NAND port configuration */ /* NAND port configuration */
move.l #0xEC094048, %a1 move.l #0xEC094048, %a1