projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename TEXT_BASE into CONFIG_SYS_TEXT_BASE
[platform/kernel/u-boot.git]
/
board
/
innokom
/
lowlevel_init.S
diff --git
a/board/innokom/lowlevel_init.S
b/board/innokom/lowlevel_init.S
index
4c9f10f
..
55169be
100644
(file)
--- a/
board/innokom/lowlevel_init.S
+++ b/
board/innokom/lowlevel_init.S
@@
-29,7
+29,7
@@
#include <version.h>
#include <asm/arch/pxa-regs.h>
#include <version.h>
#include <asm/arch/pxa-regs.h>
-DRAM_SIZE: .long C
FG
_DRAM_SIZE
+DRAM_SIZE: .long C
ONFIG_SYS
_DRAM_SIZE
/* wait for coprocessor write complete */
.macro CPWAIT reg
/* wait for coprocessor write complete */
.macro CPWAIT reg
@@
-39,7
+39,7
@@
DRAM_SIZE: .long CFG_DRAM_SIZE
.endm
_TEXT_BASE:
.endm
_TEXT_BASE:
- .word TEXT_BASE
+ .word
CONFIG_SYS_
TEXT_BASE
/*
/*
@@
-54,71
+54,71
@@
lowlevel_init:
/* Set up GPIO pins first ----------------------------------------- */
ldr r0, =GPSR0
/* Set up GPIO pins first ----------------------------------------- */
ldr r0, =GPSR0
- ldr r1, =C
FG
_GPSR0_VAL
+ ldr r1, =C
ONFIG_SYS
_GPSR0_VAL
str r1, [r0]
ldr r0, =GPSR1
str r1, [r0]
ldr r0, =GPSR1
- ldr r1, =C
FG
_GPSR1_VAL
+ ldr r1, =C
ONFIG_SYS
_GPSR1_VAL
str r1, [r0]
ldr r0, =GPSR2
str r1, [r0]
ldr r0, =GPSR2
- ldr r1, =C
FG
_GPSR2_VAL
+ ldr r1, =C
ONFIG_SYS
_GPSR2_VAL
str r1, [r0]
ldr r0, =GPCR0
str r1, [r0]
ldr r0, =GPCR0
- ldr r1, =C
FG
_GPCR0_VAL
+ ldr r1, =C
ONFIG_SYS
_GPCR0_VAL
str r1, [r0]
ldr r0, =GPCR1
str r1, [r0]
ldr r0, =GPCR1
- ldr r1, =C
FG
_GPCR1_VAL
+ ldr r1, =C
ONFIG_SYS
_GPCR1_VAL
str r1, [r0]
ldr r0, =GPCR2
str r1, [r0]
ldr r0, =GPCR2
- ldr r1, =C
FG
_GPCR2_VAL
+ ldr r1, =C
ONFIG_SYS
_GPCR2_VAL
str r1, [r0]
ldr r0, =GPDR0
str r1, [r0]
ldr r0, =GPDR0
- ldr r1, =C
FG
_GPDR0_VAL
+ ldr r1, =C
ONFIG_SYS
_GPDR0_VAL
str r1, [r0]
ldr r0, =GPDR1
str r1, [r0]
ldr r0, =GPDR1
- ldr r1, =C
FG
_GPDR1_VAL
+ ldr r1, =C
ONFIG_SYS
_GPDR1_VAL
str r1, [r0]
ldr r0, =GPDR2
str r1, [r0]
ldr r0, =GPDR2
- ldr r1, =C
FG
_GPDR2_VAL
+ ldr r1, =C
ONFIG_SYS
_GPDR2_VAL
str r1, [r0]
ldr r0, =GAFR0_L
str r1, [r0]
ldr r0, =GAFR0_L
- ldr r1, =C
FG
_GAFR0_L_VAL
+ ldr r1, =C
ONFIG_SYS
_GAFR0_L_VAL
str r1, [r0]
ldr r0, =GAFR0_U
str r1, [r0]
ldr r0, =GAFR0_U
- ldr r1, =C
FG
_GAFR0_U_VAL
+ ldr r1, =C
ONFIG_SYS
_GAFR0_U_VAL
str r1, [r0]
ldr r0, =GAFR1_L
str r1, [r0]
ldr r0, =GAFR1_L
- ldr r1, =C
FG
_GAFR1_L_VAL
+ ldr r1, =C
ONFIG_SYS
_GAFR1_L_VAL
str r1, [r0]
ldr r0, =GAFR1_U
str r1, [r0]
ldr r0, =GAFR1_U
- ldr r1, =C
FG
_GAFR1_U_VAL
+ ldr r1, =C
ONFIG_SYS
_GAFR1_U_VAL
str r1, [r0]
ldr r0, =GAFR2_L
str r1, [r0]
ldr r0, =GAFR2_L
- ldr r1, =C
FG
_GAFR2_L_VAL
+ ldr r1, =C
ONFIG_SYS
_GAFR2_L_VAL
str r1, [r0]
ldr r0, =GAFR2_U
str r1, [r0]
ldr r0, =GAFR2_U
- ldr r1, =C
FG
_GAFR2_U_VAL
+ ldr r1, =C
ONFIG_SYS
_GAFR2_U_VAL
str r1, [r0]
ldr r0, =PSSR /* enable GPIO pins */
str r1, [r0]
ldr r0, =PSSR /* enable GPIO pins */
- ldr r1, =C
FG
_PSSR_VAL
+ ldr r1, =C
ONFIG_SYS
_PSSR_VAL
str r1, [r0]
/* ldr r3, =MSC1 / low - bank 2 Lubbock Registers / SRAM */
str r1, [r0]
/* ldr r3, =MSC1 / low - bank 2 Lubbock Registers / SRAM */
-/* ldr r2, =C
FG_MSC1_VAL
/ high - bank 3 Ethernet Controller */
+/* ldr r2, =C
ONFIG_SYS_MSC1_VAL
/ high - bank 3 Ethernet Controller */
/* str r2, [r3] / need to set MSC1 before trying to write to the HEX LEDs */
/* ldr r2, [r3] / need to read it back to make sure the value latches (see MSC section of manual) */
/* */
/* str r2, [r3] / need to set MSC1 before trying to write to the HEX LEDs */
/* ldr r2, [r3] / need to read it back to make sure the value latches (see MSC section of manual) */
/* */
@@
-168,17
+168,17
@@
mem_init:
/* MSC registers: timing, bus width, mem type */
/* MSC0: nCS(0,1) */
/* MSC registers: timing, bus width, mem type */
/* MSC0: nCS(0,1) */
- ldr r2, =C
FG
_MSC0_VAL
+ ldr r2, =C
ONFIG_SYS
_MSC0_VAL
str r2, [r1, #MSC0_OFFSET]
ldr r2, [r1, #MSC0_OFFSET] /* read back to ensure */
/* that data latches */
/* MSC1: nCS(2,3) */
str r2, [r1, #MSC0_OFFSET]
ldr r2, [r1, #MSC0_OFFSET] /* read back to ensure */
/* that data latches */
/* MSC1: nCS(2,3) */
- ldr r2, =C
FG
_MSC1_VAL
+ ldr r2, =C
ONFIG_SYS
_MSC1_VAL
str r2, [r1, #MSC1_OFFSET]
ldr r2, [r1, #MSC1_OFFSET]
/* MSC2: nCS(4,5) */
str r2, [r1, #MSC1_OFFSET]
ldr r2, [r1, #MSC1_OFFSET]
/* MSC2: nCS(4,5) */
- ldr r2, =C
FG
_MSC2_VAL
+ ldr r2, =C
ONFIG_SYS
_MSC2_VAL
str r2, [r1, #MSC2_OFFSET]
ldr r2, [r1, #MSC2_OFFSET]
str r2, [r1, #MSC2_OFFSET]
ldr r2, [r1, #MSC2_OFFSET]
@@
-187,37
+187,37
@@
mem_init:
/* ---------------------------------------------------------------- */
/* MECR: Memory Expansion Card Register */
/* ---------------------------------------------------------------- */
/* MECR: Memory Expansion Card Register */
- ldr r2, =C
FG
_MECR_VAL
+ ldr r2, =C
ONFIG_SYS
_MECR_VAL
str r2, [r1, #MECR_OFFSET]
ldr r2, [r1, #MECR_OFFSET]
/* MCMEM0: Card Interface slot 0 timing */
str r2, [r1, #MECR_OFFSET]
ldr r2, [r1, #MECR_OFFSET]
/* MCMEM0: Card Interface slot 0 timing */
- ldr r2, =C
FG
_MCMEM0_VAL
+ ldr r2, =C
ONFIG_SYS
_MCMEM0_VAL
str r2, [r1, #MCMEM0_OFFSET]
ldr r2, [r1, #MCMEM0_OFFSET]
/* MCMEM1: Card Interface slot 1 timing */
str r2, [r1, #MCMEM0_OFFSET]
ldr r2, [r1, #MCMEM0_OFFSET]
/* MCMEM1: Card Interface slot 1 timing */
- ldr r2, =C
FG
_MCMEM1_VAL
+ ldr r2, =C
ONFIG_SYS
_MCMEM1_VAL
str r2, [r1, #MCMEM1_OFFSET]
ldr r2, [r1, #MCMEM1_OFFSET]
/* MCATT0: Card Interface Attribute Space Timing, slot 0 */
str r2, [r1, #MCMEM1_OFFSET]
ldr r2, [r1, #MCMEM1_OFFSET]
/* MCATT0: Card Interface Attribute Space Timing, slot 0 */
- ldr r2, =C
FG
_MCATT0_VAL
+ ldr r2, =C
ONFIG_SYS
_MCATT0_VAL
str r2, [r1, #MCATT0_OFFSET]
ldr r2, [r1, #MCATT0_OFFSET]
/* MCATT1: Card Interface Attribute Space Timing, slot 1 */
str r2, [r1, #MCATT0_OFFSET]
ldr r2, [r1, #MCATT0_OFFSET]
/* MCATT1: Card Interface Attribute Space Timing, slot 1 */
- ldr r2, =C
FG
_MCATT1_VAL
+ ldr r2, =C
ONFIG_SYS
_MCATT1_VAL
str r2, [r1, #MCATT1_OFFSET]
ldr r2, [r1, #MCATT1_OFFSET]
/* MCIO0: Card Interface I/O Space Timing, slot 0 */
str r2, [r1, #MCATT1_OFFSET]
ldr r2, [r1, #MCATT1_OFFSET]
/* MCIO0: Card Interface I/O Space Timing, slot 0 */
- ldr r2, =C
FG
_MCIO0_VAL
+ ldr r2, =C
ONFIG_SYS
_MCIO0_VAL
str r2, [r1, #MCIO0_OFFSET]
ldr r2, [r1, #MCIO0_OFFSET]
/* MCIO1: Card Interface I/O Space Timing, slot 1 */
str r2, [r1, #MCIO0_OFFSET]
ldr r2, [r1, #MCIO0_OFFSET]
/* MCIO1: Card Interface I/O Space Timing, slot 1 */
- ldr r2, =C
FG
_MCIO1_VAL
+ ldr r2, =C
ONFIG_SYS
_MCIO1_VAL
str r2, [r1, #MCIO1_OFFSET]
ldr r2, [r1, #MCIO1_OFFSET]
str r2, [r1, #MCIO1_OFFSET]
ldr r2, [r1, #MCIO1_OFFSET]
@@
-239,7
+239,7
@@
mem_init:
/* Before accessing MDREFR we need a valid DRI field, so we set */
/* this to power on defaults + DRI field. */
/* Before accessing MDREFR we need a valid DRI field, so we set */
/* this to power on defaults + DRI field. */
- ldr r3, =C
FG
_MDREFR_VAL
+ ldr r3, =C
ONFIG_SYS
_MDREFR_VAL
ldr r2, =0xFFF
and r3, r3, r2
ldr r4, =0x03ca4000
ldr r2, =0xFFF
and r3, r3, r2
ldr r4, =0x03ca4000
@@
-269,7
+269,7
@@
mem_init:
/* Step 4a: assert MDREFR:K?RUN and configure */
/* MDREFR:K1DB2 and MDREFR:K2DB2 as desired. */
/* Step 4a: assert MDREFR:K?RUN and configure */
/* MDREFR:K1DB2 and MDREFR:K2DB2 as desired. */
- ldr r4, =C
FG
_MDREFR_VAL
+ ldr r4, =C
ONFIG_SYS
_MDREFR_VAL
str r4, [r1, #MDREFR_OFFSET] /* write back MDREFR */
ldr r4, [r1, #MDREFR_OFFSET]
str r4, [r1, #MDREFR_OFFSET] /* write back MDREFR */
ldr r4, [r1, #MDREFR_OFFSET]
@@
-292,7
+292,7
@@
mem_init:
/* Step 4d: write MDCNFG with MDCNFG:DEx deasserted (set to 0), to */
/* configure but not enable each SDRAM partition pair. */
/* Step 4d: write MDCNFG with MDCNFG:DEx deasserted (set to 0), to */
/* configure but not enable each SDRAM partition pair. */
- ldr r4, =C
FG
_MDCNFG_VAL
+ ldr r4, =C
ONFIG_SYS
_MDCNFG_VAL
bic r4, r4, #(MDCNFG_DE0|MDCNFG_DE1)
str r4, [r1, #MDCNFG_OFFSET] /* write back MDCNFG */
bic r4, r4, #(MDCNFG_DE0|MDCNFG_DE1)
str r4, [r1, #MDCNFG_OFFSET] /* write back MDCNFG */
@@
-325,7
+325,7
@@
mem_init:
/* Jan 2003, Errata #116, page 30. */
/* Jan 2003, Errata #116, page 30. */
- ldr r3, =C
FG
_DRAM_BASE
+ ldr r3, =C
ONFIG_SYS
_DRAM_BASE
str r2, [r3]
str r2, [r3]
str r2, [r3]
str r2, [r3]
str r2, [r3]
str r2, [r3]
@@
-345,7
+345,7
@@
mem_init:
/* Step 4h: Write MDMRS. */
/* Step 4h: Write MDMRS. */
- ldr r2, =C
FG
_MDMRS_VAL
+ ldr r2, =C
ONFIG_SYS
_MDMRS_VAL
str r2, [r1, #MDMRS_OFFSET]
str r2, [r1, #MDMRS_OFFSET]