summaryrefslogtreecommitdiff
path: root/cleopatre/u-boot-1.1.6/cpu/spc300/start.S
diff options
context:
space:
mode:
authorMSE500 Team2011-12-06 10:54:05 +0100
committerNicolas Schodet2012-05-09 10:41:12 +0200
commit74d85a20c37ca80f262751a447a34a72511a67fb (patch)
treec67807d6ccc866443b309616d9ac5523e4394c2a /cleopatre/u-boot-1.1.6/cpu/spc300/start.S
parent59e74789a998fc5770e5267276c387a6afbf40aa (diff)
cleo/u-boot: support spc300dini, refs #2758
Support the SPC300c (MARIA2) prototype which is an FPGA based on DINI boards.
Diffstat (limited to 'cleopatre/u-boot-1.1.6/cpu/spc300/start.S')
-rw-r--r--cleopatre/u-boot-1.1.6/cpu/spc300/start.S17
1 files changed, 17 insertions, 0 deletions
diff --git a/cleopatre/u-boot-1.1.6/cpu/spc300/start.S b/cleopatre/u-boot-1.1.6/cpu/spc300/start.S
index 1427fc7848..f5e81f4e97 100644
--- a/cleopatre/u-boot-1.1.6/cpu/spc300/start.S
+++ b/cleopatre/u-boot-1.1.6/cpu/spc300/start.S
@@ -285,6 +285,8 @@ in_sdram:
bl ethernet_config /* we pass NVRAM addr in r10; do not corrupt r10 in this function */
mov lr, ip /* restore link */
+#ifndef CONFIG_CHIP_FEATURE_NO_RESET
+
/*
* Release the resets
*/
@@ -313,7 +315,12 @@ in_sdram:
cmp r0, #0
bne .Lwaitrst
+#endif /* CONFIG_CHIP_FEATURE_NO_RESET */
+
bl_no_nvram:
+
+#ifndef CONFIG_CHIP_FEATURE_NO_RESET
+
/* EXT reset */
ldr r0, =REGBANK_BASE
ldr r1, [r0, #RB_RST_MODULE]
@@ -321,6 +328,8 @@ bl_no_nvram:
bic r1, r1, #RST_EXT /* clear bit 12 of RB_RST_MODULE, sw_rst_ext -> 0 */
str r1, [r0, #RB_RST_MODULE]
+#endif
+
/*
* call the set-up function in lib_arm/board.c
* we will never return from this function normally
@@ -349,6 +358,8 @@ cpu_init_crit:
ldr r1, =SPI_FREQ_VAL
str r1, [r0]
+#ifndef CONFIG_CHIP_FEATURE_FIXED_ARM_CLOCK
+
ldr r0, =REGBANK_BASE
ldr r1, =CLK_DIV_ARM_2
str r1, [r0, #RB_CLK_DIV_ARM] /* 0 -> RB_CLK_DIV_ARM CLK_ARM = CLK_AHB * 2*/
@@ -359,6 +370,8 @@ poll_RB_CLK_DIV_STAT_ARM:
cmp r1, #CLK_DIV_ARM_2
bne poll_RB_CLK_DIV_STAT_ARM
+#endif
+
/*
* Detect NVRAM address
*/
@@ -384,6 +397,8 @@ poll_RB_CLK_DIV_STAT_ARM:
#endif
+#ifndef CONFIG_CHIP_FEATURE_NO_PLL
+
/*
* Do PLL initialization (depending on nvram parameters Xclk and Freq)
*/
@@ -391,6 +406,8 @@ poll_RB_CLK_DIV_STAT_ARM:
bl pll_init /* we pass NVRAM addr in r10; do not corrupt r10 in this function */
mov lr, ip /* restore link */
+#endif
+
/*
* All vital periphs configured, exit cpu_init_crit
*/