acpi: Put the version numbers in a central place

At present two acpi files are built every time since they use a version
number from version.h

This is not necessary. Make use of the same technique as for the version
string, so that they are build only when they change.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/cmd/version.c b/cmd/version.c
index 190ef6a9061ab7fcd2eb45e2df790f578617f0e4..87e1fa4159c1c4524d7c09a652f4348947c5bb77 100644 (file)
--- a/cmd/version.c
+++ b/cmd/version.c
@@ -19,6 +19,8 @@
        U_BOOT_TIME " " U_BOOT_TZ ")" CONFIG_IDENT_STRING
 
 const char version_string[] = U_BOOT_VERSION_STRING;
+const unsigned short version_num = U_BOOT_VERSION_NUM;
+const unsigned char version_num_patch = U_BOOT_VERSION_NUM_PATCH;
 
 static int do_version(struct cmd_tbl *cmdtp, int flag, int argc,
                      char *const argv[])

diff --git a/include/version_string.h b/include/version_string.h
index a89a6e43705e4e2cd3abce3002279aaa91b205de..a7d07e4cc7cac3d7e54327bfe08c64c6ad9c784c 100644 (file)
--- a/include/version_string.h
+++ b/include/version_string.h
@@ -4,5 +4,7 @@
 #define        __VERSION_STRING_H__
 
 extern const char version_string[];
+extern const unsigned short version_num;
+extern const unsigned char version_num_patch;
 
 #endif /* __VERSION_STRING_H__ */

diff --git a/lib/acpi/acpi_table.c b/lib/acpi/acpi_table.c
index 7c4189e2434b10db8abe549663e9ca1ef56295ad..a8d4b470001d16f3811a42d001184118104087b0 100644 (file)
--- a/lib/acpi/acpi_table.c
+++ b/lib/acpi/acpi_table.c
@@ -11,8 +11,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <tables_csum.h>
-#include <timestamp.h>
-#include <version.h>
+#include <version_string.h>
 #include <acpi/acpi_table.h>
 #include <asm/global_data.h>
 #include <dm/acpi.h>
@@ -25,12 +24,12 @@
  * to have valid date. So for U-Boot version 2021.04 OEM_REVISION is set to
  * value 0x20210401.
  */
-#define OEM_REVISION ((((U_BOOT_VERSION_NUM / 1000) % 10) << 28) | \
-                     (((U_BOOT_VERSION_NUM / 100) % 10) << 24) | \
-                     (((U_BOOT_VERSION_NUM / 10) % 10) << 20) | \
-                     ((U_BOOT_VERSION_NUM % 10) << 16) | \
-                     (((U_BOOT_VERSION_NUM_PATCH / 10) % 10) << 12) | \
-                     ((U_BOOT_VERSION_NUM_PATCH % 10) << 8) | \
+#define OEM_REVISION ((((version_num / 1000) % 10) << 28) | \
+                     (((version_num / 100) % 10) << 24) | \
+                     (((version_num / 10) % 10) << 20) | \
+                     ((version_num % 10) << 16) | \
+                     (((version_num_patch / 10) % 10) << 12) | \
+                     ((version_num_patch % 10) << 8) | \
                      0x01)
 
 int acpi_create_dmar(struct acpi_dmar *dmar, enum dmar_flags flags)

diff --git a/test/dm/acpi.c b/test/dm/acpi.c
index 9634fc2e9002e275e9b9d4641277561f891bc958..818f71572c7c64de21db2164dd44a94d12f347aa 100644 (file)
--- a/test/dm/acpi.c
+++ b/test/dm/acpi.c
@@ -11,10 +11,8 @@
 #include <dm.h>
 #include <malloc.h>
 #include <mapmem.h>
-#include <timestamp.h>
-#include <version.h>
 #include <tables_csum.h>
-#include <version.h>
+#include <version_string.h>
 #include <acpi/acpigen.h>
 #include <acpi/acpi_device.h>
 #include <acpi/acpi_table.h>
@@ -26,12 +24,12 @@
 
 #define BUF_SIZE               4096
 
-#define OEM_REVISION ((((U_BOOT_VERSION_NUM / 1000) % 10) << 28) | \
-                     (((U_BOOT_VERSION_NUM / 100) % 10) << 24) | \
-                     (((U_BOOT_VERSION_NUM / 10) % 10) << 20) | \
-                     ((U_BOOT_VERSION_NUM % 10) << 16) | \
-                     (((U_BOOT_VERSION_NUM_PATCH / 10) % 10) << 12) | \
-                     ((U_BOOT_VERSION_NUM_PATCH % 10) << 8) | \
+#define OEM_REVISION ((((version_num / 1000) % 10) << 28) | \
+                     (((version_num / 100) % 10) << 24) | \
+                     (((version_num / 10) % 10) << 20) | \
+                     ((version_num % 10) << 16) | \
+                     (((version_num_patch / 10) % 10) << 12) | \
+                     ((version_num_patch % 10) << 8) | \
                      0x01)
 
 /**