dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Separate out the proc- and unit-specific header directories from the general 

MN10300 arch headers and place them instead in the same directories as contain
the .c files for the processor and unit implementations.

This permits the symlinks include/asm/proc and include/asm/unit to be
dispensed with.  This does, however, require that #include <asm/proc/xxx.h> be
converted to #include <proc/xxx.h> and similarly for asm/unit -> unit.

Signed-off-by: David Howells <dhowells@redhat.com>
This commit is contained in:
David Howells 2009-04-10 14:33:48 +01:00
parent da7616610c
commit 2f2a2132ff
35 changed files with 31 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
arch/mn10300/Makefile
View File

@ -94,42 +94,8 @@ ifdef CONFIG_DEBUG_INFO
KBUILD_AFLAGS += -Wa,--gdwarf2
endif
###################################################################################################
#
# juggle some symlinks in the MN10300 asm include dir
# include the appropriate processor- and unit-specific headers
#
# Update machine proc and unit symlinks if something which affects
# them changed. We use .proc / .unit to indicate when they were
# updated last, otherwise make uses the target directory mtime.
#
###################################################################################################
# processor specific definitions
arch/mn10300/include/asm/.proc: $(wildcard include/config/proc/*.h) include/config/auto.conf
@echo ' SYMLINK arch/mn10300/include/asm/proc -> arch/mn10300/include/asm/proc-$(PROCESSOR)'
ifneq ($(KBUILD_SRC),)
$(Q)mkdir -p arch/mn10300/include/asm
$(Q)ln -fsn $(srctree)/arch/mn10300/include/asm/proc-$(PROCESSOR) arch/mn10300/include/asm/proc
else
$(Q)ln -fsn proc-$(PROCESSOR) arch/mn10300/include/asm/proc
endif
@touch $@
CLEAN_FILES += arch/mn10300/include/asm/proc arch/mn10300/include/asm/.proc
prepare: arch/mn10300/include/asm/.proc
# unit specific definitions
arch/mn10300/include/asm/.unit: $(wildcard include/config/unit/*.h) include/config/auto.conf
@echo ' SYMLINK arch/mn10300/include/asm/unit -> arch/mn10300/include/asm/unit-$(UNIT)'
ifneq ($(KBUILD_SRC),)
$(Q)mkdir -p arch/mn10300/include/asm
$(Q)ln -fsn $(srctree)/arch/mn10300/include/asm/unit-$(UNIT) arch/mn10300/include/asm/unit
else
$(Q)ln -fsn unit-$(UNIT) arch/mn10300/include/asm/unit
endif
@touch $@
CLEAN_FILES += arch/mn10300/include/asm/unit arch/mn10300/include/asm/.unit
prepare: arch/mn10300/include/asm/.unit
KBUILD_CPPFLAGS += -I$(srctree)/arch/mn10300/proc-$(PROCESSOR)/include
KBUILD_CPPFLAGS += -I$(srctree)/arch/mn10300/unit-$(UNIT)/include

2
arch/mn10300/include/asm/cache.h
View File

@ -13,7 +13,7 @@
#define _ASM_CACHE_H
#include <asm/cpu-regs.h>
#include <asm/proc/cache.h>
#include <proc/cache.h>
#ifndef __ASSEMBLY__
#define L1_CACHE_DISPARITY (L1_CACHE_NENTRIES * L1_CACHE_BYTES)

2
arch/mn10300/include/asm/irq.h
View File

@ -16,7 +16,7 @@
#include <asm/intctl-regs.h>
#include <asm/reset-regs.h>
#include <asm/proc/irq.h>
#include <proc/irq.h>
/* this number is used when no interrupt has been assigned */
#define NO_IRQ INT_MAX

2
arch/mn10300/include/asm/serial.h
View File

@ -33,4 +33,4 @@
#define RS_TABLE_SIZE
#endif
#include <asm/unit/serial.h>
#include <unit/serial.h>

2
arch/mn10300/include/asm/timex.h
View File

@ -12,7 +12,7 @@
#define _ASM_TIMEX_H
#include <asm/hardirq.h>
#include <asm/unit/timex.h>
#include <unit/timex.h>
#define TICK_SIZE (tick_nsec / 1000)

2
arch/mn10300/kernel/entry.S
View File

@ -20,7 +20,7 @@
#include <asm/intctl-regs.h>
#include <asm/busctl-regs.h>
#include <asm/timer-regs.h>
#include <asm/unit/leds.h>
#include <unit/leds.h>
#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/errno.h>

2
arch/mn10300/kernel/gdb-io-serial-low.S
View File

@ -18,7 +18,7 @@
#include <asm/thread_info.h>
#include <asm/frame.inc>
#include <asm/intctl-regs.h>
#include <asm/unit/serial.h>
#include <unit/serial.h>
.text

2
arch/mn10300/kernel/gdb-io-serial.c
View File

@ -22,7 +22,7 @@
#include <asm/gdb-stub.h>
#include <asm/exceptions.h>
#include <asm/serial-regs.h>
#include <asm/unit/serial.h>
#include <unit/serial.h>
/*
* initialise the GDB stub

2
arch/mn10300/kernel/gdb-io-ttysm-low.S
View File

@ -18,7 +18,7 @@
#include <asm/cpu-regs.h>
#include <asm/frame.inc>
#include <asm/intctl-regs.h>
#include <asm/unit/serial.h>
#include <unit/serial.h>
#include "mn10300-serial.h"
.text

2
arch/mn10300/kernel/gdb-io-ttysm.c
View File

@ -20,7 +20,7 @@
#include <asm/system.h>
#include <asm/gdb-stub.h>
#include <asm/exceptions.h>
#include <asm/unit/clock.h>
#include <unit/clock.h>
#include "mn10300-serial.h"
#if defined(CONFIG_GDBSTUB_ON_TTYSM0)

4
arch/mn10300/kernel/gdb-stub.c
View File

@ -136,8 +136,8 @@
#include <asm/cacheflush.h>
#include <asm/serial-regs.h>
#include <asm/busctl-regs.h>
#include <asm/unit/leds.h>
#include <asm/unit/serial.h>
#include <unit/leds.h>
#include <unit/serial.h>
/* define to use F7F7 rather than FF which is subverted by JTAG debugger */
#undef GDBSTUB_USE_F7F7_AS_BREAKPOINT

2
arch/mn10300/kernel/head.S
View File

@ -17,7 +17,7 @@
#include <asm/pgtable.h>
#include <asm/frame.inc>
#include <asm/param.h>
#include <asm/unit/serial.h>
#include <unit/serial.h>
.section .text.head,"ax"

4
arch/mn10300/kernel/mn10300-serial-low.S
View File

@ -18,8 +18,8 @@
#include <asm/cpu-regs.h>
#include <asm/frame.inc>
#include <asm/timer-regs.h>
#include <asm/proc/cache.h>
#include <asm/unit/timex.h>
#include <proc/cache.h>
#include <unit/timex.h>
#include "mn10300-serial.h"
#define SCxCTR 0x00

2
arch/mn10300/kernel/mn10300-serial.c
View File

@ -41,7 +41,7 @@ static const char serial_revdate[] = "2007-11-06";
#include <asm/irq.h>
#include <asm/bitops.h>
#include <asm/serial-regs.h>
#include <asm/unit/timex.h>
#include <unit/timex.h>
#include "mn10300-serial.h"
static inline __attribute__((format(printf, 1, 2)))

2
arch/mn10300/kernel/mn10300-watchdog.c
View File

@ -25,7 +25,7 @@
#include <asm/div64.h>
#include <asm/smp.h>
#include <asm/gdb-stub.h>
#include <asm/proc/clock.h>
#include <proc/clock.h>
static DEFINE_SPINLOCK(watchdog_print_lock);
static unsigned int watchdog;

2
arch/mn10300/kernel/setup.c
View File

@ -30,7 +30,7 @@
#include <asm/setup.h>
#include <asm/io.h>
#include <asm/smp.h>
#include <asm/proc/proc.h>
#include <proc/proc.h>
#include <asm/busctl-regs.h>
#include <asm/fpu.h>
#include <asm/sections.h>

2
arch/mn10300/kernel/traps.c
View File

@ -37,7 +37,7 @@
#include <asm/cacheflush.h>
#include <asm/cpu-regs.h>
#include <asm/busctl-regs.h>
#include <asm/unit/leds.h>
#include <unit/leds.h>
#include <asm/fpu.h>
#include <asm/gdb-stub.h>
#include <asm/sections.h>

0
arch/mn10300/include/asm/proc-mn103e010/cache.h → arch/mn10300/proc-mn103e010/include/proc/cache.h
View File

2
arch/mn10300/include/asm/proc-mn103e010/clock.h → arch/mn10300/proc-mn103e010/include/proc/clock.h
View File

@ -11,7 +11,7 @@
#ifndef _ASM_PROC_CLOCK_H
#define _ASM_PROC_CLOCK_H
#include <asm/unit/clock.h>
#include <unit/clock.h>
#define MN10300_WDCLK MN10300_IOCLK

0
arch/mn10300/include/asm/proc-mn103e010/irq.h → arch/mn10300/proc-mn103e010/include/proc/irq.h
View File

0
arch/mn10300/include/asm/proc-mn103e010/proc.h → arch/mn10300/proc-mn103e010/include/proc/proc.h
View File

0
arch/mn10300/include/asm/unit-asb2303/clock.h → arch/mn10300/unit-asb2303/include/unit/clock.h
View File

0
arch/mn10300/include/asm/unit-asb2303/leds.h → arch/mn10300/unit-asb2303/include/unit/leds.h
View File

2
arch/mn10300/include/asm/unit-asb2303/serial.h → arch/mn10300/unit-asb2303/include/unit/serial.h
View File

@ -13,7 +13,7 @@
#define _ASM_UNIT_SERIAL_H
#include <asm/cpu-regs.h>
#include <asm/proc/irq.h>
#include <proc/irq.h>
#include <linux/serial_reg.h>
#define SERIAL_PORT0_BASE_ADDRESS 0xA6FB0000

0
arch/mn10300/include/asm/unit-asb2303/smc91111.h → arch/mn10300/unit-asb2303/include/unit/smc91111.h
View File

2
arch/mn10300/include/asm/unit-asb2303/timex.h → arch/mn10300/unit-asb2303/include/unit/timex.h
View File

@ -16,7 +16,7 @@
#endif /* __ASSEMBLY__ */
#include <asm/timer-regs.h>
#include <asm/unit/clock.h>
#include <unit/clock.h>
/*
* jiffies counter specifications

2
arch/mn10300/unit-asb2303/leds.c
View File

@ -16,7 +16,7 @@
#include <asm/processor.h>
#include <asm/intctl-regs.h>
#include <asm/rtc-regs.h>
#include <asm/unit/leds.h>
#include <unit/leds.h>
#if 0
static const u8 asb2303_led_hex_tbl[16] = {

2
arch/mn10300/unit-asb2303/smc91111.c
View File

@ -18,7 +18,7 @@
#include <asm/timex.h>
#include <asm/processor.h>
#include <asm/intctl-regs.h>
#include <asm/unit/smc91111.h>
#include <unit/smc91111.h>
static struct resource smc91c111_resources[] = {
[0] = {

0
arch/mn10300/include/asm/unit-asb2305/clock.h → arch/mn10300/unit-asb2305/include/unit/clock.h
View File

0
arch/mn10300/include/asm/unit-asb2305/leds.h → arch/mn10300/unit-asb2305/include/unit/leds.h
View File

2
arch/mn10300/include/asm/unit-asb2305/serial.h → arch/mn10300/unit-asb2305/include/unit/serial.h
View File

@ -12,7 +12,7 @@
#define _ASM_UNIT_SERIAL_H
#include <asm/cpu/cpu-regs.h>
#include <asm/proc/irq.h>
#include <proc/irq.h>
#include <linux/serial_reg.h>
#define SERIAL_PORT0_BASE_ADDRESS 0xA6FB0000

2
arch/mn10300/include/asm/unit-asb2305/timex.h → arch/mn10300/unit-asb2305/include/unit/timex.h
View File

@ -16,7 +16,7 @@
#endif /* __ASSEMBLY__ */
#include <asm/cpu/timer-regs.h>
#include <asm/unit/clock.h>
#include <unit/clock.h>
/*
* jiffies counter specifications

2
arch/mn10300/unit-asb2305/leds.c
View File

@ -15,7 +15,7 @@
#include <asm/processor.h>
#include <asm/cpu/intctl-regs.h>
#include <asm/cpu/rtc-regs.h>
#include <asm/unit/leds.h>
#include <unit/leds.h>
static const u8 asb2305_led_hex_tbl[16] = {
0x80, 0xf2, 0x48, 0x60, 0x32, 0x24, 0x04, 0xf0,

2
arch/mn10300/unit-asb2305/unit-init.c
View File

@ -18,7 +18,7 @@
#include <asm/cpu/intctl-regs.h>
#include <asm/cpu/rtc-regs.h>
#include <asm/cpu/serial-regs.h>
#include <asm/unit/serial.h>
#include <unit/serial.h>
/*
* initialise some of the unit hardware before gdbstub is set up

2
drivers/net/smc91x.h
View File

@ -369,7 +369,7 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r,
* MN10300/AM33 configuration
*/
#include <asm/unit/smc91111.h>
#include <unit/smc91111.h>
#else