diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-02-04 19:09:15 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-02-04 19:09:15 +0100 |
commit | ce961e341258dc9f78da3c0d64231cf1afdc4e63 (patch) | |
tree | 90c65241a72f55fbd67f58c05b091f714e4c2490 /arch | |
parent | 91d4a4264bc2dead4e3101c5064da35c78f4c89b (diff) | |
parent | cf715885604004ccfc30bc4caa75d58a75bb02c7 (diff) | |
download | barebox-ce961e341258dc9f78da3c0d64231cf1afdc4e63.tar.gz barebox-ce961e341258dc9f78da3c0d64231cf1afdc4e63.tar.xz |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/cpu/setupc.S | 2 | ||||
-rw-r--r-- | arch/blackfin/boards/ipe337/barebox.lds.S | 4 | ||||
-rw-r--r-- | arch/blackfin/include/asm/linkage.h | 53 | ||||
-rw-r--r-- | arch/blackfin/include/asm/system.h | 2 | ||||
-rw-r--r-- | arch/blackfin/lib/flush.S | 2 | ||||
-rw-r--r-- | arch/efi/Makefile | 2 | ||||
-rw-r--r-- | arch/nios2/cpu/.gitignore | 1 | ||||
-rw-r--r-- | arch/ppc/lib/crtsavres.S | 4 | ||||
-rw-r--r-- | arch/sandbox/Makefile | 1 | ||||
-rw-r--r-- | arch/sandbox/os/Makefile | 2 | ||||
-rw-r--r-- | arch/sandbox/os/common.c | 2 | ||||
-rw-r--r-- | arch/x86/Makefile | 2 |
13 files changed, 21 insertions, 58 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 193f731e90..f0133d4165 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -13,8 +13,6 @@ AS += -EL LD += -EL endif -comma = , - # This selects which instruction set is used. # Note that GCC does not numerically define an architecture version # macro, but instead defines a whole series of macros which makes diff --git a/arch/arm/cpu/setupc.S b/arch/arm/cpu/setupc.S index 2df2683128..c232b08d3b 100644 --- a/arch/arm/cpu/setupc.S +++ b/arch/arm/cpu/setupc.S @@ -40,7 +40,7 @@ ENDPROC(setup_c) /* * void relocate_to_adr(unsigned long targetadr) * - * Copy binary to targetadr, relocate code, clear bss and continue + * Copy binary to targetadr, relocate code and continue * executing at new address. */ .section .text.relocate_to_adr diff --git a/arch/blackfin/boards/ipe337/barebox.lds.S b/arch/blackfin/boards/ipe337/barebox.lds.S index 21a91eeb0a..9bb7cc4953 100644 --- a/arch/blackfin/boards/ipe337/barebox.lds.S +++ b/arch/blackfin/boards/ipe337/barebox.lds.S @@ -68,9 +68,9 @@ SECTIONS .barebox_cmd : { BAREBOX_CMDS } ___barebox_cmd_end = .; - __barebox_magicvar_start = .; + ___barebox_magicvar_start = .; .barebox_magicvar : { BAREBOX_MAGICVARS } - __barebox_magicvar_end = .; + ___barebox_magicvar_end = .; ___barebox_initcalls_start = .; .barebox_initcalls : { INITCALLS } diff --git a/arch/blackfin/include/asm/linkage.h b/arch/blackfin/include/asm/linkage.h index 0f547271f8..f7d6d47a04 100644 --- a/arch/blackfin/include/asm/linkage.h +++ b/arch/blackfin/include/asm/linkage.h @@ -1,54 +1,13 @@ /* - * barebox - linkage.h - * - * Copyright (c) 2005 blackfin.uclinux.org - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Copyright 2004-2009 Analog Devices Inc. * + * Licensed under the GPL-2 or later. */ -#ifndef _LINUX_LINKAGE_H -#define _LINUX_LINKAGE_H - -#ifdef __cplusplus -#define CPP_ASMLINKAGE extern "C" -#else -#define CPP_ASMLINKAGE -#endif - -#define asmlinkage CPP_ASMLINKAGE +#ifndef __ASM_LINKAGE_H +#define __ASM_LINKAGE_H -#define SYMBOL_NAME_STR(X) #X -#define SYMBOL_NAME(X) X -#ifdef __STDC__ -#define SYMBOL_NAME_LABEL(X) X##: -#else -#define SYMBOL_NAME_LABEL(X) X: -#endif - -#define __ALIGN .align 4 -#define __ALIGN_STR ".align 4" - -#ifdef __ASSEMBLY__ - -#define ALIGN __ALIGN -#define ALIGN_STR __ALIGN_STR - -#define ENTRY(name) \ - .globl SYMBOL_NAME(name); \ - ALIGN; \ - SYMBOL_NAME_LABEL(name) -#endif +#define __ALIGN .align 4 +#define __ALIGN_STR ".align 4" #endif diff --git a/arch/blackfin/include/asm/system.h b/arch/blackfin/include/asm/system.h index 581fd42397..f11dd4ebf1 100644 --- a/arch/blackfin/include/asm/system.h +++ b/arch/blackfin/include/asm/system.h @@ -21,7 +21,7 @@ #ifndef _BLACKFIN_SYSTEM_H #define _BLACKFIN_SYSTEM_H -#include <asm/linkage.h> +#include <linux/linkage.h> #include <asm/blackfin.h> #include <asm/segment.h> #include <asm/entry.h> diff --git a/arch/blackfin/lib/flush.S b/arch/blackfin/lib/flush.S index 62aa496986..4ee5d870ac 100644 --- a/arch/blackfin/lib/flush.S +++ b/arch/blackfin/lib/flush.S @@ -8,7 +8,7 @@ */ #define ASSEMBLY -#include <asm/linkage.h> +#include <linux/linkage.h> #include <asm/cplb.h> #include <asm/blackfin.h> diff --git a/arch/efi/Makefile b/arch/efi/Makefile index 85cb655615..b078bd0e35 100644 --- a/arch/efi/Makefile +++ b/arch/efi/Makefile @@ -1,3 +1,5 @@ +KBUILD_DEFCONFIG := efi_defconfig + CFLAGS += -fpic -fshort-wchar -mno-sse -mno-mmx ifeq ($(CONFIG_X86_32),y) diff --git a/arch/nios2/cpu/.gitignore b/arch/nios2/cpu/.gitignore new file mode 100644 index 0000000000..d1165788c9 --- /dev/null +++ b/arch/nios2/cpu/.gitignore @@ -0,0 +1 @@ +barebox.lds diff --git a/arch/ppc/lib/crtsavres.S b/arch/ppc/lib/crtsavres.S index a764ae4ce6..b0fbbfc997 100644 --- a/arch/ppc/lib/crtsavres.S +++ b/arch/ppc/lib/crtsavres.S @@ -33,13 +33,11 @@ * the executable file might be covered by the GNU General Public License. */ +#include <linux/stringify.h> #include <asm/ppc_asm.tmpl> #define N_FUN 36 -#define __stringify_1(x...) #x -#define __stringify(x...) __stringify_1(x) - #define _GLOBAL(n) \ .text; \ .stabs __stringify(n:F-1),N_FUN,0,0,n;\ diff --git a/arch/sandbox/Makefile b/arch/sandbox/Makefile index ed5d3a3dab..e3fb039554 100644 --- a/arch/sandbox/Makefile +++ b/arch/sandbox/Makefile @@ -1,3 +1,4 @@ +KBUILD_DEFCONFIG := sandbox_defconfig CPPFLAGS += -D__SANDBOX__ -fno-strict-aliasing diff --git a/arch/sandbox/os/Makefile b/arch/sandbox/os/Makefile index 2e65be5eed..537f848e06 100644 --- a/arch/sandbox/os/Makefile +++ b/arch/sandbox/os/Makefile @@ -8,6 +8,8 @@ else CPPFLAGS = $(patsubst %,-I$(srctree)/%include,$(machdirs)) endif +CPPFLAGS += -DCONFIG_MALLOC_SIZE=$(CONFIG_MALLOC_SIZE) + CFLAGS := -Wall NOSTDINC_FLAGS := diff --git a/arch/sandbox/os/common.c b/arch/sandbox/os/common.c index 412393811e..0854fb5d80 100644 --- a/arch/sandbox/os/common.c +++ b/arch/sandbox/os/common.c @@ -285,7 +285,7 @@ int main(int argc, char *argv[]) { void *ram; int opt, ret, fd; - int malloc_size = 8 * 1024 * 1024; + int malloc_size = CONFIG_MALLOC_SIZE; char str[6]; int fdno = 0, envno = 0, option_index = 0; diff --git a/arch/x86/Makefile b/arch/x86/Makefile index a78fa22ac6..da17d70bdc 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -1,3 +1,5 @@ +KBUILD_DEFCONFIG := generic_defconfig + CPPFLAGS += -D__X86__ -fno-strict-aliasing board-y := x86_generic |