Skip to content

Commit

Permalink
Blackfin arch: unify differences between our diff head.S files -- no …
Browse files Browse the repository at this point in the history 
…functional changes

Signed-off-by: Mike Frysinger <michael.frysinger@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
  • Loading branch information
Mike Frysinger authored and Bryan Wu committed Jun 11, 2007
1 parent 16983de commit 83a5c3e
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 27 deletions.
17 changes: 9 additions & 8 deletions arch/blackfin/mach-bf533/head.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,14 @@ ENTRY(__start)
ENTRY(__stext)
/* R0: argument of command line string, passed from uboot, save it */
R7 = R0;
/* Set the SYSCFG register */
/* Set the SYSCFG register:
* Enable Cycle Counter and Nesting Of Interrupts (3rd Bit)
*/
R0 = 0x36;
/*Enable Cycle Counter and Nesting Of Interrupts(3rd Bit)*/
SYSCFG = R0;
R0 = 0;

/*Clear Out All the data and pointer Registers*/
/* Clear Out All the data and pointer Registers */
R1 = R0;
R2 = R0;
R3 = R0;
Expand All @@ -79,7 +80,7 @@ ENTRY(__stext)
L2 = r0;
L3 = r0;

/* Clear Out All the DAG Registers*/
/* Clear Out All the DAG Registers */
B0 = r0;
B1 = r0;
B2 = r0;
Expand Down Expand Up @@ -303,7 +304,7 @@ ENTRY(_real_start)
.L_clear_zero:
W[p1++] = r0;

/* pass the uboot arguments to the global value command line */
/* pass the uboot arguments to the global value command line */
R0 = R7;
call _cmdline_init;

Expand All @@ -322,7 +323,7 @@ ENTRY(_real_start)
[p1] = r1;

/*
* load the current thread pointer and stack
* load the current thread pointer and stack
*/
r1.l = _init_thread_union;
r1.h = _init_thread_union;
Expand Down Expand Up @@ -439,8 +440,8 @@ ENTRY(_start_dma_code)

p0.h = hi(SIC_IWR);
p0.l = lo(SIC_IWR);
r0.l = lo(IWR_ENABLE_ALL)
r0.h = hi(IWR_ENABLE_ALL)
r0.l = lo(IWR_ENABLE_ALL);
r0.h = hi(IWR_ENABLE_ALL);
[p0] = r0;
SSYNC;

Expand Down
22 changes: 12 additions & 10 deletions arch/blackfin/mach-bf537/head.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,22 @@
.extern ___bss_start
.extern _bf53x_relocate_l1_mem

#define INITIAL_STACK 0xFFB01000
#define INITIAL_STACK 0xFFB01000

.text

ENTRY(__start)
ENTRY(__stext)
/* R0: argument of command line string, passed from uboot, save it */
R7 = R0;
/* Set the SYSCFG register */
/* Set the SYSCFG register:
* Enable Cycle Counter and Nesting Of Interrupts (3rd Bit)
*/
R0 = 0x36;
SYSCFG = R0; /*Enable Cycle Counter and Nesting Of Interrupts(3rd Bit)*/
SYSCFG = R0;
R0 = 0;

/* Clear Out All the data and pointer Registers*/
/* Clear Out All the data and pointer Registers */
R1 = R0;
R2 = R0;
R3 = R0;
Expand All @@ -75,7 +77,7 @@ ENTRY(__stext)
L2 = r0;
L3 = r0;

/* Clear Out All the DAG Registers*/
/* Clear Out All the DAG Registers */
B0 = r0;
B1 = r0;
B2 = r0;
Expand Down Expand Up @@ -191,7 +193,7 @@ ENTRY(__stext)

p0.h = hi(UART_DLL);
p0.l = lo(UART_DLL);
r0 = 0x00(Z);
r0 = 0x0(Z);
w[p0] = r0.L;
ssync;

Expand All @@ -218,6 +220,7 @@ ENTRY(__stext)
#if CONFIG_BFIN_KERNEL_CLOCK
call _start_dma_code;
#endif

/* Code for initializing Async memory banks */

p2.h = hi(EBIU_AMBCTL1);
Expand Down Expand Up @@ -291,7 +294,7 @@ ENTRY(_real_start)
p2.h = ___bss_stop;
r0 = 0;
p2 -= p1;
lsetup (.L_clear_bss, .L_clear_bss ) lc0 = p2;
lsetup (.L_clear_bss, .L_clear_bss) lc0 = p2;
.L_clear_bss:
B[p1++] = r0;

Expand All @@ -306,7 +309,7 @@ ENTRY(_real_start)
r0 = r0 >> 1;
p2 = r0;
r0 = 0;
lsetup (.L_clear_zero, .L_clear_zero ) lc0 = p2;
lsetup (.L_clear_zero, .L_clear_zero) lc0 = p2;
.L_clear_zero:
W[p1++] = r0;

Expand All @@ -328,9 +331,8 @@ ENTRY(_real_start)
r1 = p3;
[p1] = r1;


/*
* load the current thread pointer and stack
* load the current thread pointer and stack
*/
r1.l = _init_thread_union;
r1.h = _init_thread_union;
Expand Down
20 changes: 11 additions & 9 deletions arch/blackfin/mach-bf561/head.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,16 @@

ENTRY(__start)
ENTRY(__stext)
/* R0: argument of command line string, passed from uboot, save it */
/* R0: argument of command line string, passed from uboot, save it */
R7 = R0;
/* Set the SYSCFG register */
/* Set the SYSCFG register:
* Enable Cycle Counter and Nesting Of Interrupts (3rd Bit)
*/
R0 = 0x36;
SYSCFG = R0; /*Enable Cycle Counter and Nesting Of Interrupts(3rd Bit)*/
SYSCFG = R0;
R0 = 0;

/*Clear Out All the data and pointer Registers*/
/* Clear Out All the data and pointer Registers */
R1 = R0;
R2 = R0;
R3 = R0;
Expand All @@ -75,7 +77,7 @@ ENTRY(__stext)
L2 = r0;
L3 = r0;

/* Clear Out All the DAG Registers*/
/* Clear Out All the DAG Registers */
B0 = r0;
B1 = r0;
B2 = r0;
Expand Down Expand Up @@ -238,7 +240,7 @@ ENTRY(_real_start)
p2.h = ___bss_stop;
r0 = 0;
p2 -= p1;
lsetup (.L_clear_bss, .L_clear_bss ) lc0 = p2;
lsetup (.L_clear_bss, .L_clear_bss) lc0 = p2;
.L_clear_bss:
B[p1++] = r0;

Expand All @@ -253,11 +255,11 @@ ENTRY(_real_start)
r0 = r0 >> 1;
p2 = r0;
r0 = 0;
lsetup (.L_clear_zero, .L_clear_zero ) lc0 = p2;
lsetup (.L_clear_zero, .L_clear_zero) lc0 = p2;
.L_clear_zero:
W[p1++] = r0;

/* pass the uboot arguments to the global value command line */
/* pass the uboot arguments to the global value command line */
R0 = R7;
call _cmdline_init;

Expand Down Expand Up @@ -350,7 +352,7 @@ ENTRY(_start_dma_code)
if ! CC jump .Lcheck_again;

/* Configure SCLK & CCLK Dividers */
r0 = (CONFIG_CCLK_ACT_DIV | CONFIG_SCLK_DIV);
r0 = (CONFIG_CCLK_ACT_DIV | CONFIG_SCLK_DIV);
p0.h = hi(PLL_DIV);
p0.l = lo(PLL_DIV);
w[p0] = r0.l;
Expand Down

0 comments on commit 83a5c3e

Please sign in to comment.