[PATCH 11/11] Remove including timestamp.h in version.h

Pali Rohár
2021-08-02T13:21:56Z

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>
---
arch/arm/mach-rockchip/tpl.c | 4 ++++
board/work-microwave/work_92105/work_92105_display.c | 1 +
cmd/version.c | 1 +
common/spl/spl.c | 4 ++++
drivers/rtc/emul_rtc.c | 2 +-
include/version.h | 2 --
6 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-rockchip/tpl.c b/arch/arm/mach-rockchip/tpl.c
index cc908e1b0e81..56c65149ebe5 100644
--- 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 defined(CONFIG_DEBUG_UART) && defined(CONFIG_TPL_SERIAL_SUPPORT) && defined(CONFIG_TPL_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 fecbbbdb584a..6add68518247 100644
--- 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 42eb85b75bb7..11a5d5d9f150 100644
--- 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 d55d3c284851..3c04b75ab8e4 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -34,6 +34,10 @@
#include <bootcount.h>
#include <wdt.h>

+#if defined(CONFIG_SPL_SERIAL_SUPPORT) && CONFIG_IS_ENABLED(BANNER_PRINT)
+#include <timestamp.h>
+#endif
+
DECLARE_GLOBAL_DATA_PTR;

#ifndef CONFIG_SYS_UBOOT_START
diff --git a/drivers/rtc/emul_rtc.c b/drivers/rtc/emul_rtc.c
index 8f0e1ab5ac63..6f47d82522ba 100644
--- 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 8ee07134fd2f..5955b21e8904 100644
--- 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
--
2.20.1