Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Sam Ravnborg and committed by
Michal Marek
3252b11f 66206536

+8 -13
+3 -7
arch/sh/Makefile
··· 205 205 206 206 BOOT_TARGETS = uImage uImage.bz2 uImage.gz uImage.lzma uImage.srec uImage.bin \ 207 207 zImage vmlinux.srec romImage 208 - PHONY += maketools $(BOOT_TARGETS) FORCE 209 - 210 - maketools: include/linux/version.h FORCE 211 - $(Q)$(MAKE) $(build)=arch/sh/tools include/asm-sh/machtypes.h 208 + PHONY += $(BOOT_TARGETS) 212 209 213 210 all: $(KBUILD_IMAGE) 214 211 ··· 214 217 215 218 compressed: zImage 216 219 217 - archprepare: maketools 220 + archprepare: 221 + $(Q)$(MAKE) $(build)=arch/sh/tools include/generated/machtypes.h 218 222 219 223 archclean: 220 224 $(Q)$(MAKE) $(clean)=$(boot) ··· 232 234 @echo ' uImage.bz2 - Kernel-only image for U-Boot (bzip2)' 233 235 @echo ' uImage.lzma - Kernel-only image for U-Boot (lzma)' 234 236 endef 235 - 236 - CLEAN_FILES += include/asm-sh/machtypes.h
+1 -1
arch/sh/drivers/pci/fixups-rts7751r2d.c
··· 15 15 #include <mach/lboxre2.h> 16 16 #include <mach/r2d.h> 17 17 #include "pci-sh4.h" 18 - #include <asm/machtypes.h> 18 + #include <generated/machtypes.h> 19 19 20 20 #define PCIMCR_MRSET_OFF 0xBFFFFFFF 21 21 #define PCIMCR_RFSH_OFF 0xFFFFFFFB
-1
arch/sh/include/asm/.gitignore
··· 1 - machtypes.h
+1 -1
arch/sh/include/asm/machvec.h
··· 12 12 13 13 #include <linux/types.h> 14 14 #include <linux/time.h> 15 - #include <asm/machtypes.h> 15 + #include <generated/machtypes.h> 16 16 17 17 struct sh_machine_vector { 18 18 void (*mv_setup)(char **cmdline_p);
+2 -2
arch/sh/tools/Makefile
··· 10 10 # Shamelessly cloned from ARM. 11 11 # 12 12 13 - include/asm-sh/machtypes.h: $(src)/gen-mach-types $(src)/mach-types 13 + include/generated/machtypes.h: $(src)/gen-mach-types $(src)/mach-types 14 14 @echo ' Generating $@' 15 - $(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi 15 + $(Q)mkdir -p $(dir $@) 16 16 $(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; }
+1 -1
arch/sh/tools/gen-mach-types
··· 1 1 #!/bin/awk 2 2 # 3 - # Awk script to generate include/asm-sh/machtypes.h 3 + # Awk script to generate include/generated/machtypes.h 4 4 # Heavily based on arch/arm/tools/gen-mach-types 5 5 # 6 6 BEGIN { nr = 0 }