[coreboot-gerrit] Change in coreboot[master]: ec/acpi: Replace __PRE_RAM__ use

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has submitted this change. ( https://review.coreboot.org/c/coreboot/+/35397 )

Change subject: ec/acpi: Replace __PRE_RAM__ use
......................................................................

ec/acpi: Replace __PRE_RAM__ use

Change-Id: Iae31569f16168ba00ce272e4777f3a69bcd6ee94
Signed-off-by: Kyösti Mälkki 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35397
Tested-by: build bot (Jenkins) 
Reviewed-by: Aaron Durbin 
---
M src/ec/acpi/ec.c
1 file changed, 6 insertions(+), 15 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Aaron Durbin: Looks good to me, approved

diff --git a/src/ec/acpi/ec.c b/src/ec/acpi/ec.c
index 481622c..939ff78 100644
--- a/src/ec/acpi/ec.c
+++ b/src/ec/acpi/ec.c
@@ -18,19 +18,11 @@
 #include <device/device.h>
 #include <arch/io.h>
 #include <delay.h>
+#include <stdint.h>
 #include "ec.h"

-#ifdef __PRE_RAM__
-
-static const int ec_cmd_reg = EC_SC;
-static const int ec_data_reg = EC_DATA;
-
-#else
-
-static int ec_cmd_reg = EC_SC;
-static int ec_data_reg = EC_DATA;
-
-#endif
+static u16 ec_cmd_reg = EC_SC;
+static u16 ec_data_reg = EC_DATA;

int send_ec_command(u8 command)
 {
@@ -162,16 +154,15 @@
    ec_write(addr, ec_read(addr) &  ~(1 << bit));
 }

-#ifndef __PRE_RAM__
-
 void ec_set_ports(u16 cmd_reg, u16 data_reg)
 {
+	if (!ENV_STAGE_HAS_DATA_SECTION)
+		return;
+
    ec_cmd_reg = cmd_reg;
    ec_data_reg = data_reg;
 }

-#endif
-
 struct chip_operations ec_acpi_ops = {
    CHIP_NAME("ACPI Embedded Controller")
 };