diff --git a/Makefile b/Makefile index cdd8a37c0..b0cb8fa2a 100644 --- a/Makefile +++ b/Makefile @@ -168,6 +168,7 @@ CROSS_COMPILE ?= # Architecture as present in compile.h UTS_MACHINE := $(ARCH) +SRCARCH := $(ARCH) KCONFIG_CONFIG ?= .config @@ -287,6 +288,7 @@ export MODVERDIR := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_ve # Needed to be compatible with the O= option LINUXINCLUDE := -Iinclude \ $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \ + -I$(srctree)/arch/$(ARCH)/include \ -include include/linux/autoconf.h CPPFLAGS := -D__KERNEL__ -D__U_BOOT__ $(LINUXINCLUDE) -fno-builtin -ffreestanding @@ -749,7 +751,9 @@ ifneq ($(KBUILD_SRC),) /bin/false; \ fi; $(Q)if [ ! -d include2 ]; then mkdir -p include2; fi; - $(Q)ln -fsn $(srctree)/include/asm-$(ARCH) include2/asm + $(Q)if [ -e $(srctree)/include/asm-$(SRCARCH)/u-boot.h ]; then \ + ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \ + fi endif # prepare2 creates a makefile if using a separate output directory @@ -780,10 +784,34 @@ export CPPFLAGS_uboot.lds += -P -C -U$(ARCH) # hard to detect, but I suppose "make mrproper" is a good idea # before switching between archs anyway. +define check-symlink + set -e; \ + if [ -L include/asm ]; then \ + asmlink=`readlink include/asm | cut -d '-' -f 2`; \ + if [ "$$asmlink" != "$(SRCARCH)" ]; then \ + echo "ERROR: the symlink $@ points to asm-$$asmlink but asm-$(SRCARCH) was expected"; \ + echo " set ARCH or save .config and run 'make mrproper' to fix it"; \ + exit 1; \ + fi; \ + fi +endef + +# We create the target directory of the symlink if it does +# not exist so the test in chack-symlink works and we have a +# directory for generated filesas used by some architectures. +define create-symlink + if [ ! -L include/asm ]; then \ + echo ' SYMLINK $@ -> include/asm-$(SRCARCH)'; \ + if [ ! -d include/asm-$(SRCARCH) ]; then \ + mkdir -p include/asm-$(SRCARCH); \ + fi; \ + ln -fsn asm-$(SRCARCH) $@; \ + fi +endef + include/asm: - @echo ' SYMLINK $@ -> include/asm-$(ARCH)' - $(Q)if [ ! -d include ]; then mkdir -p include; fi; - @ln -fsn asm-$(ARCH) $@ + $(Q)$(check-symlink) + $(Q)$(create-symlink) include/config.h: include/config/auto.conf @echo ' SYMLINK $@ -> board/$(board-y)/config.h' @@ -1075,7 +1103,11 @@ define find-sources \( -name config -o -name 'asm-*' \) -prune \ -o -name $1 -print; \ for ARCH in $(ALLINCLUDE_ARCHS) ; do \ - find $(__srctree)include/asm-$${ARCH} $(RCS_FIND_IGNORE) \ + test -e $(__srctree)include/asm-$${arch} && \ + find $(__srctree)include/asm-$${arch} $(RCS_FIND_IGNORE) \ + -name $1 -print; \ + test -e $(__srctree)arch/$${arch}/include/asm && \ + find $(__srctree)arch/$${arch}/include/asm $(RCS_FIND_IGNORE) \ -name $1 -print; \ done ; \ find $(__srctree)include/asm-generic $(RCS_FIND_IGNORE) \ diff --git a/arch/arm/Makefile b/arch/arm/Makefile index fc5499684..5105d63de 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -32,6 +32,14 @@ board-$(CONFIG_MACH_EUKREA_CPUIMX27) := eukrea_cpuimx27 cpu-$(CONFIG_ARM920T) := arm920t cpu-$(CONFIG_ARM926EJS) := arm926ejs +machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y)) + +ifeq ($(KBUILD_SRC),) +CPPFLAGS += $(patsubst %,-I%include,$(machdirs)) +else +CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs)) +endif + TEXT_BASE = $(CONFIG_TEXT_BASE) CPPFLAGS += -mabi=apcs-gnu -DTEXT_BASE=$(TEXT_BASE) -P @@ -42,32 +50,6 @@ CPPFLAGS += -fdata-sections -ffunction-sections LDFLAGS_uboot += -static --gc-sections endif -ifeq ($(incdir-y),) -incdir-y := $(machine-y) -endif -INCDIR := arch-$(incdir-y) - -# Update machine arch and proc symlinks if something which affects -# them changed. We use .arch to indicate when they were updated -# last, otherwise make uses the target directory mtime. - -include/asm-arm/.arch: $(wildcard include/config/arch/*.h) include/config/auto.conf - @echo ' SYMLINK include/asm-arm/arch -> include/asm-arm/$(INCDIR)' -ifneq ($(KBUILD_SRC),) - $(Q)mkdir -p include/asm-arm - $(Q)ln -fsn $(srctree)/include/asm-arm/$(INCDIR) include/asm-arm/arch -else - $(Q)ln -fsn $(INCDIR) include/asm-arm/arch -endif - @echo ' SYMLINK include/asm-arm/proc -> include/asm-arm/proc-armv' -ifneq ($(KBUILD_SRC),) - $(Q)mkdir -p include/asm-arm - $(Q)ln -fsn $(srctree)/include/asm-arm/proc-armv include/asm-arm/proc -else - $(Q)ln -fsn proc-armv include/asm-arm/proc -endif - @touch $@ - uboot.netx: uboot.bin $(Q)scripts/gen_netx_image -i uboot.bin -o uboot.netx \ --sdramctrl=$(CONFIG_NETX_SDRAM_CTRL) \ @@ -85,7 +67,6 @@ all: $(KBUILD_IMAGE) archprepare: maketools PHONY += maketools -maketools: include/asm-arm/.arch # Add architecture specific flags ifeq ($(CONFIG_ARMCORTEXA8),y) @@ -111,4 +92,3 @@ lds-$(CONFIG_GENERIC_LINKER_SCRIPT) := arch/arm/lib/u-boot.lds lds-$(CONFIG_BOARD_LINKER_SCRIPT) := $(BOARD)/u-boot.lds CLEAN_FILES += arch/arm/lib/u-boot.lds -MRPROPER_FILES += include/asm-arm/arch include/asm-arm/proc diff --git a/include/asm-arm/armlinux.h b/arch/arm/include/asm/armlinux.h similarity index 100% rename from include/asm-arm/armlinux.h rename to arch/arm/include/asm/armlinux.h diff --git a/include/asm-arm/assembler.h b/arch/arm/include/asm/assembler.h similarity index 100% rename from include/asm-arm/assembler.h rename to arch/arm/include/asm/assembler.h diff --git a/include/asm-arm/bitops.h b/arch/arm/include/asm/bitops.h similarity index 100% rename from include/asm-arm/bitops.h rename to arch/arm/include/asm/bitops.h diff --git a/include/asm-arm/byteorder.h b/arch/arm/include/asm/byteorder.h similarity index 100% rename from include/asm-arm/byteorder.h rename to arch/arm/include/asm/byteorder.h diff --git a/include/asm-arm/cache-l2x0.h b/arch/arm/include/asm/cache-l2x0.h similarity index 100% rename from include/asm-arm/cache-l2x0.h rename to arch/arm/include/asm/cache-l2x0.h diff --git a/include/asm-arm/common.h b/arch/arm/include/asm/common.h similarity index 100% rename from include/asm-arm/common.h rename to arch/arm/include/asm/common.h diff --git a/include/asm-arm/elf.h b/arch/arm/include/asm/elf.h similarity index 100% rename from include/asm-arm/elf.h rename to arch/arm/include/asm/elf.h diff --git a/include/asm-arm/global_data.h b/arch/arm/include/asm/global_data.h similarity index 100% rename from include/asm-arm/global_data.h rename to arch/arm/include/asm/global_data.h diff --git a/include/asm-arm/gpio.h b/arch/arm/include/asm/gpio.h similarity index 84% rename from include/asm-arm/gpio.h rename to arch/arm/include/asm/gpio.h index fff4f800e..166a7a3e2 100644 --- a/include/asm-arm/gpio.h +++ b/arch/arm/include/asm/gpio.h @@ -2,6 +2,6 @@ #define _ARCH_ARM_GPIO_H /* not all ARM platforms necessarily support this API ... */ -#include +#include #endif /* _ARCH_ARM_GPIO_H */ diff --git a/include/asm-arm/hardware.h b/arch/arm/include/asm/hardware.h similarity index 92% rename from include/asm-arm/hardware.h rename to arch/arm/include/asm/hardware.h index 1fd1a5b65..c71c2aeab 100644 --- a/include/asm-arm/hardware.h +++ b/arch/arm/include/asm/hardware.h @@ -13,6 +13,6 @@ #ifndef __ASM_HARDWARE_H #define __ASM_HARDWARE_H -#include +#include #endif diff --git a/include/asm-arm/io.h b/arch/arm/include/asm/io.h similarity index 100% rename from include/asm-arm/io.h rename to arch/arm/include/asm/io.h diff --git a/include/asm-arm/linkage.h b/arch/arm/include/asm/linkage.h similarity index 100% rename from include/asm-arm/linkage.h rename to arch/arm/include/asm/linkage.h diff --git a/include/asm-arm/mach-types.h b/arch/arm/include/asm/mach-types.h similarity index 100% rename from include/asm-arm/mach-types.h rename to arch/arm/include/asm/mach-types.h diff --git a/include/asm-arm/memory.h b/arch/arm/include/asm/memory.h similarity index 100% rename from include/asm-arm/memory.h rename to arch/arm/include/asm/memory.h diff --git a/include/asm-arm/mmu.h b/arch/arm/include/asm/mmu.h similarity index 100% rename from include/asm-arm/mmu.h rename to arch/arm/include/asm/mmu.h diff --git a/include/asm-arm/module.h b/arch/arm/include/asm/module.h similarity index 100% rename from include/asm-arm/module.h rename to arch/arm/include/asm/module.h diff --git a/include/asm-arm/pgtable.h b/arch/arm/include/asm/pgtable.h similarity index 100% rename from include/asm-arm/pgtable.h rename to arch/arm/include/asm/pgtable.h diff --git a/include/asm-arm/posix_types.h b/arch/arm/include/asm/posix_types.h similarity index 100% rename from include/asm-arm/posix_types.h rename to arch/arm/include/asm/posix_types.h diff --git a/include/asm-arm/processor.h b/arch/arm/include/asm/processor.h similarity index 100% rename from include/asm-arm/processor.h rename to arch/arm/include/asm/processor.h diff --git a/include/asm-arm/proc-armv/ptrace.h b/arch/arm/include/asm/ptrace.h similarity index 76% rename from include/asm-arm/proc-armv/ptrace.h rename to arch/arm/include/asm/ptrace.h index a060ee67e..b38436930 100644 --- a/include/asm-arm/proc-armv/ptrace.h +++ b/arch/arm/include/asm/ptrace.h @@ -1,15 +1,28 @@ /* - * linux/include/asm-arm/proc-armv/ptrace.h + * arch/arm/include/asm/ptrace.h * - * Copyright (C) 1996-1999 Russell King + * Copyright (C) 1996-2003 Russell King * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#ifndef __ASM_PROC_PTRACE_H -#define __ASM_PROC_PTRACE_H +#ifndef __ASM_ARM_PTRACE_H +#define __ASM_ARM_PTRACE_H +#define PTRACE_GETREGS 12 +#define PTRACE_SETREGS 13 +#define PTRACE_GETFPREGS 14 +#define PTRACE_SETFPREGS 15 + +#define PTRACE_SETOPTIONS 21 + +/* options set using PTRACE_SETOPTIONS */ +#define PTRACE_O_TRACESYSGOOD 0x00000001 + +/* + * PSR bits + */ #define USR26_MODE 0x00 #define FIQ26_MODE 0x01 #define IRQ26_MODE 0x02 @@ -104,4 +117,21 @@ static inline int valid_user_regs(struct pt_regs *regs) #endif /* __ASSEMBLY__ */ +#ifndef __ASSEMBLY__ +#define pc_pointer(v) \ + ((v) & ~PCMASK) + +#define instruction_pointer(regs) \ + (pc_pointer((regs)->ARM_pc)) + +#ifdef __KERNEL__ +extern void show_regs(struct pt_regs *); + +#define predicate(x) (x & 0xf0000000) +#define PREDICATE_ALWAYS 0xe0000000 + +#endif + +#endif /* __ASSEMBLY__ */ + #endif diff --git a/include/asm-arm/setup.h b/arch/arm/include/asm/setup.h similarity index 100% rename from include/asm-arm/setup.h rename to arch/arm/include/asm/setup.h diff --git a/include/asm-arm/string.h b/arch/arm/include/asm/string.h similarity index 100% rename from include/asm-arm/string.h rename to arch/arm/include/asm/string.h diff --git a/include/asm-arm/types.h b/arch/arm/include/asm/types.h similarity index 100% rename from include/asm-arm/types.h rename to arch/arm/include/asm/types.h diff --git a/include/asm-arm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h similarity index 100% rename from include/asm-arm/u-boot-arm.h rename to arch/arm/include/asm/u-boot-arm.h diff --git a/include/asm-arm/u-boot.h b/arch/arm/include/asm/u-boot.h similarity index 100% rename from include/asm-arm/u-boot.h rename to arch/arm/include/asm/u-boot.h diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c index 5e321c1e7..0cfe913f7 100644 --- a/arch/arm/mach-at91/at91sam9260_devices.c +++ b/arch/arm/mach-at91/at91sam9260_devices.c @@ -12,11 +12,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include static struct memory_platform_data sram_pdata = { .name = "sram0", diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c index 83b733f58..50a63488f 100644 --- a/arch/arm/mach-at91/at91sam9263_devices.c +++ b/arch/arm/mach-at91/at91sam9263_devices.c @@ -12,11 +12,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include static struct memory_platform_data ram_pdata = { .name = "ram0", diff --git a/arch/arm/mach-at91/clocksource.c b/arch/arm/mach-at91/clocksource.c index d937e49c3..b5886f938 100644 --- a/arch/arm/mach-at91/clocksource.c +++ b/arch/arm/mach-at91/clocksource.c @@ -33,10 +33,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include uint64_t at91sam9_clocksource_read(void) diff --git a/arch/arm/mach-at91/gpio.c b/arch/arm/mach-at91/gpio.c index b479a4f83..1cafaf7e2 100644 --- a/arch/arm/mach-at91/gpio.c +++ b/arch/arm/mach-at91/gpio.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include static int gpio_banks; diff --git a/include/asm-arm/arch-at91/at91_pio.h b/arch/arm/mach-at91/include/mach/at91_pio.h similarity index 100% rename from include/asm-arm/arch-at91/at91_pio.h rename to arch/arm/mach-at91/include/mach/at91_pio.h diff --git a/include/asm-arm/arch-at91/at91_pit.h b/arch/arm/mach-at91/include/mach/at91_pit.h similarity index 100% rename from include/asm-arm/arch-at91/at91_pit.h rename to arch/arm/mach-at91/include/mach/at91_pit.h diff --git a/include/asm-arm/arch-at91/at91_pmc.h b/arch/arm/mach-at91/include/mach/at91_pmc.h similarity index 100% rename from include/asm-arm/arch-at91/at91_pmc.h rename to arch/arm/mach-at91/include/mach/at91_pmc.h diff --git a/include/asm-arm/arch-at91/at91_rstc.h b/arch/arm/mach-at91/include/mach/at91_rstc.h similarity index 100% rename from include/asm-arm/arch-at91/at91_rstc.h rename to arch/arm/mach-at91/include/mach/at91_rstc.h diff --git a/include/asm-arm/arch-at91/at91_wdt.h b/arch/arm/mach-at91/include/mach/at91_wdt.h similarity index 100% rename from include/asm-arm/arch-at91/at91_wdt.h rename to arch/arm/mach-at91/include/mach/at91_wdt.h diff --git a/include/asm-arm/arch-at91/at91sam9260.h b/arch/arm/mach-at91/include/mach/at91sam9260.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9260.h rename to arch/arm/mach-at91/include/mach/at91sam9260.h diff --git a/include/asm-arm/arch-at91/at91sam9260_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9260_matrix.h rename to arch/arm/mach-at91/include/mach/at91sam9260_matrix.h diff --git a/include/asm-arm/arch-at91/at91sam9263.h b/arch/arm/mach-at91/include/mach/at91sam9263.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9263.h rename to arch/arm/mach-at91/include/mach/at91sam9263.h diff --git a/include/asm-arm/arch-at91/at91sam9263_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9263_matrix.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9263_matrix.h rename to arch/arm/mach-at91/include/mach/at91sam9263_matrix.h diff --git a/include/asm-arm/arch-at91/at91sam9_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9_matrix.h similarity index 77% rename from include/asm-arm/arch-at91/at91sam9_matrix.h rename to arch/arm/mach-at91/include/mach/at91sam9_matrix.h index 56600c741..58cafd852 100644 --- a/include/asm-arm/arch-at91/at91sam9_matrix.h +++ b/arch/arm/mach-at91/include/mach/at91sam9_matrix.h @@ -12,17 +12,17 @@ #define __ASM_ARCH_AT91SAM9_MATRIX_H #if defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9G20) -#include +#include #elif defined(CONFIG_ARCH_AT91SAM9261) -#include +#include #elif defined(CONFIG_ARCH_AT91SAM9263) -#include +#include #elif defined(CONFIG_ARCH_AT91SAM9RL) -#include +#include #elif defined(CONFIG_ARCH_AT91CAP9) -#include +#include #elif defined(CONFIG_ARCH_AT91SAM9G45) || defined(CONFIG_ARCH_AT91SAM9M10G45) -#include +#include #else #error "Unsupported AT91SAM9/CAP9 processor" #endif diff --git a/include/asm-arm/arch-at91/at91sam9_sdramc.h b/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9_sdramc.h rename to arch/arm/mach-at91/include/mach/at91sam9_sdramc.h diff --git a/include/asm-arm/arch-at91/at91sam9_smc.h b/arch/arm/mach-at91/include/mach/at91sam9_smc.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9_smc.h rename to arch/arm/mach-at91/include/mach/at91sam9_smc.h diff --git a/include/asm-arm/arch-at91/board.h b/arch/arm/mach-at91/include/mach/board.h similarity index 100% rename from include/asm-arm/arch-at91/board.h rename to arch/arm/mach-at91/include/mach/board.h diff --git a/include/asm-arm/arch-at91/clk.h b/arch/arm/mach-at91/include/mach/clk.h similarity index 97% rename from include/asm-arm/arch-at91/clk.h rename to arch/arm/mach-at91/include/mach/clk.h index f67b4356d..a9c06836b 100644 --- a/include/asm-arm/arch-at91/clk.h +++ b/arch/arm/mach-at91/include/mach/clk.h @@ -24,7 +24,7 @@ #ifndef __ASM_ARM_ARCH_CLK_H__ #define __ASM_ARM_ARCH_CLK_H__ -#include +#include static inline unsigned long get_macb_pclk_rate(unsigned int dev_id) { diff --git a/include/asm-arm/arch-at91/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h similarity index 99% rename from include/asm-arm/arch-at91/gpio.h rename to arch/arm/mach-at91/include/mach/gpio.h index 1b0238c4c..76d53ba24 100644 --- a/include/asm-arm/arch-at91/gpio.h +++ b/arch/arm/mach-at91/include/mach/gpio.h @@ -15,8 +15,8 @@ #include #include -#include -#include +#include +#include #define PIN_BASE 32 diff --git a/include/asm-arm/arch-at91/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h similarity index 84% rename from include/asm-arm/arch-at91/hardware.h rename to arch/arm/mach-at91/include/mach/hardware.h index 6f48c3439..82b574eb0 100644 --- a/include/asm-arm/arch-at91/hardware.h +++ b/arch/arm/mach-at91/include/mach/hardware.h @@ -15,21 +15,21 @@ #define __ASM_ARCH_HARDWARE_H #if defined(CONFIG_ARCH_AT91RM9200) -#include +#include #elif defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9G20) -#include +#include #elif defined(CONFIG_ARCH_AT91SAM9261) || defined(CONFIG_ARCH_AT91SAM9G10) -#include +#include #elif defined(CONFIG_ARCH_AT91SAM9263) -#include +#include #elif defined(CONFIG_ARCH_AT91SAM9RL) -#include +#include #elif defined(CONFIG_ARCH_AT91SAM9G45) || defined(CONFIG_ARCH_AT91SAM9M10G45) -#include +#include #elif defined(CONFIG_ARCH_AT91CAP9) -#include +#include #elif defined(CONFIG_ARCH_AT91X40) -#include +#include #else #error "Unsupported AT91 processor" #endif diff --git a/include/asm-arm/arch-at91/io.h b/arch/arm/mach-at91/include/mach/io.h similarity index 100% rename from include/asm-arm/arch-at91/io.h rename to arch/arm/mach-at91/include/mach/io.h diff --git a/include/asm-arm/arch-at91/sam9_smc.h b/arch/arm/mach-at91/include/mach/sam9_smc.h similarity index 100% rename from include/asm-arm/arch-at91/sam9_smc.h rename to arch/arm/mach-at91/include/mach/sam9_smc.h diff --git a/arch/arm/mach-at91/lowlevel_init.S b/arch/arm/mach-at91/lowlevel_init.S index fa6577a6a..5bd32e89b 100644 --- a/arch/arm/mach-at91/lowlevel_init.S +++ b/arch/arm/mach-at91/lowlevel_init.S @@ -28,14 +28,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include _TEXT_BASE: .word TEXT_BASE diff --git a/arch/arm/mach-at91/sam9_smc.c b/arch/arm/mach-at91/sam9_smc.c index f3f885c72..3e7de2fc5 100644 --- a/arch/arm/mach-at91/sam9_smc.c +++ b/arch/arm/mach-at91/sam9_smc.c @@ -10,11 +10,11 @@ #include #include -#include -#include +#include +#include -#include -#include +#include +#include void sam9_smc_configure(int cs, struct sam9_smc_config* config) { diff --git a/include/asm-arm/arch-at91rm9200/AT91RM9200.h b/arch/arm/mach-at91rm9200/include/mach/AT91RM9200.h similarity index 100% rename from include/asm-arm/arch-at91rm9200/AT91RM9200.h rename to arch/arm/mach-at91rm9200/include/mach/AT91RM9200.h diff --git a/include/asm-arm/arch-at91rm9200/hardware.h b/arch/arm/mach-at91rm9200/include/mach/hardware.h similarity index 100% rename from include/asm-arm/arch-at91rm9200/hardware.h rename to arch/arm/mach-at91rm9200/include/mach/hardware.h diff --git a/arch/arm/mach-imx/clko.c b/arch/arm/mach-imx/clko.c index 11edfb5ed..6a8072213 100644 --- a/arch/arm/mach-imx/clko.c +++ b/arch/arm/mach-imx/clko.c @@ -1,8 +1,8 @@ #include #include #include -#include -#include +#include +#include static int do_clko (cmd_tbl_t *cmdtp, int argc, char *argv[]) { diff --git a/arch/arm/mach-imx/clocksource.c b/arch/arm/mach-imx/clocksource.c index 6c5cc1141..09d43183b 100644 --- a/arch/arm/mach-imx/clocksource.c +++ b/arch/arm/mach-imx/clocksource.c @@ -33,8 +33,8 @@ #include #include #include -#include -#include +#include +#include #define GPT(x) __REG(IMX_TIM1_BASE + (x)) diff --git a/arch/arm/mach-imx/gpio.c b/arch/arm/mach-imx/gpio.c index 49566e41c..2e1362c96 100644 --- a/arch/arm/mach-imx/gpio.c +++ b/arch/arm/mach-imx/gpio.c @@ -24,7 +24,7 @@ */ #include -#include +#include void imx_gpio_mode(int gpio_mode) { diff --git a/arch/arm/mach-imx/imx21.c b/arch/arm/mach-imx/imx21.c index 90b1eef99..0741f112a 100644 --- a/arch/arm/mach-imx/imx21.c +++ b/arch/arm/mach-imx/imx21.c @@ -16,7 +16,7 @@ */ #include -#include +#include int imx_silicon_revision(void) { diff --git a/arch/arm/mach-imx/imx27.c b/arch/arm/mach-imx/imx27.c index 7255a7770..c33346aaf 100644 --- a/arch/arm/mach-imx/imx27.c +++ b/arch/arm/mach-imx/imx27.c @@ -16,7 +16,7 @@ */ #include -#include +#include int imx_silicon_revision(void) { diff --git a/include/asm-arm/arch-imx/clock-imx1.h b/arch/arm/mach-imx/include/mach/clock-imx1.h similarity index 100% rename from include/asm-arm/arch-imx/clock-imx1.h rename to arch/arm/mach-imx/include/mach/clock-imx1.h diff --git a/include/asm-arm/arch-imx/clock.h b/arch/arm/mach-imx/include/mach/clock.h similarity index 100% rename from include/asm-arm/arch-imx/clock.h rename to arch/arm/mach-imx/include/mach/clock.h diff --git a/include/asm-arm/arch-imx/esdctl.h b/arch/arm/mach-imx/include/mach/esdctl.h similarity index 100% rename from include/asm-arm/arch-imx/esdctl.h rename to arch/arm/mach-imx/include/mach/esdctl.h diff --git a/include/asm-arm/arch-imx/generic.h b/arch/arm/mach-imx/include/mach/generic.h similarity index 100% rename from include/asm-arm/arch-imx/generic.h rename to arch/arm/mach-imx/include/mach/generic.h diff --git a/include/asm-arm/arch-imx/gpio.h b/arch/arm/mach-imx/include/mach/gpio.h similarity index 100% rename from include/asm-arm/arch-imx/gpio.h rename to arch/arm/mach-imx/include/mach/gpio.h diff --git a/include/asm-arm/arch-imx/imx-nand.h b/arch/arm/mach-imx/include/mach/imx-nand.h similarity index 100% rename from include/asm-arm/arch-imx/imx-nand.h rename to arch/arm/mach-imx/include/mach/imx-nand.h diff --git a/include/asm-arm/arch-imx/imx-pll.h b/arch/arm/mach-imx/include/mach/imx-pll.h similarity index 100% rename from include/asm-arm/arch-imx/imx-pll.h rename to arch/arm/mach-imx/include/mach/imx-pll.h diff --git a/include/asm-arm/arch-imx/imx-regs.h b/arch/arm/mach-imx/include/mach/imx-regs.h similarity index 95% rename from include/asm-arm/arch-imx/imx-regs.h rename to arch/arm/mach-imx/include/mach/imx-regs.h index b7a83a4e2..459714e9b 100644 --- a/include/asm-arm/arch-imx/imx-regs.h +++ b/arch/arm/mach-imx/include/mach/imx-regs.h @@ -40,17 +40,17 @@ #endif #ifdef CONFIG_ARCH_IMX1 -# include +# include #elif defined CONFIG_ARCH_IMX21 -# include +# include #elif defined CONFIG_ARCH_IMX27 -# include +# include #elif defined CONFIG_ARCH_IMX31 -# include +# include #elif defined CONFIG_ARCH_IMX35 -# include +# include #elif defined CONFIG_ARCH_IMX25 -# include +# include #else # error "unknown i.MX soc type" #endif diff --git a/include/asm-arm/arch-imx/imx1-regs.h b/arch/arm/mach-imx/include/mach/imx1-regs.h similarity index 100% rename from include/asm-arm/arch-imx/imx1-regs.h rename to arch/arm/mach-imx/include/mach/imx1-regs.h diff --git a/include/asm-arm/arch-imx/imx21-regs.h b/arch/arm/mach-imx/include/mach/imx21-regs.h similarity index 100% rename from include/asm-arm/arch-imx/imx21-regs.h rename to arch/arm/mach-imx/include/mach/imx21-regs.h diff --git a/include/asm-arm/arch-imx/imx25-flash-header.h b/arch/arm/mach-imx/include/mach/imx25-flash-header.h similarity index 100% rename from include/asm-arm/arch-imx/imx25-flash-header.h rename to arch/arm/mach-imx/include/mach/imx25-flash-header.h diff --git a/include/asm-arm/arch-imx/imx25-regs.h b/arch/arm/mach-imx/include/mach/imx25-regs.h similarity index 100% rename from include/asm-arm/arch-imx/imx25-regs.h rename to arch/arm/mach-imx/include/mach/imx25-regs.h diff --git a/include/asm-arm/arch-imx/imx27-regs.h b/arch/arm/mach-imx/include/mach/imx27-regs.h similarity index 100% rename from include/asm-arm/arch-imx/imx27-regs.h rename to arch/arm/mach-imx/include/mach/imx27-regs.h diff --git a/include/asm-arm/arch-imx/imx31-regs.h b/arch/arm/mach-imx/include/mach/imx31-regs.h similarity index 100% rename from include/asm-arm/arch-imx/imx31-regs.h rename to arch/arm/mach-imx/include/mach/imx31-regs.h diff --git a/include/asm-arm/arch-imx/imx35-regs.h b/arch/arm/mach-imx/include/mach/imx35-regs.h similarity index 100% rename from include/asm-arm/arch-imx/imx35-regs.h rename to arch/arm/mach-imx/include/mach/imx35-regs.h diff --git a/include/asm-arm/arch-imx/imxfb.h b/arch/arm/mach-imx/include/mach/imxfb.h similarity index 100% rename from include/asm-arm/arch-imx/imxfb.h rename to arch/arm/mach-imx/include/mach/imxfb.h diff --git a/include/asm-arm/arch-imx/iomux-mx25.h b/arch/arm/mach-imx/include/mach/iomux-mx25.h similarity index 99% rename from include/asm-arm/arch-imx/iomux-mx25.h rename to arch/arm/mach-imx/include/mach/iomux-mx25.h index aaacc3e72..020b7f214 100644 --- a/include/asm-arm/arch-imx/iomux-mx25.h +++ b/arch/arm/mach-imx/include/mach/iomux-mx25.h @@ -1,7 +1,7 @@ #ifndef __MACH_IOMUX_MX25_H__ #define __MACH_IOMUX_MX25_H__ -#include +#include #define SRE (1 << 0) #define DSE_STD (0 << 1) diff --git a/include/asm-arm/arch-imx/iomux-mx31.h b/arch/arm/mach-imx/include/mach/iomux-mx31.h similarity index 100% rename from include/asm-arm/arch-imx/iomux-mx31.h rename to arch/arm/mach-imx/include/mach/iomux-mx31.h diff --git a/include/asm-arm/arch-imx/iomux-mx35.h b/arch/arm/mach-imx/include/mach/iomux-mx35.h similarity index 99% rename from include/asm-arm/arch-imx/iomux-mx35.h rename to arch/arm/mach-imx/include/mach/iomux-mx35.h index 16a109a15..8a56d8679 100644 --- a/include/asm-arm/arch-imx/iomux-mx35.h +++ b/arch/arm/mach-imx/include/mach/iomux-mx35.h @@ -19,7 +19,7 @@ #ifndef __MACH_IOMUX_MX35_H__ #define __MACH_IOMUX_MX35_H__ -#include +#include /* * The naming convention for the pad modes is MX35_PAD___ diff --git a/include/asm-arm/arch-imx/iomux-v3.h b/arch/arm/mach-imx/include/mach/iomux-v3.h similarity index 100% rename from include/asm-arm/arch-imx/iomux-v3.h rename to arch/arm/mach-imx/include/mach/iomux-v3.h diff --git a/include/asm-arm/arch-imx/pmic.h b/arch/arm/mach-imx/include/mach/pmic.h similarity index 100% rename from include/asm-arm/arch-imx/pmic.h rename to arch/arm/mach-imx/include/mach/pmic.h diff --git a/include/asm-arm/arch-imx/spi.h b/arch/arm/mach-imx/include/mach/spi.h similarity index 100% rename from include/asm-arm/arch-imx/spi.h rename to arch/arm/mach-imx/include/mach/spi.h diff --git a/include/asm-arm/arch-imx/u-boot.lds.h b/arch/arm/mach-imx/include/mach/u-boot.lds.h similarity index 100% rename from include/asm-arm/arch-imx/u-boot.lds.h rename to arch/arm/mach-imx/include/mach/u-boot.lds.h diff --git a/arch/arm/mach-imx/iomux-v2.c b/arch/arm/mach-imx/iomux-v2.c index d040deeec..abb2ebe19 100644 --- a/arch/arm/mach-imx/iomux-v2.c +++ b/arch/arm/mach-imx/iomux-v2.c @@ -19,8 +19,8 @@ #include #include -#include -#include +#include +#include /* * IOMUX register (base) addresses diff --git a/arch/arm/mach-imx/iomux-v3.c b/arch/arm/mach-imx/iomux-v3.c index 3b9416e95..a74f94250 100644 --- a/arch/arm/mach-imx/iomux-v3.c +++ b/arch/arm/mach-imx/iomux-v3.c @@ -20,8 +20,8 @@ */ #include #include -#include -#include +#include +#include /* * setups a single pin: diff --git a/arch/arm/mach-imx/speed-imx1.c b/arch/arm/mach-imx/speed-imx1.c index 9db5d113c..41b56deeb 100644 --- a/arch/arm/mach-imx/speed-imx1.c +++ b/arch/arm/mach-imx/speed-imx1.c @@ -23,8 +23,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/arch/arm/mach-imx/speed-imx21.c b/arch/arm/mach-imx/speed-imx21.c index c9d6d8835..aa0a5281d 100644 --- a/arch/arm/mach-imx/speed-imx21.c +++ b/arch/arm/mach-imx/speed-imx21.c @@ -16,9 +16,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include #ifndef CLK32 diff --git a/arch/arm/mach-imx/speed-imx25.c b/arch/arm/mach-imx/speed-imx25.c index bc2af193a..be20880b2 100644 --- a/arch/arm/mach-imx/speed-imx25.c +++ b/arch/arm/mach-imx/speed-imx25.c @@ -1,7 +1,7 @@ #include -#include +#include #include -#include +#include #include unsigned long imx_get_mpllclk(void) diff --git a/arch/arm/mach-imx/speed-imx27.c b/arch/arm/mach-imx/speed-imx27.c index 61fcc72bf..deaca1eb4 100644 --- a/arch/arm/mach-imx/speed-imx27.c +++ b/arch/arm/mach-imx/speed-imx27.c @@ -16,9 +16,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include #ifndef CLK32 diff --git a/arch/arm/mach-imx/speed-imx31.c b/arch/arm/mach-imx/speed-imx31.c index 77f861053..630c648db 100644 --- a/arch/arm/mach-imx/speed-imx31.c +++ b/arch/arm/mach-imx/speed-imx31.c @@ -17,8 +17,8 @@ #include #include -#include -#include +#include +#include #include ulong imx_get_mpl_dpdgck_clk(void) diff --git a/arch/arm/mach-imx/speed-imx35.c b/arch/arm/mach-imx/speed-imx35.c index 43a6ddb35..8d1614f3d 100644 --- a/arch/arm/mach-imx/speed-imx35.c +++ b/arch/arm/mach-imx/speed-imx35.c @@ -16,9 +16,9 @@ */ #include -#include +#include #include -#include +#include #include unsigned long imx_get_mpllclk(void) diff --git a/arch/arm/mach-netx/clocksource.c b/arch/arm/mach-netx/clocksource.c index b326c1553..818709df4 100644 --- a/arch/arm/mach-netx/clocksource.c +++ b/arch/arm/mach-netx/clocksource.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include uint64_t netx_clocksource_read(void) { diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c index 985f3b8ce..4af945f4d 100644 --- a/arch/arm/mach-netx/generic.c +++ b/arch/arm/mach-netx/generic.c @@ -20,7 +20,7 @@ #include #include -#include +#include #include "eth_firmware.h" struct fw_header { diff --git a/include/asm-arm/arch-netx/netx-cm.h b/arch/arm/mach-netx/include/mach/netx-cm.h similarity index 100% rename from include/asm-arm/arch-netx/netx-cm.h rename to arch/arm/mach-netx/include/mach/netx-cm.h diff --git a/include/asm-arm/arch-netx/netx-eth.h b/arch/arm/mach-netx/include/mach/netx-eth.h similarity index 100% rename from include/asm-arm/arch-netx/netx-eth.h rename to arch/arm/mach-netx/include/mach/netx-eth.h diff --git a/include/asm-arm/arch-netx/netx-regs.h b/arch/arm/mach-netx/include/mach/netx-regs.h similarity index 100% rename from include/asm-arm/arch-netx/netx-regs.h rename to arch/arm/mach-netx/include/mach/netx-regs.h diff --git a/include/asm-arm/arch-netx/netx-xc.h b/arch/arm/mach-netx/include/mach/netx-xc.h similarity index 100% rename from include/asm-arm/arch-netx/netx-xc.h rename to arch/arm/mach-netx/include/mach/netx-xc.h diff --git a/arch/arm/mach-netx/interrupts.c b/arch/arm/mach-netx/interrupts.c index d163a51fd..af78e19bf 100644 --- a/arch/arm/mach-netx/interrupts.c +++ b/arch/arm/mach-netx/interrupts.c @@ -1,6 +1,6 @@ #include -#include +#include int timer_init (void) { diff --git a/arch/arm/mach-netx/netx-cm.c b/arch/arm/mach-netx/netx-cm.c index 2a7ac1fb9..58b204274 100644 --- a/arch/arm/mach-netx/netx-cm.c +++ b/arch/arm/mach-netx/netx-cm.c @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include #define I2C_CTRL_ENABLE (1<<0) #define I2C_CTRL_SPEED_25 (0<<1) diff --git a/arch/arm/mach-omap/gpmc.c b/arch/arm/mach-omap/gpmc.c index 4e7383ccc..2b9964950 100644 --- a/arch/arm/mach-omap/gpmc.c +++ b/arch/arm/mach-omap/gpmc.c @@ -30,10 +30,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include /** * @brief Do a Generic initialization of GPMC. if you choose otherwise, diff --git a/include/asm-arm/arch-omap/clocks.h b/arch/arm/mach-omap/include/mach/clocks.h similarity index 97% rename from include/asm-arm/arch-omap/clocks.h rename to arch/arm/mach-omap/include/mach/clocks.h index 042f777ac..1221238de 100644 --- a/include/asm-arm/arch-omap/clocks.h +++ b/arch/arm/mach-omap/include/mach/clocks.h @@ -42,7 +42,7 @@ #define S38_4M 38400000 #ifdef CONFIG_ARCH_OMAP3 -#include +#include #endif #endif /* __OMAP_CLOCKS_H_ */ diff --git a/include/asm-arm/arch-omap/control.h b/arch/arm/mach-omap/include/mach/control.h similarity index 98% rename from include/asm-arm/arch-omap/control.h rename to arch/arm/mach-omap/include/mach/control.h index 8301ead5f..7c1614cc2 100644 --- a/include/asm-arm/arch-omap/control.h +++ b/arch/arm/mach-omap/include/mach/control.h @@ -91,7 +91,7 @@ /** * macro for Padconfig Registers @see - * include/asm/arch-arm/arch-omap/omap3-mux.h + * include/mach-arm/arch-omap/omap3-mux.h */ #define CP(X) (CONTROL_PADCONF_##X) diff --git a/include/asm-arm/arch-omap/gpmc.h b/arch/arm/mach-omap/include/mach/gpmc.h similarity index 100% rename from include/asm-arm/arch-omap/gpmc.h rename to arch/arm/mach-omap/include/mach/gpmc.h diff --git a/include/asm-arm/arch-omap/gpmc_nand.h b/arch/arm/mach-omap/include/mach/gpmc_nand.h similarity index 100% rename from include/asm-arm/arch-omap/gpmc_nand.h rename to arch/arm/mach-omap/include/mach/gpmc_nand.h diff --git a/include/asm-arm/arch-omap/intc.h b/arch/arm/mach-omap/include/mach/intc.h similarity index 100% rename from include/asm-arm/arch-omap/intc.h rename to arch/arm/mach-omap/include/mach/intc.h diff --git a/include/asm-arm/arch-omap/omap3-clock.h b/arch/arm/mach-omap/include/mach/omap3-clock.h similarity index 100% rename from include/asm-arm/arch-omap/omap3-clock.h rename to arch/arm/mach-omap/include/mach/omap3-clock.h diff --git a/include/asm-arm/arch-omap/omap3-mux.h b/arch/arm/mach-omap/include/mach/omap3-mux.h similarity index 100% rename from include/asm-arm/arch-omap/omap3-mux.h rename to arch/arm/mach-omap/include/mach/omap3-mux.h diff --git a/include/asm-arm/arch-omap/omap3-silicon.h b/arch/arm/mach-omap/include/mach/omap3-silicon.h similarity index 100% rename from include/asm-arm/arch-omap/omap3-silicon.h rename to arch/arm/mach-omap/include/mach/omap3-silicon.h diff --git a/include/asm-arm/arch-omap/omap3-smx.h b/arch/arm/mach-omap/include/mach/omap3-smx.h similarity index 100% rename from include/asm-arm/arch-omap/omap3-smx.h rename to arch/arm/mach-omap/include/mach/omap3-smx.h diff --git a/include/asm-arm/arch-omap/sdrc.h b/arch/arm/mach-omap/include/mach/sdrc.h similarity index 100% rename from include/asm-arm/arch-omap/sdrc.h rename to arch/arm/mach-omap/include/mach/sdrc.h diff --git a/include/asm-arm/arch-omap/silicon.h b/arch/arm/mach-omap/include/mach/silicon.h similarity index 97% rename from include/asm-arm/arch-omap/silicon.h rename to arch/arm/mach-omap/include/mach/silicon.h index df41a74f2..22daa5c96 100644 --- a/include/asm-arm/arch-omap/silicon.h +++ b/arch/arm/mach-omap/include/mach/silicon.h @@ -23,7 +23,7 @@ /* Each platform silicon header comes here */ #ifdef CONFIG_ARCH_OMAP3 -#include +#include #endif /* If Architecture specific init functions are present */ diff --git a/include/asm-arm/arch-omap/sys_info.h b/arch/arm/mach-omap/include/mach/sys_info.h similarity index 100% rename from include/asm-arm/arch-omap/sys_info.h rename to arch/arm/mach-omap/include/mach/sys_info.h diff --git a/include/asm-arm/arch-omap/syslib.h b/arch/arm/mach-omap/include/mach/syslib.h similarity index 100% rename from include/asm-arm/arch-omap/syslib.h rename to arch/arm/mach-omap/include/mach/syslib.h diff --git a/include/asm-arm/arch-omap/timers.h b/arch/arm/mach-omap/include/mach/timers.h similarity index 100% rename from include/asm-arm/arch-omap/timers.h rename to arch/arm/mach-omap/include/mach/timers.h diff --git a/include/asm-arm/arch-omap/wdt.h b/arch/arm/mach-omap/include/mach/wdt.h similarity index 100% rename from include/asm-arm/arch-omap/wdt.h rename to arch/arm/mach-omap/include/mach/wdt.h diff --git a/arch/arm/mach-omap/omap3_clock.c b/arch/arm/mach-omap/omap3_clock.c index ce26cb5fa..4e81ae80d 100644 --- a/arch/arm/mach-omap/omap3_clock.c +++ b/arch/arm/mach-omap/omap3_clock.c @@ -40,11 +40,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* Following functions are exported from omap3_clock_core.S */ #ifdef CONFIG_OMAP3_COPY_CLOCK_SRAM diff --git a/arch/arm/mach-omap/omap3_clock_core.S b/arch/arm/mach-omap/omap3_clock_core.S index 6e10563fb..872ae5abc 100644 --- a/arch/arm/mach-omap/omap3_clock_core.S +++ b/arch/arm/mach-omap/omap3_clock_core.S @@ -37,9 +37,9 @@ */ #include -#include -#include -#include +#include +#include +#include #ifdef CONFIG_OMAP3_COPY_CLOCK_SRAM /** diff --git a/arch/arm/mach-omap/omap3_core.S b/arch/arm/mach-omap/omap3_core.S index dece199fa..76f80e68c 100644 --- a/arch/arm/mach-omap/omap3_core.S +++ b/arch/arm/mach-omap/omap3_core.S @@ -37,9 +37,9 @@ */ #include -#include -#include -#include +#include +#include +#include #ifdef CONFIG_ARCH_HAS_LOWLEVEL_INIT .globl arch_init_lowlevel diff --git a/arch/arm/mach-omap/omap3_generic.c b/arch/arm/mach-omap/omap3_generic.c index 3acf91125..794d2fa8f 100644 --- a/arch/arm/mach-omap/omap3_generic.c +++ b/arch/arm/mach-omap/omap3_generic.c @@ -37,15 +37,15 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /** * @brief Reset the CPU diff --git a/arch/arm/mach-omap/s32k_clksource.c b/arch/arm/mach-omap/s32k_clksource.c index 4166d83d7..353670c58 100644 --- a/arch/arm/mach-omap/s32k_clksource.c +++ b/arch/arm/mach-omap/s32k_clksource.c @@ -34,11 +34,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /** * @brief Provide a simple clock read diff --git a/arch/arm/mach-omap/syslib.c b/arch/arm/mach-omap/syslib.c index 0ca4ef21d..51824dadb 100644 --- a/arch/arm/mach-omap/syslib.c +++ b/arch/arm/mach-omap/syslib.c @@ -32,7 +32,7 @@ #include #include -#include +#include /** * @brief simple spin loop diff --git a/arch/arm/mach-s3c24xx/generic.c b/arch/arm/mach-s3c24xx/generic.c index 515731a5a..4613e5976 100644 --- a/arch/arm/mach-s3c24xx/generic.c +++ b/arch/arm/mach-s3c24xx/generic.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include /** * Calculate the current M-PLL clock. diff --git a/include/asm-arm/arch-s3c24xx/s3c24x0-iomap.h b/arch/arm/mach-s3c24xx/include/mach/s3c24x0-iomap.h similarity index 100% rename from include/asm-arm/arch-s3c24xx/s3c24x0-iomap.h rename to arch/arm/mach-s3c24xx/include/mach/s3c24x0-iomap.h diff --git a/include/asm-arm/arch-s3c24xx/s3c24x0-nand.h b/arch/arm/mach-s3c24xx/include/mach/s3c24x0-nand.h similarity index 100% rename from include/asm-arm/arch-s3c24xx/s3c24x0-nand.h rename to arch/arm/mach-s3c24xx/include/mach/s3c24x0-nand.h diff --git a/include/asm-arm/arch-s3c24xx/s3c24xx-generic.h b/arch/arm/mach-s3c24xx/include/mach/s3c24xx-generic.h similarity index 100% rename from include/asm-arm/arch-s3c24xx/s3c24xx-generic.h rename to arch/arm/mach-s3c24xx/include/mach/s3c24xx-generic.h diff --git a/arch/arm/mach-s3c24xx/lowlevel-init.S b/arch/arm/mach-s3c24xx/lowlevel-init.S index d27cfa5df..fd6b0f396 100644 --- a/arch/arm/mach-s3c24xx/lowlevel-init.S +++ b/arch/arm/mach-s3c24xx/lowlevel-init.S @@ -19,7 +19,7 @@ */ #include -#include +#include .section ".text_bare_init.s3c24x0_disable_wd","ax" diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile index 9aa9c497b..6199fed6f 100644 --- a/arch/blackfin/Makefile +++ b/arch/blackfin/Makefile @@ -16,29 +16,9 @@ ifndef CONFIG_BFIN_BOOT_BYPASS all: uboot.ldr endif -ifeq ($(incdir-y),) -incdir-y := $(machine-y) -endif -INCDIR := arch-$(incdir-y) - -# Update machine arch and proc symlinks if something which affects -# them changed. We use .arch to indicate when they were updated -# last, otherwise make uses the target directory mtime. - -include/asm-blackfin/.arch: $(wildcard include/config/arch/*.h) include/config/auto.conf - @echo ' SYMLINK include/asm-blackfin/arch -> include/asm-blackfin/$(INCDIR)' -ifneq ($(KBUILD_SRC),) - $(Q)mkdir -p include/asm-blackfin - $(Q)ln -fsn $(srctree)/include/asm-blackfin/$(INCDIR) include/asm-blackfin/arch -else - $(Q)ln -fsn $(INCDIR) include/asm-blackfin/arch -endif - @touch $@ - archprepare: maketools PHONY += maketools -maketools: include/asm-blackfin/.arch ifneq ($(board-y),) @@ -58,8 +38,6 @@ common-y += arch/blackfin/lib/ $(CPU) lds-y += $(BOARD)/u-boot.lds -MRPROPER_FILES += include/asm-blackfin/arch include/asm-blackfin/proc - ifdef CONFIG_BFIN_BOOT_FLASH16 FLASHBITS :=-B 16 else diff --git a/include/asm-blackfin/bitops.h b/arch/blackfin/include/asm/bitops.h similarity index 100% rename from include/asm-blackfin/bitops.h rename to arch/blackfin/include/asm/bitops.h diff --git a/include/asm-blackfin/blackfin.h b/arch/blackfin/include/asm/blackfin.h similarity index 100% rename from include/asm-blackfin/blackfin.h rename to arch/blackfin/include/asm/blackfin.h diff --git a/include/asm-blackfin/blackfin_defs.h b/arch/blackfin/include/asm/blackfin_defs.h similarity index 100% rename from include/asm-blackfin/blackfin_defs.h rename to arch/blackfin/include/asm/blackfin_defs.h diff --git a/include/asm-blackfin/byteorder.h b/arch/blackfin/include/asm/byteorder.h similarity index 100% rename from include/asm-blackfin/byteorder.h rename to arch/blackfin/include/asm/byteorder.h diff --git a/include/asm-blackfin/common.h b/arch/blackfin/include/asm/common.h similarity index 100% rename from include/asm-blackfin/common.h rename to arch/blackfin/include/asm/common.h diff --git a/include/asm-blackfin/cplb.h b/arch/blackfin/include/asm/cplb.h similarity index 100% rename from include/asm-blackfin/cplb.h rename to arch/blackfin/include/asm/cplb.h diff --git a/include/asm-blackfin/cpu.h b/arch/blackfin/include/asm/cpu.h similarity index 100% rename from include/asm-blackfin/cpu.h rename to arch/blackfin/include/asm/cpu.h diff --git a/include/asm-blackfin/cpu/cdefBF531.h b/arch/blackfin/include/asm/cpu/cdefBF531.h similarity index 100% rename from include/asm-blackfin/cpu/cdefBF531.h rename to arch/blackfin/include/asm/cpu/cdefBF531.h diff --git a/include/asm-blackfin/cpu/cdefBF532.h b/arch/blackfin/include/asm/cpu/cdefBF532.h similarity index 100% rename from include/asm-blackfin/cpu/cdefBF532.h rename to arch/blackfin/include/asm/cpu/cdefBF532.h diff --git a/include/asm-blackfin/cpu/cdefBF533.h b/arch/blackfin/include/asm/cpu/cdefBF533.h similarity index 100% rename from include/asm-blackfin/cpu/cdefBF533.h rename to arch/blackfin/include/asm/cpu/cdefBF533.h diff --git a/include/asm-blackfin/cpu/cdefBF53x.h b/arch/blackfin/include/asm/cpu/cdefBF53x.h similarity index 100% rename from include/asm-blackfin/cpu/cdefBF53x.h rename to arch/blackfin/include/asm/cpu/cdefBF53x.h diff --git a/include/asm-blackfin/cpu/cdefBF561.h b/arch/blackfin/include/asm/cpu/cdefBF561.h similarity index 100% rename from include/asm-blackfin/cpu/cdefBF561.h rename to arch/blackfin/include/asm/cpu/cdefBF561.h diff --git a/include/asm-blackfin/cpu/cdef_LPBlackfin.h b/arch/blackfin/include/asm/cpu/cdef_LPBlackfin.h similarity index 100% rename from include/asm-blackfin/cpu/cdef_LPBlackfin.h rename to arch/blackfin/include/asm/cpu/cdef_LPBlackfin.h diff --git a/include/asm-blackfin/cpu/defBF531.h b/arch/blackfin/include/asm/cpu/defBF531.h similarity index 100% rename from include/asm-blackfin/cpu/defBF531.h rename to arch/blackfin/include/asm/cpu/defBF531.h diff --git a/include/asm-blackfin/cpu/defBF532.h b/arch/blackfin/include/asm/cpu/defBF532.h similarity index 100% rename from include/asm-blackfin/cpu/defBF532.h rename to arch/blackfin/include/asm/cpu/defBF532.h diff --git a/include/asm-blackfin/cpu/defBF533.h b/arch/blackfin/include/asm/cpu/defBF533.h similarity index 100% rename from include/asm-blackfin/cpu/defBF533.h rename to arch/blackfin/include/asm/cpu/defBF533.h diff --git a/include/asm-blackfin/cpu/defBF533_extn.h b/arch/blackfin/include/asm/cpu/defBF533_extn.h similarity index 100% rename from include/asm-blackfin/cpu/defBF533_extn.h rename to arch/blackfin/include/asm/cpu/defBF533_extn.h diff --git a/include/asm-blackfin/cpu/defBF561.h b/arch/blackfin/include/asm/cpu/defBF561.h similarity index 100% rename from include/asm-blackfin/cpu/defBF561.h rename to arch/blackfin/include/asm/cpu/defBF561.h diff --git a/include/asm-blackfin/cpu/defBF561_extn.h b/arch/blackfin/include/asm/cpu/defBF561_extn.h similarity index 100% rename from include/asm-blackfin/cpu/defBF561_extn.h rename to arch/blackfin/include/asm/cpu/defBF561_extn.h diff --git a/include/asm-blackfin/cpu/def_LPBlackfin.h b/arch/blackfin/include/asm/cpu/def_LPBlackfin.h similarity index 100% rename from include/asm-blackfin/cpu/def_LPBlackfin.h rename to arch/blackfin/include/asm/cpu/def_LPBlackfin.h diff --git a/include/asm-blackfin/current.h b/arch/blackfin/include/asm/current.h similarity index 100% rename from include/asm-blackfin/current.h rename to arch/blackfin/include/asm/current.h diff --git a/include/asm-blackfin/elf.h b/arch/blackfin/include/asm/elf.h similarity index 100% rename from include/asm-blackfin/elf.h rename to arch/blackfin/include/asm/elf.h diff --git a/include/asm-blackfin/entry.h b/arch/blackfin/include/asm/entry.h similarity index 100% rename from include/asm-blackfin/entry.h rename to arch/blackfin/include/asm/entry.h diff --git a/include/asm-blackfin/hw_irq.h b/arch/blackfin/include/asm/hw_irq.h similarity index 100% rename from include/asm-blackfin/hw_irq.h rename to arch/blackfin/include/asm/hw_irq.h diff --git a/include/asm-blackfin/io.h b/arch/blackfin/include/asm/io.h similarity index 100% rename from include/asm-blackfin/io.h rename to arch/blackfin/include/asm/io.h diff --git a/include/asm-blackfin/irq.h b/arch/blackfin/include/asm/irq.h similarity index 100% rename from include/asm-blackfin/irq.h rename to arch/blackfin/include/asm/irq.h diff --git a/include/asm-blackfin/linkage.h b/arch/blackfin/include/asm/linkage.h similarity index 100% rename from include/asm-blackfin/linkage.h rename to arch/blackfin/include/asm/linkage.h diff --git a/include/asm-blackfin/mem_init.h b/arch/blackfin/include/asm/mem_init.h similarity index 100% rename from include/asm-blackfin/mem_init.h rename to arch/blackfin/include/asm/mem_init.h diff --git a/include/asm-blackfin/module.h b/arch/blackfin/include/asm/module.h similarity index 100% rename from include/asm-blackfin/module.h rename to arch/blackfin/include/asm/module.h diff --git a/include/asm-blackfin/page.h b/arch/blackfin/include/asm/page.h similarity index 100% rename from include/asm-blackfin/page.h rename to arch/blackfin/include/asm/page.h diff --git a/include/asm-blackfin/page_offset.h b/arch/blackfin/include/asm/page_offset.h similarity index 100% rename from include/asm-blackfin/page_offset.h rename to arch/blackfin/include/asm/page_offset.h diff --git a/include/asm-blackfin/posix_types.h b/arch/blackfin/include/asm/posix_types.h similarity index 100% rename from include/asm-blackfin/posix_types.h rename to arch/blackfin/include/asm/posix_types.h diff --git a/include/asm-blackfin/processor.h b/arch/blackfin/include/asm/processor.h similarity index 100% rename from include/asm-blackfin/processor.h rename to arch/blackfin/include/asm/processor.h diff --git a/include/asm-blackfin/ptrace.h b/arch/blackfin/include/asm/ptrace.h similarity index 100% rename from include/asm-blackfin/ptrace.h rename to arch/blackfin/include/asm/ptrace.h diff --git a/include/asm-blackfin/segment.h b/arch/blackfin/include/asm/segment.h similarity index 100% rename from include/asm-blackfin/segment.h rename to arch/blackfin/include/asm/segment.h diff --git a/include/asm-blackfin/setup.h b/arch/blackfin/include/asm/setup.h similarity index 100% rename from include/asm-blackfin/setup.h rename to arch/blackfin/include/asm/setup.h diff --git a/include/asm-blackfin/string.h b/arch/blackfin/include/asm/string.h similarity index 100% rename from include/asm-blackfin/string.h rename to arch/blackfin/include/asm/string.h diff --git a/include/asm-blackfin/system.h b/arch/blackfin/include/asm/system.h similarity index 100% rename from include/asm-blackfin/system.h rename to arch/blackfin/include/asm/system.h diff --git a/include/asm-blackfin/traps.h b/arch/blackfin/include/asm/traps.h similarity index 100% rename from include/asm-blackfin/traps.h rename to arch/blackfin/include/asm/traps.h diff --git a/include/asm-blackfin/types.h b/arch/blackfin/include/asm/types.h similarity index 100% rename from include/asm-blackfin/types.h rename to arch/blackfin/include/asm/types.h diff --git a/include/asm-blackfin/u-boot.h b/arch/blackfin/include/asm/u-boot.h similarity index 100% rename from include/asm-blackfin/u-boot.h rename to arch/blackfin/include/asm/u-boot.h diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile index d30b335d1..0f2c4f324 100644 --- a/arch/m68k/Makefile +++ b/arch/m68k/Makefile @@ -46,31 +46,13 @@ CFLAGS += -msoft-float -mcfv4e -gdwarf-2 -feliminate-unused-debug-types \ LDFLAGS_uboot :=-L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc # --verbose --stats -ifeq ($(incdir-y),) -incdir-y := $(machine-y) -endif -INCDIR := arch-$(incdir-y) +machdirs := $(patsubst %,arch/m68k/mach-%/,$(machine-y)) -# Update machine arch and proc symlinks if something which affects -# them changed. We use .arch to indicate when they were updated -# last, otherwise make uses the target directory mtime. - -include/asm-m68k/.arch: $(wildcard include/config/arch/*.h) include/config/auto.conf - @echo ' SYMLINK include/asm-m68k/arch -> include/asm-m68k/$(INCDIR)' -ifneq ($(KBUILD_SRC),) - $(Q)mkdir -p include/asm-m68k - $(Q)ln -fsn $(srctree)/include/asm-m68k/$(INCDIR) include/asm-m68k/arch +ifeq ($(KBUILD_SRC),) +CPPFLAGS += $(patsubst %,-I%include,$(machdirs)) else - $(Q)ln -fsn $(INCDIR) include/asm-m68k/arch +CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs)) endif - @echo ' SYMLINK include/asm-m68k/proc -> include/asm-m68k/proc-mcfv4e' -ifneq ($(KBUILD_SRC),) - $(Q)mkdir -p include/asm-m68k - $(Q)ln -fsn $(srctree)/include/asm-m68k/proc-mcfv4e include/asm-m68k/proc -else - $(Q)ln -fsn proc-mcfv4e include/asm-m68k/proc -endif - @touch $@ all: $(KBUILD_IMAGE) @@ -78,7 +60,6 @@ all: $(KBUILD_IMAGE) archprepare: maketools PHONY += maketools -maketools: include/asm-m68k/.arch ifneq ($(board-y),) @@ -100,4 +81,3 @@ lds-$(CONFIG_GENERIC_LINKER_SCRIPT) := arch/m68k/lib/u-boot.lds lds-$(CONFIG_BOARD_LINKER_SCRIPT) := $(BOARD)/u-boot.lds CLEAN_FILES += arch/m68k/lib/u-boot.lds -MRPROPER_FILES += include/asm-m68k/arch include/asm-m68k/proc diff --git a/arch/m68k/cpu/cpu.c b/arch/m68k/cpu/cpu.c index 5c48add8d..c27d08901 100644 --- a/arch/m68k/cpu/cpu.c +++ b/arch/m68k/cpu/cpu.c @@ -24,8 +24,8 @@ #include #include #include -#include // FIXME -stup place -#include +#include // FIXME -stup place +#include static uint32_t CACR_shadow = MCF5XXX_CACR_BEC; diff --git a/arch/m68k/cpu/interrupts.c b/arch/m68k/cpu/interrupts.c index 16aac38ad..9fc64a124 100644 --- a/arch/m68k/cpu/interrupts.c +++ b/arch/m68k/cpu/interrupts.c @@ -23,7 +23,7 @@ */ #include #include -#include +#include #ifdef CONFIG_USE_IRQ void enable_interrupts(void) diff --git a/include/asm-m68k/atomic.h b/arch/m68k/include/asm/atomic.h similarity index 100% rename from include/asm-m68k/atomic.h rename to arch/m68k/include/asm/atomic.h diff --git a/include/asm-m68k/bitops.h b/arch/m68k/include/asm/bitops.h similarity index 100% rename from include/asm-m68k/bitops.h rename to arch/m68k/include/asm/bitops.h diff --git a/include/asm-m68k/bootinfo.h b/arch/m68k/include/asm/bootinfo.h similarity index 100% rename from include/asm-m68k/bootinfo.h rename to arch/m68k/include/asm/bootinfo.h diff --git a/include/asm-m68k/byteorder.h b/arch/m68k/include/asm/byteorder.h similarity index 100% rename from include/asm-m68k/byteorder.h rename to arch/m68k/include/asm/byteorder.h diff --git a/include/asm-m68k/coldfire/mcf548x.h b/arch/m68k/include/asm/coldfire/mcf548x.h similarity index 100% rename from include/asm-m68k/coldfire/mcf548x.h rename to arch/m68k/include/asm/coldfire/mcf548x.h diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_can.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_can.h similarity index 100% rename from include/asm-m68k/coldfire/mcf548x/mcf548x_can.h rename to arch/m68k/include/asm/coldfire/mcf548x/mcf548x_can.h diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_ctm.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_ctm.h similarity index 100% rename from include/asm-m68k/coldfire/mcf548x/mcf548x_ctm.h rename to arch/m68k/include/asm/coldfire/mcf548x/mcf548x_ctm.h diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_dma.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dma.h similarity index 100% rename from include/asm-m68k/coldfire/mcf548x/mcf548x_dma.h rename to arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dma.h diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_dma_ereq.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dma_ereq.h similarity index 100% rename from include/asm-m68k/coldfire/mcf548x/mcf548x_dma_ereq.h rename to arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dma_ereq.h diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_dspi.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dspi.h similarity index 100% rename from include/asm-m68k/coldfire/mcf548x/mcf548x_dspi.h rename to arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dspi.h diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_eport.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_eport.h similarity index 100% rename from include/asm-m68k/coldfire/mcf548x/mcf548x_eport.h rename to arch/m68k/include/asm/coldfire/mcf548x/mcf548x_eport.h diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_fbcs.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_fbcs.h similarity index 100% rename from include/asm-m68k/coldfire/mcf548x/mcf548x_fbcs.h rename to arch/m68k/include/asm/coldfire/mcf548x/mcf548x_fbcs.h diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_fec.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_fec.h similarity index 100% rename from include/asm-m68k/coldfire/mcf548x/mcf548x_fec.h rename to arch/m68k/include/asm/coldfire/mcf548x/mcf548x_fec.h diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_gpio.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_gpio.h similarity index 100% rename from include/asm-m68k/coldfire/mcf548x/mcf548x_gpio.h rename to arch/m68k/include/asm/coldfire/mcf548x/mcf548x_gpio.h diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_gpt.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_gpt.h similarity index 100% rename from include/asm-m68k/coldfire/mcf548x/mcf548x_gpt.h rename to arch/m68k/include/asm/coldfire/mcf548x/mcf548x_gpt.h diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_i2c.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_i2c.h similarity index 100% rename from include/asm-m68k/coldfire/mcf548x/mcf548x_i2c.h rename to arch/m68k/include/asm/coldfire/mcf548x/mcf548x_i2c.h diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_intc.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_intc.h similarity index 100% rename from include/asm-m68k/coldfire/mcf548x/mcf548x_intc.h rename to arch/m68k/include/asm/coldfire/mcf548x/mcf548x_intc.h diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_pci.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_pci.h similarity index 100% rename from include/asm-m68k/coldfire/mcf548x/mcf548x_pci.h rename to arch/m68k/include/asm/coldfire/mcf548x/mcf548x_pci.h diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_pciarb.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_pciarb.h similarity index 100% rename from include/asm-m68k/coldfire/mcf548x/mcf548x_pciarb.h rename to arch/m68k/include/asm/coldfire/mcf548x/mcf548x_pciarb.h diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_psc.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_psc.h similarity index 100% rename from include/asm-m68k/coldfire/mcf548x/mcf548x_psc.h rename to arch/m68k/include/asm/coldfire/mcf548x/mcf548x_psc.h diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_sdramc.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sdramc.h similarity index 100% rename from include/asm-m68k/coldfire/mcf548x/mcf548x_sdramc.h rename to arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sdramc.h diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_sec.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sec.h similarity index 100% rename from include/asm-m68k/coldfire/mcf548x/mcf548x_sec.h rename to arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sec.h diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_siu.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_siu.h similarity index 100% rename from include/asm-m68k/coldfire/mcf548x/mcf548x_siu.h rename to arch/m68k/include/asm/coldfire/mcf548x/mcf548x_siu.h diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_slt.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_slt.h similarity index 100% rename from include/asm-m68k/coldfire/mcf548x/mcf548x_slt.h rename to arch/m68k/include/asm/coldfire/mcf548x/mcf548x_slt.h diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_sram.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sram.h similarity index 100% rename from include/asm-m68k/coldfire/mcf548x/mcf548x_sram.h rename to arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sram.h diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_uart.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_uart.h similarity index 100% rename from include/asm-m68k/coldfire/mcf548x/mcf548x_uart.h rename to arch/m68k/include/asm/coldfire/mcf548x/mcf548x_uart.h diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_usb.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_usb.h similarity index 100% rename from include/asm-m68k/coldfire/mcf548x/mcf548x_usb.h rename to arch/m68k/include/asm/coldfire/mcf548x/mcf548x_usb.h diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_xlbarb.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_xlbarb.h similarity index 100% rename from include/asm-m68k/coldfire/mcf548x/mcf548x_xlbarb.h rename to arch/m68k/include/asm/coldfire/mcf548x/mcf548x_xlbarb.h diff --git a/include/asm-m68k/coldfire/mcf5xxx.h b/arch/m68k/include/asm/coldfire/mcf5xxx.h similarity index 100% rename from include/asm-m68k/coldfire/mcf5xxx.h rename to arch/m68k/include/asm/coldfire/mcf5xxx.h diff --git a/include/asm-m68k/common.h b/arch/m68k/include/asm/common.h similarity index 100% rename from include/asm-m68k/common.h rename to arch/m68k/include/asm/common.h diff --git a/include/asm-m68k/elf.h b/arch/m68k/include/asm/elf.h similarity index 100% rename from include/asm-m68k/elf.h rename to arch/m68k/include/asm/elf.h diff --git a/include/asm-m68k/hardware.h b/arch/m68k/include/asm/hardware.h similarity index 96% rename from include/asm-m68k/hardware.h rename to arch/m68k/include/asm/hardware.h index 54cec0ee2..616a4feeb 100644 --- a/include/asm-m68k/hardware.h +++ b/arch/m68k/include/asm/hardware.h @@ -25,6 +25,6 @@ #ifndef __M68K_HARDWARE_H #define __M68K_HARDWARE_H -#include +#include #endif diff --git a/include/asm-m68k/io.h b/arch/m68k/include/asm/io.h similarity index 100% rename from include/asm-m68k/io.h rename to arch/m68k/include/asm/io.h diff --git a/include/asm-m68k/mach-types.h b/arch/m68k/include/asm/mach-types.h similarity index 100% rename from include/asm-m68k/mach-types.h rename to arch/m68k/include/asm/mach-types.h diff --git a/include/asm-m68k/memory.h b/arch/m68k/include/asm/memory.h similarity index 100% rename from include/asm-m68k/memory.h rename to arch/m68k/include/asm/memory.h diff --git a/include/asm-m68k/module.h b/arch/m68k/include/asm/module.h similarity index 100% rename from include/asm-m68k/module.h rename to arch/m68k/include/asm/module.h diff --git a/include/asm-m68k/posix_types.h b/arch/m68k/include/asm/posix_types.h similarity index 100% rename from include/asm-m68k/posix_types.h rename to arch/m68k/include/asm/posix_types.h diff --git a/include/asm-m68k/processor.h b/arch/m68k/include/asm/processor.h similarity index 100% rename from include/asm-m68k/processor.h rename to arch/m68k/include/asm/processor.h diff --git a/include/asm-m68k/ptrace.h b/arch/m68k/include/asm/ptrace.h similarity index 98% rename from include/asm-m68k/ptrace.h rename to arch/m68k/include/asm/ptrace.h index fb0f3314d..96ea84938 100644 --- a/include/asm-m68k/ptrace.h +++ b/arch/m68k/include/asm/ptrace.h @@ -33,7 +33,7 @@ #define PTRACE_SETOPTIONS 21 -#include +#include #ifndef __ASSEMBLY__ diff --git a/include/asm-m68k/setup.h b/arch/m68k/include/asm/setup.h similarity index 100% rename from include/asm-m68k/setup.h rename to arch/m68k/include/asm/setup.h diff --git a/include/asm-m68k/string.h b/arch/m68k/include/asm/string.h similarity index 100% rename from include/asm-m68k/string.h rename to arch/m68k/include/asm/string.h diff --git a/include/asm-m68k/types.h b/arch/m68k/include/asm/types.h similarity index 100% rename from include/asm-m68k/types.h rename to arch/m68k/include/asm/types.h diff --git a/include/asm-m68k/u-boot-m68k.h b/arch/m68k/include/asm/u-boot-m68k.h similarity index 100% rename from include/asm-m68k/u-boot-m68k.h rename to arch/m68k/include/asm/u-boot-m68k.h diff --git a/include/asm-m68k/u-boot.h b/arch/m68k/include/asm/u-boot.h similarity index 100% rename from include/asm-m68k/u-boot.h rename to arch/m68k/include/asm/u-boot.h diff --git a/arch/m68k/mach-mcfv4e/dma_utils.c b/arch/m68k/mach-mcfv4e/dma_utils.c index 15b520abc..adeefea3b 100644 --- a/arch/m68k/mach-mcfv4e/dma_utils.c +++ b/arch/m68k/mach-mcfv4e/dma_utils.c @@ -10,10 +10,10 @@ #include #include #include -#include -#include +#include +#include -#include +#include /* * This global keeps track of which initiators have been diff --git a/arch/m68k/mach-mcfv4e/fec.c b/arch/m68k/mach-mcfv4e/fec.c index 551f00f00..7619283f8 100644 --- a/arch/m68k/mach-mcfv4e/fec.c +++ b/arch/m68k/mach-mcfv4e/fec.c @@ -7,12 +7,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #define TRUE 1 diff --git a/arch/m68k/mach-mcfv4e/fecbd.c b/arch/m68k/mach-mcfv4e/fecbd.c index 26fb16d98..a8e732b3a 100644 --- a/arch/m68k/mach-mcfv4e/fecbd.c +++ b/arch/m68k/mach-mcfv4e/fecbd.c @@ -7,12 +7,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #define ASSERT(x) if (!(x)) hang(); diff --git a/include/asm-m68k/arch-mcfv4e/clocks.h b/arch/m68k/mach-mcfv4e/include/mach/clocks.h similarity index 100% rename from include/asm-m68k/arch-mcfv4e/clocks.h rename to arch/m68k/mach-mcfv4e/include/mach/clocks.h diff --git a/include/asm-m68k/arch-mcfv4e/debug_ll.h b/arch/m68k/mach-mcfv4e/include/mach/debug_ll.h similarity index 100% rename from include/asm-m68k/arch-mcfv4e/debug_ll.h rename to arch/m68k/mach-mcfv4e/include/mach/debug_ll.h diff --git a/include/asm-m68k/arch-mcfv4e/hardware.h b/arch/m68k/mach-mcfv4e/include/mach/hardware.h similarity index 100% rename from include/asm-m68k/arch-mcfv4e/hardware.h rename to arch/m68k/mach-mcfv4e/include/mach/hardware.h diff --git a/include/asm-m68k/arch-mcfv4e/mcf54xx-regs.h b/arch/m68k/mach-mcfv4e/include/mach/mcf54xx-regs.h similarity index 100% rename from include/asm-m68k/arch-mcfv4e/mcf54xx-regs.h rename to arch/m68k/mach-mcfv4e/include/mach/mcf54xx-regs.h diff --git a/include/asm-m68k/proc-mcfv4e/dma_utils.h b/arch/m68k/mach-mcfv4e/include/proc/dma_utils.h similarity index 100% rename from include/asm-m68k/proc-mcfv4e/dma_utils.h rename to arch/m68k/mach-mcfv4e/include/proc/dma_utils.h diff --git a/include/asm-m68k/proc-mcfv4e/fec.h b/arch/m68k/mach-mcfv4e/include/proc/fec.h similarity index 100% rename from include/asm-m68k/proc-mcfv4e/fec.h rename to arch/m68k/mach-mcfv4e/include/proc/fec.h diff --git a/include/asm-m68k/proc-mcfv4e/fecbd.h b/arch/m68k/mach-mcfv4e/include/proc/fecbd.h similarity index 100% rename from include/asm-m68k/proc-mcfv4e/fecbd.h rename to arch/m68k/mach-mcfv4e/include/proc/fecbd.h diff --git a/include/asm-m68k/proc-mcfv4e/mcdapi/MCD_dma.h b/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_dma.h similarity index 100% rename from include/asm-m68k/proc-mcfv4e/mcdapi/MCD_dma.h rename to arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_dma.h diff --git a/include/asm-m68k/proc-mcfv4e/mcdapi/MCD_progCheck.h b/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_progCheck.h similarity index 100% rename from include/asm-m68k/proc-mcfv4e/mcdapi/MCD_progCheck.h rename to arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_progCheck.h diff --git a/include/asm-m68k/proc-mcfv4e/mcdapi/MCD_tasksInit.h b/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_tasksInit.h similarity index 100% rename from include/asm-m68k/proc-mcfv4e/mcdapi/MCD_tasksInit.h rename to arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_tasksInit.h diff --git a/include/asm-m68k/proc-mcfv4e/net/eth.h b/arch/m68k/mach-mcfv4e/include/proc/net/eth.h similarity index 100% rename from include/asm-m68k/proc-mcfv4e/net/eth.h rename to arch/m68k/mach-mcfv4e/include/proc/net/eth.h diff --git a/include/asm-m68k/proc-mcfv4e/net/nbuf.h b/arch/m68k/mach-mcfv4e/include/proc/net/nbuf.h similarity index 100% rename from include/asm-m68k/proc-mcfv4e/net/nbuf.h rename to arch/m68k/mach-mcfv4e/include/proc/net/nbuf.h diff --git a/include/asm-m68k/proc-mcfv4e/net/net.h b/arch/m68k/mach-mcfv4e/include/proc/net/net.h similarity index 100% rename from include/asm-m68k/proc-mcfv4e/net/net.h rename to arch/m68k/mach-mcfv4e/include/proc/net/net.h diff --git a/include/asm-m68k/proc-mcfv4e/net/queue.h b/arch/m68k/mach-mcfv4e/include/proc/net/queue.h similarity index 100% rename from include/asm-m68k/proc-mcfv4e/net/queue.h rename to arch/m68k/mach-mcfv4e/include/proc/net/queue.h diff --git a/include/asm-m68k/proc-mcfv4e/processor.h b/arch/m68k/mach-mcfv4e/include/proc/processor.h similarity index 100% rename from include/asm-m68k/proc-mcfv4e/processor.h rename to arch/m68k/mach-mcfv4e/include/proc/processor.h diff --git a/include/asm-m68k/proc-mcfv4e/ptrace.h b/arch/m68k/mach-mcfv4e/include/proc/ptrace.h similarity index 100% rename from include/asm-m68k/proc-mcfv4e/ptrace.h rename to arch/m68k/mach-mcfv4e/include/proc/ptrace.h diff --git a/arch/m68k/mach-mcfv4e/mcdapi/MCD_dmaApi.c b/arch/m68k/mach-mcfv4e/mcdapi/MCD_dmaApi.c index b4d7f2847..60e2b6dd7 100644 --- a/arch/m68k/mach-mcfv4e/mcdapi/MCD_dmaApi.c +++ b/arch/m68k/mach-mcfv4e/mcdapi/MCD_dmaApi.c @@ -6,9 +6,9 @@ */ #include -#include -#include -#include +#include +#include +#include /* * This is an API-internal pointer to the DMA's registers diff --git a/arch/m68k/mach-mcfv4e/mcdapi/MCD_tasks.c b/arch/m68k/mach-mcfv4e/mcdapi/MCD_tasks.c index 3bfed232d..812120dd7 100644 --- a/arch/m68k/mach-mcfv4e/mcdapi/MCD_tasks.c +++ b/arch/m68k/mach-mcfv4e/mcdapi/MCD_tasks.c @@ -5,7 +5,7 @@ * Notes: */ #include -#include +#include u32 MCD_varTab0[]; u32 MCD_varTab1[]; diff --git a/arch/m68k/mach-mcfv4e/mcdapi/MCD_tasksInit.c b/arch/m68k/mach-mcfv4e/mcdapi/MCD_tasksInit.c index 14104f718..8d82b471f 100644 --- a/arch/m68k/mach-mcfv4e/mcdapi/MCD_tasksInit.c +++ b/arch/m68k/mach-mcfv4e/mcdapi/MCD_tasksInit.c @@ -11,7 +11,7 @@ */ #include -#include +#include extern dmaRegs *MCD_dmaBar; diff --git a/arch/m68k/mach-mcfv4e/mcf_clocksource.c b/arch/m68k/mach-mcfv4e/mcf_clocksource.c index 1278bf83e..926a59215 100644 --- a/arch/m68k/mach-mcfv4e/mcf_clocksource.c +++ b/arch/m68k/mach-mcfv4e/mcf_clocksource.c @@ -24,9 +24,9 @@ #include #include #include -#include -#include -#include //FIXME - move to other file +#include +#include +#include //FIXME - move to other file #ifdef CONFIG_USE_IRQ diff --git a/arch/m68k/mach-mcfv4e/mcf_reset_cpu.c b/arch/m68k/mach-mcfv4e/mcf_reset_cpu.c index 5a3368f90..dc04a270d 100644 --- a/arch/m68k/mach-mcfv4e/mcf_reset_cpu.c +++ b/arch/m68k/mach-mcfv4e/mcf_reset_cpu.c @@ -22,7 +22,7 @@ * Implements a watchdog triggered reset for V4e Coldfire cores */ #include -#include +#include /** * Reset the cpu by setting up the watchdog timer and let it time out diff --git a/arch/m68k/mach-mcfv4e/multichannel_dma.c b/arch/m68k/mach-mcfv4e/multichannel_dma.c index 11aceeb9b..494fc68bd 100644 --- a/arch/m68k/mach-mcfv4e/multichannel_dma.c +++ b/arch/m68k/mach-mcfv4e/multichannel_dma.c @@ -25,9 +25,9 @@ */ #include #include -#include -#include -#include +#include +#include +#include static int mcdapi_init(void) diff --git a/arch/m68k/mach-mcfv4e/net/nbuf.c b/arch/m68k/mach-mcfv4e/net/nbuf.c index d7ae921be..5dc6027e0 100644 --- a/arch/m68k/mach-mcfv4e/net/nbuf.c +++ b/arch/m68k/mach-mcfv4e/net/nbuf.c @@ -26,10 +26,10 @@ #include #include -#include -#include +#include +#include -#include +#include #define ASSERT(x) diff --git a/arch/m68k/mach-mcfv4e/net/net.c b/arch/m68k/mach-mcfv4e/net/net.c index 76e28531b..1bc089bdd 100644 --- a/arch/m68k/mach-mcfv4e/net/net.c +++ b/arch/m68k/mach-mcfv4e/net/net.c @@ -26,14 +26,14 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include //FIXME - move to other file +#include //FIXME - move to other file int netif_init(int channel) { diff --git a/arch/m68k/mach-mcfv4e/net/queue.c b/arch/m68k/mach-mcfv4e/net/queue.c index 55f938af3..e573fcfd5 100644 --- a/arch/m68k/mach-mcfv4e/net/queue.c +++ b/arch/m68k/mach-mcfv4e/net/queue.c @@ -25,7 +25,7 @@ * @todo Replace by u-boot standard list functions */ #include -#include +#include /** Initialize the specified queue to an empty state * diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile index ab79a6506..72eb36bad 100644 --- a/arch/ppc/Makefile +++ b/arch/ppc/Makefile @@ -21,29 +21,17 @@ ifndef CONFIG_MODULE CPPFLAGS += -fdata-sections -ffunction-sections endif -ifeq ($(incdir-y),) -incdir-y := $(machine-y) -endif -INCDIR := arch-$(incdir-y) +machdirs := $(patsubst %,arch/ppc/mach-%/,$(cpu-y)) -# Update machine arch and proc symlinks if something which affects -# them changed. We use .arch to indicate when they were updated -# last, otherwise make uses the target directory mtime. - -include/asm-ppc/.arch: $(wildcard include/config/arch/*.h) include/config/auto.conf - @echo ' SYMLINK include/asm-ppc/arch -> include/asm-ppc/$(INCDIR)' -ifneq ($(KBUILD_SRC),) - $(Q)mkdir -p include/asm-ppc - $(Q)ln -fsn $(srctree)/include/asm-ppc/$(INCDIR) include/asm-ppc/arch +ifeq ($(KBUILD_SRC),) +CPPFLAGS += $(patsubst %,-I%include,$(machdirs)) else - $(Q)ln -fsn $(INCDIR) include/asm-ppc/arch +CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs)) endif - @touch $@ archprepare: maketools PHONY += maketools -maketools: include/asm-ppc/.arch ifneq ($(board-y),) @@ -62,5 +50,3 @@ common-y += $(BOARD) $(CPU) common-y += arch/ppc/lib/ lds-y += $(BOARD)/u-boot.lds - -MRPROPER_FILES += include/asm-ppc/arch diff --git a/include/asm-ppc/atomic.h b/arch/ppc/include/asm/atomic.h similarity index 100% rename from include/asm-ppc/atomic.h rename to arch/ppc/include/asm/atomic.h diff --git a/include/asm-ppc/bitops.h b/arch/ppc/include/asm/bitops.h similarity index 100% rename from include/asm-ppc/bitops.h rename to arch/ppc/include/asm/bitops.h diff --git a/include/asm-ppc/byteorder.h b/arch/ppc/include/asm/byteorder.h similarity index 100% rename from include/asm-ppc/byteorder.h rename to arch/ppc/include/asm/byteorder.h diff --git a/include/asm-ppc/cache.h b/arch/ppc/include/asm/cache.h similarity index 100% rename from include/asm-ppc/cache.h rename to arch/ppc/include/asm/cache.h diff --git a/include/asm-ppc/common.h b/arch/ppc/include/asm/common.h similarity index 100% rename from include/asm-ppc/common.h rename to arch/ppc/include/asm/common.h diff --git a/include/asm-ppc/e300.h b/arch/ppc/include/asm/e300.h similarity index 100% rename from include/asm-ppc/e300.h rename to arch/ppc/include/asm/e300.h diff --git a/include/asm-ppc/elf.h b/arch/ppc/include/asm/elf.h similarity index 100% rename from include/asm-ppc/elf.h rename to arch/ppc/include/asm/elf.h diff --git a/include/asm-ppc/fsl_i2c.h b/arch/ppc/include/asm/fsl_i2c.h similarity index 100% rename from include/asm-ppc/fsl_i2c.h rename to arch/ppc/include/asm/fsl_i2c.h diff --git a/include/asm-ppc/global_data.h b/arch/ppc/include/asm/global_data.h similarity index 100% rename from include/asm-ppc/global_data.h rename to arch/ppc/include/asm/global_data.h diff --git a/include/asm-ppc/io.h b/arch/ppc/include/asm/io.h similarity index 100% rename from include/asm-ppc/io.h rename to arch/ppc/include/asm/io.h diff --git a/include/asm-ppc/mc146818rtc.h b/arch/ppc/include/asm/mc146818rtc.h similarity index 100% rename from include/asm-ppc/mc146818rtc.h rename to arch/ppc/include/asm/mc146818rtc.h diff --git a/include/asm-ppc/mmu.h b/arch/ppc/include/asm/mmu.h similarity index 100% rename from include/asm-ppc/mmu.h rename to arch/ppc/include/asm/mmu.h diff --git a/include/asm-ppc/module.h b/arch/ppc/include/asm/module.h similarity index 100% rename from include/asm-ppc/module.h rename to arch/ppc/include/asm/module.h diff --git a/include/asm-ppc/pci_io.h b/arch/ppc/include/asm/pci_io.h similarity index 100% rename from include/asm-ppc/pci_io.h rename to arch/ppc/include/asm/pci_io.h diff --git a/include/asm-ppc/posix_types.h b/arch/ppc/include/asm/posix_types.h similarity index 100% rename from include/asm-ppc/posix_types.h rename to arch/ppc/include/asm/posix_types.h diff --git a/include/asm-ppc/ppc_asm.tmpl b/arch/ppc/include/asm/ppc_asm.tmpl similarity index 100% rename from include/asm-ppc/ppc_asm.tmpl rename to arch/ppc/include/asm/ppc_asm.tmpl diff --git a/include/asm-ppc/ppc_defs.h b/arch/ppc/include/asm/ppc_defs.h similarity index 100% rename from include/asm-ppc/ppc_defs.h rename to arch/ppc/include/asm/ppc_defs.h diff --git a/include/asm-ppc/processor.h b/arch/ppc/include/asm/processor.h similarity index 100% rename from include/asm-ppc/processor.h rename to arch/ppc/include/asm/processor.h diff --git a/include/asm-ppc/ptrace.h b/arch/ppc/include/asm/ptrace.h similarity index 100% rename from include/asm-ppc/ptrace.h rename to arch/ppc/include/asm/ptrace.h diff --git a/include/asm-ppc/sigcontext.h b/arch/ppc/include/asm/sigcontext.h similarity index 100% rename from include/asm-ppc/sigcontext.h rename to arch/ppc/include/asm/sigcontext.h diff --git a/include/asm-ppc/signal.h b/arch/ppc/include/asm/signal.h similarity index 100% rename from include/asm-ppc/signal.h rename to arch/ppc/include/asm/signal.h diff --git a/include/asm-ppc/status_led.h b/arch/ppc/include/asm/status_led.h similarity index 100% rename from include/asm-ppc/status_led.h rename to arch/ppc/include/asm/status_led.h diff --git a/include/asm-ppc/string.h b/arch/ppc/include/asm/string.h similarity index 100% rename from include/asm-ppc/string.h rename to arch/ppc/include/asm/string.h diff --git a/include/asm-ppc/types.h b/arch/ppc/include/asm/types.h similarity index 100% rename from include/asm-ppc/types.h rename to arch/ppc/include/asm/types.h diff --git a/include/asm-ppc/u-boot.h b/arch/ppc/include/asm/u-boot.h similarity index 100% rename from include/asm-ppc/u-boot.h rename to arch/ppc/include/asm/u-boot.h diff --git a/arch/ppc/lib/time.c b/arch/ppc/lib/time.c index 9db04601c..ee6cbdf67 100644 --- a/arch/ppc/lib/time.c +++ b/arch/ppc/lib/time.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include /* ------------------------------------------------------------------------- */ diff --git a/arch/ppc/mach-mpc5xxx/cpu.c b/arch/ppc/mach-mpc5xxx/cpu.c index eebe53e83..59b1538cd 100644 --- a/arch/ppc/mach-mpc5xxx/cpu.c +++ b/arch/ppc/mach-mpc5xxx/cpu.c @@ -27,12 +27,12 @@ #include #include -#include +#include #include #include #include #include -#include +#include #if defined(CONFIG_OF_FLAT_TREE) #include diff --git a/arch/ppc/mach-mpc5xxx/cpu_init.c b/arch/ppc/mach-mpc5xxx/cpu_init.c index 8eb00f05f..fc5db0ec3 100644 --- a/arch/ppc/mach-mpc5xxx/cpu_init.c +++ b/arch/ppc/mach-mpc5xxx/cpu_init.c @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include diff --git a/include/asm-ppc/arch-mpc5200/clocks.h b/arch/ppc/mach-mpc5xxx/include/mach/clocks.h similarity index 100% rename from include/asm-ppc/arch-mpc5200/clocks.h rename to arch/ppc/mach-mpc5xxx/include/mach/clocks.h diff --git a/include/asm-ppc/arch-mpc5200/fec.h b/arch/ppc/mach-mpc5xxx/include/mach/fec.h similarity index 100% rename from include/asm-ppc/arch-mpc5200/fec.h rename to arch/ppc/mach-mpc5xxx/include/mach/fec.h diff --git a/include/asm-ppc/arch-mpc5200/mpc5xxx.h b/arch/ppc/mach-mpc5xxx/include/mach/mpc5xxx.h similarity index 99% rename from include/asm-ppc/arch-mpc5200/mpc5xxx.h rename to arch/ppc/mach-mpc5xxx/include/mach/mpc5xxx.h index 0638df157..d7d081137 100644 --- a/include/asm-ppc/arch-mpc5200/mpc5xxx.h +++ b/arch/ppc/mach-mpc5xxx/include/mach/mpc5xxx.h @@ -1,5 +1,5 @@ /* - * include/asm-ppc/mpc5xxx.h + * arch/ppc/mach-mpc5xxx/include/mach/mpc5xxx.h * * Prototypes, etc. for the Motorola MGT5xxx/MPC5xxx * embedded cpu chips diff --git a/include/asm-ppc/arch-mpc5200/sdma.h b/arch/ppc/mach-mpc5xxx/include/mach/sdma.h similarity index 99% rename from include/asm-ppc/arch-mpc5200/sdma.h rename to arch/ppc/mach-mpc5xxx/include/mach/sdma.h index 17f22f0ad..5e7ff5fff 100644 --- a/include/asm-ppc/arch-mpc5200/sdma.h +++ b/arch/ppc/mach-mpc5xxx/include/mach/sdma.h @@ -12,7 +12,7 @@ #define __MPC5XXX_SDMA_H #include -#include +#include /* Task number assignment */ #define FEC_RECV_TASK_NO 0 diff --git a/arch/ppc/mach-mpc5xxx/interrupts.c b/arch/ppc/mach-mpc5xxx/interrupts.c index 8665a066b..58f4530dc 100644 --- a/arch/ppc/mach-mpc5xxx/interrupts.c +++ b/arch/ppc/mach-mpc5xxx/interrupts.c @@ -41,9 +41,9 @@ #include #include #include -#include +#include #include -#include +#include struct irq_action { interrupt_handler_t *handler; diff --git a/arch/ppc/mach-mpc5xxx/loadtask.c b/arch/ppc/mach-mpc5xxx/loadtask.c index 77ba8c89d..1458cf721 100644 --- a/arch/ppc/mach-mpc5xxx/loadtask.c +++ b/arch/ppc/mach-mpc5xxx/loadtask.c @@ -7,7 +7,7 @@ */ #include -#include +#include #include /* BestComm/SmartComm microcode */ diff --git a/arch/ppc/mach-mpc5xxx/reginfo.c b/arch/ppc/mach-mpc5xxx/reginfo.c index 130e0357d..92a1b5951 100644 --- a/arch/ppc/mach-mpc5xxx/reginfo.c +++ b/arch/ppc/mach-mpc5xxx/reginfo.c @@ -1,6 +1,6 @@ #include #include -#include +#include void reginfo(void) { diff --git a/arch/ppc/mach-mpc5xxx/speed.c b/arch/ppc/mach-mpc5xxx/speed.c index 720701683..46efc6c24 100644 --- a/arch/ppc/mach-mpc5xxx/speed.c +++ b/arch/ppc/mach-mpc5xxx/speed.c @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include #include diff --git a/arch/sandbox/Makefile b/arch/sandbox/Makefile index 5501b104b..57fac202f 100644 --- a/arch/sandbox/Makefile +++ b/arch/sandbox/Makefile @@ -1,7 +1,7 @@ CPPFLAGS += -fno-strict-aliasing -machine-y := sandbox +machine-y := sandbox board-y := sandbox lds-y := board/sandbox/u-boot.lds @@ -22,10 +22,13 @@ CFLAGS += -Dmalloc=u_boot_malloc \ -Dglob=u_boot_glob -Dglobfree=u_boot_globfree \ -Dioctl=u_boot_ioctl -ifeq ($(incdir-y),) -incdir-y := $(machine-y) +machdirs := $(patsubst %,arch/sandbox/mach-%/,$(machine-y)) + +ifeq ($(KBUILD_SRC),) +CPPFLAGS += $(patsubst %,-I%include,$(machdirs)) +else +CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs)) endif -INCDIR := arch-$(incdir-y) SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ -e s/arm.*/arm/ -e s/sa110/arm/ \ @@ -50,24 +53,10 @@ endif CPPFLAGS += -DELF_CLASS="$(ELF_CLASS)" export ELF_FORMAT ELF_ARCH SUBARCH ELF_CLASS -# Update machine arch and proc symlinks if something which affects -# them changed. We use .arch to indicate when they were updated -# last, otherwise make uses the target directory mtime. - -include/asm-sandbox/.arch: $(wildcard include/config/arch/*.h) include/config/auto.conf - @echo ' SYMLINK include/asm-sandbox/arch -> include/asm-sandbox/$(INCDIR)' -ifneq ($(KBUILD_SRC),) - $(Q)mkdir -p include/asm-sandbox - $(Q)ln -fsn $(srctree)/include/asm-sandbox/$(INCDIR) include/asm-sandbox/arch -else - $(Q)ln -fsn $(INCDIR) include/asm-sandbox/arch -endif - @touch $@ archprepare: maketools PHONY += maketools -maketools: include/asm-sandbox/.arch cmd_uboot__ = $(CC) -o $@ -Wl,-T,$(uboot-lds) \ -Wl,--start-group $(uboot-common) -Wl,--end-group \ @@ -76,4 +65,3 @@ cmd_uboot__ = $(CC) -o $@ -Wl,-T,$(uboot-lds) \ common-y += board/sandbox/ arch/sandbox/os/ CLEAN_FILES += board/sandbox/u-boot.lds -MRPROPER_FILES += include/asm-sandbox/arch diff --git a/include/asm-sandbox/bitops.h b/arch/sandbox/include/asm/bitops.h similarity index 100% rename from include/asm-sandbox/bitops.h rename to arch/sandbox/include/asm/bitops.h diff --git a/include/asm-sandbox/byteorder.h b/arch/sandbox/include/asm/byteorder.h similarity index 100% rename from include/asm-sandbox/byteorder.h rename to arch/sandbox/include/asm/byteorder.h diff --git a/include/asm-sandbox/common.h b/arch/sandbox/include/asm/common.h similarity index 100% rename from include/asm-sandbox/common.h rename to arch/sandbox/include/asm/common.h diff --git a/include/asm-sandbox/elf.h b/arch/sandbox/include/asm/elf.h similarity index 100% rename from include/asm-sandbox/elf.h rename to arch/sandbox/include/asm/elf.h diff --git a/include/asm-sandbox/global_data.h b/arch/sandbox/include/asm/global_data.h similarity index 100% rename from include/asm-sandbox/global_data.h rename to arch/sandbox/include/asm/global_data.h diff --git a/include/asm-sandbox/posix_types.h b/arch/sandbox/include/asm/posix_types.h similarity index 100% rename from include/asm-sandbox/posix_types.h rename to arch/sandbox/include/asm/posix_types.h diff --git a/include/asm-sandbox/processor.h b/arch/sandbox/include/asm/processor.h similarity index 100% rename from include/asm-sandbox/processor.h rename to arch/sandbox/include/asm/processor.h diff --git a/include/asm-sandbox/ptrace.h b/arch/sandbox/include/asm/ptrace.h similarity index 100% rename from include/asm-sandbox/ptrace.h rename to arch/sandbox/include/asm/ptrace.h diff --git a/include/asm-sandbox/string.h b/arch/sandbox/include/asm/string.h similarity index 100% rename from include/asm-sandbox/string.h rename to arch/sandbox/include/asm/string.h diff --git a/include/asm-sandbox/types.h b/arch/sandbox/include/asm/types.h similarity index 100% rename from include/asm-sandbox/types.h rename to arch/sandbox/include/asm/types.h diff --git a/include/asm-sandbox/u-boot.h b/arch/sandbox/include/asm/u-boot.h similarity index 100% rename from include/asm-sandbox/u-boot.h rename to arch/sandbox/include/asm/u-boot.h diff --git a/include/asm-sandbox/arch-sandbox/hostfile.h b/arch/sandbox/mach-sandbox/include/mach/hostfile.h similarity index 100% rename from include/asm-sandbox/arch-sandbox/hostfile.h rename to arch/sandbox/mach-sandbox/include/mach/hostfile.h diff --git a/include/asm-sandbox/arch-sandbox/linux.h b/arch/sandbox/mach-sandbox/include/mach/linux.h similarity index 100% rename from include/asm-sandbox/arch-sandbox/linux.h rename to arch/sandbox/mach-sandbox/include/mach/linux.h diff --git a/arch/sandbox/os/Makefile b/arch/sandbox/os/Makefile index 117f05eba..2980301e1 100644 --- a/arch/sandbox/os/Makefile +++ b/arch/sandbox/os/Makefile @@ -1,4 +1,14 @@ -CPPFLAGS := -Iinclude/asm/arch -P +machine-y := sandbox + +machdirs := $(patsubst %,arch/sandbox/mach-%/,$(machine-y)) + +ifeq ($(KBUILD_SRC),) +CPPFLAGS := $(patsubst %,-I%include,$(machdirs)) +else +CPPFLAGS = $(patsubst %,-I$(srctree)/%include,$(machdirs)) +endif + +CPPFLAGS += -P CFLAGS := -Wall NOSTDINC_FLAGS := diff --git a/arch/sandbox/os/common.c b/arch/sandbox/os/common.c index 72e4c8d70..e89d8a6d3 100644 --- a/arch/sandbox/os/common.c +++ b/arch/sandbox/os/common.c @@ -47,8 +47,8 @@ /* * ...except the ones needed to connect with U-Boot */ -#include -#include +#include +#include static struct termios term_orig, term_vi; static char erase_char; /* the users erase character */ diff --git a/board/a9m2410/a9m2410.c b/board/a9m2410/a9m2410.c index ba3004e25..f327f82b7 100644 --- a/board/a9m2410/a9m2410.c +++ b/board/a9m2410/a9m2410.c @@ -32,8 +32,8 @@ #include #include #include -#include -#include +#include +#include static struct memory_platform_data ram_pdata = { .name = "ram0", diff --git a/board/a9m2410/lowlevel_init.S b/board/a9m2410/lowlevel_init.S index 1af42ddcd..461b93c3f 100644 --- a/board/a9m2410/lowlevel_init.S +++ b/board/a9m2410/lowlevel_init.S @@ -3,7 +3,7 @@ */ #include -#include +#include .section ".text_bare_init.board_init_lowlevel","ax" diff --git a/board/a9m2440/a9m2440.c b/board/a9m2440/a9m2440.c index 228fbde9f..2567f5ed1 100644 --- a/board/a9m2440/a9m2440.c +++ b/board/a9m2440/a9m2440.c @@ -32,9 +32,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include "baseboards.h" diff --git a/board/a9m2440/lowlevel_init.S b/board/a9m2440/lowlevel_init.S index ff8ef07aa..4b5c59607 100644 --- a/board/a9m2440/lowlevel_init.S +++ b/board/a9m2440/lowlevel_init.S @@ -3,7 +3,7 @@ */ #include -#include +#include .section ".text_bare_init.board_init_lowlevel","ax" diff --git a/board/at91sam9260ek/init.c b/board/at91sam9260ek/init.c index d484e9b46..bf40bc489 100644 --- a/board/at91sam9260ek/init.c +++ b/board/at91sam9260ek/init.c @@ -33,9 +33,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include static struct atmel_nand_data nand_pdata = { diff --git a/board/eco920/eco920.c b/board/eco920/eco920.c index 30d5ac02a..53041ddd4 100644 --- a/board/eco920/eco920.c +++ b/board/eco920/eco920.c @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include #include diff --git a/board/eukrea_cpuimx27/eukrea_cpuimx27.c b/board/eukrea_cpuimx27/eukrea_cpuimx27.c index f4b278395..6ffc40b39 100644 --- a/board/eukrea_cpuimx27/eukrea_cpuimx27.c +++ b/board/eukrea_cpuimx27/eukrea_cpuimx27.c @@ -25,21 +25,21 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include -#include +#include #include #include #include #include #include #include -#include -#include +#include +#include static struct device_d cfi_dev = { .name = "cfi_flash", diff --git a/board/eukrea_cpuimx27/lowlevel_init.S b/board/eukrea_cpuimx27/lowlevel_init.S index 8f6172178..c7ac3410c 100644 --- a/board/eukrea_cpuimx27/lowlevel_init.S +++ b/board/eukrea_cpuimx27/lowlevel_init.S @@ -1,5 +1,5 @@ #include -#include +#include #define writel(val, reg) \ ldr r0, =reg; \ diff --git a/board/freescale-mx25-3-stack/3stack.c b/board/freescale-mx25-3-stack/3stack.c index 0f770ee5c..3acc46bd2 100644 --- a/board/freescale-mx25-3-stack/3stack.c +++ b/board/freescale-mx25-3-stack/3stack.c @@ -25,17 +25,17 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include -#include +#include #include #include -#include -#include +#include +#include extern unsigned long _stext; diff --git a/board/freescale-mx25-3-stack/lowlevel_init.S b/board/freescale-mx25-3-stack/lowlevel_init.S index 9d1916469..d622bd362 100644 --- a/board/freescale-mx25-3-stack/lowlevel_init.S +++ b/board/freescale-mx25-3-stack/lowlevel_init.S @@ -21,9 +21,9 @@ * MA 02111-1307 USA */ -#include -#include -#include +#include +#include +#include #include #define writel(val, reg) \ diff --git a/board/freescale-mx35-3-stack/3stack.c b/board/freescale-mx35-3-stack/3stack.c index 84b94f5ab..ade5d12f9 100644 --- a/board/freescale-mx35-3-stack/3stack.c +++ b/board/freescale-mx35-3-stack/3stack.c @@ -23,20 +23,20 @@ #include #include #include -#include +#include #include -#include +#include #include #include -#include +#include #include #include #include #include #include #include -#include -#include +#include +#include static struct device_d cfi_dev = { .name = "cfi_flash", diff --git a/board/freescale-mx35-3-stack/lowlevel_init.S b/board/freescale-mx35-3-stack/lowlevel_init.S index 02b0326ca..f912a3a1b 100644 --- a/board/freescale-mx35-3-stack/lowlevel_init.S +++ b/board/freescale-mx35-3-stack/lowlevel_init.S @@ -5,7 +5,7 @@ */ #include -#include +#include #define writel(val, reg) \ ldr r0, =reg; \ diff --git a/board/imx21ads/imx21ads.c b/board/imx21ads/imx21ads.c index 3e1f47ff3..ba67e462b 100644 --- a/board/imx21ads/imx21ads.c +++ b/board/imx21ads/imx21ads.c @@ -26,15 +26,15 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include #include #include -#include +#include static struct device_d cfi_dev = { .name = "cfi_flash", diff --git a/board/imx21ads/lowlevel_init.S b/board/imx21ads/lowlevel_init.S index ee3b0853c..b13ec7b3e 100644 --- a/board/imx21ads/lowlevel_init.S +++ b/board/imx21ads/lowlevel_init.S @@ -4,7 +4,7 @@ */ #include -#include +#include #define writel(val, reg) \ ldr r0, =reg; \ diff --git a/board/imx27ads/imx27ads.c b/board/imx27ads/imx27ads.c index d3524360a..5f43d1b4f 100644 --- a/board/imx27ads/imx27ads.c +++ b/board/imx27ads/imx27ads.c @@ -23,11 +23,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/board/imx27ads/lowlevel_init.S b/board/imx27ads/lowlevel_init.S index 57b93eb6b..2d079b615 100644 --- a/board/imx27ads/lowlevel_init.S +++ b/board/imx27ads/lowlevel_init.S @@ -5,7 +5,7 @@ */ #include -#include +#include #define writel(val, reg) \ ldr r0, =reg; \ diff --git a/board/kp_ukd_r1_num/highlevel_init.c b/board/kp_ukd_r1_num/highlevel_init.c index e3d9a16ce..11b30f183 100644 --- a/board/kp_ukd_r1_num/highlevel_init.c +++ b/board/kp_ukd_r1_num/highlevel_init.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include static void board_gpio_init(void) { diff --git a/board/kp_ukd_r1_num/kp_ukd_r1_num.c b/board/kp_ukd_r1_num/kp_ukd_r1_num.c index 751828682..a9052e196 100644 --- a/board/kp_ukd_r1_num/kp_ukd_r1_num.c +++ b/board/kp_ukd_r1_num/kp_ukd_r1_num.c @@ -24,9 +24,9 @@ #include #include #include -#include -//#include -#include +#include +//#include +#include #include #include diff --git a/board/kp_ukd_r1_num/lowlevel_init.c b/board/kp_ukd_r1_num/lowlevel_init.c index 56863afb0..31b3bb981 100644 --- a/board/kp_ukd_r1_num/lowlevel_init.c +++ b/board/kp_ukd_r1_num/lowlevel_init.c @@ -23,7 +23,7 @@ */ #include #include -#include +#include /** Initialize board specific very early inits * diff --git a/board/mmccpu/init.c b/board/mmccpu/init.c index 7f519e449..bac8ef385 100644 --- a/board/mmccpu/init.c +++ b/board/mmccpu/init.c @@ -33,10 +33,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include static struct device_d cfi_dev = { .name = "cfi_flash", diff --git a/board/netx/netx.c b/board/netx/netx.c index 6f6aa78e1..5276d5975 100644 --- a/board/netx/netx.c +++ b/board/netx/netx.c @@ -23,13 +23,13 @@ #include #include #include -#include +#include #include #include #include #include #include -#include +#include static struct device_d cfi_dev = { .name = "cfi_flash", diff --git a/board/omap/board-beagle.c b/board/omap/board-beagle.c index 5da64d499..282c532d3 100644 --- a/board/omap/board-beagle.c +++ b/board/omap/board-beagle.c @@ -53,13 +53,13 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "board.h" /******************** Board Boot Time *******************/ diff --git a/board/omap/board-sdp343x.c b/board/omap/board-sdp343x.c index 2ddc5c271..caf21087f 100644 --- a/board/omap/board-sdp343x.c +++ b/board/omap/board-sdp343x.c @@ -48,13 +48,13 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "board.h" /******************** Board Boot Time *******************/ diff --git a/board/omap/devices-gpmc-nand.c b/board/omap/devices-gpmc-nand.c index d6db8a36d..bbcceafe8 100644 --- a/board/omap/devices-gpmc-nand.c +++ b/board/omap/devices-gpmc-nand.c @@ -33,9 +33,9 @@ #include #include -#include -#include -#include +#include +#include +#include #ifdef CONFIG_MACH_OMAP_GPMC_GENERICNAND diff --git a/board/omap/platform.S b/board/omap/platform.S index c6ce87511..9014a8f1c 100644 --- a/board/omap/platform.S +++ b/board/omap/platform.S @@ -32,7 +32,7 @@ */ #include -#include +#include #ifdef CONFIG_MACH_DO_LOWLEVEL_INIT /** diff --git a/board/pcm030/config.h b/board/pcm030/config.h index 16b7ba851..a772ee6d9 100644 --- a/board/pcm030/config.h +++ b/board/pcm030/config.h @@ -27,7 +27,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -#include +#include /* #define DEBUG */ diff --git a/board/pcm030/pcm030.c b/board/pcm030/pcm030.c index c0c9a33a7..23c1be394 100644 --- a/board/pcm030/pcm030.c +++ b/board/pcm030/pcm030.c @@ -31,8 +31,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/board/pcm037/lowlevel_init.S b/board/pcm037/lowlevel_init.S index bbd98ce5e..a32d375dd 100644 --- a/board/pcm037/lowlevel_init.S +++ b/board/pcm037/lowlevel_init.S @@ -21,8 +21,8 @@ * MA 02111-1307 USA */ -#include -#include +#include +#include #define writel(val, reg) \ ldr r0, =reg; \ diff --git a/board/pcm037/pcm037.c b/board/pcm037/pcm037.c index 8fc516248..8a15da47f 100644 --- a/board/pcm037/pcm037.c +++ b/board/pcm037/pcm037.c @@ -27,14 +27,14 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include -#include +#include /* diff --git a/board/pcm038/lowlevel_init.S b/board/pcm038/lowlevel_init.S index 64c55778b..759ecd77a 100644 --- a/board/pcm038/lowlevel_init.S +++ b/board/pcm038/lowlevel_init.S @@ -5,7 +5,7 @@ */ #include -#include +#include #define writel(val, reg) \ ldr r0, =reg; \ diff --git a/board/pcm038/pcm038.c b/board/pcm038/pcm038.c index 995844838..6d8358b6d 100644 --- a/board/pcm038/pcm038.c +++ b/board/pcm038/pcm038.c @@ -23,13 +23,13 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include -#include +#include #include #include #include @@ -37,12 +37,12 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include -#include +#include static struct device_d cfi_dev = { .name = "cfi_flash", diff --git a/board/pcm043/lowlevel_init.S b/board/pcm043/lowlevel_init.S index a7cb300ad..56ebae433 100644 --- a/board/pcm043/lowlevel_init.S +++ b/board/pcm043/lowlevel_init.S @@ -21,9 +21,9 @@ * MA 02111-1307 USA */ -#include -#include -#include +#include +#include +#include #include #define writel(val, reg) \ diff --git a/board/pcm043/pcm043.c b/board/pcm043/pcm043.c index 889093a9c..a396ff70c 100644 --- a/board/pcm043/pcm043.c +++ b/board/pcm043/pcm043.c @@ -29,17 +29,17 @@ #include #include #include -#include -#include -#include +#include #include -#include +#include #include #include #include #include +#include #include -#include +#include +#include #define CYG_MACRO_START #define CYG_MACRO_END diff --git a/board/phycard-i.MX27/lowlevel_init.S b/board/phycard-i.MX27/lowlevel_init.S index 64c55778b..759ecd77a 100644 --- a/board/phycard-i.MX27/lowlevel_init.S +++ b/board/phycard-i.MX27/lowlevel_init.S @@ -5,7 +5,7 @@ */ #include -#include +#include #define writel(val, reg) \ ldr r0, =reg; \ diff --git a/board/phycard-i.MX27/pca100.c b/board/phycard-i.MX27/pca100.c index 317c19c9e..fe9b894a6 100644 --- a/board/phycard-i.MX27/pca100.c +++ b/board/phycard-i.MX27/pca100.c @@ -23,9 +23,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include @@ -34,8 +34,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/board/phycore_mcf54xx/highlevel_init.c b/board/phycore_mcf54xx/highlevel_init.c index e3d9a16ce..11b30f183 100644 --- a/board/phycore_mcf54xx/highlevel_init.c +++ b/board/phycore_mcf54xx/highlevel_init.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include static void board_gpio_init(void) { diff --git a/board/phycore_mcf54xx/lowlevel_init.c b/board/phycore_mcf54xx/lowlevel_init.c index a4da9ec6e..89ac6ff8d 100644 --- a/board/phycore_mcf54xx/lowlevel_init.c +++ b/board/phycore_mcf54xx/lowlevel_init.c @@ -23,7 +23,7 @@ */ #include #include -#include +#include /** Initialize board specific very early inits * diff --git a/board/phycore_mcf54xx/phyCore_MCF54xx.c b/board/phycore_mcf54xx/phyCore_MCF54xx.c index f8e96d3af..6fe799328 100644 --- a/board/phycore_mcf54xx/phyCore_MCF54xx.c +++ b/board/phycore_mcf54xx/phyCore_MCF54xx.c @@ -26,8 +26,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/board/pm9263/init.c b/board/pm9263/init.c index 0d3d6d941..1060fe27a 100644 --- a/board/pm9263/init.c +++ b/board/pm9263/init.c @@ -33,10 +33,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include static struct device_d cfi_dev = { .name = "cfi_flash", diff --git a/board/sandbox/board.c b/board/sandbox/board.c index a3f64983c..84017eb50 100644 --- a/board/sandbox/board.c +++ b/board/sandbox/board.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff --git a/board/sandbox/clock.c b/board/sandbox/clock.c index 27ae7e234..7ad1f53e1 100644 --- a/board/sandbox/clock.c +++ b/board/sandbox/clock.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include static uint64_t linux_clocksource_read(void) { diff --git a/board/sandbox/console.c b/board/sandbox/console.c index 7b429df8b..094521678 100644 --- a/board/sandbox/console.c +++ b/board/sandbox/console.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include int u_boot_register_console(char *name, int stdinfd, int stdoutfd) diff --git a/board/sandbox/hostfile.c b/board/sandbox/hostfile.c index eb3b08ff7..f91601feb 100644 --- a/board/sandbox/hostfile.c +++ b/board/sandbox/hostfile.c @@ -23,10 +23,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include struct hf_priv { diff --git a/board/scb9328/lowlevel_init.S b/board/scb9328/lowlevel_init.S index 6a51f5bf9..5b024286b 100644 --- a/board/scb9328/lowlevel_init.S +++ b/board/scb9328/lowlevel_init.S @@ -18,7 +18,7 @@ * */ -#include +#include #define CPU200 diff --git a/board/scb9328/scb9328.c b/board/scb9328/scb9328.c index af666f2af..6b86352e6 100644 --- a/board/scb9328/scb9328.c +++ b/board/scb9328/scb9328.c @@ -24,9 +24,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/drivers/nand/atmel_nand.c b/drivers/nand/atmel_nand.c index 9481990b8..e8f85fc62 100644 --- a/drivers/nand/atmel_nand.c +++ b/drivers/nand/atmel_nand.c @@ -32,7 +32,7 @@ #include #include -#include +#include #include diff --git a/drivers/nand/nand_imx.c b/drivers/nand/nand_imx.c index 5434f0c02..1a708e952 100644 --- a/drivers/nand/nand_imx.c +++ b/drivers/nand/nand_imx.c @@ -24,9 +24,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/drivers/nand/nand_imx_v2.c b/drivers/nand/nand_imx_v2.c index fcdfb79f7..32e356420 100644 --- a/drivers/nand/nand_imx_v2.c +++ b/drivers/nand/nand_imx_v2.c @@ -17,8 +17,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/drivers/nand/nand_omap_gpmc.c b/drivers/nand/nand_omap_gpmc.c index cc365bc3c..c6647e56e 100644 --- a/drivers/nand/nand_omap_gpmc.c +++ b/drivers/nand/nand_omap_gpmc.c @@ -72,9 +72,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include /* Enable me to get tons of debug messages -for use without jtag */ #if 0 diff --git a/drivers/nand/nand_s3c2410.c b/drivers/nand/nand_s3c2410.c index 6423f85b6..b1fe377be 100644 --- a/drivers/nand/nand_s3c2410.c +++ b/drivers/nand/nand_s3c2410.c @@ -30,9 +30,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c index 6591b7b06..9d8b8c75c 100644 --- a/drivers/net/fec_imx.c +++ b/drivers/net/fec_imx.c @@ -29,9 +29,9 @@ #include #include -#include +#include #include -#include +#include #include #include "fec_imx.h" diff --git a/drivers/net/fec_mpc5200.c b/drivers/net/fec_mpc5200.c index 05f63d780..d803ddf60 100644 --- a/drivers/net/fec_mpc5200.c +++ b/drivers/net/fec_mpc5200.c @@ -7,15 +7,15 @@ */ #include -#include +#include #include #include #include #include #include -#include -#include -#include +#include +#include +#include #include #include "fec_mpc5200.h" diff --git a/drivers/net/macb.c b/drivers/net/macb.c index fabb4fa8f..693e64f27 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -47,8 +47,8 @@ #include #include #include -#include -#include +#include +#include #include "macb.h" diff --git a/drivers/net/netx_eth.c b/drivers/net/netx_eth.c index 6c52fb790..e29f69ccb 100644 --- a/drivers/net/netx_eth.c +++ b/drivers/net/netx_eth.c @@ -3,9 +3,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/drivers/net/tap.c b/drivers/net/tap.c index e09c136ec..7070cc6b4 100644 --- a/drivers/net/tap.c +++ b/drivers/net/tap.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include struct tap_priv { int fd; diff --git a/drivers/serial/atmel.c b/drivers/serial/atmel.c index 3901835c1..e9e811661 100644 --- a/drivers/serial/atmel.c +++ b/drivers/serial/atmel.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include /* USART3 register offsets */ #define USART3_CR 0x0000 diff --git a/drivers/serial/linux_console.c b/drivers/serial/linux_console.c index 39ff86272..c792b501a 100644 --- a/drivers/serial/linux_console.c +++ b/drivers/serial/linux_console.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/serial/serial_at91rm9200.c b/drivers/serial/serial_at91rm9200.c index 7f00b30ad..f5546aa75 100644 --- a/drivers/serial/serial_at91rm9200.c +++ b/drivers/serial/serial_at91rm9200.c @@ -31,7 +31,7 @@ #include #include -#include +#include #if !defined(CONFIG_DBGU) && !defined(CONFIG_USART0) && !defined(CONFIG_USART1) #error must define one of CONFIG_DBGU or CONFIG_USART0 or CONFIG_USART1 diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c index 89f1c4a9a..91d3b188c 100644 --- a/drivers/serial/serial_imx.c +++ b/drivers/serial/serial_imx.c @@ -18,8 +18,8 @@ */ #include -#include -#include +#include +#include #include #include #include diff --git a/drivers/serial/serial_mpc5xxx.c b/drivers/serial/serial_mpc5xxx.c index a86c655bc..250970886 100644 --- a/drivers/serial/serial_mpc5xxx.c +++ b/drivers/serial/serial_mpc5xxx.c @@ -34,13 +34,13 @@ */ #include -#include +#include #include #include #include #include #include -#include +#include static int __mpc5xxx_serial_setbaudrate(struct mpc5xxx_psc *psc, int baudrate) { diff --git a/drivers/serial/serial_netx.c b/drivers/serial/serial_netx.c index 68b4d2075..7c095197f 100644 --- a/drivers/serial/serial_netx.c +++ b/drivers/serial/serial_netx.c @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include #include diff --git a/drivers/serial/serial_s3c24x0.c b/drivers/serial/serial_s3c24x0.c index 92e9fa9b0..fedddd33b 100644 --- a/drivers/serial/serial_s3c24x0.c +++ b/drivers/serial/serial_s3c24x0.c @@ -25,8 +25,8 @@ #include #include #include -#include -#include +#include +#include /* Note: Offsets are for little endian access */ #define ULCON 0x00 /* line control */ diff --git a/drivers/spi/imx_spi.c b/drivers/spi/imx_spi.c index 8a483082e..5c9791978 100644 --- a/drivers/spi/imx_spi.c +++ b/drivers/spi/imx_spi.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #define MXC_CSPIRXDATA 0x00 #define MXC_CSPITXDATA 0x04 diff --git a/drivers/spi/mc13783.c b/drivers/spi/mc13783.c index 1cded4b78..19e278092 100644 --- a/drivers/spi/mc13783.c +++ b/drivers/spi/mc13783.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #define REG_INTERRUPT_STATUS_0 0x0 #define REG_INTERRUPT_MASK 0x1 diff --git a/drivers/video/imx.c b/drivers/video/imx.c index 10aaa80cf..9a30ca46f 100644 --- a/drivers/video/imx.c +++ b/drivers/video/imx.c @@ -17,14 +17,14 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include -#include +#include #define LCDC_SSA 0x00 diff --git a/include/asm-arm/.gitignore b/include/asm-arm/.gitignore deleted file mode 100644 index 673849bfc..000000000 --- a/include/asm-arm/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -arch -proc diff --git a/include/asm-arm/ptrace.h b/include/asm-arm/ptrace.h deleted file mode 100644 index 73c9087b5..000000000 --- a/include/asm-arm/ptrace.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef __ASM_ARM_PTRACE_H -#define __ASM_ARM_PTRACE_H - -#define PTRACE_GETREGS 12 -#define PTRACE_SETREGS 13 -#define PTRACE_GETFPREGS 14 -#define PTRACE_SETFPREGS 15 - -#define PTRACE_SETOPTIONS 21 - -/* options set using PTRACE_SETOPTIONS */ -#define PTRACE_O_TRACESYSGOOD 0x00000001 - -#include - -#ifndef __ASSEMBLY__ -#define pc_pointer(v) \ - ((v) & ~PCMASK) - -#define instruction_pointer(regs) \ - (pc_pointer((regs)->ARM_pc)) - -#ifdef __KERNEL__ -extern void show_regs(struct pt_regs *); - -#define predicate(x) (x & 0xf0000000) -#define PREDICATE_ALWAYS 0xe0000000 - -#endif - -#endif /* __ASSEMBLY__ */ - -#endif diff --git a/include/asm-generic/u-boot.lds.h b/include/asm-generic/u-boot.lds.h index 4982ce03d..1a5f2f775 100644 --- a/include/asm-generic/u-boot.lds.h +++ b/include/asm-generic/u-boot.lds.h @@ -1,6 +1,6 @@ #ifdef CONFIG_ARCH_IMX25 -#include +#include #endif #ifndef PRE_IMAGE diff --git a/include/asm-ppc/.gitignore b/include/asm-ppc/.gitignore deleted file mode 100644 index aca8da44f..000000000 --- a/include/asm-ppc/.gitignore +++ /dev/null @@ -1 +0,0 @@ -arch \ No newline at end of file diff --git a/include/debug_ll.h b/include/debug_ll.h index f06fa6e57..e99ae7d20 100644 --- a/include/debug_ll.h +++ b/include/debug_ll.h @@ -26,7 +26,7 @@ #define __INCLUDE_DEBUG_LL_H__ #if defined (CONFIG_DEBUG_LL) -# include +# include #define PUTC_LL(x) putc(x) # define PUTHEX_LL(value) ({ unsigned long v = (unsigned long) (value); \