Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f2a2132 authored by David Howells's avatar David Howells
Browse files

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: default avatarDavid Howells <dhowells@redhat.com>
parent da761661

arch/mn10300/Makefile

+3 −37
Original line number Original line Diff line number Diff line
@@ -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

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

arch/mn10300/include/asm/cache.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -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)

arch/mn10300/include/asm/irq.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

arch/mn10300/include/asm/serial.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -33,4 +33,4 @@ 
#define RS_TABLE_SIZE

#define RS_TABLE_SIZE

#endif

#endif





#include <asm/unit/serial.h>
 
#include <unit/serial.h>

arch/mn10300/include/asm/timex.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -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)