diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2012-09-12 16:12:11 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-12 17:25:19 +0200 |
| commit | 114c3d6294c5b45202a74330096dd60ba8c5d2fd (patch) | |
| tree | 873526b6ab185ee18e0789e57c660508c55e8cb2 /arch/arm/lib/armlinux.c | |
| parent | 4271879e3b82e2e4d52a46f7c4ef01461a786b5e (diff) | |
| download | barebox-114c3d6294c5b45202a74330096dd60ba8c5d2fd.tar.gz barebox-114c3d6294c5b45202a74330096dd60ba8c5d2fd.tar.xz | |
arm: armlinux: get the architecture before shutdown barebox
As we may try to get it from the env.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/lib/armlinux.c')
| -rw-r--r-- | arch/arm/lib/armlinux.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/lib/armlinux.c b/arch/arm/lib/armlinux.c index 9f9dea8754..191274e51b 100644 --- a/arch/arm/lib/armlinux.c +++ b/arch/arm/lib/armlinux.c @@ -264,6 +264,7 @@ void start_linux(void *adr, int swap, unsigned long initrd_address, setup_tags(initrd_address, initrd_size, swap); params = armlinux_bootparams; } + architecture = armlinux_get_architecture(); shutdown_barebox(); if (swap) { @@ -273,8 +274,6 @@ void start_linux(void *adr, int swap, unsigned long initrd_address, __asm__ __volatile__("mcr p15, 0, %0, c1, c0" :: "r" (reg)); } - architecture = armlinux_get_architecture(); - #ifdef CONFIG_THUMB2_BAREBOX __asm__ __volatile__ ( "mov r0, #0\n" |