ARM: refactor start.S files
Subsystems (2)
cover ARM: refactor start.S files
This series aims at refactoring start.S files. Some of these files contain cache-related or cpu-reset-related core, which is moved where it belongs. Useless symbols are removed, and finally, exception vector code, common across all ARM CPUs, is moved in its own file.
At this point, the start.S files only contain CPU-specific reset sequences.
NOTE: this series should be applied above the "arm: remove unneeded symbol offsets and _TEXT_BASE" series.
Albert ARIBAUD (6):
arm1136: move cache code from start.S to cache.c
arm: move reset_cpu from start.S into cpu.c
arm: pxa: move SP check from start.S to cpuinfo.c
arm: ixp: cosmetic: move code around in start.S
arm: remove unused _end_vect and _vectors_end symbols
arm: move exception handling out of start.S files
arch/arm/cpu/arm1136/start.S | 254 +----------------------- arch/arm/cpu/arm1176/start.S | 198 +------------------ arch/arm/cpu/arm720t/start.S | 229 +-------------------- arch/arm/cpu/arm920t/ep93xx/u-boot.lds | 3 +- arch/arm/cpu/arm920t/start.S | 216 +------------------- arch/arm/cpu/arm926ejs/mxs/start.S | 92 +-------- arch/arm/cpu/arm926ejs/spear/start.S | 27 +-- arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds | 1 + arch/arm/cpu/arm926ejs/start.S | 262 +----------------------- arch/arm/cpu/arm946es/cpu.c | 12 ++ arch/arm/cpu/arm946es/start.S | 246 +---------------------- arch/arm/cpu/arm_intcm/start.S | 228 +-------------------- arch/arm/cpu/armv7/start.S | 246 +---------------------- arch/arm/cpu/ixp/cpu.c | 9 + arch/arm/cpu/ixp/start.S | 249 +---------------------- arch/arm/cpu/ixp/u-boot.lds | 1 + arch/arm/cpu/pxa/cpuinfo.c | 6 + arch/arm/cpu/pxa/start.S | 253 +----------------------- arch/arm/cpu/sa1100/cpu.c | 14 ++ arch/arm/cpu/sa1100/start.S | 225 +-------------------- arch/arm/cpu/u-boot-spl.lds | 1 + arch/arm/cpu/u-boot.lds | 1 + arch/arm/lib/Makefile | 2 +- arch/arm/lib/cache.c | 13 +- arch/arm/lib/vectors.S | 296 ++++++++++++++++++++++++++++ board/actux1/u-boot.lds | 1 + board/actux2/u-boot.lds | 1 + board/actux3/u-boot.lds | 1 + board/dvlhost/u-boot.lds | 1 + board/ti/am335x/u-boot.lds | 1 + 30 files changed, 383 insertions(+), 2706 deletions(-) create mode 100644 arch/arm/lib/vectors.S
Signature · 1 line
1.8.3.2
PATCH 1/6 arm1136: move cache code from start.S to cache.c
arch/arm/cpu/arm1136/start.S contain a cache flushing function. Remove the function and move its code into arch/arm/lib/cache.c.
--- arch/arm/cpu/arm1136/start.S | 10 ---------- arch/arm/lib/cache.c | 13 ++++++++++--- 2 files changed, 10 insertions(+), 13 deletions(-)
arch/arm/cpu/arm1136/start.S +0 -10
@@ -333,14 +333,4 @@ fiq: bl do_fiq #endif - .align 5 -.global arm1136_cache_flush -arm1136_cache_flush: -#if !defined(CONFIG_SYS_ICACHE_OFF) - mcr p15, 0, r1, c7, c5, 0 @ invalidate I cache -#endif -#if !defined(CONFIG_SYS_DCACHE_OFF) - mcr p15, 0, r1, c7, c14, 0 @ invalidate D cache -#endif - mov pc, lr @ back to caller #endif /* CONFIG_SPL_BUILD */
arch/arm/lib/cache.c +10 -3
@@ -12,16 +12,23 @@void __flush_cache (unsigned long start,unsigned long size) {#if defined(CONFIG_ARM1136 ) -void arm1136_cache_flush (void ); -arm1136_cache_flush (); +#if !defined(CONFIG_SYS_ICACHE_OFF ) + asm("mcr p15, 0, r1, c7, c5, 0" );/* invalidate I cache */ #endif + +#if !defined(CONFIG_SYS_DCACHE_OFF ) + asm("mcr p15, 0, r1, c7, c14, 0" );/* Clean+invalidate D cache */ +#endif + +#endif /* CONFIG_ARM1136 */ +#ifdef CONFIG_ARM926EJS /* test and clean, page 2-23 of arm926ejs manual */ asm("0: mrc p15, 0, r15, c7, c10, 3\n\t" "bne 0b\n" : : :"memory" );/* disable write buffer as well (page 2-22) */ asm("mcr p15, 0, %0, c7, c10, 4" : :"r" (0 )); -#endif +#endif /* CONFIG_ARM926EJS */ return ; }void flush_cache (unsigned long start,unsigned long size)
Signature · 1 line
1.8.3.2
PATCH 2/6 arm: move reset_cpu from start.S into cpu.c
CPUs arm946es, ixp and sa1100 all define the reset_cpu() function in their start.S file. Move this cpu-specific code into cpu.c so that start.S only contains ARM generic code.
--- arch/arm/cpu/arm946es/cpu.c | 12 ++++++++++++ arch/arm/cpu/arm946es/start.S | 23 ----------------------- arch/arm/cpu/ixp/cpu.c | 9 +++++++++ arch/arm/cpu/ixp/start.S | 24 ------------------------ arch/arm/cpu/sa1100/cpu.c | 14 ++++++++++++++ arch/arm/cpu/sa1100/start.S | 10 ---------- 6 files changed, 35 insertions(+), 57 deletions(-)
arch/arm/cpu/arm946es/cpu.c +12 -0
@@ -16,6 +16,7 @@#include <common.h> #include <command.h> #include <asm/system.h> +#include <asm/io.h> static void cache_flush (void );
@@ -51,3 +52,14 @@ static void cache_flush (void) asm ("mcr p15, 0, %0, c7, c5, 0" : :"r" (i)); asm ("mcr p15, 0, %0, c7, c6, 0" : :"r" (i)); } + +#ifndef CONFIG_INTEGRATOR + +__attribute__((noreturn))void reset_cpu (ulong addr __attribute__((unused))) +{ +writew (0x0 ,0xfffece10 ); +writew (0x8 ,0xfffece10 ); +for (;;) {} +} + +#endif /* #ifdef CONFIG_INTEGRATOR */
arch/arm/cpu/arm946es/start.S +0 -23
@@ -320,26 +320,3 @@ fiq: bl do_fiq #endif - -# ifdef CONFIG_INTEGRATOR - - /* Satisfied by general board level routine */ - -#else - - .align 5 -.globl reset_cpu -reset_cpu: - - ldr r1, rstctl1 /* get clkm1 reset ctl */ - mov r3, #0x0 - strh r3, [r1] /* clear it */ - mov r3, #0x8 - strh r3, [r1] /* force dsp+arm reset */ -_loop_forever: - b _loop_forever - -rstctl1: - .word 0xfffece10 - -#endif /* #ifdef CONFIG_INTEGRATOR */
arch/arm/cpu/ixp/cpu.c +9 -0
@@ -19,6 +19,7 @@#include <netdev.h> #include <asm/arch/ixp425.h> #include <asm/system.h> +#include <asm/io.h> static void cache_flush (void );
@@ -98,3 +99,11 @@ int cpu_eth_init(bd_t *bis)#endif return 0 ; } + +__attribute__((noreturn))void reset_cpu (ulong addr __attribute__((unused))) +{ +writel (0x482e ,IXP425_OSWK ); +writel (0x0fff ,IXP425_OSWT ); +writel (0x5 ,IXP425_OSWE ); +for (;;) {} +}
arch/arm/cpu/ixp/start.S +0 -24
@@ -378,27 +378,3 @@ fiq: bl do_fiq #endif - -/****************************************************************************/ -/* */ -/* Reset function: Use Watchdog to reset */ -/* */ -/****************************************************************************/ - - .align 5 -.globl reset_cpu - -reset_cpu: - ldr r1, =0x482e - ldr r2, =IXP425_OSWK - str r1, [r2] - ldr r1, =0x0fff - ldr r2, =IXP425_OSWT - str r1, [r2] - ldr r1, =0x5 - ldr r2, =IXP425_OSWE - str r1, [r2] - b reset_endless - -reset_endless: - b reset_endless
arch/arm/cpu/sa1100/cpu.c +14 -0
@@ -17,6 +17,7 @@#include <common.h> #include <command.h> #include <asm/system.h> +#include <asm/io.h> #ifdef CONFIG_USE_IRQ DECLARE_GLOBAL_DATA_PTR ;
@@ -52,3 +53,16 @@ static void cache_flush (void) asm ("mcr p15, 0, %0, c7, c5, 0" : :"r" (i)); } + +#define RST_BASE 0x90030000 +#define RSRR 0x00 +#define RCSR 0x04 + +__attribute__((noreturn))void reset_cpu (ulong addr __attribute__((unused))) +{ +while (1 )/* repeat endlessly */ + { +writel (0 ,RST_BASE +RCSR ); +writel (1 ,RST_BASE +RSRR ); + } +}
arch/arm/cpu/sa1100/start.S +0 -10
@@ -337,13 +337,3 @@ fiq: bl do_fiq #endif - - .align 5 -.globl reset_cpu -reset_cpu: - ldr r0, RST_BASE - mov r1, #0x0 @ set bit 3-0 ... - str r1, [r0, #RCSR] @ ... to clear in RCSR - mov r1, #0x1 - str r1, [r0, #RSRR] @ and perform reset - b reset_cpu @ silly, but repeat endlessly
Signature · 1 line
1.8.3.2
PATCH 3/6 arm: pxa: move SP check from start.S to cpuinfo.c
PXA start.S has a PXA (variant) specific check instart.S. Move it to cpuinfo.c.
--- arch/arm/cpu/pxa/cpuinfo.c | 6 ++++++ arch/arm/cpu/pxa/start.S | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/cpu/pxa/cpuinfo.c +6 -0
@@ -11,6 +11,12 @@#include <errno.h> #include <linux/compiler.h> +#ifdef CONFIG_CPU_PXA25X +#if ((CONFIG_SYS_INIT_SP_ADDR ) !=0xfffff800 ) +#error "Init SP address must be set to 0xfffff800 for PXA250" +#endif +#endif +#define CPU_MASK_PXA_PRODID 0x000003f0#define CPU_MASK_PXA_REVID 0x0000000f
arch/arm/cpu/pxa/start.S +0 -6
@@ -23,12 +23,6 @@ #include <config.h> #include <version.h> -#ifdef CONFIG_CPU_PXA25X -#if ((CONFIG_SYS_INIT_SP_ADDR) != 0xfffff800) -#error "Init SP address must be set to 0xfffff800 for PXA250" -#endif -#endif - .globl _start _start: b reset #ifdef CONFIG_SPL_BUILD
Signature · 1 line
1.8.3.2
PATCH 4/6 arm: ixp: cosmetic: move code around in start.S
Make IPX start.S more consistant with other start.S files by moving defines and macros away so that the file begins with the exception vectors table.
--- arch/arm/cpu/ixp/start.S | 64 ++++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 32 deletions(-)
arch/arm/cpu/ixp/start.S +32 -32
@@ -16,38 +16,6 @@ #include <version.h> #include <asm/arch/ixp425.h> -#define MMU_Control_M 0x001 /* Enable MMU */ -#define MMU_Control_A 0x002 /* Enable address alignment faults */ -#define MMU_Control_C 0x004 /* Enable cache */ -#define MMU_Control_W 0x008 /* Enable write-buffer */ -#define MMU_Control_P 0x010 /* Compatability: 32 bit code */ -#define MMU_Control_D 0x020 /* Compatability: 32 bit data */ -#define MMU_Control_L 0x040 /* Compatability: */ -#define MMU_Control_B 0x080 /* Enable Big-Endian */ -#define MMU_Control_S 0x100 /* Enable system protection */ -#define MMU_Control_R 0x200 /* Enable ROM protection */ -#define MMU_Control_I 0x1000 /* Enable Instruction cache */ -#define MMU_Control_X 0x2000 /* Set interrupt vectors at 0xFFFF0000 */ -#define MMU_Control_Init (MMU_Control_P|MMU_Control_D|MMU_Control_L) - - -/* - * Macro definitions - */ - /* Delay a bit */ - .macro DELAY_FOR cycles, reg0 - ldr \reg0, =\cycles - subs \reg0, \reg0, #1 - subne pc, pc, #0xc - .endm - - /* wait for coprocessor write complete */ - .macro CPWAIT reg - mrc p15,0,\reg,c2,c0,0 - mov \reg,\reg - sub pc,pc,#4 - .endm - .globl _start _start: ldr pc, _reset
@@ -101,6 +69,38 @@ IRQ_STACK_START_IN: * the actual reset code */ +#define MMU_Control_M 0x001 /* Enable MMU */ +#define MMU_Control_A 0x002 /* Enable address alignment faults */ +#define MMU_Control_C 0x004 /* Enable cache */ +#define MMU_Control_W 0x008 /* Enable write-buffer */ +#define MMU_Control_P 0x010 /* Compatability: 32 bit code */ +#define MMU_Control_D 0x020 /* Compatability: 32 bit data */ +#define MMU_Control_L 0x040 /* Compatability: */ +#define MMU_Control_B 0x080 /* Enable Big-Endian */ +#define MMU_Control_S 0x100 /* Enable system protection */ +#define MMU_Control_R 0x200 /* Enable ROM protection */ +#define MMU_Control_I 0x1000 /* Enable Instruction cache */ +#define MMU_Control_X 0x2000 /* Set interrupt vectors at 0xFFFF0000 */ +#define MMU_Control_Init (MMU_Control_P|MMU_Control_D|MMU_Control_L) + + +/* + * Macro definitions + */ + /* Delay a bit */ + .macro DELAY_FOR cycles, reg0 + ldr \reg0, =\cycles + subs \reg0, \reg0, #1 + subne pc, pc, #0xc + .endm + + /* wait for coprocessor write complete */ + .macro CPWAIT reg + mrc p15,0,\reg,c2,c0,0 + mov \reg,\reg + sub pc,pc,#4 + .endm + reset: /* disable mmu, set big-endian */ mov r0, #0xf8
Signature · 1 line
1.8.3.2
PATCH 5/6 arm: remove unused _end_vect and _vectors_end symbols
--- arch/arm/cpu/arm1136/start.S | 2 -- arch/arm/cpu/arm1176/start.S | 2 -- arch/arm/cpu/arm946es/start.S | 2 -- arch/arm/cpu/armv7/start.S | 3 --- arch/arm/cpu/pxa/start.S | 2 -- 5 files changed, 11 deletions(-)
arch/arm/cpu/arm1136/start.S +0 -2
@@ -53,8 +53,6 @@ _irq: .word irq _fiq: .word fiq _pad: .word 0x12345678 /* now 16*4=64 */ #endif /* CONFIG_SPL_BUILD */ -.global _end_vect -_end_vect: .balignl 16,0xdeadbeef /*
arch/arm/cpu/arm1176/start.S +0 -2
@@ -61,8 +61,6 @@ _pad: . = _start + 64 #endif -.global _end_vect -_end_vect: .balignl 16,0xdeadbeef /* *************************************************************************
arch/arm/cpu/arm946es/start.S +0 -2
@@ -56,8 +56,6 @@ _fiq: .balignl 16,0xdeadbeef -_vectors_end: - /* ************************************************************************* *
arch/arm/cpu/armv7/start.S +0 -3
@@ -48,9 +48,6 @@ _fiq: .word fiq _pad: .word 0x12345678 /* now 16*4=64 */ #endif /* CONFIG_SPL_BUILD */ -.global _end_vect -_end_vect: - .balignl 16,0xdeadbeef /************************************************************************* *
arch/arm/cpu/pxa/start.S +0 -2
@@ -61,8 +61,6 @@ _irq: .word irq _fiq: .word fiq _pad: .word 0x12345678 /* now 16*4=64 */ #endif /* CONFIG_SPL_BUILD */ -.global _end_vect -_end_vect: .balignl 16,0xdeadbeef /*
Signature · 1 line
1.8.3.2
PATCH 6/6 arm: move exception handling out of start.S files
Exception handling is basically identical for all ARM targets. Factorize it out of the various start.S files and into a single vectors.S file, and adjust linker scripts accordingly.
--- arch/arm/cpu/arm1136/start.S | 242 +---------------------- arch/arm/cpu/arm1176/start.S | 196 +----------------- arch/arm/cpu/arm720t/start.S | 229 +-------------------- arch/arm/cpu/arm920t/ep93xx/u-boot.lds | 3 +- arch/arm/cpu/arm920t/start.S | 216 +------------------- arch/arm/cpu/arm926ejs/mxs/start.S | 92 +-------- arch/arm/cpu/arm926ejs/spear/start.S | 27 +-- arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds | 1 + arch/arm/cpu/arm926ejs/start.S | 262 +----------------------- arch/arm/cpu/arm946es/start.S | 221 +-------------------- arch/arm/cpu/arm_intcm/start.S | 228 +-------------------- arch/arm/cpu/armv7/start.S | 243 +---------------------- arch/arm/cpu/ixp/start.S | 209 +------------------- arch/arm/cpu/ixp/u-boot.lds | 1 + arch/arm/cpu/pxa/start.S | 245 +---------------------- arch/arm/cpu/sa1100/start.S | 215 +------------------- arch/arm/cpu/u-boot-spl.lds | 1 + arch/arm/cpu/u-boot.lds | 1 + arch/arm/lib/Makefile | 2 +- arch/arm/lib/vectors.S | 296 ++++++++++++++++++++++++++++ board/actux1/u-boot.lds | 1 + board/actux2/u-boot.lds | 1 + board/actux3/u-boot.lds | 1 + board/dvlhost/u-boot.lds | 1 + board/ti/am335x/u-boot.lds | 1 + 25 files changed, 324 insertions(+), 2611 deletions(-) create mode 100644 arch/arm/lib/vectors.S
arch/arm/cpu/arm1136/start.S +1 -241
@@ -15,46 +15,7 @@ #include <asm-offsets.h> #include <config.h> #include <version.h> -.globl _start -_start: b reset -#ifdef CONFIG_SPL_BUILD - ldr pc, _hang - ldr pc, _hang - ldr pc, _hang - ldr pc, _hang - ldr pc, _hang - ldr pc, _hang - ldr pc, _hang -_hang: - .word do_hang - .word 0x12345678 - .word 0x12345678 - .word 0x12345678 - .word 0x12345678 - .word 0x12345678 - .word 0x12345678 - .word 0x12345678 /* now 16*4=64 */ -#else - ldr pc, _undefined_instruction - ldr pc, _software_interrupt - ldr pc, _prefetch_abort - ldr pc, _data_abort - ldr pc, _not_used - ldr pc, _irq - ldr pc, _fiq - -_undefined_instruction: .word undefined_instruction -_software_interrupt: .word software_interrupt -_prefetch_abort: .word prefetch_abort -_data_abort: .word data_abort -_not_used: .word not_used -_irq: .word irq -_fiq: .word fiq -_pad: .word 0x12345678 /* now 16*4=64 */ -#endif /* CONFIG_SPL_BUILD */ - - .balignl 16,0xdeadbeef /* ************************************************************************* *
@@ -68,26 +29,7 @@ _pad: .word 0x12345678 /* now 16*4=64 */ ************************************************************************* */ -#ifdef CONFIG_USE_IRQ -/* IRQ stack memory (calculated at run-time) */ -.globl IRQ_STACK_START -IRQ_STACK_START: - .word 0x0badc0de - -/* IRQ stack memory (calculated at run-time) */ -.globl FIQ_STACK_START -FIQ_STACK_START: - .word 0x0badc0de -#endif - -/* IRQ stack memory (calculated at run-time) + 8 bytes */ -.globl IRQ_STACK_START_IN -IRQ_STACK_START_IN: - .word 0x0badc0de - -/* - * the actual reset code - */ + .globl reset reset: /*
@@ -150,185 +92,3 @@ cpu_init_crit: mov lr, ip /* restore link */ mov pc, lr /* back to my caller */ #endif /* CONFIG_SKIP_LOWLEVEL_INIT */ - -#ifndef CONFIG_SPL_BUILD -/* - ************************************************************************* - * - * Interrupt handling - * - ************************************************************************* - */ -@ -@ IRQ stack frame. -@ -#define S_FRAME_SIZE 72 - -#define S_OLD_R0 68 -#define S_PSR 64 -#define S_PC 60 -#define S_LR 56 -#define S_SP 52 - -#define S_IP 48 -#define S_FP 44 -#define S_R10 40 -#define S_R9 36 -#define S_R8 32 -#define S_R7 28 -#define S_R6 24 -#define S_R5 20 -#define S_R4 16 -#define S_R3 12 -#define S_R2 8 -#define S_R1 4 -#define S_R0 0 - -#define MODE_SVC 0x13 -#define I_BIT 0x80 - -/* - * use bad_save_user_regs for abort/prefetch/undef/swi ... - * use irq_save_user_regs / irq_restore_user_regs for IRQ/FIQ handling - */ - - .macro bad_save_user_regs - sub sp, sp, #S_FRAME_SIZE @ carve out a frame on current user stack - stmia sp, {r0 - r12} @ Save user registers (now in svc mode) r0-r12 - - ldr r2, IRQ_STACK_START_IN @ set base 2 words into abort stack - ldmia r2, {r2 - r3} @ get values for "aborted" pc and cpsr (into parm regs) - add r0, sp, #S_FRAME_SIZE @ grab pointer to old stack - - add r5, sp, #S_SP - mov r1, lr - stmia r5, {r0 - r3} @ save sp_SVC, lr_SVC, pc, cpsr - mov r0, sp @ save current stack into r0 (param register) - .endm - - .macro irq_save_user_regs - sub sp, sp, #S_FRAME_SIZE - stmia sp, {r0 - r12} @ Calling r0-r12 - add r8, sp, #S_PC @ !!!! R8 NEEDS to be saved !!!! a reserved stack spot would be good. - stmdb r8, {sp, lr}^ @ Calling SP, LR - str lr, [r8, #0] @ Save calling PC - mrs r6, spsr - str r6, [r8, #4] @ Save CPSR - str r0, [r8, #8] @ Save OLD_R0 - mov r0, sp - .endm - - .macro irq_restore_user_regs - ldmia sp, {r0 - lr}^ @ Calling r0 - lr - mov r0, r0 - ldr lr, [sp, #S_PC] @ Get PC - add sp, sp, #S_FRAME_SIZE - subs pc, lr, #4 @ return & move spsr_svc into cpsr - .endm - - .macro get_bad_stack - ldr r13, IRQ_STACK_START_IN @ setup our mode stack (enter in banked mode) - - str lr, [r13] @ save caller lr in position 0 of saved stack - mrs lr, spsr @ get the spsr - str lr, [r13, #4] @ save spsr in position 1 of saved stack - - mov r13, #MODE_SVC @ prepare SVC-Mode - @ msr spsr_c, r13 - msr spsr, r13 @ switch modes, make sure moves will execute - mov lr, pc @ capture return pc - movs pc, lr @ jump to next instruction & switch modes. - .endm - - .macro get_bad_stack_swi - sub r13, r13, #4 @ space on current stack for scratch reg. - str r0, [r13] @ save R0's value. - ldr r0, IRQ_STACK_START_IN @ get data regions start - str lr, [r0] @ save caller lr in position 0 of saved stack - mrs lr, spsr @ get the spsr - str lr, [r0, #4] @ save spsr in position 1 of saved stack - ldr lr, [r0] @ restore lr - ldr r0, [r13] @ restore r0 - add r13, r13, #4 @ pop stack entry - .endm - - .macro get_irq_stack @ setup IRQ stack - ldr sp, IRQ_STACK_START - .endm - - .macro get_fiq_stack @ setup FIQ stack - ldr sp, FIQ_STACK_START - .endm -#endif /* CONFIG_SPL_BUILD */ - -/* - * exception handlers - */ -#ifdef CONFIG_SPL_BUILD - .align 5 -do_hang: - bl hang /* hang and never return */ -#else /* !CONFIG_SPL_BUILD */ - .align 5 -undefined_instruction: - get_bad_stack - bad_save_user_regs - bl do_undefined_instruction - - .align 5 -software_interrupt: - get_bad_stack_swi - bad_save_user_regs - bl do_software_interrupt - - .align 5 -prefetch_abort: - get_bad_stack - bad_save_user_regs - bl do_prefetch_abort - - .align 5 -data_abort: - get_bad_stack - bad_save_user_regs - bl do_data_abort - - .align 5 -not_used: - get_bad_stack - bad_save_user_regs - bl do_not_used - -#ifdef CONFIG_USE_IRQ - - .align 5 -irq: - get_irq_stack - irq_save_user_regs - bl do_irq - irq_restore_user_regs - - .align 5 -fiq: - get_fiq_stack - /* someone ought to write a more effiction fiq_save_user_regs */ - irq_save_user_regs - bl do_fiq - irq_restore_user_regs - -#else - - .align 5 -irq: - get_bad_stack - bad_save_user_regs - bl do_irq - - .align 5 -fiq: - get_bad_stack - bad_save_user_regs - bl do_fiq - -#endif -#endif /* CONFIG_SPL_BUILD */
arch/arm/cpu/arm1176/start.S +1 -195
211 lines not on this page · raw message
arch/arm/cpu/arm720t/start.S +1 -228
244 lines not on this page · raw message
arch/arm/cpu/arm920t/ep93xx/u-boot.lds +2 -1
@@ -16,7 +16,8 @@ SECTIONS .text : { *(.__image_copy_start) - arch/arm/cpu/arm920t/start.o (.text*) + *(.vectors) + arch/arm/cpu/arm920t/start.o (.text*) /* the EP93xx expects to find the pattern 'CRUS' at 0x1000 */ . = 0x1000; LONG(0x53555243)
arch/arm/cpu/arm920t/start.S +2 -214
232 lines not on this page · raw message
arch/arm/cpu/arm926ejs/mxs/start.S +2 -90
107 lines not on this page · raw message
arch/arm/cpu/arm926ejs/spear/start.S +1 -26
@@ -17,29 +17,6 @@ #include <config.h> -.globl _start -_start: - b reset - ldr pc, _undefined_instruction - ldr pc, _software_interrupt - ldr pc, _prefetch_abort - ldr pc, _data_abort - ldr pc, _not_used - ldr pc, _irq - ldr pc, _fiq - -_undefined_instruction: -_software_interrupt: -_prefetch_abort: -_data_abort: -_not_used: -_irq: -_fiq: - .word infinite_loop - -infinite_loop: - b infinite_loop - /* ************************************************************************* *
@@ -53,9 +30,7 @@ infinite_loop: ************************************************************************* */ -/* - * the actual reset code - */ + .globl reset reset: /*
arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds +1 -0
@@ -21,6 +21,7 @@ SECTIONS . = ALIGN(4); .text : { + *(.vectors) arch/arm/cpu/arm926ejs/spear/start.o (.text*) *(.text*) }
arch/arm/cpu/arm926ejs/start.S +1 -261
277 lines not on this page · raw message
arch/arm/cpu/arm946es/start.S +1 -220
236 lines not on this page · raw message
arch/arm/cpu/arm_intcm/start.S +1 -227
243 lines not on this page · raw message
arch/arm/cpu/armv7/start.S +1 -242
258 lines not on this page · raw message
arch/arm/cpu/ixp/start.S +2 -207
230 lines not on this page · raw message
arch/arm/cpu/ixp/u-boot.lds +1 -0
@@ -16,6 +16,7 @@ SECTIONS .text : { *(.__image_copy_start) + *(.vectors) arch/arm/cpu/ixp/start.o(.text*) *(.text*) }
arch/arm/cpu/pxa/start.S +1 -244
263 lines not on this page · raw message
arch/arm/cpu/sa1100/start.S +1 -214
230 lines not on this page · raw message
arch/arm/cpu/u-boot-spl.lds +1 -0
@@ -18,6 +18,7 @@ SECTIONS .text : { __image_copy_start = .; + *(.vectors) CPUDIR/start.o (.text*) *(.text*) }
arch/arm/cpu/u-boot.lds +1 -0
@@ -18,6 +18,7 @@ SECTIONS .text : { *(.__image_copy_start) + *(.vectors) CPUDIR/start.o (.text*) *(.text*) }
arch/arm/lib/Makefile +1 -1
@@ -20,7 +20,7 @@ GLSOBJS += _umodsi3.o GLCOBJS += div0.o -SOBJS-y += crt0.o +SOBJS-y += vectors.o crt0.o ifndef CONFIG_SPL_BUILD SOBJS-y += relocate.o
arch/arm/lib/vectors.S new file +296 -0
127 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.8.3.2
Part of the diff is not shown here. View the raw message.
PATCH 3/6 arm: pxa: move SP check from start.S to cpuinfo.c
In reply to Albert ARIBAUDDear Albert ARIBAUD,
Quoted 4 lines
PXA
start.Shas a PXA (variant) specific check instart.S. Move it tocpuinfo.c.Signed-off-by Albert ARIBAUD <[email protected]>
Either way WFM
Quoted 29 lines
--- arch/arm/cpu/pxa/cpuinfo.c | 6 ++++++ arch/arm/cpu/pxa/start.S | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-)arch/arm/cpu/pxa/cpuinfo.c +6
-0@@ -11,6 +11,12 @@#include <errno.h> #include <linux/compiler.h> +#ifdef CONFIG_CPU_PXA25X +#if ((CONFIG_SYS_INIT_SP_ADDR ) !=0xfffff800 ) +#error "Init SP address must be set to 0xfffff800 for PXA250" +#endif +#endif +#define CPU_MASK_PXA_PRODID 0x000003f0#define CPU_MASK_PXA_REVID 0x0000000farch/arm/cpu/pxa/start.S +0
-0@@ -23,12 +23,6 @@ #include <config.h> #include <version.h>
arch/arm/cpu/pxa/start.S line 28
Quoted 10 lines
arch/arm/cpu/pxa/start.S +0
-6-#ifdef CONFIG_CPU_PXA25X -#if ((CONFIG_SYS_INIT_SP_ADDR) != 0xfffff800) -#error "Init SP address must be set to 0xfffff800 for PXA250" -#endif -#endif - .globl _start _start: b reset #ifdef CONFIG_SPL_BUILD
Best regards,
Marek Vasut
PATCH 2/6 arm: move reset_cpu from start.S into cpu.c
In reply to Albert ARIBAUDHi Albert,
Quoted 5 lines · Albert ARIBAUD
CPUs arm946es, ixp and sa1100 all define the
reset_cpu()function in theirstart.Sfile. Move this cpu-specific code intocpu.cso thatstart.Sonly contains ARM generic code.Signed-off-by Albert ARIBAUD <[email protected]>
Best regards,
Beno?t
PATCH 1/6 arm1136: move cache code from start.S to cache.c
In reply to Albert ARIBAUDHi Albert,
Quoted 4 lines · Albert ARIBAUD
arch/arm/cpu/arm1136/start.Scontain a cache flushing function. Remove the function and move its code intoarch/arm/lib/cache.c.Signed-off-by Albert ARIBAUD <[email protected]>
Best regards,
Beno?t