Skip to content

L
linux
Commit d8482238 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300 

* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300:
  Separate out the proc- and unit-specific header directories from the general
  Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.
parents 5de4c51d 2f2a2132
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 65 deletions
arch/mn10300/Makefile
View file @ d8482238
...@@ -94,42 +94,8 @@ ifdef CONFIG_DEBUG_INFO ...@@ -94,42 +94,8 @@ ifdef CONFIG_DEBUG_INFO
KBUILD_AFLAGS += -Wa,--gdwarf2 KBUILD_AFLAGS += -Wa,--gdwarf2
endif 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 KBUILD_CPPFLAGS += -I$(srctree)/arch/mn10300/proc-$(PROCESSOR)/include
# them changed. We use .proc / .unit to indicate when they were KBUILD_CPPFLAGS += -I$(srctree)/arch/mn10300/unit-$(UNIT)/include
# updated last, otherwise make uses the target directory mtime.
#
###################################################################################################
# processor specific definitions
include/asm-mn10300/.proc: $(wildcard include/config/proc/*.h) include/config/auto.conf
@echo ' SYMLINK include/asm-mn10300/proc -> include/asm-mn10300/proc-$(PROCESSOR)'
ifneq ($(KBUILD_SRC),)
$(Q)mkdir -p include/asm-mn10300
$(Q)ln -fsn $(srctree)/include/asm-mn10300/proc-$(PROCESSOR) include/asm-mn10300/proc
else
$(Q)ln -fsn proc-$(PROCESSOR) include/asm-mn10300/proc
endif
@touch $@
CLEAN_FILES += include/asm-mn10300/proc include/asm-mn10300/.proc
prepare: include/asm-mn10300/.proc
# unit specific definitions
include/asm-mn10300/.unit: $(wildcard include/config/unit/*.h) include/config/auto.conf
@echo ' SYMLINK include/asm-mn10300/unit -> include/asm-mn10300/unit-$(UNIT)'
ifneq ($(KBUILD_SRC),)
$(Q)mkdir -p include/asm-mn10300
$(Q)ln -fsn $(srctree)/include/asm-mn10300/unit-$(UNIT) include/asm-mn10300/unit
else
$(Q)ln -fsn unit-$(UNIT) include/asm-mn10300/unit
endif
@touch $@
CLEAN_FILES += include/asm-mn10300/unit include/asm-mn10300/.unit
prepare: include/asm-mn10300/.unit
include/asm-mn10300/cache.h → arch/mn10300/include/asm/cache.h
View file @ d8482238
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#define _ASM_CACHE_H #define _ASM_CACHE_H
#include <asm/cpu-regs.h> #include <asm/cpu-regs.h>
#include <asm/proc/cache.h> #include <proc/cache.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#define L1_CACHE_DISPARITY (L1_CACHE_NENTRIES * L1_CACHE_BYTES) #define L1_CACHE_DISPARITY (L1_CACHE_NENTRIES * L1_CACHE_BYTES)
......
include/asm-mn10300/irq.h → arch/mn10300/include/asm/irq.h
View file @ d8482238
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <asm/intctl-regs.h> #include <asm/intctl-regs.h>
#include <asm/reset-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 */ /* this number is used when no interrupt has been assigned */
#define NO_IRQ INT_MAX #define NO_IRQ INT_MAX
......
include/asm-mn10300/serial.h → arch/mn10300/include/asm/serial.h
View file @ d8482238
...@@ -33,4 +33,4 @@ ...@@ -33,4 +33,4 @@
#define RS_TABLE_SIZE #define RS_TABLE_SIZE
#endif #endif
#include <asm/unit/serial.h> #include <unit/serial.h>
include/asm-mn10300/timex.h → arch/mn10300/include/asm/timex.h
View file @ d8482238
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#define _ASM_TIMEX_H #define _ASM_TIMEX_H
#include <asm/hardirq.h> #include <asm/hardirq.h>
#include <asm/unit/timex.h> #include <unit/timex.h>
#define TICK_SIZE (tick_nsec / 1000) #define TICK_SIZE (tick_nsec / 1000)
......
arch/mn10300/kernel/entry.S
View file @ d8482238
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <asm/intctl-regs.h> #include <asm/intctl-regs.h>
#include <asm/busctl-regs.h> #include <asm/busctl-regs.h>
#include <asm/timer-regs.h> #include <asm/timer-regs.h>
#include <asm/unit/leds.h> #include <unit/leds.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/errno.h> #include <asm/errno.h>
......
arch/mn10300/kernel/gdb-io-serial-low.S
View file @ d8482238
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/frame.inc> #include <asm/frame.inc>
#include <asm/intctl-regs.h> #include <asm/intctl-regs.h>
#include <asm/unit/serial.h> #include <unit/serial.h>
.text .text
......
arch/mn10300/kernel/gdb-io-serial.c
View file @ d8482238
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <asm/gdb-stub.h> #include <asm/gdb-stub.h>
#include <asm/exceptions.h> #include <asm/exceptions.h>
#include <asm/serial-regs.h> #include <asm/serial-regs.h>
#include <asm/unit/serial.h> #include <unit/serial.h>
/* /*
* initialise the GDB stub * initialise the GDB stub
......
arch/mn10300/kernel/gdb-io-ttysm-low.S
View file @ d8482238
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <asm/cpu-regs.h> #include <asm/cpu-regs.h>
#include <asm/frame.inc> #include <asm/frame.inc>
#include <asm/intctl-regs.h> #include <asm/intctl-regs.h>
#include <asm/unit/serial.h> #include <unit/serial.h>
#include "mn10300-serial.h" #include "mn10300-serial.h"
.text .text
......
arch/mn10300/kernel/gdb-io-ttysm.c
View file @ d8482238
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/gdb-stub.h> #include <asm/gdb-stub.h>
#include <asm/exceptions.h> #include <asm/exceptions.h>
#include <asm/unit/clock.h> #include <unit/clock.h>
#include "mn10300-serial.h" #include "mn10300-serial.h"
#if defined(CONFIG_GDBSTUB_ON_TTYSM0) #if defined(CONFIG_GDBSTUB_ON_TTYSM0)
......
arch/mn10300/kernel/gdb-stub.c
View file @ d8482238
...@@ -136,8 +136,8 @@ ...@@ -136,8 +136,8 @@
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/serial-regs.h> #include <asm/serial-regs.h>
#include <asm/busctl-regs.h> #include <asm/busctl-regs.h>
#include <asm/unit/leds.h> #include <unit/leds.h>
#include <asm/unit/serial.h> #include <unit/serial.h>
/* define to use F7F7 rather than FF which is subverted by JTAG debugger */ /* define to use F7F7 rather than FF which is subverted by JTAG debugger */
#undef GDBSTUB_USE_F7F7_AS_BREAKPOINT #undef GDBSTUB_USE_F7F7_AS_BREAKPOINT
......
arch/mn10300/kernel/head.S
View file @ d8482238
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/frame.inc> #include <asm/frame.inc>
#include <asm/param.h> #include <asm/param.h>
#include <asm/unit/serial.h> #include <unit/serial.h>
.section .text.head,"ax" .section .text.head,"ax"
......
arch/mn10300/kernel/mn10300-serial-low.S
View file @ d8482238
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
#include <asm/cpu-regs.h> #include <asm/cpu-regs.h>
#include <asm/frame.inc> #include <asm/frame.inc>
#include <asm/timer-regs.h> #include <asm/timer-regs.h>
#include <asm/proc/cache.h> #include <proc/cache.h>
#include <asm/unit/timex.h> #include <unit/timex.h>
#include "mn10300-serial.h" #include "mn10300-serial.h"
#define SCxCTR 0x00 #define SCxCTR 0x00
......
arch/mn10300/kernel/mn10300-serial.c
View file @ d8482238
...@@ -41,7 +41,7 @@ static const char serial_revdate[] = "2007-11-06"; ...@@ -41,7 +41,7 @@ static const char serial_revdate[] = "2007-11-06";
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/bitops.h> #include <asm/bitops.h>
#include <asm/serial-regs.h> #include <asm/serial-regs.h>
#include <asm/unit/timex.h> #include <unit/timex.h>
#include "mn10300-serial.h" #include "mn10300-serial.h"
static inline __attribute__((format(printf, 1, 2))) static inline __attribute__((format(printf, 1, 2)))
......
arch/mn10300/kernel/mn10300-watchdog.c
View file @ d8482238
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <asm/div64.h> #include <asm/div64.h>
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/gdb-stub.h> #include <asm/gdb-stub.h>
#include <asm/proc/clock.h> #include <proc/clock.h>
static DEFINE_SPINLOCK(watchdog_print_lock); static DEFINE_SPINLOCK(watchdog_print_lock);
static unsigned int watchdog; static unsigned int watchdog;
......
arch/mn10300/kernel/setup.c
View file @ d8482238
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/proc/proc.h> #include <proc/proc.h>
#include <asm/busctl-regs.h> #include <asm/busctl-regs.h>
#include <asm/fpu.h> #include <asm/fpu.h>
#include <asm/sections.h> #include <asm/sections.h>
......
arch/mn10300/kernel/traps.c
View file @ d8482238
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/cpu-regs.h> #include <asm/cpu-regs.h>
#include <asm/busctl-regs.h> #include <asm/busctl-regs.h>
#include <asm/unit/leds.h> #include <unit/leds.h>
#include <asm/fpu.h> #include <asm/fpu.h>
#include <asm/gdb-stub.h> #include <asm/gdb-stub.h>
#include <asm/sections.h> #include <asm/sections.h>
......
include/asm-mn10300/proc-mn103e010/clock.h → arch/mn10300/proc-mn103e010/include/proc/clock.h
View file @ d8482238
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#ifndef _ASM_PROC_CLOCK_H #ifndef _ASM_PROC_CLOCK_H
#define _ASM_PROC_CLOCK_H #define _ASM_PROC_CLOCK_H
#include <asm/unit/clock.h> #include <unit/clock.h>
#define MN10300_WDCLK MN10300_IOCLK #define MN10300_WDCLK MN10300_IOCLK
......
include/asm-mn10300/unit-asb2303/serial.h → arch/mn10300/unit-asb2303/include/unit/serial.h
View file @ d8482238
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#define _ASM_UNIT_SERIAL_H #define _ASM_UNIT_SERIAL_H
#include <asm/cpu-regs.h> #include <asm/cpu-regs.h>
#include <asm/proc/irq.h> #include <proc/irq.h>
#include <linux/serial_reg.h> #include <linux/serial_reg.h>
#define SERIAL_PORT0_BASE_ADDRESS 0xA6FB0000 #define SERIAL_PORT0_BASE_ADDRESS 0xA6FB0000
......
include/asm-mn10300/unit-asb2303/timex.h → arch/mn10300/unit-asb2303/include/unit/timex.h
View file @ d8482238
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#include <asm/timer-regs.h> #include <asm/timer-regs.h>
#include <asm/unit/clock.h> #include <unit/clock.h>
/* /*
* jiffies counter specifications * jiffies counter specifications
......
arch/mn10300/unit-asb2303/leds.c
View file @ d8482238
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/intctl-regs.h> #include <asm/intctl-regs.h>
#include <asm/rtc-regs.h> #include <asm/rtc-regs.h>
#include <asm/unit/leds.h> #include <unit/leds.h>
#if 0 #if 0
static const u8 asb2303_led_hex_tbl[16] = { static const u8 asb2303_led_hex_tbl[16] = {
......
arch/mn10300/unit-asb2303/smc91111.c
View file @ d8482238
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <asm/timex.h> #include <asm/timex.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/intctl-regs.h> #include <asm/intctl-regs.h>
#include <asm/unit/smc91111.h> #include <unit/smc91111.h>
static struct resource smc91c111_resources[] = { static struct resource smc91c111_resources[] = {
[0] = { [0] = {
......
include/asm-mn10300/unit-asb2305/serial.h → arch/mn10300/unit-asb2305/include/unit/serial.h
View file @ d8482238
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#define _ASM_UNIT_SERIAL_H #define _ASM_UNIT_SERIAL_H
#include <asm/cpu/cpu-regs.h> #include <asm/cpu/cpu-regs.h>
#include <asm/proc/irq.h> #include <proc/irq.h>
#include <linux/serial_reg.h> #include <linux/serial_reg.h>
#define SERIAL_PORT0_BASE_ADDRESS 0xA6FB0000 #define SERIAL_PORT0_BASE_ADDRESS 0xA6FB0000
......
include/asm-mn10300/unit-asb2305/timex.h → arch/mn10300/unit-asb2305/include/unit/timex.h
View file @ d8482238
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#include <asm/cpu/timer-regs.h> #include <asm/cpu/timer-regs.h>
#include <asm/unit/clock.h> #include <unit/clock.h>
/* /*
* jiffies counter specifications * jiffies counter specifications
......
arch/mn10300/unit-asb2305/leds.c
View file @ d8482238
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/cpu/intctl-regs.h> #include <asm/cpu/intctl-regs.h>
#include <asm/cpu/rtc-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] = { static const u8 asb2305_led_hex_tbl[16] = {
0x80, 0xf2, 0x48, 0x60, 0x32, 0x24, 0x04, 0xf0, 0x80, 0xf2, 0x48, 0x60, 0x32, 0x24, 0x04, 0xf0,
......
arch/mn10300/unit-asb2305/unit-init.c
View file @ d8482238
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <asm/cpu/intctl-regs.h> #include <asm/cpu/intctl-regs.h>
#include <asm/cpu/rtc-regs.h> #include <asm/cpu/rtc-regs.h>
#include <asm/cpu/serial-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 * initialise some of the unit hardware before gdbstub is set up
......
drivers/net/smc91x.h
View file @ d8482238
...@@ -369,7 +369,7 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r, ...@@ -369,7 +369,7 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r,
* MN10300/AM33 configuration * MN10300/AM33 configuration
*/ */
#include <asm/unit/smc91111.h> #include <unit/smc91111.h>
#else #else
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7