Commit 3252b11f authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Michal Marek
Browse files

sh: move machtypes.h to include/generated 



Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent 66206536

arch/sh/Makefile

+3 −7
Original line number Diff line number Diff line
@@ -205,10 +205,7 @@ libs-$(CONFIG_SUPERH64) := arch/sh/lib64/ $(libs-y) 


BOOT_TARGETS = uImage uImage.bz2 uImage.gz uImage.lzma uImage.srec uImage.bin \

	       zImage vmlinux.srec romImage

PHONY += maketools $(BOOT_TARGETS) FORCE



maketools:  include/linux/version.h FORCE

	$(Q)$(MAKE) $(build)=arch/sh/tools include/asm-sh/machtypes.h

PHONY += $(BOOT_TARGETS)



all: $(KBUILD_IMAGE)
@@ -217,7 +214,8 @@ $(BOOT_TARGETS): vmlinux 


compressed: zImage



archprepare: maketools

archprepare:

	$(Q)$(MAKE) $(build)=arch/sh/tools include/generated/machtypes.h



archclean:

	$(Q)$(MAKE) $(clean)=$(boot)
@@ -234,5 +232,3 @@ define archhelp 
	@echo '  uImage.bz2	           - Kernel-only image for U-Boot (bzip2)'

	@echo '  uImage.lzma	           - Kernel-only image for U-Boot (lzma)'

endef
 


CLEAN_FILES += include/asm-sh/machtypes.h

arch/sh/drivers/pci/fixups-rts7751r2d.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <mach/lboxre2.h>

#include <mach/r2d.h>

#include "pci-sh4.h"

#include <asm/machtypes.h>

#include <generated/machtypes.h>



#define PCIMCR_MRSET_OFF	0xBFFFFFFF

#define PCIMCR_RFSH_OFF		0xFFFFFFFB

arch/sh/include/asm/.gitignore

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
machtypes.h

arch/sh/include/asm/machvec.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 


#include <linux/types.h>

#include <linux/time.h>

#include <asm/machtypes.h>

#include <generated/machtypes.h>



struct sh_machine_vector {

	void (*mv_setup)(char **cmdline_p);

arch/sh/tools/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
# Shamelessly cloned from ARM.

#



include/asm-sh/machtypes.h: $(src)/gen-mach-types $(src)/mach-types

include/generated/machtypes.h: $(src)/gen-mach-types $(src)/mach-types

	@echo '  Generating $@'

	$(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi

	$(Q)mkdir -p $(dir $@)

	$(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; }