Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-09 15:29:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[CRIS] Move header files from include to arch/cris/include.

Browse Source 
Change all users of header files to correct path.
Remove some unneeded headers for arch-v32.

Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
This commit is contained in:
Jesper Nilsson 2008-10-21 17:45:58 +02:00
parent 242bfafc8e
commit 556dcee7b8
365 changed files with 122 additions and 1744 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
arch/cris/Makefile
View File

@ -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
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
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
@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 += \
$(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 \

2
arch/cris/arch-v10/boot/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
Image
zImage

2
arch/cris/arch-v10/boot/compressed/head.S
View File

@ -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

2
arch/cris/arch-v10/boot/compressed/misc.c
View File

@ -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

2
arch/cris/arch-v10/boot/rescue/head.S
View File

@ -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.

2
arch/cris/arch-v10/boot/rescue/kimagerescue.S
View File

@ -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

2
arch/cris/arch-v10/boot/rescue/testrescue.S
View File

@ -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

2
arch/cris/arch-v10/drivers/axisflashmap.c
View File

@ -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

4
arch/cris/arch-v10/drivers/ds1302.c
View File

@ -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"

4
arch/cris/arch-v10/drivers/gpio.c
View File

@ -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 */

4
arch/cris/arch-v10/drivers/i2c.c
View File

@ -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"

4
arch/cris/arch-v10/drivers/sync_serial.c
View File

@ -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.*/
/* */ /* */

2
arch/cris/arch-v10/kernel/crisksyms.c
View File

@ -1,6 +1,6 @@
#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);

2
arch/cris/arch-v10/kernel/debugport.c
View File

@ -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);

2
arch/cris/arch-v10/kernel/dma.c
View File

@ -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##_)) | \

2
arch/cris/arch-v10/kernel/entry.S
View File

@ -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>

2
arch/cris/arch-v10/kernel/fasttimer.c
View File

@ -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>

2
arch/cris/arch-v10/kernel/head.S
View File

@ -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

4
arch/cris/arch-v10/kernel/io_interface_mux.c
View File

@ -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)

2
arch/cris/arch-v10/kernel/kgdb.c
View File

@ -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;

2
arch/cris/arch-v10/kernel/process.c
View File

@ -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

2
arch/cris/arch-v10/kernel/time.c
View File

@ -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>

2
arch/cris/arch-v10/kernel/traps.c
View File

@ -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)

2
arch/cris/arch-v10/mm/fault.c
View File

@ -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 */

2
arch/cris/arch-v10/mm/init.c
View File

@ -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);

2
arch/cris/arch-v10/mm/tlb.c
View File

@ -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)

4
arch/cris/arch-v32/boot/compressed/head.S
View File

@ -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 @@
.globl input_data .globl input_data
.text .text
start: _start:
di di
;; Start clocks for used blocks. ;; Start clocks for used blocks.

2
arch/cris/arch-v32/drivers/mach-a3/gpio.c
View File

@ -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"

2
arch/cris/arch-v32/drivers/mach-a3/nandflash.c
View File

@ -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>

2
arch/cris/arch-v32/drivers/mach-fs/nandflash.c
View File

@ -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>

2
arch/cris/arch-v32/drivers/pci/bios.c
View File

@ -1,6 +1,6 @@
#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)
{ {

4
arch/cris/arch-v32/kernel/cache.c
View File

@ -1,7 +1,7 @@
#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. */

8
arch/cris/arch-v32/kernel/crisksyms.c
View File

@ -1,9 +1,9 @@
#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);

2
arch/cris/arch-v32/kernel/debugport.c
View File

@ -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
{ {

4
arch/cris/arch-v32/kernel/entry.S
View File

@ -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

4
arch/cris/arch-v32/kernel/head.S
View File

@ -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

8
arch/cris/arch-v32/kernel/kgdb.c
View File

@ -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);

2
arch/cris/arch-v32/kernel/kgdb_asm.S
View File

@ -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

8
arch/cris/arch-v32/kernel/pinmux.c
View File

@ -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

2
arch/cris/arch-v32/kernel/ptrace.c
View File

@ -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.

4
arch/cris/arch-v32/kernel/signal.c
View File

@ -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;

10
arch/cris/arch-v32/lib/nand_init.S
View File

@ -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
arch/cris/arch-v32/mach-a3/dma.c
View File

@ -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>

2
arch/cris/arch-v32/mach-a3/io.c
View File

@ -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[] = {

6
arch/cris/arch-v32/mach-fs/cpufreq.c
View File

@ -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,

2
arch/cris/arch-v32/mach-fs/dma.c
View File

@ -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];

4
arch/cris/arch-v32/mach-fs/io.c
View File

@ -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)

4
arch/cris/arch-v32/mach-fs/vcs_hook.c
View File

@ -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 */

4
arch/cris/arch-v32/mm/init.c
View File

@ -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);

4
arch/cris/arch-v32/mm/tlb.c
View File

@ -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 { \

0
include/asm-cris/arch-v10/Kbuild → arch/cris/include/arch-v10/arch/Kbuild
View File

0
include/asm-cris/arch-v10/atomic.h → arch/cris/include/arch-v10/arch/atomic.h
View File

0
include/asm-cris/arch-v10/bitops.h → arch/cris/include/arch-v10/arch/bitops.h
View File

0
include/asm-cris/arch-v10/bug.h → arch/cris/include/arch-v10/arch/bug.h
View File

0
include/asm-cris/arch-v10/byteorder.h → arch/cris/include/arch-v10/arch/byteorder.h
View File

0
include/asm-cris/arch-v10/cache.h → arch/cris/include/arch-v10/arch/cache.h
View File

0
include/asm-cris/arch-v10/checksum.h → arch/cris/include/arch-v10/arch/checksum.h
View File

0
include/asm-cris/arch-v10/delay.h → arch/cris/include/arch-v10/arch/delay.h
View File

0
include/asm-cris/arch-v10/dma.h → arch/cris/include/arch-v10/arch/dma.h
View File

0
include/asm-cris/arch-v10/elf.h → arch/cris/include/arch-v10/arch/elf.h
View File

2
include/asm-cris/arch-v10/io.h → arch/cris/include/arch-v10/arch/io.h
View File

@ -1,7 +1,7 @@
#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 */

0
include/asm-cris/arch-v10/io_interface_mux.h → arch/cris/include/arch-v10/arch/io_interface_mux.h
View File

2
include/asm-cris/arch-v10/irq.h → arch/cris/include/arch-v10/arch/irq.h
View File

@ -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

0
include/asm-cris/arch-v10/memmap.h → arch/cris/include/arch-v10/arch/memmap.h
View File

0
include/asm-cris/arch-v10/mmu.h → arch/cris/include/arch-v10/arch/mmu.h
View File

0
include/asm-cris/arch-v10/offset.h → arch/cris/include/arch-v10/arch/offset.h
View File

0
include/asm-cris/arch-v10/page.h → arch/cris/include/arch-v10/arch/page.h
View File

0
include/asm-cris/arch-v10/pgtable.h → arch/cris/include/arch-v10/arch/pgtable.h
View File

0
include/asm-cris/arch-v10/processor.h → arch/cris/include/arch-v10/arch/processor.h
View File

0
include/asm-cris/arch-v10/ptrace.h → arch/cris/include/arch-v10/arch/ptrace.h
View File

0
include/asm-cris/arch-v10/sv_addr.agh → arch/cris/include/arch-v10/arch/sv_addr.agh
View File

0
include/asm-cris/arch-v10/sv_addr_ag.h → arch/cris/include/arch-v10/arch/sv_addr_ag.h
View File

0
include/asm-cris/arch-v10/svinto.h → arch/cris/include/arch-v10/arch/svinto.h
View File

0
include/asm-cris/arch-v10/system.h → arch/cris/include/arch-v10/arch/system.h
View File

0
include/asm-cris/arch-v10/thread_info.h → arch/cris/include/arch-v10/arch/thread_info.h
View File

0
include/asm-cris/arch-v10/timex.h → arch/cris/include/arch-v10/arch/timex.h
View File

0
include/asm-cris/arch-v10/tlb.h → arch/cris/include/arch-v10/arch/tlb.h
View File

0
include/asm-cris/arch-v10/uaccess.h → arch/cris/include/arch-v10/arch/uaccess.h
View File

0
include/asm-cris/arch-v10/unistd.h → arch/cris/include/arch-v10/arch/unistd.h
View File

0
include/asm-cris/arch-v10/user.h → arch/cris/include/arch-v10/arch/user.h
View File

0
include/asm-cris/arch-v32/Kbuild → arch/cris/include/arch-v32/arch/Kbuild
View File

0
include/asm-cris/arch-v32/atomic.h → arch/cris/include/arch-v32/arch/atomic.h
View File

0
include/asm-cris/arch-v32/bitops.h → arch/cris/include/arch-v32/arch/bitops.h
View File

0
include/asm-cris/arch-v32/bug.h → arch/cris/include/arch-v32/arch/bug.h
View File

0
include/asm-cris/arch-v32/byteorder.h → arch/cris/include/arch-v32/arch/byteorder.h
View File

2
include/asm-cris/arch-v32/cache.h → arch/cris/include/arch-v32/arch/cache.h
View File

@ -1,7 +1,7 @@
#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

0
include/asm-cris/arch-v32/checksum.h → arch/cris/include/arch-v32/arch/checksum.h
View File

2
include/asm-cris/arch-v32/cryptocop.h → arch/cris/include/arch-v32/arch/cryptocop.h
View File

@ -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,

0
include/asm-cris/arch-v32/delay.h → arch/cris/include/arch-v32/arch/delay.h
View File

0
include/asm-cris/arch-v32/dma.h → arch/cris/include/arch-v32/arch/dma.h
View File

0
include/asm-cris/arch-v32/elf.h → arch/cris/include/arch-v32/arch/elf.h
View File

0
include/asm-cris/arch-v32/hwregs/Makefile → arch/cris/include/arch-v32/arch/hwregs/Makefile
View File

0
include/asm-cris/arch-v32/hwregs/asm/ata_defs_asm.h → arch/cris/include/arch-v32/arch/hwregs/asm/ata_defs_asm.h
View File

0
include/asm-cris/arch-v32/hwregs/asm/bif_core_defs_asm.h → arch/cris/include/arch-v32/arch/hwregs/asm/bif_core_defs_asm.h
View File

0
include/asm-cris/arch-v32/hwregs/asm/bif_dma_defs_asm.h → arch/cris/include/arch-v32/arch/hwregs/asm/bif_dma_defs_asm.h
View File

0
include/asm-cris/arch-v32/hwregs/asm/bif_slave_defs_asm.h → arch/cris/include/arch-v32/arch/hwregs/asm/bif_slave_defs_asm.h
View File

0
include/asm-cris/arch-v32/hwregs/asm/config_defs_asm.h → arch/cris/include/arch-v32/arch/hwregs/asm/config_defs_asm.h
View File

0
include/asm-cris/arch-v32/hwregs/asm/cpu_vect.h → arch/cris/include/arch-v32/arch/hwregs/asm/cpu_vect.h
View File

0
include/asm-cris/arch-v32/hwregs/asm/cris_defs_asm.h → arch/cris/include/arch-v32/arch/hwregs/asm/cris_defs_asm.h
View File

0
include/asm-cris/arch-v32/hwregs/asm/cris_supp_reg.h → arch/cris/include/arch-v32/arch/hwregs/asm/cris_supp_reg.h
View File

Some files were not shown because too many files have changed in this diff Show More