summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2010-09-16 16:28:38 +0800
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2010-09-17 10:56:24 +0800
commit67bb65ad2f9028c365cbfc86eb363ebd63adeeaa (patch)
treee6a4fd0025a0b4621a6dcdc5dc29ae41b4a40597 /arch
parent93bd1526aa15328cd37c2624be22b801d6ca1d1c (diff)
downloadbarebox-67bb65ad2f9028c365cbfc86eb363ebd63adeeaa.tar.gz
barebox-67bb65ad2f9028c365cbfc86eb363ebd63adeeaa.tar.xz
arm: move mach-types.h to include/generated/
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Makefile4
-rw-r--r--arch/arm/boards/a9m2410/a9m2410.c2
-rw-r--r--arch/arm/boards/a9m2440/a9m2440.c2
-rw-r--r--arch/arm/boards/at91sam9260ek/init.c2
-rw-r--r--arch/arm/boards/at91sam9263ek/init.c2
-rw-r--r--arch/arm/boards/edb93xx/edb93xx.c2
-rw-r--r--arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c2
-rw-r--r--arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c2
-rw-r--r--arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c2
-rw-r--r--arch/arm/boards/freescale-mx25-3-stack/3stack.c2
-rw-r--r--arch/arm/boards/freescale-mx35-3-stack/3stack.c2
-rw-r--r--arch/arm/boards/guf-neso/board.c2
-rw-r--r--arch/arm/boards/imx21ads/imx21ads.c2
-rw-r--r--arch/arm/boards/imx27ads/imx27ads.c2
-rw-r--r--arch/arm/boards/mmccpu/init.c2
-rw-r--r--arch/arm/boards/netx/netx.c2
-rw-r--r--arch/arm/boards/nhk8815/setup.c2
-rw-r--r--arch/arm/boards/omap/board-beagle.c2
-rw-r--r--arch/arm/boards/pcm037/pcm037.c2
-rw-r--r--arch/arm/boards/pcm038/pcm038.c2
-rw-r--r--arch/arm/boards/pcm043/pcm043.c2
-rw-r--r--arch/arm/boards/phycard-i.MX27/pca100.c2
-rw-r--r--arch/arm/boards/pm9263/init.c2
-rw-r--r--arch/arm/boards/scb9328/scb9328.c2
-rw-r--r--arch/arm/include/asm/.gitignore1
-rw-r--r--arch/arm/mach-nomadik/8815.c2
-rw-r--r--arch/arm/tools/Makefile2
-rw-r--r--arch/arm/tools/gen-mach-types2
28 files changed, 28 insertions, 29 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index e542c03c94..0fb3adcb38 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -114,7 +114,7 @@ all: $(KBUILD_IMAGE)
archprepare: maketools
maketools:
- $(Q)$(MAKE) $(build)=arch/arm/tools arch/arm/include/asm/mach-types.h
+ $(Q)$(MAKE) $(build)=arch/arm/tools include/generated/mach-types.h
PHONY += maketools
@@ -136,4 +136,4 @@ common-y += arch/arm/lib/ arch/arm/cpu/ arch/arm/common/
lds-$(CONFIG_GENERIC_LINKER_SCRIPT) := arch/arm/lib/barebox.lds
lds-$(CONFIG_BOARD_LINKER_SCRIPT) := $(BOARD)/barebox.lds
-CLEAN_FILES += arch/arm/include/asm/mach-types.h arch/arm/lib/barebox.lds
+CLEAN_FILES += include/generated/mach-types.h arch/arm/lib/barebox.lds
diff --git a/arch/arm/boards/a9m2410/a9m2410.c b/arch/arm/boards/a9m2410/a9m2410.c
index f327f82b7f..2c08125496 100644
--- a/arch/arm/boards/a9m2410/a9m2410.c
+++ b/arch/arm/boards/a9m2410/a9m2410.c
@@ -28,7 +28,7 @@
#include <driver.h>
#include <init.h>
#include <asm/armlinux.h>
-#include <asm/mach-types.h>
+#include <generated/mach-types.h>
#include <partition.h>
#include <nand.h>
#include <asm/io.h>
diff --git a/arch/arm/boards/a9m2440/a9m2440.c b/arch/arm/boards/a9m2440/a9m2440.c
index 2567f5ed13..59918e920a 100644
--- a/arch/arm/boards/a9m2440/a9m2440.c
+++ b/arch/arm/boards/a9m2440/a9m2440.c
@@ -28,7 +28,7 @@
#include <driver.h>
#include <init.h>
#include <asm/armlinux.h>
-#include <asm/mach-types.h>
+#include <generated/mach-types.h>
#include <partition.h>
#include <nand.h>
#include <asm/io.h>
diff --git a/arch/arm/boards/at91sam9260ek/init.c b/arch/arm/boards/at91sam9260ek/init.c
index 9fd75256c6..7bb3c453d5 100644
--- a/arch/arm/boards/at91sam9260ek/init.c
+++ b/arch/arm/boards/at91sam9260ek/init.c
@@ -24,7 +24,7 @@
#include <environment.h>
#include <fec.h>
#include <asm/armlinux.h>
-#include <asm/mach-types.h>
+#include <generated/mach-types.h>
#include <partition.h>
#include <fs.h>
#include <fcntl.h>
diff --git a/arch/arm/boards/at91sam9263ek/init.c b/arch/arm/boards/at91sam9263ek/init.c
index 61cd295396..0705af4b6e 100644
--- a/arch/arm/boards/at91sam9263ek/init.c
+++ b/arch/arm/boards/at91sam9263ek/init.c
@@ -25,7 +25,7 @@
#include <init.h>
#include <environment.h>
#include <asm/armlinux.h>
-#include <asm/mach-types.h>
+#include <generated/mach-types.h>
#include <partition.h>
#include <fs.h>
#include <fcntl.h>
diff --git a/arch/arm/boards/edb93xx/edb93xx.c b/arch/arm/boards/edb93xx/edb93xx.c
index b0078a5227..e106798fe6 100644
--- a/arch/arm/boards/edb93xx/edb93xx.c
+++ b/arch/arm/boards/edb93xx/edb93xx.c
@@ -28,7 +28,7 @@
#include <partition.h>
#include <asm/armlinux.h>
#include <asm/io.h>
-#include <asm/mach-types.h>
+#include <generated/mach-types.h>
#include <mach/ep93xx-regs.h>
#include "edb93xx.h"
diff --git a/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c b/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c
index caeb46e872..1fd0afda2d 100644
--- a/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c
+++ b/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c
@@ -33,7 +33,7 @@
#include <asm/mmu.h>
#include <partition.h>
-#include <asm/mach-types.h>
+#include <generated/mach-types.h>
#include <mach/imx-nand.h>
#include <mach/imxfb.h>
#include <fec.h>
diff --git a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c
index 1937d21c85..ebacd9ab94 100644
--- a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c
+++ b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c
@@ -30,7 +30,7 @@
#include <notifier.h>
#include <mach/gpio.h>
#include <asm/armlinux.h>
-#include <asm/mach-types.h>
+#include <generated/mach-types.h>
#include <mach/pmic.h>
#include <partition.h>
#include <fs.h>
diff --git a/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c
index d41d9b548e..4509e727c6 100644
--- a/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c
+++ b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c
@@ -40,7 +40,7 @@
#include <asm/armlinux.h>
#include <asm/io.h>
-#include <asm/mach-types.h>
+#include <generated/mach-types.h>
#include <asm/mmu.h>
#include <mach/gpio.h>
diff --git a/arch/arm/boards/freescale-mx25-3-stack/3stack.c b/arch/arm/boards/freescale-mx25-3-stack/3stack.c
index cd228cc470..cb95107e8c 100644
--- a/arch/arm/boards/freescale-mx25-3-stack/3stack.c
+++ b/arch/arm/boards/freescale-mx25-3-stack/3stack.c
@@ -30,7 +30,7 @@
#include <mach/gpio.h>
#include <asm/io.h>
#include <partition.h>
-#include <asm/mach-types.h>
+#include <generated/mach-types.h>
#include <mach/imx-nand.h>
#include <fec.h>
#include <nand.h>
diff --git a/arch/arm/boards/freescale-mx35-3-stack/3stack.c b/arch/arm/boards/freescale-mx35-3-stack/3stack.c
index 9a66976f9d..544262f027 100644
--- a/arch/arm/boards/freescale-mx35-3-stack/3stack.c
+++ b/arch/arm/boards/freescale-mx35-3-stack/3stack.c
@@ -38,7 +38,7 @@
#include <asm/armlinux.h>
#include <asm/io.h>
-#include <asm/mach-types.h>
+#include <generated/mach-types.h>
#include <mach/gpio.h>
#include <mach/imx-nand.h>
diff --git a/arch/arm/boards/guf-neso/board.c b/arch/arm/boards/guf-neso/board.c
index 2f53d34556..d2fb345f50 100644
--- a/arch/arm/boards/guf-neso/board.c
+++ b/arch/arm/boards/guf-neso/board.c
@@ -35,7 +35,7 @@
#include <asm/io.h>
#include <asm/mmu.h>
#include <asm/armlinux.h>
-#include <asm/mach-types.h>
+#include <generated/mach-types.h>
#include <mach/gpio.h>
#include <mach/spi.h>
diff --git a/arch/arm/boards/imx21ads/imx21ads.c b/arch/arm/boards/imx21ads/imx21ads.c
index 5e88af4fd8..ff8e6c207c 100644
--- a/arch/arm/boards/imx21ads/imx21ads.c
+++ b/arch/arm/boards/imx21ads/imx21ads.c
@@ -32,7 +32,7 @@
#include <partition.h>
#include <fs.h>
#include <fcntl.h>
-#include <asm/mach-types.h>
+#include <generated/mach-types.h>
#include <mach/imx-nand.h>
#include <mach/imxfb.h>
#include <mach/iomux-mx21.h>
diff --git a/arch/arm/boards/imx27ads/imx27ads.c b/arch/arm/boards/imx27ads/imx27ads.c
index 6f31520ffa..5dbb1e0533 100644
--- a/arch/arm/boards/imx27ads/imx27ads.c
+++ b/arch/arm/boards/imx27ads/imx27ads.c
@@ -30,7 +30,7 @@
#include <partition.h>
#include <fs.h>
#include <fcntl.h>
-#include <asm/mach-types.h>
+#include <generated/mach-types.h>
#include <mach/iomux-mx27.h>
static struct device_d cfi_dev = {
diff --git a/arch/arm/boards/mmccpu/init.c b/arch/arm/boards/mmccpu/init.c
index 9a7d930b6d..4e6138705e 100644
--- a/arch/arm/boards/mmccpu/init.c
+++ b/arch/arm/boards/mmccpu/init.c
@@ -24,7 +24,7 @@
#include <environment.h>
#include <fec.h>
#include <asm/armlinux.h>
-#include <asm/mach-types.h>
+#include <generated/mach-types.h>
#include <partition.h>
#include <fs.h>
#include <fcntl.h>
diff --git a/arch/arm/boards/netx/netx.c b/arch/arm/boards/netx/netx.c
index d6bfcca54d..a689005665 100644
--- a/arch/arm/boards/netx/netx.c
+++ b/arch/arm/boards/netx/netx.c
@@ -27,7 +27,7 @@
#include <asm/armlinux.h>
#include <fs.h>
#include <fcntl.h>
-#include <asm/mach-types.h>
+#include <generated/mach-types.h>
#include <mach/netx-eth.h>
static struct device_d cfi_dev = {
diff --git a/arch/arm/boards/nhk8815/setup.c b/arch/arm/boards/nhk8815/setup.c
index e9295f651e..1cb1ff1516 100644
--- a/arch/arm/boards/nhk8815/setup.c
+++ b/arch/arm/boards/nhk8815/setup.c
@@ -25,7 +25,7 @@
#include <partition.h>
#include <nand.h>
#include <asm/armlinux.h>
-#include <asm/mach-types.h>
+#include <generated/mach-types.h>
#include <asm/io.h>
#include <mach/hardware.h>
diff --git a/arch/arm/boards/omap/board-beagle.c b/arch/arm/boards/omap/board-beagle.c
index e9d3072262..0908b8a8e4 100644
--- a/arch/arm/boards/omap/board-beagle.c
+++ b/arch/arm/boards/omap/board-beagle.c
@@ -59,7 +59,7 @@
#include <asm/io.h>
#include <ns16550.h>
#include <asm/armlinux.h>
-#include <asm/mach-types.h>
+#include <generated/mach-types.h>
#include <mach/silicon.h>
#include <mach/sdrc.h>
#include <mach/sys_info.h>
diff --git a/arch/arm/boards/pcm037/pcm037.c b/arch/arm/boards/pcm037/pcm037.c
index 2e6968b844..4022cf4ef9 100644
--- a/arch/arm/boards/pcm037/pcm037.c
+++ b/arch/arm/boards/pcm037/pcm037.c
@@ -35,7 +35,7 @@
#include <asm/io.h>
#include <asm/mmu.h>
#include <partition.h>
-#include <asm/mach-types.h>
+#include <generated/mach-types.h>
#include <mach/imx-nand.h>
diff --git a/arch/arm/boards/pcm038/pcm038.c b/arch/arm/boards/pcm038/pcm038.c
index 03794fc13d..7621320767 100644
--- a/arch/arm/boards/pcm038/pcm038.c
+++ b/arch/arm/boards/pcm038/pcm038.c
@@ -27,7 +27,7 @@
#include <notifier.h>
#include <mach/gpio.h>
#include <asm/armlinux.h>
-#include <asm/mach-types.h>
+#include <generated/mach-types.h>
#include <mach/pmic.h>
#include <partition.h>
#include <fs.h>
diff --git a/arch/arm/boards/pcm043/pcm043.c b/arch/arm/boards/pcm043/pcm043.c
index 497149d1d8..7db3b5436c 100644
--- a/arch/arm/boards/pcm043/pcm043.c
+++ b/arch/arm/boards/pcm043/pcm043.c
@@ -35,7 +35,7 @@
#include <asm/io.h>
#include <partition.h>
#include <nand.h>
-#include <asm/mach-types.h>
+#include <generated/mach-types.h>
#include <mach/imx-nand.h>
#include <fec.h>
#include <fb.h>
diff --git a/arch/arm/boards/phycard-i.MX27/pca100.c b/arch/arm/boards/phycard-i.MX27/pca100.c
index ce59960e22..1707a062c0 100644
--- a/arch/arm/boards/phycard-i.MX27/pca100.c
+++ b/arch/arm/boards/phycard-i.MX27/pca100.c
@@ -26,7 +26,7 @@
#include <fec.h>
#include <mach/gpio.h>
#include <asm/armlinux.h>
-#include <asm/mach-types.h>
+#include <generated/mach-types.h>
#include <partition.h>
#include <fs.h>
#include <fcntl.h>
diff --git a/arch/arm/boards/pm9263/init.c b/arch/arm/boards/pm9263/init.c
index d5ed921ff6..9fde288d4e 100644
--- a/arch/arm/boards/pm9263/init.c
+++ b/arch/arm/boards/pm9263/init.c
@@ -24,7 +24,7 @@
#include <environment.h>
#include <fec.h>
#include <asm/armlinux.h>
-#include <asm/mach-types.h>
+#include <generated/mach-types.h>
#include <partition.h>
#include <fs.h>
#include <fcntl.h>
diff --git a/arch/arm/boards/scb9328/scb9328.c b/arch/arm/boards/scb9328/scb9328.c
index 3c04996254..c0d4199880 100644
--- a/arch/arm/boards/scb9328/scb9328.c
+++ b/arch/arm/boards/scb9328/scb9328.c
@@ -22,7 +22,7 @@
#include <net.h>
#include <init.h>
#include <environment.h>
-#include <asm/mach-types.h>
+#include <generated/mach-types.h>
#include <mach/imx-regs.h>
#include <asm/armlinux.h>
#include <mach/gpio.h>
diff --git a/arch/arm/include/asm/.gitignore b/arch/arm/include/asm/.gitignore
deleted file mode 100644
index 9cc4155c16..0000000000
--- a/arch/arm/include/asm/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/mach-types.h
diff --git a/arch/arm/mach-nomadik/8815.c b/arch/arm/mach-nomadik/8815.c
index 8598f14efa..5cf5d14354 100644
--- a/arch/arm/mach-nomadik/8815.c
+++ b/arch/arm/mach-nomadik/8815.c
@@ -23,7 +23,7 @@
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/armlinux.h>
-#include <asm/mach-types.h>
+#include <generated/mach-types.h>
#include "clock.h"
diff --git a/arch/arm/tools/Makefile b/arch/arm/tools/Makefile
index 5243a98906..635cb1865e 100644
--- a/arch/arm/tools/Makefile
+++ b/arch/arm/tools/Makefile
@@ -4,7 +4,7 @@
# Copyright (C) 2001 Russell King
#
-arch/arm/include/asm/mach-types.h: $(src)/gen-mach-types $(src)/mach-types
+include/generated/mach-types.h: $(src)/gen-mach-types $(src)/mach-types
@echo ' Generating $@'
@mkdir -p $(dir $@)
$(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; }
diff --git a/arch/arm/tools/gen-mach-types b/arch/arm/tools/gen-mach-types
index ce319ef64b..04fef71d7b 100644
--- a/arch/arm/tools/gen-mach-types
+++ b/arch/arm/tools/gen-mach-types
@@ -1,6 +1,6 @@
#!/bin/awk
#
-# Awk script to generate include/asm-arm/mach-types.h
+# Awk script to generate include/generated/mach-types.h
#
BEGIN { nr = 0 }
/^#/ { next }