Patch by Steven Scholz, 4 Apr 2005:
- remove all references to CONFIG_INIT_CRITICAL for ARM based boards - introduce two new configuration options instead: CONFIG_SKIP_LOWLEVEL_INIT and CONFIG_SKIP_RELOCATE_UBOOT
This commit is contained in:
parent
986ef4340e
commit
8aa1a2d115
|
@ -2,6 +2,11 @@
|
||||||
Changes for U-Boot 1.1.3:
|
Changes for U-Boot 1.1.3:
|
||||||
======================================================================
|
======================================================================
|
||||||
|
|
||||||
|
* Patch by Steven Scholz, 04 Apr 2005:
|
||||||
|
- remove all references to CONFIG_INIT_CRITICAL for ARM based boards
|
||||||
|
- introduce two new configuration options instead:
|
||||||
|
CONFIG_SKIP_LOWLEVEL_INIT and CONFIG_SKIP_RELOCATE_UBOOT
|
||||||
|
|
||||||
* Patch by Steven Scholz, 04 Apr 2005:
|
* Patch by Steven Scholz, 04 Apr 2005:
|
||||||
Make sure that MDIO clock does not exceed 2.5 MHz on AT91
|
Make sure that MDIO clock does not exceed 2.5 MHz on AT91
|
||||||
|
|
||||||
|
|
20
README
20
README
|
@ -2129,14 +2129,18 @@ Low Level (hardware related) configuration options:
|
||||||
This only takes effect if the memory commands are activated
|
This only takes effect if the memory commands are activated
|
||||||
globally (CFG_CMD_MEM).
|
globally (CFG_CMD_MEM).
|
||||||
|
|
||||||
- CONFIG_INIT_CRITICAL
|
- CONFIG_SKIP_LOWLEVEL_INIT
|
||||||
[ARM only] If this variable is NOT defined, then
|
- CONFIG_SKIP_RELOCATE_UBOOT
|
||||||
certain critical initializations (like setting up the
|
|
||||||
memory controller) are omitted. Normally this
|
[ARM only] If these variables are defined, then
|
||||||
variable MUST be defined for all boards. The only
|
certain low level initializations (like setting up
|
||||||
exception is when U-Boot is loaded (to RAM) by some
|
the memory controller) are omitted and/or U-Boot does
|
||||||
other boot loader or by a debugger which performs
|
not relocate itself into RAM.
|
||||||
these intializations itself.
|
Normally these variables MUST NOT be defined. The
|
||||||
|
only exception is when U-Boot is loaded (to RAM) by
|
||||||
|
some other boot loader or by a debugger which
|
||||||
|
performs these intializations itself.
|
||||||
|
|
||||||
|
|
||||||
Building the Software:
|
Building the Software:
|
||||||
======================
|
======================
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
#include <version.h>
|
#include <version.h>
|
||||||
|
|
||||||
#if defined(CONFIG_NS9750DEV)
|
#if defined(CONFIG_NS9750DEV)
|
||||||
# ifdef CONFIG_INIT_CRITICAL
|
# ifndef CONFIG_SKIP_LOWLEVEL_INIT
|
||||||
# include <./ns9750_sys.h>
|
# include <./ns9750_sys.h>
|
||||||
# include <./ns9750_mem.h>
|
# include <./ns9750_mem.h>
|
||||||
# endif
|
# endif
|
||||||
|
@ -74,7 +74,7 @@ _PHYS_FLASH:
|
||||||
_CAS_LATENCY:
|
_CAS_LATENCY:
|
||||||
.word 0x00022000 @ for CAS2 latency
|
.word 0x00022000 @ for CAS2 latency
|
||||||
|
|
||||||
#ifdef CONFIG_INIT_CRITICAL
|
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
|
||||||
.globl platformsetup
|
.globl platformsetup
|
||||||
platformsetup:
|
platformsetup:
|
||||||
|
|
||||||
|
@ -295,4 +295,4 @@ _AHB_MONITOR_START:
|
||||||
NS9750_SYS_AHB_MON_BATC_GEN_IRQ)
|
NS9750_SYS_AHB_MON_BATC_GEN_IRQ)
|
||||||
_AHB_MONITOR_END:
|
_AHB_MONITOR_END:
|
||||||
|
|
||||||
#endif /* CONFIG_INIT_CRITICAL */
|
#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
|
||||||
|
|
|
@ -129,8 +129,11 @@ next:
|
||||||
bl cpy_clk_code /* put dpll adjust code behind vectors */
|
bl cpy_clk_code /* put dpll adjust code behind vectors */
|
||||||
#endif
|
#endif
|
||||||
/* the mask ROM code should have PLL and others stable */
|
/* the mask ROM code should have PLL and others stable */
|
||||||
|
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
|
||||||
bl cpu_init_crit
|
bl cpu_init_crit
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef CONFIG_SKIP_RELOCATE_UBOOT
|
||||||
relocate: /* relocate U-Boot to RAM */
|
relocate: /* relocate U-Boot to RAM */
|
||||||
adr r0, _start /* r0 <- current position of code */
|
adr r0, _start /* r0 <- current position of code */
|
||||||
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
|
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
|
||||||
|
@ -147,6 +150,7 @@ copy_loop:
|
||||||
stmia r1!, {r3-r10} /* copy to target address [r1] */
|
stmia r1!, {r3-r10} /* copy to target address [r1] */
|
||||||
cmp r0, r2 /* until source end addreee [r2] */
|
cmp r0, r2 /* until source end addreee [r2] */
|
||||||
ble copy_loop
|
ble copy_loop
|
||||||
|
#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
|
||||||
|
|
||||||
/* Set up the stack */
|
/* Set up the stack */
|
||||||
stack_setup:
|
stack_setup:
|
||||||
|
|
|
@ -119,10 +119,11 @@ reset:
|
||||||
* we do sys-critical inits only at reboot,
|
* we do sys-critical inits only at reboot,
|
||||||
* not when booting from ram!
|
* not when booting from ram!
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_INIT_CRITICAL
|
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
|
||||||
bl cpu_init_crit
|
bl cpu_init_crit
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef CONFIG_SKIP_RELOCATE_UBOOT
|
||||||
relocate: /* relocate U-Boot to RAM */
|
relocate: /* relocate U-Boot to RAM */
|
||||||
adr r0, _start /* r0 <- current position of code */
|
adr r0, _start /* r0 <- current position of code */
|
||||||
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
|
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
|
||||||
|
@ -150,6 +151,8 @@ copy_loop:
|
||||||
cmp r0, r2 /* until source end addreee [r2] */
|
cmp r0, r2 /* until source end addreee [r2] */
|
||||||
ble copy_loop
|
ble copy_loop
|
||||||
|
|
||||||
|
#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
|
||||||
|
|
||||||
/* Set up the stack */
|
/* Set up the stack */
|
||||||
stack_setup:
|
stack_setup:
|
||||||
ldr r0, _TEXT_BASE /* upper 128 KiB: relocated uboot */
|
ldr r0, _TEXT_BASE /* upper 128 KiB: relocated uboot */
|
||||||
|
|
|
@ -156,10 +156,11 @@ reset:
|
||||||
* we do sys-critical inits only at reboot,
|
* we do sys-critical inits only at reboot,
|
||||||
* not when booting from ram!
|
* not when booting from ram!
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_INIT_CRITICAL
|
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
|
||||||
bl cpu_init_crit
|
bl cpu_init_crit
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef CONFIG_SKIP_RELOCATE_UBOOT
|
||||||
relocate: /* relocate U-Boot to RAM */
|
relocate: /* relocate U-Boot to RAM */
|
||||||
adr r0, _start /* r0 <- current position of code */
|
adr r0, _start /* r0 <- current position of code */
|
||||||
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
|
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
|
||||||
|
@ -176,6 +177,7 @@ copy_loop:
|
||||||
stmia r1!, {r3-r10} /* copy to target address [r1] */
|
stmia r1!, {r3-r10} /* copy to target address [r1] */
|
||||||
cmp r0, r2 /* until source end addreee [r2] */
|
cmp r0, r2 /* until source end addreee [r2] */
|
||||||
ble copy_loop
|
ble copy_loop
|
||||||
|
#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
|
||||||
|
|
||||||
/* Set up the stack */
|
/* Set up the stack */
|
||||||
stack_setup:
|
stack_setup:
|
||||||
|
|
|
@ -164,10 +164,11 @@ poll1:
|
||||||
* we do sys-critical inits only at reboot,
|
* we do sys-critical inits only at reboot,
|
||||||
* not when booting from ram!
|
* not when booting from ram!
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_INIT_CRITICAL
|
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
|
||||||
bl cpu_init_crit
|
bl cpu_init_crit
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef CONFIG_SKIP_RELOCATE_UBOOT
|
||||||
relocate: /* relocate U-Boot to RAM */
|
relocate: /* relocate U-Boot to RAM */
|
||||||
adr r0, _start /* r0 <- current position of code */
|
adr r0, _start /* r0 <- current position of code */
|
||||||
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
|
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
|
||||||
|
@ -184,6 +185,7 @@ copy_loop:
|
||||||
stmia r1!, {r3-r10} /* copy to target address [r1] */
|
stmia r1!, {r3-r10} /* copy to target address [r1] */
|
||||||
cmp r0, r2 /* until source end addreee [r2] */
|
cmp r0, r2 /* until source end addreee [r2] */
|
||||||
ble copy_loop
|
ble copy_loop
|
||||||
|
#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
|
||||||
|
|
||||||
/* Set up the stack */
|
/* Set up the stack */
|
||||||
stack_setup:
|
stack_setup:
|
||||||
|
|
|
@ -139,10 +139,11 @@ reset:
|
||||||
* we do sys-critical inits only at reboot,
|
* we do sys-critical inits only at reboot,
|
||||||
* not when booting from ram!
|
* not when booting from ram!
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_INIT_CRITICAL
|
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
|
||||||
bl cpu_init_crit
|
bl cpu_init_crit
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef CONFIG_SKIP_RELOCATE_UBOOT
|
||||||
relocate: /* relocate U-Boot to RAM */
|
relocate: /* relocate U-Boot to RAM */
|
||||||
adr r0, _start /* r0 <- current position of code */
|
adr r0, _start /* r0 <- current position of code */
|
||||||
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
|
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
|
||||||
|
@ -159,6 +160,7 @@ copy_loop:
|
||||||
stmia r1!, {r3-r10} /* copy to target address [r1] */
|
stmia r1!, {r3-r10} /* copy to target address [r1] */
|
||||||
cmp r0, r2 /* until source end addreee [r2] */
|
cmp r0, r2 /* until source end addreee [r2] */
|
||||||
ble copy_loop
|
ble copy_loop
|
||||||
|
#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
|
||||||
|
|
||||||
/* Set up the stack */
|
/* Set up the stack */
|
||||||
stack_setup:
|
stack_setup:
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
#include <version.h>
|
#include <version.h>
|
||||||
|
|
||||||
#ifdef CONFIG_INIT_CRITICAL
|
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
|
||||||
/*
|
/*
|
||||||
* some parameters for the board
|
* some parameters for the board
|
||||||
*
|
*
|
||||||
|
@ -197,4 +197,4 @@ SMRDATA1:
|
||||||
.word SDRAM
|
.word SDRAM
|
||||||
.word SDRAM_VAL
|
.word SDRAM_VAL
|
||||||
/* SMRDATA1 is 176 bytes long */
|
/* SMRDATA1 is 176 bytes long */
|
||||||
#endif /* CONFIG_INIT_CRITICAL */
|
#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
|
||||||
|
|
|
@ -115,7 +115,7 @@ reset:
|
||||||
orr r0,r0,#0xd3 /* was 13 */
|
orr r0,r0,#0xd3 /* was 13 */
|
||||||
msr cpsr,r0
|
msr cpsr,r0
|
||||||
|
|
||||||
#ifdef CONFIG_INIT_CRITICAL
|
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
|
||||||
/* scratch stack */
|
/* scratch stack */
|
||||||
/**** ldr r1, =0x00204000 ****/
|
/**** ldr r1, =0x00204000 ****/
|
||||||
/* Insure word alignment */
|
/* Insure word alignment */
|
||||||
|
@ -141,7 +141,7 @@ reset:
|
||||||
orr r0, r0, #0x00001000 @ set bit 12 (I) I-Cache
|
orr r0, r0, #0x00001000 @ set bit 12 (I) I-Cache
|
||||||
orr r0, r0, #0xC0000000 @ set bits 31:30 (iA, nF)
|
orr r0, r0, #0xC0000000 @ set bits 31:30 (iA, nF)
|
||||||
mcr p15, 0, r0, c1, c0, 0 @ write r0 in cp15 control register (cp15 r1)
|
mcr p15, 0, r0, c1, c0, 0 @ write r0 in cp15 control register (cp15 r1)
|
||||||
#endif /* CONFIG_INIT_CRITICAL */
|
#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
|
||||||
/*
|
/*
|
||||||
* relocate exeception table
|
* relocate exeception table
|
||||||
*/
|
*/
|
||||||
|
@ -158,9 +158,11 @@ copyex:
|
||||||
* we do sys-critical inits only at reboot,
|
* we do sys-critical inits only at reboot,
|
||||||
* not when booting from ram!
|
* not when booting from ram!
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_INIT_CRITICAL
|
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
|
||||||
bl cpu_init_crit
|
bl cpu_init_crit
|
||||||
|
#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
|
||||||
|
|
||||||
|
#ifndef CONFIG_SKIP_RELOCATE_UBOOT
|
||||||
relocate: /* relocate U-Boot to RAM */
|
relocate: /* relocate U-Boot to RAM */
|
||||||
adr r0, _start /* r0 <- current position of code */
|
adr r0, _start /* r0 <- current position of code */
|
||||||
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
|
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
|
||||||
|
@ -177,7 +179,7 @@ copy_loop:
|
||||||
stmia r1!, {r3-r10} /* copy to target address [r1] */
|
stmia r1!, {r3-r10} /* copy to target address [r1] */
|
||||||
cmp r0, r2 /* until source end addreee [r2] */
|
cmp r0, r2 /* until source end addreee [r2] */
|
||||||
ble copy_loop
|
ble copy_loop
|
||||||
#endif /* CONFIG_INIT_CRITICAL */
|
#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
|
||||||
|
|
||||||
/* Set up the stack */
|
/* Set up the stack */
|
||||||
stack_setup:
|
stack_setup:
|
||||||
|
|
|
@ -261,6 +261,7 @@ reset:
|
||||||
orr r0,r0,#0x13
|
orr r0,r0,#0x13
|
||||||
msr cpsr,r0
|
msr cpsr,r0
|
||||||
|
|
||||||
|
#ifndef CONFIG_SKIP_RELOCATE_UBOOT
|
||||||
relocate: /* relocate U-Boot to RAM */
|
relocate: /* relocate U-Boot to RAM */
|
||||||
adr r0, _start /* r0 <- current position of code */
|
adr r0, _start /* r0 <- current position of code */
|
||||||
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
|
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
|
||||||
|
@ -277,6 +278,7 @@ copy_loop:
|
||||||
stmia r1!, {r3-r10} /* copy to target address [r1] */
|
stmia r1!, {r3-r10} /* copy to target address [r1] */
|
||||||
cmp r0, r2 /* until source end addreee [r2] */
|
cmp r0, r2 /* until source end addreee [r2] */
|
||||||
ble copy_loop
|
ble copy_loop
|
||||||
|
#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
|
||||||
|
|
||||||
/* Set up the stack */
|
/* Set up the stack */
|
||||||
stack_setup:
|
stack_setup:
|
||||||
|
|
|
@ -145,10 +145,11 @@ reset:
|
||||||
* we do sys-critical inits only at reboot,
|
* we do sys-critical inits only at reboot,
|
||||||
* not when booting from ram!
|
* not when booting from ram!
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_INIT_CRITICAL
|
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
|
||||||
bl cpu_init_crit
|
bl cpu_init_crit
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef CONFIG_SKIP_RELOCATE_UBOOT
|
||||||
relocate: /* relocate U-Boot to RAM */
|
relocate: /* relocate U-Boot to RAM */
|
||||||
adr r0, _start /* r0 <- current position of code */
|
adr r0, _start /* r0 <- current position of code */
|
||||||
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
|
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
|
||||||
|
@ -166,6 +167,7 @@ copy_loop:
|
||||||
cmp r0, r2 /* until source end addreee [r2] */
|
cmp r0, r2 /* until source end addreee [r2] */
|
||||||
blt copy_loop /* a 'ble' here actually copies */
|
blt copy_loop /* a 'ble' here actually copies */
|
||||||
/* four bytes of bss */
|
/* four bytes of bss */
|
||||||
|
#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
|
||||||
|
|
||||||
/* Set up the stack */
|
/* Set up the stack */
|
||||||
stack_setup:
|
stack_setup:
|
||||||
|
|
|
@ -108,10 +108,11 @@ reset:
|
||||||
* we do sys-critical inits only at reboot,
|
* we do sys-critical inits only at reboot,
|
||||||
* not when booting from ram!
|
* not when booting from ram!
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_INIT_CRITICAL
|
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
|
||||||
bl cpu_init_crit /* we do sys-critical inits */
|
bl cpu_init_crit /* we do sys-critical inits */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef CONFIG_SKIP_RELOCATE_UBOOT
|
||||||
relocate: /* relocate U-Boot to RAM */
|
relocate: /* relocate U-Boot to RAM */
|
||||||
adr r0, _start /* r0 <- current position of code */
|
adr r0, _start /* r0 <- current position of code */
|
||||||
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
|
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
|
||||||
|
@ -128,6 +129,7 @@ copy_loop:
|
||||||
stmia r1!, {r3-r10} /* copy to target address [r1] */
|
stmia r1!, {r3-r10} /* copy to target address [r1] */
|
||||||
cmp r0, r2 /* until source end addreee [r2] */
|
cmp r0, r2 /* until source end addreee [r2] */
|
||||||
ble copy_loop
|
ble copy_loop
|
||||||
|
#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
|
||||||
|
|
||||||
/* Set up the stack */
|
/* Set up the stack */
|
||||||
stack_setup:
|
stack_setup:
|
||||||
|
|
|
@ -112,7 +112,7 @@ reset:
|
||||||
* not when booting from ram!
|
* not when booting from ram!
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef CONFIG_INIT_CRITICAL
|
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
|
||||||
bl cpu_init_crit
|
bl cpu_init_crit
|
||||||
/*
|
/*
|
||||||
* before relocating, we have to setup RAM timing
|
* before relocating, we have to setup RAM timing
|
||||||
|
@ -122,6 +122,7 @@ reset:
|
||||||
bl lowlevel_init
|
bl lowlevel_init
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef CONFIG_SKIP_RELOCATE_UBOOT
|
||||||
relocate: /* relocate U-Boot to RAM */
|
relocate: /* relocate U-Boot to RAM */
|
||||||
adr r0, _start /* r0 <- current position of code */
|
adr r0, _start /* r0 <- current position of code */
|
||||||
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
|
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
|
||||||
|
@ -151,6 +152,7 @@ vector_copy_loop:
|
||||||
stmia r1!, {r3-r10}
|
stmia r1!, {r3-r10}
|
||||||
cmp r0, r2
|
cmp r0, r2
|
||||||
ble vector_copy_loop
|
ble vector_copy_loop
|
||||||
|
#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
|
||||||
|
|
||||||
/* Set up the stack */
|
/* Set up the stack */
|
||||||
stack_setup:
|
stack_setup:
|
||||||
|
|
|
@ -121,10 +121,11 @@ reset:
|
||||||
* we do sys-critical inits only at reboot,
|
* we do sys-critical inits only at reboot,
|
||||||
* not when booting from ram!
|
* not when booting from ram!
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_INIT_CRITICAL
|
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
|
||||||
bl cpu_init_crit
|
bl cpu_init_crit
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef CONFIG_SKIP_RELOCATE_UBOOT
|
||||||
relocate: /* relocate U-Boot to RAM */
|
relocate: /* relocate U-Boot to RAM */
|
||||||
adr r0, _start /* r0 <- current position of code */
|
adr r0, _start /* r0 <- current position of code */
|
||||||
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
|
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
|
||||||
|
@ -141,6 +142,7 @@ copy_loop:
|
||||||
stmia r1!, {r3-r10} /* copy to target address [r1] */
|
stmia r1!, {r3-r10} /* copy to target address [r1] */
|
||||||
cmp r0, r2 /* until source end addreee [r2] */
|
cmp r0, r2 /* until source end addreee [r2] */
|
||||||
ble copy_loop
|
ble copy_loop
|
||||||
|
#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
|
||||||
|
|
||||||
/* Set up the stack */
|
/* Set up the stack */
|
||||||
stack_setup:
|
stack_setup:
|
||||||
|
|
|
@ -586,4 +586,9 @@ int pcmcia_init (void);
|
||||||
void show_boot_progress (int status);
|
void show_boot_progress (int status);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_INIT_CRITICAL
|
||||||
|
#error CONFIG_INIT_CRITICAL is depracted!
|
||||||
|
#error Read section CONFIG_SKIP_LOWLEVEL_INIT in README.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* __COMMON_H_ */
|
#endif /* __COMMON_H_ */
|
||||||
|
|
|
@ -30,12 +30,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
* (easy to change)
|
* (easy to change)
|
||||||
|
|
|
@ -23,12 +23,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
* (easy to change)
|
* (easy to change)
|
||||||
|
|
|
@ -29,12 +29,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
* (easy to change)
|
* (easy to change)
|
||||||
|
|
|
@ -31,8 +31,6 @@
|
||||||
|
|
||||||
#undef DEBUG
|
#undef DEBUG
|
||||||
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
* (easy to change)
|
* (easy to change)
|
||||||
|
|
|
@ -25,12 +25,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/* ARM asynchronous clock */
|
/* ARM asynchronous clock */
|
||||||
#define AT91C_MAIN_CLOCK 179712000 /* from 18.432 MHz crystal (18432000 / 4 * 39) */
|
#define AT91C_MAIN_CLOCK 179712000 /* from 18.432 MHz crystal (18432000 / 4 * 39) */
|
||||||
#define AT91C_MASTER_CLOCK 59904000 /* peripheral clock (AT91C_MASTER_CLOCK / 3) */
|
#define AT91C_MASTER_CLOCK 59904000 /* peripheral clock (AT91C_MASTER_CLOCK / 3) */
|
||||||
|
@ -44,7 +38,7 @@
|
||||||
#define CONFIG_SETUP_MEMORY_TAGS 1
|
#define CONFIG_SETUP_MEMORY_TAGS 1
|
||||||
#define CONFIG_INITRD_TAG 1
|
#define CONFIG_INITRD_TAG 1
|
||||||
|
|
||||||
#ifdef CONFIG_INIT_CRITICAL
|
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
|
||||||
#define CFG_USE_MAIN_OSCILLATOR 1
|
#define CFG_USE_MAIN_OSCILLATOR 1
|
||||||
/* flash */
|
/* flash */
|
||||||
#define MC_PUIA_VAL 0x00000000
|
#define MC_PUIA_VAL 0x00000000
|
||||||
|
@ -74,7 +68,7 @@
|
||||||
#define SDRC_MR_VAL2 0x00000003 /* Load Mode Register */
|
#define SDRC_MR_VAL2 0x00000003 /* Load Mode Register */
|
||||||
#define SDRC_MR_VAL3 0x00000000 /* Normal Mode */
|
#define SDRC_MR_VAL3 0x00000000 /* Normal Mode */
|
||||||
#define SDRC_TR_VAL 0x000002E0 /* Write refresh rate */
|
#define SDRC_TR_VAL 0x000002E0 /* Write refresh rate */
|
||||||
#endif /* CONFIG_INIT_CRITICAL */
|
#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
|
||||||
/*
|
/*
|
||||||
* Size of malloc() pool
|
* Size of malloc() pool
|
||||||
*/
|
*/
|
||||||
|
@ -177,19 +171,19 @@
|
||||||
#define CFG_ENV_SIZE 0x2000 /* 0x8000 */
|
#define CFG_ENV_SIZE 0x2000 /* 0x8000 */
|
||||||
#else
|
#else
|
||||||
#define CFG_ENV_IS_IN_FLASH 1
|
#define CFG_ENV_IS_IN_FLASH 1
|
||||||
#ifdef CONFIG_INIT_CRITICAL
|
#ifdef CONFIG_SKIP_LOWLEVEL_INIT
|
||||||
#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x60000) /* after u-boot.bin */
|
#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x60000) /* after u-boot.bin */
|
||||||
#define CFG_ENV_SIZE 0x10000 /* sectors are 64K here */
|
#define CFG_ENV_SIZE 0x10000 /* sectors are 64K here */
|
||||||
#else
|
#else
|
||||||
#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0xe000) /* between boot.bin and u-boot.bin.gz */
|
#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0xe000) /* between boot.bin and u-boot.bin.gz */
|
||||||
#define CFG_ENV_SIZE 0x2000 /* 0x8000 */
|
#define CFG_ENV_SIZE 0x2000 /* 0x8000 */
|
||||||
#endif /* CONFIG_INIT_CRITICAL */
|
#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
|
||||||
#endif /* CFG_ENV_IS_IN_DATAFLASH */
|
#endif /* CFG_ENV_IS_IN_DATAFLASH */
|
||||||
|
|
||||||
|
|
||||||
#define CFG_LOAD_ADDR 0x21000000 /* default load address */
|
#define CFG_LOAD_ADDR 0x21000000 /* default load address */
|
||||||
|
|
||||||
#ifdef CONFIG_INIT_CRITICAL
|
#ifdef CONFIG_SKIP_LOWLEVEL_INIT
|
||||||
#define CFG_BOOT_SIZE 0x00 /* 0 KBytes */
|
#define CFG_BOOT_SIZE 0x00 /* 0 KBytes */
|
||||||
#define CFG_U_BOOT_BASE PHYS_FLASH_1
|
#define CFG_U_BOOT_BASE PHYS_FLASH_1
|
||||||
#define CFG_U_BOOT_SIZE 0x60000 /* 384 KBytes */
|
#define CFG_U_BOOT_SIZE 0x60000 /* 384 KBytes */
|
||||||
|
@ -197,7 +191,7 @@
|
||||||
#define CFG_BOOT_SIZE 0x6000 /* 24 KBytes */
|
#define CFG_BOOT_SIZE 0x6000 /* 24 KBytes */
|
||||||
#define CFG_U_BOOT_BASE (PHYS_FLASH_1 + 0x10000)
|
#define CFG_U_BOOT_BASE (PHYS_FLASH_1 + 0x10000)
|
||||||
#define CFG_U_BOOT_SIZE 0x10000 /* 64 KBytes */
|
#define CFG_U_BOOT_SIZE 0x10000 /* 64 KBytes */
|
||||||
#endif /* CONFIG_INIT_CRITICAL */
|
#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
|
||||||
|
|
||||||
#define CFG_BAUDRATE_TABLE {115200 , 19200, 38400, 57600, 9600 }
|
#define CFG_BAUDRATE_TABLE {115200 , 19200, 38400, 57600, 9600 }
|
||||||
|
|
||||||
|
|
|
@ -30,12 +30,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
* (easy to change)
|
* (easy to change)
|
||||||
|
|
|
@ -25,12 +25,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/* ARM asynchronous clock */
|
/* ARM asynchronous clock */
|
||||||
#define AT91C_MAIN_CLOCK 207360000 /* from 18.432 MHz crystal (18432000 / 4 * 45) */
|
#define AT91C_MAIN_CLOCK 207360000 /* from 18.432 MHz crystal (18432000 / 4 * 45) */
|
||||||
#define AT91C_MASTER_CLOCK (AT91C_MAIN_CLOCK/3) /* peripheral clock */
|
#define AT91C_MASTER_CLOCK (AT91C_MAIN_CLOCK/3) /* peripheral clock */
|
||||||
|
@ -44,7 +38,7 @@
|
||||||
#define CONFIG_SETUP_MEMORY_TAGS 1
|
#define CONFIG_SETUP_MEMORY_TAGS 1
|
||||||
#define CONFIG_INITRD_TAG 1
|
#define CONFIG_INITRD_TAG 1
|
||||||
|
|
||||||
#ifdef CONFIG_INIT_CRITICAL
|
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
|
||||||
#define CFG_USE_MAIN_OSCILLATOR 1
|
#define CFG_USE_MAIN_OSCILLATOR 1
|
||||||
/* flash */
|
/* flash */
|
||||||
#define MC_PUIA_VAL 0x00000000
|
#define MC_PUIA_VAL 0x00000000
|
||||||
|
@ -74,7 +68,7 @@
|
||||||
#define SDRC_MR_VAL2 0x00000003 /* Load Mode Register */
|
#define SDRC_MR_VAL2 0x00000003 /* Load Mode Register */
|
||||||
#define SDRC_MR_VAL3 0x00000000 /* Normal Mode */
|
#define SDRC_MR_VAL3 0x00000000 /* Normal Mode */
|
||||||
#define SDRC_TR_VAL 0x000002E0 /* Write refresh rate */
|
#define SDRC_TR_VAL 0x000002E0 /* Write refresh rate */
|
||||||
#endif /* CONFIG_INIT_CRITICAL */
|
#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Size of malloc() pool
|
* Size of malloc() pool
|
||||||
|
|
|
@ -28,12 +28,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
* (easy to change)
|
* (easy to change)
|
||||||
|
|
|
@ -33,12 +33,6 @@
|
||||||
|
|
||||||
#define DEBUG 1
|
#define DEBUG 1
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start U-Boot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
* (easy to change)
|
* (easy to change)
|
||||||
|
|
|
@ -31,7 +31,8 @@
|
||||||
* If we are developing, we might want to start armboot from ram
|
* If we are developing, we might want to start armboot from ram
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
* so we MUST NOT initialize critical regs like mem-timing ...
|
||||||
*/
|
*/
|
||||||
#undef CONFIG_INIT_CRITICAL
|
#define CONFIG_SKIP_LOWLEVEL_INIT 1
|
||||||
|
#undef CONFIG_SKIP_RELOCATE_UBOOT
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
|
|
|
@ -27,12 +27,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
* (easy to change)
|
* (easy to change)
|
||||||
|
|
|
@ -32,8 +32,8 @@
|
||||||
*
|
*
|
||||||
* Also swap the flash1 and flash2 addresses during debug.
|
* Also swap the flash1 and flash2 addresses during debug.
|
||||||
*
|
*
|
||||||
|
* #define CONFIG_SKIP_LOWLEVEL_INIT
|
||||||
*/
|
*/
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
|
|
|
@ -40,7 +40,8 @@
|
||||||
* boot ROM leaves the MMU enabled when it passes control to U-Boot. So
|
* boot ROM leaves the MMU enabled when it passes control to U-Boot. So
|
||||||
* we use lowlevel_init (CONFIG_INIT_CRITICAL) to remedy that problem.
|
* we use lowlevel_init (CONFIG_INIT_CRITICAL) to remedy that problem.
|
||||||
*/
|
*/
|
||||||
#define CONFIG_INIT_CRITICAL
|
#undef CONFIG_SKIP_LOWLEVEL_INIT
|
||||||
|
#define CONFIG_SKIP_RELOCATE_UBOOT 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
|
|
|
@ -27,12 +27,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
* (easy to change)
|
* (easy to change)
|
||||||
|
|
|
@ -30,12 +30,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start U-Boot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
* (easy to change)
|
* (easy to change)
|
||||||
|
|
|
@ -37,12 +37,6 @@
|
||||||
* U-boot generic defines start here.
|
* U-boot generic defines start here.
|
||||||
***************************************************************/
|
***************************************************************/
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
#undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */
|
#undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -27,12 +27,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
* (easy to change)
|
* (easy to change)
|
||||||
|
|
|
@ -30,12 +30,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start U-Boot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
* (easy to change)
|
* (easy to change)
|
||||||
|
|
|
@ -23,12 +23,6 @@
|
||||||
|
|
||||||
#define CONFIG_LPD7A400 /* Logic LH7A400 SDK */
|
#define CONFIG_LPD7A400 /* Logic LH7A400 SDK */
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
#undef CONFIG_USE_IRQ
|
#undef CONFIG_USE_IRQ
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -23,12 +23,6 @@
|
||||||
|
|
||||||
#define CONFIG_LPD7A404 /* Logic LH7A400 SDK */
|
#define CONFIG_LPD7A404 /* Logic LH7A400 SDK */
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
#undef CONFIG_USE_IRQ
|
#undef CONFIG_USE_IRQ
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -30,12 +30,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
* (easy to change)
|
* (easy to change)
|
||||||
|
|
|
@ -27,12 +27,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start u-boot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
* (easy to change)
|
* (easy to change)
|
||||||
|
|
|
@ -28,12 +28,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
* (easy to change)
|
* (easy to change)
|
||||||
|
|
|
@ -113,8 +113,6 @@
|
||||||
#define PRECHARGE_CMD 0x910a8300
|
#define PRECHARGE_CMD 0x910a8300
|
||||||
#define AUTOREFRESH_CMD 0xa10a8300
|
#define AUTOREFRESH_CMD 0xa10a8300
|
||||||
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
#define BUS32BIT_VERSION
|
#define BUS32BIT_VERSION
|
||||||
/*
|
/*
|
||||||
* SDRAM Memory Map
|
* SDRAM Memory Map
|
||||||
|
|
|
@ -27,12 +27,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
* (easy to change)
|
* (easy to change)
|
||||||
|
|
|
@ -26,12 +26,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
* (easy to change)
|
* (easy to change)
|
||||||
|
|
|
@ -26,12 +26,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
* (easy to change)
|
* (easy to change)
|
||||||
|
|
|
@ -26,12 +26,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
* (easy to change)
|
* (easy to change)
|
||||||
|
|
|
@ -26,12 +26,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
* (easy to change)
|
* (easy to change)
|
||||||
|
|
|
@ -27,13 +27,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/* allow to overwrite serial and ethaddr */
|
/* allow to overwrite serial and ethaddr */
|
||||||
#define CONFIG_ENV_OVERWRITE
|
#define CONFIG_ENV_OVERWRITE
|
||||||
|
|
||||||
|
|
|
@ -30,12 +30,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
* (easy to change)
|
* (easy to change)
|
||||||
|
|
|
@ -119,7 +119,6 @@
|
||||||
|
|
||||||
#define PRECHARGE_CMD 0x910a8200
|
#define PRECHARGE_CMD 0x910a8200
|
||||||
#define AUTOREFRESH_CMD 0xa10a8200
|
#define AUTOREFRESH_CMD 0xa10a8200
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* SDRAM Memory Map
|
* SDRAM Memory Map
|
||||||
|
|
|
@ -28,16 +28,13 @@
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If we are developing, we might want to start armboot from ram
|
* Since we use the Inferno-Loader to bring us to live,
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
* we skip the lowlevel init stuff.
|
||||||
*/
|
* But U-Boot still relocates itself into RAM
|
||||||
|
|
||||||
/*
|
|
||||||
* we just run in non-critical mode now, because we use the Inferno-Loader to
|
|
||||||
* bring us to live
|
|
||||||
*/
|
*/
|
||||||
#define CONFIG_INFERNO /* we are using the inferno bootldr */
|
#define CONFIG_INFERNO /* we are using the inferno bootldr */
|
||||||
#undef CONFIG_INIT_CRITICAL
|
#define CONFIG_SKIP_LOWLEVEL_INIT 1
|
||||||
|
#undef CONFIG_SKIP_RELOCATE_UBOOT
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
|
|
|
@ -30,12 +30,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
* (easy to change)
|
* (easy to change)
|
||||||
|
|
|
@ -29,12 +29,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
* (easy to change)
|
* (easy to change)
|
||||||
|
|
|
@ -25,12 +25,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
* (easy to change)
|
* (easy to change)
|
||||||
|
|
|
@ -36,12 +36,6 @@
|
||||||
# define CONFIG_RAM_32MB /* 32 MB SDRAM */
|
# define CONFIG_RAM_32MB /* 32 MB SDRAM */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
* (easy to change)
|
* (easy to change)
|
||||||
|
|
|
@ -23,12 +23,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
#define CONFIG_PXA250 1 /* this is an PXA250 CPU */
|
#define CONFIG_PXA250 1 /* this is an PXA250 CPU */
|
||||||
#define CONFIG_WEPEP250 1 /* config for wepep250 board */
|
#define CONFIG_WEPEP250 1 /* config for wepep250 board */
|
||||||
#undef CONFIG_USE_IRQ /* don't need use IRQ/FIQ */
|
#undef CONFIG_USE_IRQ /* don't need use IRQ/FIQ */
|
||||||
|
|
|
@ -36,16 +36,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
|
||||||
#undef CONFIG_INIT_CRITICAL
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
* (easy to change)
|
* (easy to change)
|
||||||
|
|
|
@ -28,12 +28,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* High Level Configuration Options
|
* High Level Configuration Options
|
||||||
* (easy to change)
|
* (easy to change)
|
||||||
|
|
|
@ -28,12 +28,6 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are developing, we might want to start armboot from ram
|
|
||||||
* so we MUST NOT initialize critical regs like mem-timing ...
|
|
||||||
*/
|
|
||||||
#define CONFIG_INIT_CRITICAL
|
|
||||||
|
|
||||||
/* High Level Configuration Options */
|
/* High Level Configuration Options */
|
||||||
#define CONFIG_PXA250 1 /* This is an PXA250 CPU */
|
#define CONFIG_PXA250 1 /* This is an PXA250 CPU */
|
||||||
#define CONFIG_XSENGINE 1
|
#define CONFIG_XSENGINE 1
|
||||||
|
|
Loading…
Reference in New Issue