diff options
39 files changed, 57 insertions, 77 deletions
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile index d30b335d1d..0f2c4f324d 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) - -# 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. +machdirs := $(patsubst %,arch/m68k/mach-%/,$(machine-y)) -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 -else - $(Q)ln -fsn $(INCDIR) include/asm-m68k/arch -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 +ifeq ($(KBUILD_SRC),) +CPPFLAGS += $(patsubst %,-I%include,$(machdirs)) else - $(Q)ln -fsn proc-mcfv4e include/asm-m68k/proc +CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs)) 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 5c48add8d9..c27d089018 100644 --- a/arch/m68k/cpu/cpu.c +++ b/arch/m68k/cpu/cpu.c @@ -24,8 +24,8 @@ #include <common.h> #include <command.h> #include <init.h> -#include <asm/proc/processor.h> // FIXME -stup place -#include <asm/arch/mcf54xx-regs.h> +#include <proc/processor.h> // FIXME -stup place +#include <mach/mcf54xx-regs.h> static uint32_t CACR_shadow = MCF5XXX_CACR_BEC; diff --git a/arch/m68k/cpu/interrupts.c b/arch/m68k/cpu/interrupts.c index 16aac38ad5..9fc64a1248 100644 --- a/arch/m68k/cpu/interrupts.c +++ b/arch/m68k/cpu/interrupts.c @@ -23,7 +23,7 @@ */ #include <common.h> #include <asm/ptrace.h> -#include <asm/arch/mcf54xx-regs.h> +#include <mach/mcf54xx-regs.h> #ifdef CONFIG_USE_IRQ void enable_interrupts(void) diff --git a/arch/m68k/include/asm/hardware.h b/arch/m68k/include/asm/hardware.h index 54cec0ee20..616a4feeb5 100644 --- a/arch/m68k/include/asm/hardware.h +++ b/arch/m68k/include/asm/hardware.h @@ -25,6 +25,6 @@ #ifndef __M68K_HARDWARE_H #define __M68K_HARDWARE_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #endif diff --git a/arch/m68k/include/asm/ptrace.h b/arch/m68k/include/asm/ptrace.h index fb0f3314d8..96ea849385 100644 --- a/arch/m68k/include/asm/ptrace.h +++ b/arch/m68k/include/asm/ptrace.h @@ -33,7 +33,7 @@ #define PTRACE_SETOPTIONS 21 -#include <asm/proc/ptrace.h> +#include <proc/ptrace.h> #ifndef __ASSEMBLY__ diff --git a/arch/m68k/mach-mcfv4e/dma_utils.c b/arch/m68k/mach-mcfv4e/dma_utils.c index 15b520abc2..adeefea3b1 100644 --- a/arch/m68k/mach-mcfv4e/dma_utils.c +++ b/arch/m68k/mach-mcfv4e/dma_utils.c @@ -10,10 +10,10 @@ #include <common.h> #include <init.h> #include <linux/types.h> -#include <asm/arch/mcf54xx-regs.h> -#include <asm/proc/mcdapi/MCD_dma.h> +#include <mach/mcf54xx-regs.h> +#include <proc/mcdapi/MCD_dma.h> -#include <asm/proc/dma_utils.h> +#include <proc/dma_utils.h> /* * 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 551f00f005..7619283f86 100644 --- a/arch/m68k/mach-mcfv4e/fec.c +++ b/arch/m68k/mach-mcfv4e/fec.c @@ -7,12 +7,12 @@ #include <common.h> #include <linux/types.h> -#include <asm/arch/mcf54xx-regs.h> -#include <asm/proc/mcdapi/MCD_dma.h> -#include <asm/proc/net/net.h> -#include <asm/proc/fecbd.h> -#include <asm/proc/fec.h> -#include <asm/proc/dma_utils.h> +#include <mach/mcf54xx-regs.h> +#include <proc/mcdapi/MCD_dma.h> +#include <proc/net/net.h> +#include <proc/fecbd.h> +#include <proc/fec.h> +#include <proc/dma_utils.h> #define TRUE 1 diff --git a/arch/m68k/mach-mcfv4e/fecbd.c b/arch/m68k/mach-mcfv4e/fecbd.c index 26fb16d98d..a8e732b3ac 100644 --- a/arch/m68k/mach-mcfv4e/fecbd.c +++ b/arch/m68k/mach-mcfv4e/fecbd.c @@ -7,12 +7,12 @@ #include <common.h> #include <linux/types.h> -#include <asm/arch/mcf54xx-regs.h> -#include <asm/proc/mcdapi/MCD_dma.h> -#include <asm/proc/net/net.h> -#include <asm/proc/fecbd.h> -#include <asm/proc/fec.h> -#include <asm/proc/dma_utils.h> +#include <mach/mcf54xx-regs.h> +#include <proc/mcdapi/MCD_dma.h> +#include <proc/net/net.h> +#include <proc/fecbd.h> +#include <proc/fec.h> +#include <proc/dma_utils.h> #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 index 50124b1948..50124b1948 100644 --- a/include/asm-m68k/arch-mcfv4e/clocks.h +++ b/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 index 064961d925..064961d925 100644 --- a/include/asm-m68k/arch-mcfv4e/debug_ll.h +++ b/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 index 46dc08897f..46dc08897f 100644 --- a/include/asm-m68k/arch-mcfv4e/hardware.h +++ b/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 index e1b17d55e4..e1b17d55e4 100644 --- a/include/asm-m68k/arch-mcfv4e/mcf54xx-regs.h +++ b/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 index 4ebdd558c1..4ebdd558c1 100644 --- a/include/asm-m68k/proc-mcfv4e/dma_utils.h +++ b/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 index 4c94774381..4c94774381 100644 --- a/include/asm-m68k/proc-mcfv4e/fec.h +++ b/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 index 92195490c8..92195490c8 100644 --- a/include/asm-m68k/proc-mcfv4e/fecbd.h +++ b/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 index 09adf8272a..09adf8272a 100644 --- a/include/asm-m68k/proc-mcfv4e/mcdapi/MCD_dma.h +++ b/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 index f90600c7cd..f90600c7cd 100644 --- a/include/asm-m68k/proc-mcfv4e/mcdapi/MCD_progCheck.h +++ b/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 index bc6ec91f98..bc6ec91f98 100644 --- a/include/asm-m68k/proc-mcfv4e/mcdapi/MCD_tasksInit.h +++ b/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 index 5240c0c945..5240c0c945 100644 --- a/include/asm-m68k/proc-mcfv4e/net/eth.h +++ b/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 index bc3a7a6924..bc3a7a6924 100644 --- a/include/asm-m68k/proc-mcfv4e/net/nbuf.h +++ b/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 index a2ccd76510..a2ccd76510 100644 --- a/include/asm-m68k/proc-mcfv4e/net/net.h +++ b/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 index c9da1c83a5..c9da1c83a5 100644 --- a/include/asm-m68k/proc-mcfv4e/net/queue.h +++ b/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 index f49b65d97b..f49b65d97b 100644 --- a/include/asm-m68k/proc-mcfv4e/processor.h +++ b/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 index dd124291d6..dd124291d6 100644 --- a/include/asm-m68k/proc-mcfv4e/ptrace.h +++ b/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 b4d7f28470..60e2b6dd76 100644 --- a/arch/m68k/mach-mcfv4e/mcdapi/MCD_dmaApi.c +++ b/arch/m68k/mach-mcfv4e/mcdapi/MCD_dmaApi.c @@ -6,9 +6,9 @@ */ #include <asm/types.h> -#include <asm/proc/mcdapi/MCD_dma.h> -#include <asm/proc/mcdapi/MCD_tasksInit.h> -#include <asm/proc/mcdapi/MCD_progCheck.h> +#include <proc/mcdapi/MCD_dma.h> +#include <proc/mcdapi/MCD_tasksInit.h> +#include <proc/mcdapi/MCD_progCheck.h> /* * 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 3bfed232d7..812120dd7a 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 <asm/types.h> -#include <asm/proc/mcdapi/MCD_dma.h> +#include <proc/mcdapi/MCD_dma.h> 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 14104f7185..8d82b471f9 100644 --- a/arch/m68k/mach-mcfv4e/mcdapi/MCD_tasksInit.c +++ b/arch/m68k/mach-mcfv4e/mcdapi/MCD_tasksInit.c @@ -11,7 +11,7 @@ */ #include <asm/types.h> -#include <asm/proc/mcdapi/MCD_dma.h> +#include <proc/mcdapi/MCD_dma.h> extern dmaRegs *MCD_dmaBar; diff --git a/arch/m68k/mach-mcfv4e/mcf_clocksource.c b/arch/m68k/mach-mcfv4e/mcf_clocksource.c index 1278bf83ec..926a592158 100644 --- a/arch/m68k/mach-mcfv4e/mcf_clocksource.c +++ b/arch/m68k/mach-mcfv4e/mcf_clocksource.c @@ -24,9 +24,9 @@ #include <common.h> #include <init.h> #include <clock.h> -#include <asm/arch/mcf54xx-regs.h> -#include <asm/arch/clocks.h> -#include <asm/proc/processor.h> //FIXME - move to other file +#include <mach/mcf54xx-regs.h> +#include <mach/clocks.h> +#include <proc/processor.h> //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 5a3368f901..dc04a270d1 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 <common.h> -#include <asm/arch/mcf54xx-regs.h> +#include <mach/mcf54xx-regs.h> /** * 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 11aceeb9b9..494fc68bde 100644 --- a/arch/m68k/mach-mcfv4e/multichannel_dma.c +++ b/arch/m68k/mach-mcfv4e/multichannel_dma.c @@ -25,9 +25,9 @@ */ #include <common.h> #include <init.h> -#include <asm/arch/mcf54xx-regs.h> -#include <asm/proc/mcdapi/MCD_dma.h> -#include <asm/proc/dma_utils.h> +#include <mach/mcf54xx-regs.h> +#include <proc/mcdapi/MCD_dma.h> +#include <proc/dma_utils.h> static int mcdapi_init(void) diff --git a/arch/m68k/mach-mcfv4e/net/nbuf.c b/arch/m68k/mach-mcfv4e/net/nbuf.c index d7ae921bed..5dc6027e0e 100644 --- a/arch/m68k/mach-mcfv4e/net/nbuf.c +++ b/arch/m68k/mach-mcfv4e/net/nbuf.c @@ -26,10 +26,10 @@ #include <malloc.h> #include <linux/types.h> -#include <asm/proc/net/queue.h> -#include <asm/proc/net/net.h> +#include <proc/net/queue.h> +#include <proc/net/net.h> -#include <asm/arch/mcf54xx-regs.h> +#include <mach/mcf54xx-regs.h> #define ASSERT(x) diff --git a/arch/m68k/mach-mcfv4e/net/net.c b/arch/m68k/mach-mcfv4e/net/net.c index 76e28531b6..1bc089bdd3 100644 --- a/arch/m68k/mach-mcfv4e/net/net.c +++ b/arch/m68k/mach-mcfv4e/net/net.c @@ -26,14 +26,14 @@ #include <malloc.h> #include <linux/types.h> -#include <asm/arch/mcf54xx-regs.h> -#include <asm/proc/mcdapi/MCD_dma.h> -#include <asm/proc/net/net.h> -#include <asm/proc/fecbd.h> -#include <asm/proc/fec.h> -#include <asm/proc/dma_utils.h> - -#include <asm/proc/processor.h> //FIXME - move to other file +#include <mach/mcf54xx-regs.h> +#include <proc/mcdapi/MCD_dma.h> +#include <proc/net/net.h> +#include <proc/fecbd.h> +#include <proc/fec.h> +#include <proc/dma_utils.h> + +#include <proc/processor.h> //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 55f938af3e..e573fcfd58 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 <linux/types.h> -#include <asm/proc/net/queue.h> +#include <proc/net/queue.h> /** Initialize the specified queue to an empty state * diff --git a/board/kp_ukd_r1_num/highlevel_init.c b/board/kp_ukd_r1_num/highlevel_init.c index e3d9a16ce3..11b30f183c 100644 --- a/board/kp_ukd_r1_num/highlevel_init.c +++ b/board/kp_ukd_r1_num/highlevel_init.c @@ -24,7 +24,7 @@ #include <common.h> #include <reloc.h> #include <config.h> -#include <asm/arch/mcf54xx-regs.h> +#include <mach/mcf54xx-regs.h> 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 7518286822..a9052e196c 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 <driver.h> #include <fec.h> #include <environment.h> -#include <asm/arch/mcf54xx-regs.h> -//#include <asm/arch/gpio.h> -#include <asm/arch/clocks.h> +#include <mach/mcf54xx-regs.h> +//#include <mach/gpio.h> +#include <mach/clocks.h> #include <asm/io.h> #include <partition.h> diff --git a/board/kp_ukd_r1_num/lowlevel_init.c b/board/kp_ukd_r1_num/lowlevel_init.c index 56863afb0d..31b3bb9815 100644 --- a/board/kp_ukd_r1_num/lowlevel_init.c +++ b/board/kp_ukd_r1_num/lowlevel_init.c @@ -23,7 +23,7 @@ */ #include <common.h> #include <config.h> -#include <asm/arch/mcf54xx-regs.h> +#include <mach/mcf54xx-regs.h> /** Initialize board specific very early inits * diff --git a/board/phycore_mcf54xx/highlevel_init.c b/board/phycore_mcf54xx/highlevel_init.c index e3d9a16ce3..11b30f183c 100644 --- a/board/phycore_mcf54xx/highlevel_init.c +++ b/board/phycore_mcf54xx/highlevel_init.c @@ -24,7 +24,7 @@ #include <common.h> #include <reloc.h> #include <config.h> -#include <asm/arch/mcf54xx-regs.h> +#include <mach/mcf54xx-regs.h> static void board_gpio_init(void) { diff --git a/board/phycore_mcf54xx/lowlevel_init.c b/board/phycore_mcf54xx/lowlevel_init.c index a4da9ec6e6..89ac6ff8d9 100644 --- a/board/phycore_mcf54xx/lowlevel_init.c +++ b/board/phycore_mcf54xx/lowlevel_init.c @@ -23,7 +23,7 @@ */ #include <common.h> #include <config.h> -#include <asm/arch/mcf54xx-regs.h> +#include <mach/mcf54xx-regs.h> /** Initialize board specific very early inits * diff --git a/board/phycore_mcf54xx/phyCore_MCF54xx.c b/board/phycore_mcf54xx/phyCore_MCF54xx.c index f8e96d3af3..6fe799328d 100644 --- a/board/phycore_mcf54xx/phyCore_MCF54xx.c +++ b/board/phycore_mcf54xx/phyCore_MCF54xx.c @@ -26,8 +26,8 @@ #include <driver.h> #include <fec.h> #include <environment.h> -#include <asm/arch/mcf54xx-regs.h> -#include <asm/arch/clocks.h> +#include <mach/mcf54xx-regs.h> +#include <mach/clocks.h> #include <asm/io.h> #include <partition.h> |