Remove including timestamp.h in version.h

Header file version.h does not use anything from timestamp.h. Including of
timestamp.h has side effect which cause recompiling object file at every
make run because timestamp.h changes at every run.

So remove timestamp.h from version.h and include timestamp.h in files
which needs it.

This change reduce recompilation time of final U-Boot binary when U-Boot
source files were not changed as less source files needs to be recompiled.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
[trini: Add in lib/acpi/acpi_table.c and test/dm/acpi.c, rework a few others]
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/mach-rockchip/tpl.c b/arch/arm/mach-rockchip/tpl.c
index cca638bbef4ff6371d0e9461f70c9882e35cf6c3..3c007bb450893ff78c80174911e39887d42e33fc 100644 (file)
--- a/arch/arm/mach-rockchip/tpl.c
+++ b/arch/arm/mach-rockchip/tpl.c
@@ -16,6 +16,10 @@
 #include <asm/arch-rockchip/bootrom.h>
 #include <linux/bitops.h>
 
+#if CONFIG_IS_ENABLED(BANNER_PRINT)
+#include <timestamp.h>
+#endif
+
 #define TIMER_LOAD_COUNT_L     0x00
 #define TIMER_LOAD_COUNT_H     0x04
 #define TIMER_CONTROL_REG      0x10

diff --git a/board/work-microwave/work_92105/work_92105_display.c b/board/work-microwave/work_92105/work_92105_display.c
index e8e559ce1f9cc45d40e4d529728fd12f5dac82f9..5f625e6f52ad45f4a4f8ee999c023b3c1e606502 100644 (file)
--- a/board/work-microwave/work_92105/work_92105_display.c
+++ b/board/work-microwave/work_92105/work_92105_display.c
@@ -20,6 +20,7 @@
 #include <env.h>
 #include <spi.h>
 #include <i2c.h>
+#include <timestamp.h>
 #include <version.h>
 #include <vsprintf.h>
 #include <linux/delay.h>

diff --git a/cmd/version.c b/cmd/version.c
index 130e31cd84fe664b6cced06179d5eae6ca6d5f97..f83f6aff92ca6c1df5c04ea8c8263c0ef628e46f 100644 (file)
--- a/cmd/version.c
+++ b/cmd/version.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <timestamp.h>
 #include <version.h>
 #include <version_string.h>
 #include <linux/compiler.h>

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 2a9f54ef7081e5868ad1c7012209b1a718eed5fa..31516e1eeda71000c1a14c7b00b1b6c718875218 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -24,6 +24,9 @@
 #include <nand.h>
 #include <fat.h>
 #include <u-boot/crc.h>
+#if CONFIG_IS_ENABLED(BANNER_PRINT)
+#include <timestamp.h>
+#endif
 #include <version.h>
 #include <image.h>
 #include <malloc.h>

diff --git a/drivers/rtc/emul_rtc.c b/drivers/rtc/emul_rtc.c
index 8f0e1ab5ac63ba69a2740b105cee094c849128b5..6f47d82522baf83d0041eb2cbbef29dd28e57cfb 100644 (file)
--- a/drivers/rtc/emul_rtc.c
+++ b/drivers/rtc/emul_rtc.c
@@ -9,8 +9,8 @@
 #include <div64.h>
 #include <dm.h>
 #include <env.h>
-#include <generated/timestamp_autogenerated.h>
 #include <rtc.h>
+#include <timestamp.h>
 
 /**
  * struct emul_rtc - private data for emulated RTC driver

diff --git a/include/version.h b/include/version.h
index 8ee07134fd2f0a45db20e02ef2b88317a2a3ffbf..5955b21e89043a342ed139dc0bf13bfd08debbd1 100644 (file)
--- a/include/version.h
+++ b/include/version.h
@@ -7,8 +7,6 @@
 #ifndef        __VERSION_H__
 #define        __VERSION_H__
 
-#include <timestamp.h>
-
 #ifndef DO_DEPS_ONLY
 #include "generated/version_autogenerated.h"
 #endif

diff --git a/lib/acpi/acpi_table.c b/lib/acpi/acpi_table.c
index 2f07741784121cc638e52f10d329cc35d3802c32..7ea4b2e87eea0b0c7fd84f7d9fe2ecde5b886517 100644 (file)
--- a/lib/acpi/acpi_table.c
+++ b/lib/acpi/acpi_table.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <tables_csum.h>
+#include <timestamp.h>
 #include <version.h>
 #include <acpi/acpi_table.h>
 #include <asm/global_data.h>

diff --git a/test/dm/acpi.c b/test/dm/acpi.c
index 2edab7be544580787e7efc71c899b547613bffc5..6f0025814ed139881cbec273a31ba25ac01ac882 100644 (file)
--- a/test/dm/acpi.c
+++ b/test/dm/acpi.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <timestamp.h>
 #include <version.h>
 #include <tables_csum.h>
 #include <version.h>