soc/intel/baytrail: Simplify pattrs definitions

This reduces the differences between Bay Trail and Braswell.

Tested with BUILD_TIMELESS=1, Google Ninja remains identical.

Change-Id: I90632909cd7d632d80739b3762e4ccba51624b75
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43200
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

2 files changed, 4 insertions, 8 deletions

diff --git a/src/soc/intel/baytrail/include/soc/pattrs.h b/src/soc/intel/baytrail/include/soc/pattrs.h
index d485484e0c..cd22e123c9 100644
--- a/src/soc/intel/baytrail/include/soc/pattrs.h
+++ b/src/soc/intel/baytrail/include/soc/pattrs.h
@@ -37,13 +37,10 @@ struct pattrs {
  * This is just to hide the abstraction w/o relying on how the underlying
  * storage is allocated.
  */
-#define PATTRS_GLOB_NAME __global_pattrs
-#define DEFINE_PATTRS struct pattrs PATTRS_GLOB_NAME
-extern DEFINE_PATTRS;
-
+extern struct pattrs __global_pattrs;
 static inline const struct pattrs *pattrs_get(void)
 {
-	return &PATTRS_GLOB_NAME;
+	return &__global_pattrs;
 }
 
 #endif /* _PATTRS_H_ */
diff --git a/src/soc/intel/baytrail/ramstage.c b/src/soc/intel/baytrail/ramstage.c
index 099eb588d3..b15970e7b3 100644
--- a/src/soc/intel/baytrail/ramstage.c
+++ b/src/soc/intel/baytrail/ramstage.c
@@ -22,11 +22,10 @@
 #include <soc/ramstage.h>
 #include <soc/iosf.h>
 
-/* Global PATTRS */
-DEFINE_PATTRS;
-
 #define SHOW_PATTRS 1
 
+struct pattrs __global_pattrs;
+
 static void detect_num_cpus(struct pattrs *attrs)
 {
 	int ecx = 0;