Skip to content

Commit

Permalink
[CRIS] Move header files from include to arch/cris/include.
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Jesper Nilsson committed Oct 29, 2008
1 parent 242bfaf commit 556dcee
Show file tree
Hide file tree
Showing 365 changed files with 122 additions and 1,744 deletions.
26 changes: 9 additions & 17 deletions arch/cris/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,16 @@ mach-$(CONFIG_ETRAXFS) := fs

ifneq ($(arch-y),)
SARCH := arch-$(arch-y)
inc := -Iarch/cris/include/arch-$(arch-y) -Iarch/cris/include/arch-$(arch-y)/arch
else
SARCH :=
inc :=
endif

ifneq ($(mach-y),)
MACH := mach-$(mach-y)
inc += -Iarch/cris/include/$(SARCH)/$(MACH)/
inc += -Iarch/cris/include/$(SARCH)/$(MACH)/mach
else
MACH :=
endif
Expand All @@ -39,9 +43,9 @@ OBJCOPYFLAGS := -O binary -R .note -R .comment -S

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_CFLAGS += -mlinux -march=$(arch-y) -pipe -Iinclude/asm/arch/mach -Iinclude/asm/arch
KBUILD_AFLAGS += -mlinux -march=$(arch-y) $(inc)
KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe $(inc)
KBUILD_CPPFLAGS += $(inc)

ifdef CONFIG_FRAME_POINTER
KBUILD_CFLAGS := $(subst -fomit-frame-pointer,,$(KBUILD_CFLAGS)) -g
Expand Down Expand Up @@ -73,7 +77,7 @@ all: zImage
zImage Image: vmlinux
$(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
$(SRC_ARCH)/.links:
Expand All @@ -95,17 +99,6 @@ endif
@ln -sfn ../$(SARCH)/kernel/asm-offsets.c $(SRC_ARCH)/kernel/asm-offsets.c
@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:
$(Q)if [ -e arch/$(ARCH)/boot ]; then \
$(MAKE) $(clean)=arch/$(ARCH)/boot; \
Expand All @@ -116,8 +109,7 @@ CLEAN_FILES += \
$(MACHINE)/boot/compressed/decompress.bin \
$(MACHINE)/boot/compressed/piggy.gz \
$(MACHINE)/boot/rescue/rescue.bin \
$(SRC_ARCH)/.links \
$(srctree)/include/asm-$(ARCH)/.arch
$(SRC_ARCH)/.links

MRPROPER_FILES += \
$(SRC_ARCH)/drivers \
Expand Down
2 changes: 2 additions & 0 deletions arch/cris/arch-v10/boot/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Image
zImage
2 changes: 1 addition & 1 deletion arch/cris/arch-v10/boot/compressed/head.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/

#define ASSEMBLER_MACROS_ONLY
#include <asm/arch/sv_addr_ag.h>
#include <arch/sv_addr_ag.h>

#define RAM_INIT_MAGIC 0x56902387
#define COMMAND_LINE_MAGIC 0x87109563
Expand Down
2 changes: 1 addition & 1 deletion arch/cris/arch-v10/boot/compressed/misc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@


#include <linux/types.h>
#include <asm/arch/svinto.h>
#include <arch/svinto.h>

/*
* gzip declarations
Expand Down
2 changes: 1 addition & 1 deletion arch/cris/arch-v10/boot/rescue/head.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
#ifdef CONFIG_ETRAX_AXISFLASHMAP

#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
;; sector. Sector size is 65536 bytes in all flashes we use.
Expand Down
2 changes: 1 addition & 1 deletion arch/cris/arch-v10/boot/rescue/kimagerescue.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

#define ASSEMBLER_MACROS_ONLY
#include <asm/arch/sv_addr_ag.h>
#include <arch/sv_addr_ag.h>

#define CODE_START 0x40004000
#define CODE_LENGTH 784
Expand Down
2 changes: 1 addition & 1 deletion arch/cris/arch-v10/boot/rescue/testrescue.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

#define ASSEMBLER_MACROS_ONLY
#include <asm/arch/sv_addr_ag.h>
#include <arch/sv_addr_ag.h>

.text

Expand Down
2 changes: 1 addition & 1 deletion arch/cris/arch-v10/drivers/axisflashmap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#include <asm/axisflashmap.h>
#include <asm/mmu.h>
#include <asm/arch/sv_addr_ag.h>
#include <arch/sv_addr_ag.h>

#ifdef CONFIG_CRIS_LOW_MAP
#define FLASH_UNCACHED_ADDR KSEG_8
Expand Down
4 changes: 2 additions & 2 deletions arch/cris/arch-v10/drivers/ds1302.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@

#include <asm/uaccess.h>
#include <asm/system.h>
#include <asm/arch/svinto.h>
#include <arch/svinto.h>
#include <asm/io.h>
#include <asm/rtc.h>
#include <asm/arch/io_interface_mux.h>
#include <arch/io_interface_mux.h>

#include "i2c.h"

Expand Down
4 changes: 2 additions & 2 deletions arch/cris/arch-v10/drivers/gpio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
#include <linux/interrupt.h>

#include <asm/etraxgpio.h>
#include <asm/arch/svinto.h>
#include <arch/svinto.h>
#include <asm/io.h>
#include <asm/system.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 */

Expand Down
4 changes: 2 additions & 2 deletions arch/cris/arch-v10/drivers/i2c.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
#include <asm/etraxi2c.h>

#include <asm/system.h>
#include <asm/arch/svinto.h>
#include <arch/svinto.h>
#include <asm/io.h>
#include <asm/delay.h>
#include <asm/arch/io_interface_mux.h>
#include <arch/io_interface_mux.h>

#include "i2c.h"

Expand Down
4 changes: 2 additions & 2 deletions arch/cris/arch-v10/drivers/sync_serial.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
#include <asm/irq.h>
#include <asm/dma.h>
#include <asm/io.h>
#include <asm/arch/svinto.h>
#include <arch/svinto.h>
#include <asm/uaccess.h>
#include <asm/system.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.*/
/* */
Expand Down
2 changes: 1 addition & 1 deletion arch/cris/arch-v10/kernel/crisksyms.c
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <linux/module.h>
#include <asm/io.h>
#include <asm/arch/svinto.h>
#include <arch/svinto.h>

/* Export shadow registers for the CPU I/O pins */
EXPORT_SYMBOL(genconfig_shadow);
Expand Down
2 changes: 1 addition & 1 deletion arch/cris/arch-v10/kernel/debugport.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <linux/delay.h>
#include <linux/tty.h>
#include <asm/system.h>
#include <asm/arch/svinto.h>
#include <arch/svinto.h>
#include <asm/io.h> /* Get SIMCOUT. */

extern void reset_watchdog(void);
Expand Down
2 changes: 1 addition & 1 deletion arch/cris/arch-v10/kernel/dma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <linux/errno.h>

#include <asm/dma.h>
#include <asm/arch/svinto.h>
#include <arch/svinto.h>

/* Macro to access ETRAX 100 registers */
#define SETS(var, reg, field, val) var = (var & ~IO_MASK_(reg##_, field##_)) | \
Expand Down
2 changes: 1 addition & 1 deletion arch/cris/arch-v10/kernel/entry.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <linux/linkage.h>
#include <linux/sys.h>
#include <asm/unistd.h>
#include <asm/arch/sv_addr_ag.h>
#include <arch/sv_addr_ag.h>
#include <asm/errno.h>
#include <asm/thread_info.h>
#include <asm/asm-offsets.h>
Expand Down
2 changes: 1 addition & 1 deletion arch/cris/arch-v10/kernel/fasttimer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <asm/rtc.h>


#include <asm/arch/svinto.h>
#include <arch/svinto.h>
#include <asm/fasttimer.h>
#include <linux/proc_fs.h>

Expand Down
2 changes: 1 addition & 1 deletion arch/cris/arch-v10/kernel/head.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#define ASSEMBLER_MACROS_ONLY
/* The IO_* macros use the ## token concatenation operator, so
-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 RAM_INIT_MAGIC 0x56902387
Expand Down
4 changes: 2 additions & 2 deletions arch/cris/arch-v10/kernel/io_interface_mux.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
#include <linux/module.h>
#include <linux/init.h>

#include <asm/arch/svinto.h>
#include <arch/svinto.h>
#include <asm/io.h>
#include <asm/arch/io_interface_mux.h>
#include <arch/io_interface_mux.h>


#define DBG(s)
Expand Down
2 changes: 1 addition & 1 deletion arch/cris/arch-v10/kernel/kgdb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
#include <asm/setup.h>
#include <asm/ptrace.h>

#include <asm/arch/svinto.h>
#include <arch/svinto.h>
#include <asm/irq.h>

static int kgdb_started = 0;
Expand Down
2 changes: 1 addition & 1 deletion arch/cris/arch-v10/kernel/process.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <linux/err.h>
#include <linux/fs.h>
#include <linux/slab.h>
#include <asm/arch/svinto.h>
#include <arch/svinto.h>
#include <linux/init.h>

#ifdef CONFIG_ETRAX_GPIO
Expand Down
2 changes: 1 addition & 1 deletion arch/cris/arch-v10/kernel/time.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <linux/sched.h>
#include <linux/init.h>
#include <linux/mm.h>
#include <asm/arch/svinto.h>
#include <arch/svinto.h>
#include <asm/types.h>
#include <asm/signal.h>
#include <asm/io.h>
Expand Down
2 changes: 1 addition & 1 deletion arch/cris/arch-v10/kernel/traps.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include <linux/ptrace.h>
#include <asm/uaccess.h>
#include <asm/arch/sv_addr_ag.h>
#include <arch/sv_addr_ag.h>

void
show_registers(struct pt_regs *regs)
Expand Down
2 changes: 1 addition & 1 deletion arch/cris/arch-v10/mm/fault.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <linux/mm.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
#include <asm/arch/svinto.h>
#include <arch/svinto.h>
#include <asm/mmu_context.h>

/* debug of low-level TLB reload */
Expand Down
2 changes: 1 addition & 1 deletion arch/cris/arch-v10/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <asm/mmu.h>
#include <asm/io.h>
#include <asm/mmu_context.h>
#include <asm/arch/svinto.h>
#include <arch/svinto.h>

extern void tlb_init(void);

Expand Down
2 changes: 1 addition & 1 deletion arch/cris/arch-v10/mm/tlb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include <asm/tlb.h>
#include <asm/mmu_context.h>
#include <asm/arch/svinto.h>
#include <arch/svinto.h>

#define D(x)

Expand Down
4 changes: 2 additions & 2 deletions arch/cris/arch-v32/boot/compressed/head.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#define ASSEMBLER_MACROS_ONLY
#include <hwregs/asm/reg_map_asm.h>
#include <asm/arch/mach/startup.inc>
#include <mach/startup.inc>

#define RAM_INIT_MAGIC 0x56902387
#define COMMAND_LINE_MAGIC 0x87109563
Expand All @@ -17,7 +17,7 @@
.globl input_data

.text
start:
_start:
di

;; Start clocks for used blocks.
Expand Down
2 changes: 1 addition & 1 deletion arch/cris/arch-v32/drivers/mach-a3/gpio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include <asm/io.h>
#include <asm/system.h>
#include <asm/irq.h>
#include <asm/arch/mach/pinmux.h>
#include <mach/pinmux.h>

#ifdef CONFIG_ETRAX_VIRTUAL_GPIO
#include "../i2c.h"
Expand Down
2 changes: 1 addition & 1 deletion arch/cris/arch-v32/drivers/mach-a3/nandflash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h>
#include <linux/mtd/partitions.h>
#include <asm/arch/memmap.h>
#include <arch/memmap.h>
#include <hwregs/reg_map.h>
#include <hwregs/reg_rdwr.h>
#include <hwregs/pio_defs.h>
Expand Down
2 changes: 1 addition & 1 deletion arch/cris/arch-v32/drivers/mach-fs/nandflash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h>
#include <linux/mtd/partitions.h>
#include <asm/arch/memmap.h>
#include <arch/memmap.h>
#include <hwregs/reg_map.h>
#include <hwregs/reg_rdwr.h>
#include <hwregs/gio_defs.h>
Expand Down
2 changes: 1 addition & 1 deletion arch/cris/arch-v32/drivers/pci/bios.c
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <linux/pci.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)
{
Expand Down
4 changes: 2 additions & 2 deletions arch/cris/arch-v32/kernel/cache.c
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <linux/module.h>
#include <asm/io.h>
#include <asm/arch/cache.h>
#include <asm/arch/hwregs/dma.h>
#include <arch/cache.h>
#include <arch/hwregs/dma.h>

/* This file is used to workaround a cache bug, Guinness TR 106. */

Expand Down
8 changes: 4 additions & 4 deletions arch/cris/arch-v32/kernel/crisksyms.c
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include <linux/module.h>
#include <linux/irq.h>
#include <asm/arch/dma.h>
#include <asm/arch/intmem.h>
#include <asm/arch/mach/pinmux.h>
#include <asm/arch/io.h>
#include <arch/dma.h>
#include <arch/intmem.h>
#include <mach/pinmux.h>
#include <arch/io.h>

/* Functions for allocating DMA channels */
EXPORT_SYMBOL(crisv32_request_dma);
Expand Down
2 changes: 1 addition & 1 deletion arch/cris/arch-v32/kernel/debugport.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <hwregs/reg_map.h>
#include <hwregs/ser_defs.h>
#include <hwregs/dma_defs.h>
#include <asm/arch/mach/pinmux.h>
#include <mach/pinmux.h>

struct dbg_port
{
Expand Down
Loading

0 comments on commit 556dcee

Please sign in to comment.