Commit 0242909a authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'cris_move' of git://www.jni.nu/cris

* 'cris_move' of git://www.jni.nu/cris:
  [CRIS] Move header files from include to arch/cris/include.
  [CRISv32] Remove warning in io.h
parents 0a6d2fac 556dcee7
...@@ -23,12 +23,16 @@ mach-$(CONFIG_ETRAXFS) := fs ...@@ -23,12 +23,16 @@ mach-$(CONFIG_ETRAXFS) := fs
ifneq ($(arch-y),) ifneq ($(arch-y),)
SARCH := arch-$(arch-y) SARCH := arch-$(arch-y)
inc := -Iarch/cris/include/arch-$(arch-y) -Iarch/cris/include/arch-$(arch-y)/arch
else else
SARCH := SARCH :=
inc :=
endif endif
ifneq ($(mach-y),) ifneq ($(mach-y),)
MACH := mach-$(mach-y) MACH := mach-$(mach-y)
inc += -Iarch/cris/include/$(SARCH)/$(MACH)/
inc += -Iarch/cris/include/$(SARCH)/$(MACH)/mach
else else
MACH := MACH :=
endif endif
...@@ -39,9 +43,9 @@ OBJCOPYFLAGS := -O binary -R .note -R .comment -S ...@@ -39,9 +43,9 @@ OBJCOPYFLAGS := -O binary -R .note -R .comment -S
CPPFLAGS_vmlinux.lds = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE) CPPFLAGS_vmlinux.lds = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE)
KBUILD_AFLAGS += -mlinux -march=$(arch-y) -Iinclude/asm/arch/mach -Iinclude/asm/arch KBUILD_AFLAGS += -mlinux -march=$(arch-y) $(inc)
KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe $(inc)
KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe -Iinclude/asm/arch/mach -Iinclude/asm/arch KBUILD_CPPFLAGS += $(inc)
ifdef CONFIG_FRAME_POINTER ifdef CONFIG_FRAME_POINTER
KBUILD_CFLAGS := $(subst -fomit-frame-pointer,,$(KBUILD_CFLAGS)) -g KBUILD_CFLAGS := $(subst -fomit-frame-pointer,,$(KBUILD_CFLAGS)) -g
...@@ -73,7 +77,7 @@ all: zImage ...@@ -73,7 +77,7 @@ all: zImage
zImage Image: vmlinux zImage Image: vmlinux
$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
archprepare: $(SRC_ARCH)/.links $(srctree)/include/asm-$(ARCH)/.arch FORCE archprepare: $(SRC_ARCH)/.links FORCE
# Create some links to make all tools happy # Create some links to make all tools happy
$(SRC_ARCH)/.links: $(SRC_ARCH)/.links:
...@@ -95,17 +99,6 @@ endif ...@@ -95,17 +99,6 @@ endif
@ln -sfn ../$(SARCH)/kernel/asm-offsets.c $(SRC_ARCH)/kernel/asm-offsets.c @ln -sfn ../$(SARCH)/kernel/asm-offsets.c $(SRC_ARCH)/kernel/asm-offsets.c
@touch $@ @touch $@
# Create link to sub arch includes
$(srctree)/include/asm-$(ARCH)/.arch: $(wildcard include/config/arch/*.h)
@echo ' SYMLINK include/asm-$(ARCH)/arch -> include/asm-$(ARCH)/$(SARCH)'
@rm -f $(srctree)/include/asm-$(ARCH)/arch/mach
@rm -f $(srctree)/include/asm-$(ARCH)/arch
@ln -sf $(SARCH) $(srctree)/include/asm-$(ARCH)/arch
ifdef CONFIG_ETRAX_ARCH_V32
@ln -sf $(MACH) $(srctree)/include/asm-$(ARCH)/arch/mach
endif
@touch $@
archclean: archclean:
$(Q)if [ -e arch/$(ARCH)/boot ]; then \ $(Q)if [ -e arch/$(ARCH)/boot ]; then \
$(MAKE) $(clean)=arch/$(ARCH)/boot; \ $(MAKE) $(clean)=arch/$(ARCH)/boot; \
...@@ -116,8 +109,7 @@ CLEAN_FILES += \ ...@@ -116,8 +109,7 @@ CLEAN_FILES += \
$(MACHINE)/boot/compressed/decompress.bin \ $(MACHINE)/boot/compressed/decompress.bin \
$(MACHINE)/boot/compressed/piggy.gz \ $(MACHINE)/boot/compressed/piggy.gz \
$(MACHINE)/boot/rescue/rescue.bin \ $(MACHINE)/boot/rescue/rescue.bin \
$(SRC_ARCH)/.links \ $(SRC_ARCH)/.links
$(srctree)/include/asm-$(ARCH)/.arch
MRPROPER_FILES += \ MRPROPER_FILES += \
$(SRC_ARCH)/drivers \ $(SRC_ARCH)/drivers \
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#define ASSEMBLER_MACROS_ONLY #define ASSEMBLER_MACROS_ONLY
#include <asm/arch/sv_addr_ag.h> #include <arch/sv_addr_ag.h>
#define RAM_INIT_MAGIC 0x56902387 #define RAM_INIT_MAGIC 0x56902387
#define COMMAND_LINE_MAGIC 0x87109563 #define COMMAND_LINE_MAGIC 0x87109563
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <asm/arch/svinto.h> #include <arch/svinto.h>
/* /*
* gzip declarations * gzip declarations
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
#ifdef CONFIG_ETRAX_AXISFLASHMAP #ifdef CONFIG_ETRAX_AXISFLASHMAP
#define ASSEMBLER_MACROS_ONLY #define ASSEMBLER_MACROS_ONLY
#include <asm/arch/sv_addr_ag.h> #include <arch/sv_addr_ag.h>
;; The partitiontable is looked for at the first sector after the boot ;; The partitiontable is looked for at the first sector after the boot
;; sector. Sector size is 65536 bytes in all flashes we use. ;; sector. Sector size is 65536 bytes in all flashes we use.
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*/ */
#define ASSEMBLER_MACROS_ONLY #define ASSEMBLER_MACROS_ONLY
#include <asm/arch/sv_addr_ag.h> #include <arch/sv_addr_ag.h>
#define CODE_START 0x40004000 #define CODE_START 0x40004000
#define CODE_LENGTH 784 #define CODE_LENGTH 784
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*/ */
#define ASSEMBLER_MACROS_ONLY #define ASSEMBLER_MACROS_ONLY
#include <asm/arch/sv_addr_ag.h> #include <arch/sv_addr_ag.h>
.text .text
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <asm/axisflashmap.h> #include <asm/axisflashmap.h>
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/arch/sv_addr_ag.h> #include <arch/sv_addr_ag.h>
#ifdef CONFIG_CRIS_LOW_MAP #ifdef CONFIG_CRIS_LOW_MAP
#define FLASH_UNCACHED_ADDR KSEG_8 #define FLASH_UNCACHED_ADDR KSEG_8
......
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/arch/svinto.h> #include <arch/svinto.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/rtc.h> #include <asm/rtc.h>
#include <asm/arch/io_interface_mux.h> #include <arch/io_interface_mux.h>
#include "i2c.h" #include "i2c.h"
......
...@@ -23,11 +23,11 @@ ...@@ -23,11 +23,11 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <asm/etraxgpio.h> #include <asm/etraxgpio.h>
#include <asm/arch/svinto.h> #include <arch/svinto.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/arch/io_interface_mux.h> #include <arch/io_interface_mux.h>
#define GPIO_MAJOR 120 /* experimental MAJOR number */ #define GPIO_MAJOR 120 /* experimental MAJOR number */
......
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
#include <asm/etraxi2c.h> #include <asm/etraxi2c.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/arch/svinto.h> #include <arch/svinto.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/delay.h> #include <asm/delay.h>
#include <asm/arch/io_interface_mux.h> #include <arch/io_interface_mux.h>
#include "i2c.h" #include "i2c.h"
......
...@@ -26,11 +26,11 @@ ...@@ -26,11 +26,11 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/svinto.h> #include <arch/svinto.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/sync_serial.h> #include <asm/sync_serial.h>
#include <asm/arch/io_interface_mux.h> #include <arch/io_interface_mux.h>
/* The receiver is a bit tricky beacuse of the continuous stream of data.*/ /* The receiver is a bit tricky beacuse of the continuous stream of data.*/
/* */ /* */
......
#include <linux/module.h> #include <linux/module.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/svinto.h> #include <arch/svinto.h>
/* Export shadow registers for the CPU I/O pins */ /* Export shadow registers for the CPU I/O pins */
EXPORT_SYMBOL(genconfig_shadow); EXPORT_SYMBOL(genconfig_shadow);
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/tty.h> #include <linux/tty.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/arch/svinto.h> #include <arch/svinto.h>
#include <asm/io.h> /* Get SIMCOUT. */ #include <asm/io.h> /* Get SIMCOUT. */
extern void reset_watchdog(void); extern void reset_watchdog(void);
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/arch/svinto.h> #include <arch/svinto.h>
/* Macro to access ETRAX 100 registers */ /* Macro to access ETRAX 100 registers */
#define SETS(var, reg, field, val) var = (var & ~IO_MASK_(reg##_, field##_)) | \ #define SETS(var, reg, field, val) var = (var & ~IO_MASK_(reg##_, field##_)) | \
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/sys.h> #include <linux/sys.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include <asm/arch/sv_addr_ag.h> #include <arch/sv_addr_ag.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <asm/rtc.h> #include <asm/rtc.h>
#include <asm/arch/svinto.h> #include <arch/svinto.h>
#include <asm/fasttimer.h> #include <asm/fasttimer.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#define ASSEMBLER_MACROS_ONLY #define ASSEMBLER_MACROS_ONLY
/* The IO_* macros use the ## token concatenation operator, so /* The IO_* macros use the ## token concatenation operator, so
-traditional must not be used when assembling this file. */ -traditional must not be used when assembling this file. */
#include <asm/arch/sv_addr_ag.h> #include <arch/sv_addr_ag.h>
#define CRAMFS_MAGIC 0x28cd3d45 #define CRAMFS_MAGIC 0x28cd3d45
#define RAM_INIT_MAGIC 0x56902387 #define RAM_INIT_MAGIC 0x56902387
......
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <asm/arch/svinto.h> #include <arch/svinto.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/io_interface_mux.h> #include <arch/io_interface_mux.h>
#define DBG(s) #define DBG(s)
......
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/arch/svinto.h> #include <arch/svinto.h>
#include <asm/irq.h> #include <asm/irq.h>
static int kgdb_started = 0; static int kgdb_started = 0;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <asm/arch/svinto.h> #include <arch/svinto.h>
#include <linux/init.h> #include <linux/init.h>
#ifdef CONFIG_ETRAX_GPIO #ifdef CONFIG_ETRAX_GPIO
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <asm/arch/svinto.h> #include <arch/svinto.h>
#include <asm/types.h> #include <asm/types.h>
#include <asm/signal.h> #include <asm/signal.h>
#include <asm/io.h> #include <asm/io.h>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/arch/sv_addr_ag.h> #include <arch/sv_addr_ag.h>
void void
show_registers(struct pt_regs *regs) show_registers(struct pt_regs *regs)
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <linux/mm.h> #include <linux/mm.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/arch/svinto.h> #include <arch/svinto.h>
#include <asm/mmu_context.h> #include <asm/mmu_context.h>
/* debug of low-level TLB reload */ /* debug of low-level TLB reload */
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/mmu_context.h> #include <asm/mmu_context.h>
#include <asm/arch/svinto.h> #include <arch/svinto.h>
extern void tlb_init(void); extern void tlb_init(void);
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <asm/tlb.h> #include <asm/tlb.h>
#include <asm/mmu_context.h> #include <asm/mmu_context.h>
#include <asm/arch/svinto.h> #include <arch/svinto.h>
#define D(x) #define D(x)
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#define ASSEMBLER_MACROS_ONLY #define ASSEMBLER_MACROS_ONLY
#include <hwregs/asm/reg_map_asm.h> #include <hwregs/asm/reg_map_asm.h>
#include <asm/arch/mach/startup.inc> #include <mach/startup.inc>
#define RAM_INIT_MAGIC 0x56902387 #define RAM_INIT_MAGIC 0x56902387
#define COMMAND_LINE_MAGIC 0x87109563 #define COMMAND_LINE_MAGIC 0x87109563
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
.globl input_data .globl input_data
.text .text
start: _start:
di di
;; Start clocks for used blocks. ;; Start clocks for used blocks.
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/arch/mach/pinmux.h> #include <mach/pinmux.h>
#ifdef CONFIG_ETRAX_VIRTUAL_GPIO #ifdef CONFIG_ETRAX_VIRTUAL_GPIO
#include "../i2c.h" #include "../i2c.h"
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h> #include <linux/mtd/nand.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <asm/arch/memmap.h> #include <arch/memmap.h>
#include <hwregs/reg_map.h> #include <hwregs/reg_map.h>
#include <hwregs/reg_rdwr.h> #include <hwregs/reg_rdwr.h>
#include <hwregs/pio_defs.h> #include <hwregs/pio_defs.h>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h> #include <linux/mtd/nand.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <asm/arch/memmap.h> #include <arch/memmap.h>
#include <hwregs/reg_map.h> #include <hwregs/reg_map.h>
#include <hwregs/reg_rdwr.h> #include <hwregs/reg_rdwr.h>
#include <hwregs/gio_defs.h> #include <hwregs/gio_defs.h>
......
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <asm/arch/hwregs/intr_vect.h> #include <arch/hwregs/intr_vect.h>
void __devinit pcibios_fixup_bus(struct pci_bus *b) void __devinit pcibios_fixup_bus(struct pci_bus *b)
{ {
......
#include <linux/module.h> #include <linux/module.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/cache.h> #include <arch/cache.h>
#include <asm/arch/hwregs/dma.h> #include <arch/hwregs/dma.h>
/* This file is used to workaround a cache bug, Guinness TR 106. */ /* This file is used to workaround a cache bug, Guinness TR 106. */
......
#include <linux/module.h> #include <linux/module.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <asm/arch/dma.h> #include <arch/dma.h>
#include <asm/arch/intmem.h> #include <arch/intmem.h>
#include <asm/arch/mach/pinmux.h> #include <mach/pinmux.h>
#include <asm/arch/io.h> #include <arch/io.h>
/* Functions for allocating DMA channels */ /* Functions for allocating DMA channels */
EXPORT_SYMBOL(crisv32_request_dma); EXPORT_SYMBOL(crisv32_request_dma);
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include <hwregs/reg_map.h> #include <hwregs/reg_map.h>
#include <hwregs/ser_defs.h> #include <hwregs/ser_defs.h>
#include <hwregs/dma_defs.h> #include <hwregs/dma_defs.h>
#include <asm/arch/mach/pinmux.h> #include <mach/pinmux.h>
struct dbg_port struct dbg_port
{ {
......
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/arch/hwregs/asm/reg_map_asm.h> #include <hwregs/asm/reg_map_asm.h>
#include <asm/arch/hwregs/asm/intr_vect_defs_asm.h> #include <hwregs/asm/intr_vect_defs_asm.h>
;; Exported functions. ;; Exported functions.
.globl system_call .globl system_call
......
...@@ -11,11 +11,11 @@ ...@@ -11,11 +11,11 @@
* -traditional must not be used when assembling this file. * -traditional must not be used when assembling this file.
*/ */
#include <hwregs/reg_rdwr.h> #include <hwregs/reg_rdwr.h>
#include <asm/arch/memmap.h> #include <arch/memmap.h>
#include <hwregs/intr_vect.h> #include <hwregs/intr_vect.h>
#include <hwregs/asm/mmu_defs_asm.h> #include <hwregs/asm/mmu_defs_asm.h>
#include <hwregs/asm/reg_map_asm.h> #include <hwregs/asm/reg_map_asm.h>
#include <asm/arch/mach/startup.inc> #include <mach/startup.inc>
#define CRAMFS_MAGIC 0x28cd3d45 #define CRAMFS_MAGIC 0x28cd3d45
#define JHEAD_MAGIC 0x1FF528A6 #define JHEAD_MAGIC 0x1FF528A6
......
...@@ -174,10 +174,10 @@ ...@@ -174,10 +174,10 @@
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/arch/hwregs/reg_map.h> #include <arch/hwregs/reg_map.h>
#include <asm/arch/hwregs/reg_rdwr.h> #include <arch/hwregs/reg_rdwr.h>
#include <asm/arch/hwregs/intr_vect_defs.h> #include <arch/hwregs/intr_vect_defs.h>
#include <asm/arch/hwregs/ser_defs.h> #include <arch/hwregs/ser_defs.h>
/* From entry.S. */ /* From entry.S. */
extern void gdb_handle_exception(void); extern void gdb_handle_exception(void);
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* port exceptions for kernel debugging purposes. * port exceptions for kernel debugging purposes.
*/ */
#include <asm/arch/hwregs/intr_vect.h> #include <arch/hwregs/intr_vect.h>
;; Exported functions. ;; Exported functions.
.globl kgdb_handle_exception .globl kgdb_handle_exception
......
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <asm/arch/hwregs/reg_map.h> #include <arch/hwregs/reg_map.h>
#include <asm/arch/hwregs/reg_rdwr.h> #include <arch/hwregs/reg_rdwr.h>
#include <asm/arch/pinmux.h> #include <arch/pinmux.h>
#include <asm/arch/hwregs/pinmux_defs.h> #include <arch/hwregs/pinmux_defs.h>
#undef DEBUG #undef DEBUG
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/arch/hwregs/supp_reg.h> #include <arch/hwregs/supp_reg.h>
/* /*
* Determines which bits in CCS the user has access to. * Determines which bits in CCS the user has access to.
......
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/ucontext.h> #include <asm/ucontext.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/arch/ptrace.h> #include <arch/ptrace.h>
#include <asm/arch/hwregs/cpu_vect.h> #include <arch/hwregs/cpu_vect.h>
extern unsigned long cris_signal_return_page; extern unsigned long cris_signal_return_page;
......
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
## ##
##============================================================================= ##=============================================================================
#include <asm/arch/hwregs/asm/reg_map_asm.h> #include <arch/hwregs/asm/reg_map_asm.h>
#include <asm/arch/hwregs/asm/gio_defs_asm.h> #include <arch/hwregs/asm/gio_defs_asm.h>
#include <asm/arch/hwregs/asm/pinmux_defs_asm.h> #include <arch/hwregs/asm/pinmux_defs_asm.h>
#include <asm/arch/hwregs/asm/bif_core_defs_asm.h> #include <arch/hwregs/asm/bif_core_defs_asm.h>
#include <asm/arch/hwregs/asm/config_defs_asm.h> #include <arch/hwregs/asm/config_defs_asm.h>
;; There are 8-bit NAND flashes and 16-bit NAND flashes. ;; There are 8-bit NAND flashes and 16-bit NAND flashes.
;; We need to treat them slightly different. ;; We need to treat them slightly different.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <asm/arch/mach/dma.h> #include <mach/dma.h>
#include <hwregs/reg_map.h> #include <hwregs/reg_map.h>
#include <hwregs/reg_rdwr.h> #include <hwregs/reg_rdwr.h>
#include <hwregs/marb_defs.h> #include <hwregs/marb_defs.h>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/mach/pinmux.h> #include <mach/pinmux.h>
#include <hwregs/gio_defs.h> #include <hwregs/gio_defs.h>
struct crisv32_ioport crisv32_ioports[] = { struct crisv32_ioport crisv32_ioports[] = {
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/cpufreq.h> #include <linux/cpufreq.h>
#include <hwregs/reg_map.h> #include <hwregs/reg_map.h>
#include <asm/arch/hwregs/reg_rdwr.h> #include <arch/hwregs/reg_rdwr.h>
#include <asm/arch/hwregs/config_defs.h> #include <arch/hwregs/config_defs.h>
#include <asm/arch/hwregs/bif_core_defs.h> #include <arch/hwregs/bif_core_defs.h>
static int static int
cris_sdram_freq_notifier(struct notifier_block *nb, unsigned long val, cris_sdram_freq_notifier(struct notifier_block *nb, unsigned long val,
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <hwregs/strmux_defs.h> #include <hwregs/strmux_defs.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/arch/mach/arbiter.h> #include <mach/arbiter.h>
static char used_dma_channels[MAX_DMA_CHANNELS]; static char used_dma_channels[MAX_DMA_CHANNELS];
static const char *used_dma_channels_users[MAX_DMA_CHANNELS]; static const char *used_dma_channels_users[MAX_DMA_CHANNELS];
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/pinmux.h> #include <mach/pinmux.h>
#include <asm/arch/hwregs/gio_defs.h> #include <hwregs/gio_defs.h>
#ifndef DEBUG #ifndef DEBUG
#define DEBUG(x) #define DEBUG(x)
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
#include "vcs_hook.h" #include "vcs_hook.h"
#include <stdarg.h> #include <stdarg.h>
#include <asm/arch-v32/hwregs/reg_map.h> #include <arch-v32/hwregs/reg_map.h>
#include <asm/arch-v32/hwregs/intr_vect_defs.h> #include <arch-v32/hwregs/intr_vect_defs.h>
#define HOOK_TRIG_ADDR 0xb7000000 /* hook cvlog model reg address */ #define HOOK_TRIG_ADDR 0xb7000000 /* hook cvlog model reg address */
#define HOOK_MEM_BASE_ADDR 0xa0000000 /* csp4 (shared mem) base addr */ #define HOOK_MEM_BASE_ADDR 0xa0000000 /* csp4 (shared mem) base addr */
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/mmu_context.h> #include <asm/mmu_context.h>
#include <asm/arch/hwregs/asm/mmu_defs_asm.h> #include <arch/hwregs/asm/mmu_defs_asm.h>
#include <asm/arch/hwregs/supp_reg.h> #include <arch/hwregs/supp_reg.h>
extern void tlb_init(void); extern void tlb_init(void);
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#include <asm/tlb.h> #include <asm/tlb.h>
#include <asm/mmu_context.h> #include <asm/mmu_context.h>
#include <asm/arch/hwregs/asm/mmu_defs_asm.h> #include <arch/hwregs/asm/mmu_defs_asm.h>
#include <asm/arch/hwregs/supp_reg.h> #include <arch/hwregs/supp_reg.h>
#define UPDATE_TLB_SEL_IDX(val) \ #define UPDATE_TLB_SEL_IDX(val) \
do { \ do { \
......
#ifndef _ASM_ARCH_CRIS_IO_H #ifndef _ASM_ARCH_CRIS_IO_H
#define _ASM_ARCH_CRIS_IO_H #define _ASM_ARCH_CRIS_IO_H
#include <asm/arch/svinto.h> #include <arch/svinto.h>
/* Etrax shadow registers - which live in arch/cris/kernel/shadows.c */ /* Etrax shadow registers - which live in arch/cris/kernel/shadows.c */
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef _ASM_ARCH_IRQ_H #ifndef _ASM_ARCH_IRQ_H
#define _ASM_ARCH_IRQ_H #define _ASM_ARCH_IRQ_H
#include <asm/arch/sv_addr_ag.h> #include <arch/sv_addr_ag.h>
#define NR_IRQS 32 #define NR_IRQS 32
......
#ifndef _ASM_CRIS_ARCH_CACHE_H #ifndef _ASM_CRIS_ARCH_CACHE_H
#define _ASM_CRIS_ARCH_CACHE_H #define _ASM_CRIS_ARCH_CACHE_H
#include <asm/arch/hwregs/dma.h> #include <arch/hwregs/dma.h>
/* A cache-line is 32 bytes. */ /* A cache-line is 32 bytes. */
#define L1_CACHE_BYTES 32 #define L1_CACHE_BYTES 32
......
...@@ -122,7 +122,7 @@ struct strcop_crypto_op{ ...@@ -122,7 +122,7 @@ struct strcop_crypto_op{
/********** The API to use from inside the kernel. ************/ /********** The API to use from inside the kernel. ************/
#include <asm/arch/hwregs/dma.h> #include <arch/hwregs/dma.h>
typedef enum { typedef enum {
cryptocop_alg_csum = 0, cryptocop_alg_csum = 0,
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment