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

Merge branch 'master' into next

This commit is contained in:
Sascha Hauer 2012-02-15 12:59:10 +01:00
parent 4b06ebc820 238b7b1d99
commit c20952a621
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/boards/omap343xdsp/board.c
View File

@ -61,7 +61,6 @@
#include <mach/control.h>
#include <mach/omap3-mux.h>
#include <mach/gpmc.h>
#include <mach/board.h>
#include <errno.h>
/******************** Board Boot Time *******************/

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

@ -258,6 +258,7 @@ void start_linux(void *adr, int swap, unsigned long initrd_address,
if (oftree) {
printf("booting Linux kernel with devicetree\n");
params = oftree;
} else {
setup_tags(initrd_address, initrd_size, swap);
params = armlinux_bootparams;

1
arch/arm/mach-omap/omap4_generic.c
View File

@ -352,6 +352,7 @@ static unsigned int cortex_a9_rev(void)
unsigned int i;
/* Read Main ID Register (MIDR) */
asm ("mrc p15, 0, %0, c0, c0, 0" : "=r" (i));
return i;

2
commands/bootm.c
View File

@ -324,7 +324,7 @@ static int do_bootm(struct command *cmdtp, int argc, char *argv[])
if (os_type == filetype_uimage) {
ret = bootm_open_os_uimage(&data);
if (ret) {
printf("loading initrd failed with %s\n",
printf("loading os image failed with %s\n",
strerror(-ret));
goto err_out;
}

4
drivers/mci/Kconfig
View File

@ -69,8 +69,8 @@ config MCI_OMAP_HSMMC
bool "OMAP HSMMC"
depends on ARCH_OMAP4 || ARCH_OMAP3
help
Enable this entry to add support to read and write SD cards on a
OMAP4 based system.
Enable this entry to add support to read and write SD cards on
both OMAP3 and OMAP4 based systems.
config MCI_PXA
bool "PXA"