[PATCH] fsp: Move and rename fsp_types.h file
The fsp_types.h header file contains macros for building signatures of different widths. These signature macros are architecture agnostic, and can be used in all places which use signatures in a data structure. Move and rename the fsp_types.h under the common include header.
Signed-off-by: Sughosh Ganu sughosh.ganu@linaro.org ---
Build tested for cougarcanyon2 board which builds the relevant fsp code.
arch/x86/include/asm/fsp/fsp_support.h | 3 ++- .../asm/fsp/fsp_types.h => include/signature_types.h | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) rename arch/x86/include/asm/fsp/fsp_types.h => include/signature_types.h (94%)
diff --git a/arch/x86/include/asm/fsp/fsp_support.h b/arch/x86/include/asm/fsp/fsp_support.h index 29e511415c..7651a0dac0 100644 --- a/arch/x86/include/asm/fsp/fsp_support.h +++ b/arch/x86/include/asm/fsp/fsp_support.h @@ -11,10 +11,11 @@ #include <asm/fsp/fsp_fv.h> #include <asm/fsp/fsp_hob.h> #include <asm/fsp/fsp_infoheader.h> -#include <asm/fsp/fsp_types.h> #include <asm/fsp_arch.h> #include <asm/fsp/fsp_azalia.h>
+#include <signature_types.h> + #define FSP_LOWMEM_BASE 0x100000UL #define FSP_HIGHMEM_BASE 0x100000000ULL #define UPD_TERMINATOR 0x55AA diff --git a/arch/x86/include/asm/fsp/fsp_types.h b/include/signature_types.h similarity index 94% rename from arch/x86/include/asm/fsp/fsp_types.h rename to include/signature_types.h index 3d5b17ecf1..9b8c0543f6 100644 --- a/arch/x86/include/asm/fsp/fsp_types.h +++ b/include/signature_types.h @@ -4,8 +4,8 @@ * Copyright (C) 2014, Bin Meng bmeng.cn@gmail.com */
-#ifndef __FSP_TYPES_H__ -#define __FSP_TYPES_H__ +#ifndef __SIGNATURE_TYPES_H__ +#define __SIGNATURE_TYPES_H__
/** * Returns a 16-bit signature built from 2 ASCII characters. @@ -59,4 +59,4 @@ #define SIGNATURE_64(A, B, C, D, E, F, G, H) \ (SIGNATURE_32(A, B, C, D) | ((u64)(SIGNATURE_32(E, F, G, H)) << 32))
-#endif +#endif /* __SIGNATURE_TYPES_H__ */
Hi Sughosh,
On Fri, 11 Dec 2020 at 03:06, Sughosh Ganu sughosh.ganu@linaro.org wrote:
The fsp_types.h header file contains macros for building signatures of different widths. These signature macros are architecture agnostic, and can be used in all places which use signatures in a data structure. Move and rename the fsp_types.h under the common include header.
Signed-off-by: Sughosh Ganu sughosh.ganu@linaro.org
Build tested for cougarcanyon2 board which builds the relevant fsp code.
arch/x86/include/asm/fsp/fsp_support.h | 3 ++- .../asm/fsp/fsp_types.h => include/signature_types.h | 6 +++---
How about just signatures.h ?
2 files changed, 5 insertions(+), 4 deletions(-) rename arch/x86/include/asm/fsp/fsp_types.h => include/signature_types.h (94%)
diff --git a/arch/x86/include/asm/fsp/fsp_support.h b/arch/x86/include/asm/fsp/fsp_support.h index 29e511415c..7651a0dac0 100644 --- a/arch/x86/include/asm/fsp/fsp_support.h +++ b/arch/x86/include/asm/fsp/fsp_support.h @@ -11,10 +11,11 @@ #include <asm/fsp/fsp_fv.h> #include <asm/fsp/fsp_hob.h> #include <asm/fsp/fsp_infoheader.h> -#include <asm/fsp/fsp_types.h> #include <asm/fsp_arch.h> #include <asm/fsp/fsp_azalia.h>
+#include <signature_types.h>
Can you put that at the top, as we normally put asm headers below common ones.
#define FSP_LOWMEM_BASE 0x100000UL #define FSP_HIGHMEM_BASE 0x100000000ULL #define UPD_TERMINATOR 0x55AA diff --git a/arch/x86/include/asm/fsp/fsp_types.h b/include/signature_types.h similarity index 94% rename from arch/x86/include/asm/fsp/fsp_types.h rename to include/signature_types.h index 3d5b17ecf1..9b8c0543f6 100644 --- a/arch/x86/include/asm/fsp/fsp_types.h +++ b/include/signature_types.h @@ -4,8 +4,8 @@
- Copyright (C) 2014, Bin Meng bmeng.cn@gmail.com
*/
-#ifndef __FSP_TYPES_H__ -#define __FSP_TYPES_H__ +#ifndef __SIGNATURE_TYPES_H__ +#define __SIGNATURE_TYPES_H__
/**
- Returns a 16-bit signature built from 2 ASCII characters.
@@ -59,4 +59,4 @@ #define SIGNATURE_64(A, B, C, D, E, F, G, H) \ (SIGNATURE_32(A, B, C, D) | ((u64)(SIGNATURE_32(E, F, G, H)) << 32))
-#endif
+#endif /* __SIGNATURE_TYPES_H__ */
2.17.1
Regards, Simon
hi Simon,
On Sat, 12 Dec 2020 at 21:10, Simon Glass sjg@chromium.org wrote:
Hi Sughosh,
On Fri, 11 Dec 2020 at 03:06, Sughosh Ganu sughosh.ganu@linaro.org wrote:
The fsp_types.h header file contains macros for building signatures of different widths. These signature macros are architecture agnostic, and can be used in all places which use signatures in a data structure. Move and rename the fsp_types.h under the common include header.
Signed-off-by: Sughosh Ganu sughosh.ganu@linaro.org
Build tested for cougarcanyon2 board which builds the relevant fsp code.
arch/x86/include/asm/fsp/fsp_support.h | 3 ++- .../asm/fsp/fsp_types.h => include/signature_types.h | 6 +++---
How about just signatures.h ?
Ok. Will change.
2 files changed, 5 insertions(+), 4 deletions(-) rename arch/x86/include/asm/fsp/fsp_types.h =>
include/signature_types.h (94%)
diff --git a/arch/x86/include/asm/fsp/fsp_support.h
b/arch/x86/include/asm/fsp/fsp_support.h
index 29e511415c..7651a0dac0 100644 --- a/arch/x86/include/asm/fsp/fsp_support.h +++ b/arch/x86/include/asm/fsp/fsp_support.h @@ -11,10 +11,11 @@ #include <asm/fsp/fsp_fv.h> #include <asm/fsp/fsp_hob.h> #include <asm/fsp/fsp_infoheader.h> -#include <asm/fsp/fsp_types.h> #include <asm/fsp_arch.h> #include <asm/fsp/fsp_azalia.h>
+#include <signature_types.h>
Can you put that at the top, as we normally put asm headers below common ones.
Sure, I will re-arrange. Thanks for your review.
-sughosh
On Fri, Dec 11, 2020 at 6:06 PM Sughosh Ganu sughosh.ganu@linaro.org wrote:
The fsp_types.h header file contains macros for building signatures of different widths. These signature macros are architecture agnostic, and can be used in all places which use signatures in a data structure. Move and rename the fsp_types.h under the common include header.
Signed-off-by: Sughosh Ganu sughosh.ganu@linaro.org
Build tested for cougarcanyon2 board which builds the relevant fsp code.
arch/x86/include/asm/fsp/fsp_support.h | 3 ++- .../asm/fsp/fsp_types.h => include/signature_types.h | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) rename arch/x86/include/asm/fsp/fsp_types.h => include/signature_types.h (94%)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
participants (3)
-
Bin Meng -
Simon Glass -
Sughosh Ganu