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

Merge branch 'master' into next

This commit is contained in:
Sascha Hauer 2010-11-17 10:23:56 +01:00
parent 4d63d07ffa 7e7ca7cb3a
commit f90e136aa2
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boards/mini2440/mini2440.c
View File

@ -30,7 +30,7 @@
#include <driver.h>
#include <init.h>
#include <asm/armlinux.h>
#include <asm/mach-types.h>
#include <generated/mach-types.h>
#include <partition.h>
#include <nand.h>
#include <asm/io.h>

3
arch/x86/Makefile
View File

@ -5,7 +5,8 @@ machine-y := i386
TEXT_BASE = $(CONFIG_TEXT_BASE)
CPPFLAGS += -march=i386 -DTEXT_BASE=$(TEXT_BASE) -P
CPPFLAGS += -march=i386 -m32 -DTEXT_BASE=$(TEXT_BASE) -P
LDFLAGS += -m elf_i386
ifndef CONFIG_MODULES
# Add cleanup flags

2
commands/linux16.c
View File

@ -150,7 +150,7 @@ struct linux_kernel_header {
* (setup = 'real mode code' and kernel = 'protected mode code') to their
* default locations, switches back to real mode and runs the setup code.
*/
static int do_linux16(cmd_tbl_t *cmdtp, int argc, char *argv[])
static int do_linux16(struct command *cmdtp, int argc, char *argv[])
{
struct linux_kernel_header *lh = NULL;
int rc;

2
drivers/serial/serial_s3c24x0.c
View File

@ -113,7 +113,7 @@ static void s3c24x0_serial_flush(struct console_device *cdev)
{
struct device_d *dev = cdev->dev;
while (!readb(dev->map_base + UTRSTAT) & 0x4)
while (!(readb(dev->map_base + UTRSTAT) & 0x4))
;
}

4
scripts/setupmbr/setupmbr.c
View File

@ -42,8 +42,8 @@
#include <assert.h>
/* include the info from this barebox release */
#include "include/generated/utsrelease.h"
#include "arch/x86/include/asm/barebox.lds.h"
#include "../../include/generated/utsrelease.h"
#include "../../arch/x86/include/asm/barebox.lds.h"
/** define to disable integrity tests and debug messages */
#define NDEBUG