Kyösti Mälkki has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31930 )
Change subject: mb/*/chromeos.c: Be explicit about code for ramstage ......................................................................
mb/*/chromeos.c: Be explicit about code for ramstage
Motivation is to reduce use of !__PRE_RAM__, it does not mean ENV_RAMSTAGE but we also exclude ENV_SMM with the change.
Change-Id: I1f96bb8c055a3da63274e1ab7f7d4bc70867cbf1 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/31930 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Julius Werner jwerner@chromium.org --- M src/mainboard/google/beltino/chromeos.c M src/mainboard/google/butterfly/chromeos.c M src/mainboard/google/jecht/chromeos.c M src/mainboard/google/parrot/chromeos.c M src/mainboard/google/stout/chromeos.c M src/mainboard/intel/baskingridge/chromeos.c M src/mainboard/intel/emeraldlake2/chromeos.c M src/mainboard/samsung/lumpy/chromeos.c M src/mainboard/samsung/stumpy/chromeos.c 9 files changed, 9 insertions(+), 9 deletions(-)
Approvals: build bot (Jenkins): Verified Julius Werner: Looks good to me, approved
diff --git a/src/mainboard/google/beltino/chromeos.c b/src/mainboard/google/beltino/chromeos.c index c6b0db2..dfa93a2 100644 --- a/src/mainboard/google/beltino/chromeos.c +++ b/src/mainboard/google/beltino/chromeos.c @@ -28,7 +28,7 @@ #define FLAG_REC_MODE 1 #define FLAG_DEV_MODE 2
-#ifndef __PRE_RAM__ +#if ENV_RAMSTAGE #include <boot/coreboot_tables.h>
void fill_lb_gpios(struct lb_gpios *gpios) diff --git a/src/mainboard/google/butterfly/chromeos.c b/src/mainboard/google/butterfly/chromeos.c index 4108e31..11b28cd 100644 --- a/src/mainboard/google/butterfly/chromeos.c +++ b/src/mainboard/google/butterfly/chromeos.c @@ -30,7 +30,7 @@ #define DEVMODE_GPIO 54 #define FORCE_RECOVERY_MODE 0
-#ifndef __PRE_RAM__ +#if ENV_RAMSTAGE #include <boot/coreboot_tables.h>
#define GPIO_COUNT 6 diff --git a/src/mainboard/google/jecht/chromeos.c b/src/mainboard/google/jecht/chromeos.c index 05c8a3e..548470e 100644 --- a/src/mainboard/google/jecht/chromeos.c +++ b/src/mainboard/google/jecht/chromeos.c @@ -29,7 +29,7 @@ #define FLAG_REC_MODE 1 #define FLAG_DEV_MODE 2
-#ifndef __PRE_RAM__ +#if ENV_RAMSTAGE #include <boot/coreboot_tables.h>
void fill_lb_gpios(struct lb_gpios *gpios) diff --git a/src/mainboard/google/parrot/chromeos.c b/src/mainboard/google/parrot/chromeos.c index 6e6a4de..1420bf5 100644 --- a/src/mainboard/google/parrot/chromeos.c +++ b/src/mainboard/google/parrot/chromeos.c @@ -27,7 +27,7 @@ #include "ec.h"
-#ifndef __PRE_RAM__ +#if ENV_RAMSTAGE #include <boot/coreboot_tables.h>
#define GPIO_COUNT 6 diff --git a/src/mainboard/google/stout/chromeos.c b/src/mainboard/google/stout/chromeos.c index 6a4be31..d366e40 100644 --- a/src/mainboard/google/stout/chromeos.c +++ b/src/mainboard/google/stout/chromeos.c @@ -26,7 +26,7 @@ #include "ec.h" #include <ec/quanta/it8518/ec.h>
-#ifndef __PRE_RAM__ +#if ENV_RAMSTAGE #include <boot/coreboot_tables.h>
#define GPIO_COUNT 7 diff --git a/src/mainboard/intel/baskingridge/chromeos.c b/src/mainboard/intel/baskingridge/chromeos.c index 69e1050..1c62e5e 100644 --- a/src/mainboard/intel/baskingridge/chromeos.c +++ b/src/mainboard/intel/baskingridge/chromeos.c @@ -23,7 +23,7 @@ #include <southbridge/intel/common/gpio.h> #include <vendorcode/google/chromeos/chromeos.h>
-#ifndef __PRE_RAM__ +#if ENV_RAMSTAGE #include <boot/coreboot_tables.h>
#define GPIO_COUNT 6 diff --git a/src/mainboard/intel/emeraldlake2/chromeos.c b/src/mainboard/intel/emeraldlake2/chromeos.c index 24f8875..8c0aeea 100644 --- a/src/mainboard/intel/emeraldlake2/chromeos.c +++ b/src/mainboard/intel/emeraldlake2/chromeos.c @@ -23,7 +23,7 @@ #include <southbridge/intel/common/gpio.h> #include <vendorcode/google/chromeos/chromeos.h>
-#ifndef __PRE_RAM__ +#if ENV_RAMSTAGE #include <boot/coreboot_tables.h>
#define GPIO_COUNT 6 diff --git a/src/mainboard/samsung/lumpy/chromeos.c b/src/mainboard/samsung/lumpy/chromeos.c index baa4094..0dba27a 100644 --- a/src/mainboard/samsung/lumpy/chromeos.c +++ b/src/mainboard/samsung/lumpy/chromeos.c @@ -31,7 +31,7 @@ #define FLAG_REC_MODE 1 #define FLAG_DEV_MODE 2
-#ifndef __SIMPLE_DEVICE__ +#if ENV_RAMSTAGE #include <boot/coreboot_tables.h> #include "ec.h" #include <ec/smsc/mec1308/ec.h> diff --git a/src/mainboard/samsung/stumpy/chromeos.c b/src/mainboard/samsung/stumpy/chromeos.c index 85f9038..d055444 100644 --- a/src/mainboard/samsung/stumpy/chromeos.c +++ b/src/mainboard/samsung/stumpy/chromeos.c @@ -30,7 +30,7 @@ #define FLAG_REC_MODE 1 #define FLAG_DEV_MODE 2
-#ifndef __PRE_RAM__ +#if ENV_RAMSTAGE #include <boot/coreboot_tables.h>
#define GPIO_COUNT 6