OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sh: move machtypes.h to include/generated 

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Michal Marek <mmarek@suse.cz>
This commit is contained in:
Sam Ravnborg 2009-10-17 22:20:22 +02:00 committed by Michal Marek
parent 66206536fe
commit 3252b11fc4
6 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/sh/Makefile
View File

@ -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 \ BOOT_TARGETS = uImage uImage.bz2 uImage.gz uImage.lzma uImage.srec uImage.bin \
zImage vmlinux.srec romImage zImage vmlinux.srec romImage
PHONY += maketools $(BOOT_TARGETS) FORCE PHONY += $(BOOT_TARGETS)
maketools: include/linux/version.h FORCE
$(Q)$(MAKE) $(build)=arch/sh/tools include/asm-sh/machtypes.h
all: $(KBUILD_IMAGE) all: $(KBUILD_IMAGE)
@ -217,7 +214,8 @@ $(BOOT_TARGETS): vmlinux
compressed: zImage compressed: zImage
archprepare: maketools archprepare:
$(Q)$(MAKE) $(build)=arch/sh/tools include/generated/machtypes.h
archclean: archclean:
$(Q)$(MAKE) $(clean)=$(boot) $(Q)$(MAKE) $(clean)=$(boot)
@ -234,5 +232,3 @@ define archhelp
@echo ' uImage.bz2 - Kernel-only image for U-Boot (bzip2)' @echo ' uImage.bz2 - Kernel-only image for U-Boot (bzip2)'
@echo ' uImage.lzma - Kernel-only image for U-Boot (lzma)' @echo ' uImage.lzma - Kernel-only image for U-Boot (lzma)'
endef endef
CLEAN_FILES += include/asm-sh/machtypes.h

2
arch/sh/drivers/pci/fixups-rts7751r2d.c
View File

@ -15,7 +15,7 @@
#include <mach/lboxre2.h> #include <mach/lboxre2.h>
#include <mach/r2d.h> #include <mach/r2d.h>
#include "pci-sh4.h" #include "pci-sh4.h"
#include <asm/machtypes.h> #include <generated/machtypes.h>
#define PCIMCR_MRSET_OFF 0xBFFFFFFF #define PCIMCR_MRSET_OFF 0xBFFFFFFF
#define PCIMCR_RFSH_OFF 0xFFFFFFFB #define PCIMCR_RFSH_OFF 0xFFFFFFFB

1
arch/sh/include/asm/.gitignore vendored
View File

@ -1 +0,0 @@
machtypes.h

2
arch/sh/include/asm/machvec.h
View File

@ -12,7 +12,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/time.h> #include <linux/time.h>
#include <asm/machtypes.h> #include <generated/machtypes.h>
struct sh_machine_vector { struct sh_machine_vector {
void (*mv_setup)(char **cmdline_p); void (*mv_setup)(char **cmdline_p);

4
arch/sh/tools/Makefile
View File

@ -10,7 +10,7 @@
# Shamelessly cloned from ARM. # 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 $@' @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; } $(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; }

2
arch/sh/tools/gen-mach-types
View File

@ -1,6 +1,6 @@
#!/bin/awk #!/bin/awk
# #
# Awk script to generate include/asm-sh/machtypes.h # Awk script to generate include/generated/machtypes.h
# Heavily based on arch/arm/tools/gen-mach-types # Heavily based on arch/arm/tools/gen-mach-types
# #
BEGIN { nr = 0 } BEGIN { nr = 0 }