summaryrefslogtreecommitdiff
path: root/src/mainboard/intel
diff options
context:
space:
mode:
authorJeremy Compostella <jeremy.compostella@intel.com>2023-09-06 10:57:56 -0700
committerFelix Held <felix-coreboot@felixheld.de>2023-09-18 13:18:23 +0000
commitf65ae7490a8f8c1ada67902b149ac6591c21b2d1 (patch)
treef62ca90dbfde5fe3359a6bc0646e3a294c95df15 /src/mainboard/intel
parent4712f5d56002ec7c2e986c9d1c1914177b52c445 (diff)
clean-up: Remove the no more necessary `ENV_HAS_DATA_SECTION` flag
With commit b7832de0260b042c25bf8f53abcb32e20a29ae9c ("x86: Add .data section support for pre-memory stages"), the `ENV_HAS_DATA_SECTION' flag and its derivatives can now be removed from the code. Change-Id: Ic0afac76264a9bd4a9c93ca35c90bd84e9b747a2 Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/77291 Reviewed-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Maximilian Brune <maximilian.brune@9elements.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/intel')
-rw-r--r--src/mainboard/intel/adlrvp/board_id.c2
-rw-r--r--src/mainboard/intel/glkrvp/boardid.c2
-rw-r--r--src/mainboard/intel/glkrvp/variants/baseboard/boardid.c2
-rw-r--r--src/mainboard/intel/jasperlake_rvp/board_id.c2
-rw-r--r--src/mainboard/intel/kblrvp/board_id.c2
-rw-r--r--src/mainboard/intel/tglrvp/board_id.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/mainboard/intel/adlrvp/board_id.c b/src/mainboard/intel/adlrvp/board_id.c
index de7a3804d9..041cdff451 100644
--- a/src/mainboard/intel/adlrvp/board_id.c
+++ b/src/mainboard/intel/adlrvp/board_id.c
@@ -19,7 +19,7 @@ static uint32_t get_board_id_via_ext_ec(void)
/* Get Board ID via EC I/O port write/read */
int get_board_id(void)
{
- MAYBE_STATIC_NONZERO int id = -1;
+ static int id = -1;
if (id < 0) {
if (CONFIG(EC_GOOGLE_CHROMEEC)) {
diff --git a/src/mainboard/intel/glkrvp/boardid.c b/src/mainboard/intel/glkrvp/boardid.c
index e53a0a11f7..35dcc4b29d 100644
--- a/src/mainboard/intel/glkrvp/boardid.c
+++ b/src/mainboard/intel/glkrvp/boardid.c
@@ -12,7 +12,7 @@
uint32_t board_id(void)
{
- MAYBE_STATIC_NONZERO int id = -1;
+ static int id = -1;
if (id < 0) {
if (CONFIG(EC_GOOGLE_CHROMEEC))
id = variant_board_id();
diff --git a/src/mainboard/intel/glkrvp/variants/baseboard/boardid.c b/src/mainboard/intel/glkrvp/variants/baseboard/boardid.c
index 2553dccde5..54081d1b81 100644
--- a/src/mainboard/intel/glkrvp/variants/baseboard/boardid.c
+++ b/src/mainboard/intel/glkrvp/variants/baseboard/boardid.c
@@ -6,7 +6,7 @@
int variant_board_id(void)
{
- MAYBE_STATIC_NONZERO uint32_t id = BOARD_ID_INIT;
+ static uint32_t id = BOARD_ID_INIT;
if (CONFIG(EC_GOOGLE_CHROMEEC)) {
if (id == BOARD_ID_INIT) {
diff --git a/src/mainboard/intel/jasperlake_rvp/board_id.c b/src/mainboard/intel/jasperlake_rvp/board_id.c
index 90609ff079..d1876de48f 100644
--- a/src/mainboard/intel/jasperlake_rvp/board_id.c
+++ b/src/mainboard/intel/jasperlake_rvp/board_id.c
@@ -23,7 +23,7 @@ static uint32_t get_board_id_via_ext_ec(void)
*/
int get_board_id(void)
{
- MAYBE_STATIC_NONZERO int id = -1;
+ static int id = -1;
if (id < 0) {
if (CONFIG(EC_GOOGLE_CHROMEEC)) {
diff --git a/src/mainboard/intel/kblrvp/board_id.c b/src/mainboard/intel/kblrvp/board_id.c
index c206b8675e..4305295d9b 100644
--- a/src/mainboard/intel/kblrvp/board_id.c
+++ b/src/mainboard/intel/kblrvp/board_id.c
@@ -9,7 +9,7 @@
*/
int get_ec_boardinfo(void)
{
- MAYBE_STATIC_NONZERO int ec_info = -1;
+ static int ec_info = -1;
if (ec_info < 0) {
uint8_t buffer[2];
uint8_t index;
diff --git a/src/mainboard/intel/tglrvp/board_id.c b/src/mainboard/intel/tglrvp/board_id.c
index a6cad1c4d8..fc262fea9e 100644
--- a/src/mainboard/intel/tglrvp/board_id.c
+++ b/src/mainboard/intel/tglrvp/board_id.c
@@ -20,7 +20,7 @@ static uint32_t get_board_id_via_ext_ec(void)
/* Get Board ID via EC I/O port write/read */
int get_board_id(void)
{
- MAYBE_STATIC_NONZERO int id = -1;
+ static int id = -1;
if (id < 0) {
if (CONFIG(EC_GOOGLE_CHROMEEC)) {