sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

ARM: factor out a start_linux function 

This can be shared between the different boot commands.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2011-04-01 14:15:54 +02:00
parent cf76694df6
commit 4ade5f8670
4 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/Kconfig
View File

@ -21,6 +21,11 @@ config ARM
config ARM_AMBA
bool
config ARM_LINUX
bool
default y
depends on CMD_BOOTZ || CMD_BOOTU || CMD_BOOTM
menu "System Type"
choice

4
arch/arm/include/asm/armlinux.h
View File

@ -30,4 +30,8 @@ static inline void armlinux_set_serial(u64 serial)
}
#endif
struct image_data;
void start_linux(void *adr, int swap, struct image_data *data);
#endif /* __ARCH_ARMLINUX_H */

2
arch/arm/lib/Makefile
View File

@ -1,4 +1,4 @@
obj-y += armlinux.o
obj-$(CONFIG_ARM_LINUX) += armlinux.o
obj-y += div0.o
obj-y += findbit.o
obj-y += arm.o

39
arch/arm/lib/armlinux.c
View File

@ -215,6 +215,23 @@ void armlinux_set_serial(u64 serial)
system_serial = serial;
}
void start_linux(void *adr, int swap, struct image_data *data)
{
void (*kernel)(int zero, int arch, void *params) = adr;
setup_tags(data, swap);
shutdown_barebox();
if (swap) {
u32 reg;
__asm__ __volatile__("mrc p15, 0, %0, c1, c0" : "=r" (reg));
reg ^= CR_B; /* swap big-endian flag */
__asm__ __volatile__("mcr p15, 0, %0, c1, c0" :: "r" (reg));
}
kernel(0, armlinux_architecture, armlinux_bootparams);
}
#ifdef CONFIG_CMD_BOOTM
static int do_bootm_linux(struct image_data *data)
{
@ -241,8 +258,6 @@ static int do_bootm_linux(struct image_data *data)
debug("## Transferring control to Linux (at address 0x%p) ...\n",
theKernel);
setup_tags(data, 0);
if (relocate_image(data->os, (void *)image_get_load(os_header)))
return -1;
@ -253,8 +268,7 @@ static int do_bootm_linux(struct image_data *data)
/* we assume that the kernel is in place */
printf("\nStarting kernel %s...\n\n", data->initrd ? "with initrd " : "");
shutdown_barebox();
theKernel (0, armlinux_architecture, armlinux_bootparams);
start_linux(theKernel, 0, data);
return -1;
}
@ -370,17 +384,7 @@ static int do_bootz(struct command *cmdtp, int argc, char *argv[])
printf("loaded zImage from %s with size %d\n", argv[1], end);
setup_tags(NULL, swap);
shutdown_barebox();
if (swap) {
u32 reg;
__asm__ __volatile__("mrc p15, 0, %0, c1, c0" : "=r" (reg));
reg ^= CR_B; /* swap big-endian flag */
__asm__ __volatile__("mcr p15, 0, %0, c1, c0" :: "r" (reg));
}
theKernel(0, armlinux_architecture, armlinux_bootparams);
start_linux(theKernel, swap, NULL);
return 0;
@ -421,10 +425,7 @@ static int do_bootu(struct command *cmdtp, int argc, char *argv[])
if (!theKernel)
theKernel = (void *)simple_strtoul(argv[1], NULL, 0);
setup_tags(NULL, 0);
shutdown_barebox();
theKernel(0, armlinux_architecture, armlinux_bootparams);
start_linux(theKernel, 0, NULL);
return 1;
}