[PATCH] version: Move version_string[] from version.h to version_string.h

[Stefan Roese]

On 27.01.21 16:56, Pali Rohár wrote:
> More C files do not use compile time timestamp macros and do not have to be
> recompiled every time when SOURCE_DATE_EPOCH changes.
> 
> This patch moves version_string[] from version.h to version_string.h and
> updates other C files which only needs version_string[] string to include
> version_string.h instead of version.h. After applying this patch these
> files are not recompiled every time when SOURCE_DATE_EPOCH changes.
> 
> Signed-off-by: Pali Rohár <pali at kernel.org>

Reviewed-by: Stefan Roese <sr at denx.de>

Thanks,
Stefan

> ---
>   board/ge/b1x5v2/b1x5v2.c    | 2 +-
>   board/ge/bx50v3/bx50v3.c    | 2 +-
>   board/ge/mx53ppd/mx53ppd.c  | 2 +-
>   cmd/version.c               | 1 +
>   common/main.c               | 2 +-
>   drivers/video/cfb_console.c | 3 +--
>   include/version.h           | 3 ---
>   include/version_string.h    | 8 ++++++++
>   lib/display_options.c       | 2 +-
>   test/print_ut.c             | 2 +-
>   10 files changed, 16 insertions(+), 11 deletions(-)
>   create mode 100644 include/version_string.h
> 
> diff --git a/board/ge/b1x5v2/b1x5v2.c b/board/ge/b1x5v2/b1x5v2.c
> index 1cb347fd9e..18ba5c9e71 100644
> --- a/board/ge/b1x5v2/b1x5v2.c
> +++ b/board/ge/b1x5v2/b1x5v2.c
> @@ -29,7 +29,7 @@
>   #include <panel.h>
>   #include <rtc.h>
>   #include <spi_flash.h>
> -#include <version.h>
> +#include <version_string.h>
>   
>   #include "../common/vpd_reader.h"
>   
> diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c
> index 3ea9425fd1..faad9cef72 100644
> --- a/board/ge/bx50v3/bx50v3.c
> +++ b/board/ge/bx50v3/bx50v3.c
> @@ -32,7 +32,7 @@
>   #include <power/da9063_pmic.h>
>   #include <input.h>
>   #include <pwm.h>
> -#include <version.h>
> +#include <version_string.h>
>   #include <stdlib.h>
>   #include <dm/root.h>
>   #include "../common/ge_rtc.h"
> diff --git a/board/ge/mx53ppd/mx53ppd.c b/board/ge/mx53ppd/mx53ppd.c
> index ef689733c4..9a76cdc388 100644
> --- a/board/ge/mx53ppd/mx53ppd.c
> +++ b/board/ge/mx53ppd/mx53ppd.c
> @@ -32,7 +32,7 @@
>   #include <fsl_pmic.h>
>   #include <linux/fb.h>
>   #include <ipu_pixfmt.h>
> -#include <version.h>
> +#include <version_string.h>
>   #include <watchdog.h>
>   #include "ppd_gpio.h"
>   #include <stdlib.h>
> diff --git a/cmd/version.c b/cmd/version.c
> index 3686b87332..b183cc8b63 100644
> --- a/cmd/version.c
> +++ b/cmd/version.c
> @@ -7,6 +7,7 @@
>   #include <common.h>
>   #include <command.h>
>   #include <version.h>
> +#include <version_string.h>
>   #include <linux/compiler.h>
>   #ifdef CONFIG_SYS_COREBOOT
>   #include <asm/arch/sysinfo.h>
> diff --git a/common/main.c b/common/main.c
> index ae5bcdb32f..3f5214fd44 100644
> --- a/common/main.c
> +++ b/common/main.c
> @@ -15,7 +15,7 @@
>   #include <env.h>
>   #include <init.h>
>   #include <net.h>
> -#include <version.h>
> +#include <version_string.h>
>   #include <efi_loader.h>
>   
>   static void run_preboot_environment_command(void)
> diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
> index 3f07f4eb29..1a471ce07b 100644
> --- a/drivers/video/cfb_console.c
> +++ b/drivers/video/cfb_console.c
> @@ -71,7 +71,7 @@
>   #include <fdtdec.h>
>   #include <gzip.h>
>   #include <log.h>
> -#include <version.h>
> +#include <version_string.h>
>   #include <malloc.h>
>   #include <video.h>
>   #include <linux/compiler.h>
> @@ -121,7 +121,6 @@
>    * Console device
>    */
>   
> -#include <version.h>
>   #include <linux/types.h>
>   #include <stdio_dev.h>
>   #include <video_font.h>
> diff --git a/include/version.h b/include/version.h
> index 2d24451569..0a3b29adb8 100644
> --- a/include/version.h
> +++ b/include/version.h
> @@ -16,7 +16,4 @@
>   #define U_BOOT_VERSION_STRING U_BOOT_VERSION " (" U_BOOT_DATE " - " \
>   	U_BOOT_TIME " " U_BOOT_TZ ")" CONFIG_IDENT_STRING
>   
> -#ifndef __ASSEMBLY__
> -extern const char version_string[];
> -#endif	/* __ASSEMBLY__ */
>   #endif	/* __VERSION_H__ */
> diff --git a/include/version_string.h b/include/version_string.h
> new file mode 100644
> index 0000000000..a89a6e4370
> --- /dev/null
> +++ b/include/version_string.h
> @@ -0,0 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0+ */
> +
> +#ifndef	__VERSION_STRING_H__
> +#define	__VERSION_STRING_H__
> +
> +extern const char version_string[];
> +
> +#endif	/* __VERSION_STRING_H__ */
> diff --git a/lib/display_options.c b/lib/display_options.c
> index b2025eeb5c..1b069761f8 100644
> --- a/lib/display_options.c
> +++ b/lib/display_options.c
> @@ -8,7 +8,7 @@
>   #include <compiler.h>
>   #include <console.h>
>   #include <div64.h>
> -#include <version.h>
> +#include <version_string.h>
>   #include <linux/ctype.h>
>   #include <asm/io.h>
>   
> diff --git a/test/print_ut.c b/test/print_ut.c
> index a456a449ef..ae1cf85f1c 100644
> --- a/test/print_ut.c
> +++ b/test/print_ut.c
> @@ -12,7 +12,7 @@
>   #endif
>   #include <display_options.h>
>   #include <log.h>
> -#include <version.h>
> +#include <version_string.h>
>   
>   #define FAKE_BUILD_TAG	"jenkins-u-boot-denx_uboot_dm-master-build-aarch64" \
>   			"and a lot more text to come"
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de