[PATCH v2 0/1] Headers: moved ENV_FILE_NAME from bootguard.h to envdata.h

[Tobias Schmidl]

Diff to v1:
- insted of moving both variables to a third file, let's use envdata.h
as shared include file

Tobias Schmidl (1):
Headers: moved ENV_FILE_NAME from bootguard.h to envdata.h

include/bootguard.h | 4 ++--
include/envdata.h | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)

--
2.37.2

[Tobias Schmidl]

We have two variables that are really dependent on each other, so let's
collect them in envdata.h.

Signed-off-by: Tobias Schmidl <tobias...@siemens.com>
---

include/bootguard.h | 4 ++--
include/envdata.h | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/bootguard.h b/include/bootguard.h
index 8e38d95..588b122 100644
--- a/include/bootguard.h
+++ b/include/bootguard.h
@@ -16,6 +16,8 @@

#include <efi.h>

+#include "envdata.h"
+
/* The following definitions regarding status and error constants are
* implemented the same way the corresponding gnu-efi constants are
* defined. This is done for symmetry reasons and for the sake of
@@ -31,8 +33,6 @@ typedef int BG_STATUS;

#define DEFAULT_TIMEOUT_SEC 60

-#define ENV_FILE_NAME L"BGENV.DAT"
-
extern EFI_HANDLE this_image;

typedef struct _BG_LOADER_PARAMS {
diff --git a/include/envdata.h b/include/envdata.h
index fddfa7f..9c4ad44 100644
--- a/include/envdata.h
+++ b/include/envdata.h
@@ -16,6 +16,7 @@

#include <stdint.h>

+#define ENV_FILE_NAME L"BGENV.DAT"
#define FAT_ENV_FILENAME "BGENV.DAT"
#define ENV_STRING_LENGTH 255

--
2.37.2

[Jan Kiszka]

Thanks, applied.

Jan

--
Siemens AG, Technology
Competence Center Embedded Linux