diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/spl.c | 3 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/spl_mmc.c | 3 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/spl_nand.c | 3 | ||||
| -rw-r--r-- | drivers/serial/usbtty.h | 2 | ||||
| -rw-r--r-- | include/.gitignore | 2 | ||||
| -rw-r--r-- | include/timestamp.h | 2 | ||||
| -rw-r--r-- | include/version.h | 2 |
8 files changed, 8 insertions, 13 deletions
@@ -30,8 +30,8 @@ U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) else U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL)$(EXTRAVERSION) endif -TIMESTAMP_FILE = $(obj)include/timestamp_autogenerated.h -VERSION_FILE = $(obj)include/version_autogenerated.h +TIMESTAMP_FILE = $(obj)include/generated/timestamp_autogenerated.h +VERSION_FILE = $(obj)include/generated/version_autogenerated.h HOSTARCH := $(shell uname -m | \ sed -e s/i.86/x86/ \ diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/arch/arm/cpu/armv7/omap-common/spl.c index c76fea6188..01fd58a354 100644 --- a/arch/arm/cpu/armv7/omap-common/spl.c +++ b/arch/arm/cpu/armv7/omap-common/spl.c @@ -29,8 +29,7 @@ #include <nand.h> #include <mmc.h> #include <fat.h> -#include <timestamp_autogenerated.h> -#include <version_autogenerated.h> +#include <version.h> #include <asm/omap_common.h> #include <asm/arch/mmc_host_def.h> #include <i2c.h> diff --git a/arch/arm/cpu/armv7/omap-common/spl_mmc.c b/arch/arm/cpu/armv7/omap-common/spl_mmc.c index 1d1e50c3c4..6f5b43e559 100644 --- a/arch/arm/cpu/armv7/omap-common/spl_mmc.c +++ b/arch/arm/cpu/armv7/omap-common/spl_mmc.c @@ -28,8 +28,7 @@ #include <asm/arch/sys_proto.h> #include <mmc.h> #include <fat.h> -#include <timestamp_autogenerated.h> -#include <version_autogenerated.h> +#include <version.h> #include <asm/omap_common.h> #include <asm/arch/mmc_host_def.h> diff --git a/arch/arm/cpu/armv7/omap-common/spl_nand.c b/arch/arm/cpu/armv7/omap-common/spl_nand.c index af02a59557..38d06b1ea8 100644 --- a/arch/arm/cpu/armv7/omap-common/spl_nand.c +++ b/arch/arm/cpu/armv7/omap-common/spl_nand.c @@ -25,8 +25,7 @@ #include <asm/utils.h> #include <asm/arch/sys_proto.h> #include <nand.h> -#include <timestamp_autogenerated.h> -#include <version_autogenerated.h> +#include <version.h> #include <asm/omap_common.h> diff --git a/drivers/serial/usbtty.h b/drivers/serial/usbtty.h index a23169a29d..14961c1969 100644 --- a/drivers/serial/usbtty.h +++ b/drivers/serial/usbtty.h @@ -37,7 +37,7 @@ #include <usb/spr_udc.h> #endif -#include <version_autogenerated.h> +#include <version.h> /* If no VendorID/ProductID is defined in config.h, pretend to be Linux * DO NOT Reuse this Vendor/Product setup with protocol incompatible devices */ diff --git a/include/.gitignore b/include/.gitignore index 77594e53ff..ec224c545c 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -3,5 +3,3 @@ /bmp_logo.h /config.h /config.mk -/timestamp_autogenerated.h -/version_autogenerated.h diff --git a/include/timestamp.h b/include/timestamp.h index b2f4cf4d7b..05a6658573 100644 --- a/include/timestamp.h +++ b/include/timestamp.h @@ -24,7 +24,7 @@ #define __TIMESTAMP_H__ #ifndef DO_DEPS_ONLY -#include "timestamp_autogenerated.h" +#include "generated/timestamp_autogenerated.h" #endif #endif /* __TIMESTAMP_H__ */ diff --git a/include/version.h b/include/version.h index 129acef0b8..c908bd3013 100644 --- a/include/version.h +++ b/include/version.h @@ -27,7 +27,7 @@ #include <timestamp.h> #ifndef DO_DEPS_ONLY -#include "version_autogenerated.h" +#include "generated/version_autogenerated.h" #endif #ifndef CONFIG_IDENT_STRING |
