diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-10-23 13:38:39 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-10-23 13:38:39 +0200 |
| commit | 6b8503baabb5a55dc6e21c80d02ac8729149525e (patch) | |
| tree | d5d5ae95990164e0cee130a629dabb9ba8226a8b /arch | |
| parent | 9a5898e524437495cfdbcb84521136d2bb7ddf2d (diff) | |
| parent | dac6e90115de9b47295fc5289a26f686bcae4d35 (diff) | |
| download | barebox-6b8503baabb5a55dc6e21c80d02ac8729149525e.tar.gz barebox-6b8503baabb5a55dc6e21c80d02ac8729149525e.tar.xz | |
Merge branch 'master' into next
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/lib/bootz.c | 8 | ||||
| -rw-r--r-- | arch/blackfin/Makefile | 2 | ||||
| -rw-r--r-- | arch/ppc/Makefile | 2 | ||||
| -rw-r--r-- | arch/sandbox/Makefile | 1 | ||||
| -rw-r--r-- | arch/sandbox/os/Makefile | 1 | ||||
| -rw-r--r-- | arch/x86/Makefile | 2 |
7 files changed, 8 insertions, 10 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index d25412d11f..0c42f3d1ea 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -121,7 +121,7 @@ endif TEXT_BASE = $(CONFIG_TEXT_BASE) -CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -P +CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) ifndef CONFIG_MODULES # Add cleanup flags diff --git a/arch/arm/lib/bootz.c b/arch/arm/lib/bootz.c index fc14487bfa..956ea82862 100644 --- a/arch/arm/lib/bootz.c +++ b/arch/arm/lib/bootz.c @@ -53,7 +53,7 @@ static int do_bootz(struct command *cmdtp, int argc, char *argv[]) if (!usemap) { header = &__header; - ret = read(fd, header, sizeof(header)); + ret = read(fd, header, sizeof(*header)); if (ret < sizeof(*header)) { printf("could not read %s\n", argv[1]); goto err_out; @@ -89,10 +89,10 @@ static int do_bootz(struct command *cmdtp, int argc, char *argv[]) } } - memcpy(zimage, &header, sizeof(header)); + memcpy(zimage, header, sizeof(*header)); - ret = read(fd, zimage + sizeof(header), end - sizeof(header)); - if (ret < end - sizeof(header)) { + ret = read(fd, zimage + sizeof(*header), end - sizeof(*header)); + if (ret < end - sizeof(*header)) { printf("could not read %s\n", argv[1]); goto err_out1; } diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile index 902268da70..a0b87f77d7 100644 --- a/arch/blackfin/Makefile +++ b/arch/blackfin/Makefile @@ -7,7 +7,7 @@ cpu-$(CONFIG_BF561) := bf561 TEXT_BASE = $(CONFIG_TEXT_BASE) -CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -P +CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) CFLAGS += -D__blackfin__ # -Ttext $(TEXT_BASE) KALLSYMS += --symbol-prefix=_ diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile index 46d64e5bc6..c7bf863747 100644 --- a/arch/ppc/Makefile +++ b/arch/ppc/Makefile @@ -14,7 +14,7 @@ cpu-$(CONFIG_ARCH_MPC5200) := mpc5xxx TEXT_BASE = $(CONFIG_TEXT_BASE) -CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -P +CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) # Add cleanup flags ifndef CONFIG_MODULES diff --git a/arch/sandbox/Makefile b/arch/sandbox/Makefile index ed1194c3e6..b88f1f60f8 100644 --- a/arch/sandbox/Makefile +++ b/arch/sandbox/Makefile @@ -10,7 +10,6 @@ lds-y := $(BOARD)/barebox.lds TEXT_BASE = $(CONFIG_TEXT_BASE) -CPPFLAGS += -P CFLAGS += -Dmalloc=barebox_malloc \ -Dfree=barebox_free -Drealloc=barebox_realloc \ -Dread=barebox_read -Dwrite=barebox_write \ diff --git a/arch/sandbox/os/Makefile b/arch/sandbox/os/Makefile index 2980301e15..dc211d94cd 100644 --- a/arch/sandbox/os/Makefile +++ b/arch/sandbox/os/Makefile @@ -8,7 +8,6 @@ else CPPFLAGS = $(patsubst %,-I$(srctree)/%include,$(machdirs)) endif -CPPFLAGS += -P CFLAGS := -Wall NOSTDINC_FLAGS := diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 3b034c0516..db4180b32b 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -5,7 +5,7 @@ machine-y := i386 TEXT_BASE = $(CONFIG_TEXT_BASE) -CPPFLAGS += -march=i386 -m32 -DTEXT_BASE=$(TEXT_BASE) -P +CPPFLAGS += -march=i386 -m32 -DTEXT_BASE=$(TEXT_BASE) LDFLAGS += -m elf_i386 ifndef CONFIG_MODULES |