diff options
| author | Tom Rini <[email protected]> | 2023-06-01 11:23:23 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-06-01 11:23:23 -0400 |
| commit | f415495e2a261cab52cb03c46a92b7b457728380 (patch) | |
| tree | eecf08dd3376548353ec92e67c4ad56215c95fe4 /test | |
| parent | e863c7b2854bf9a882939f828023508fb1a1bc16 (diff) | |
| parent | 229d689e3c32164875667da282e496b858dbc608 (diff) | |
Merge branch '2023-05-31-assorted-fixes-and-improvements' into next
- Makefile logic fixes, address some issues that clang uncovers on ARM,
assorted code cleanups
Diffstat (limited to 'test')
| -rw-r--r-- | test/dm/acpi.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/test/dm/acpi.c b/test/dm/acpi.c index 9634fc2e900..818f71572c7 100644 --- 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) /** |