| Message ID | 20130610091936.18944.66463.sendpatchset@w520 (mailing list archive) |
|---|---|
| State | Superseded |
| Commit | 53c2bd991d2c04f86944765d6f6e97e5b485bd4b |
| Headers | show |
On Mon, Jun 10, 2013 at 06:19:36PM +0900, Magnus Damm wrote: > From: Magnus Damm <damm@opensource.se> > > Add code for mach-shmobile to allow specifying boot function > and argument. Will initially be used for SMP together with SCU > but may in the future also be used for deep sleep resume. This > patch removes one inline virtual to physical address conversion. > > Signed-off-by: Magnus Damm <damm@opensource.se> > --- > > arch/arm/mach-shmobile/headsmp.S | 13 ++++++++++--- > arch/arm/mach-shmobile/include/mach/common.h | 4 +++- > 2 files changed, 13 insertions(+), 4 deletions(-) Thanks, I have queued this up for v3.11 in the (new) cleanup-boot branch. -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- 0001/arch/arm/mach-shmobile/headsmp.S +++ work/arch/arm/mach-shmobile/headsmp.S 2013-06-05 13:21:14.000000000 +0900 @@ -27,7 +27,14 @@ ENDPROC(shmobile_invalidate_start) * We need _long_ jump to the physical address. */ .align 12 -ENTRY(shmobile_secondary_vector) +ENTRY(shmobile_boot_vector) + ldr r0, 2f ldr pc, 1f -1: .long shmobile_invalidate_start - PAGE_OFFSET + PLAT_PHYS_OFFSET -ENDPROC(shmobile_secondary_vector) +ENDPROC(shmobile_boot_vector) + + .globl shmobile_boot_fn +shmobile_boot_fn: +1: .space 4 + .globl shmobile_boot_arg +shmobile_boot_arg: +2: .space 4 --- 0016/arch/arm/mach-shmobile/include/mach/common.h +++ work/arch/arm/mach-shmobile/include/mach/common.h 2013-06-05 13:19:52.000000000 +0900 @@ -7,7 +7,9 @@ extern void shmobile_setup_delay(unsigne unsigned int mult, unsigned int div); struct twd_local_timer; extern void shmobile_setup_console(void); -extern void shmobile_secondary_vector(void); +extern void shmobile_boot_vector(void); +extern unsigned long shmobile_boot_fn; +extern unsigned long shmobile_boot_arg; extern void shmobile_secondary_vector_scu(void); struct clk; extern int shmobile_clk_init(void);