Angel Pons submitted this change.
mb/google/slippy: Put GPIOs in a C file
This will allow dropping the pointer inside romstage_params.
Change-Id: Iec6dac1a271b22d6c09b4064a9e8a310e57026a6
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43102
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tristan Corrick <tristan@corrick.kiwi>
---
M src/mainboard/google/slippy/Makefile.inc
M src/mainboard/google/slippy/romstage.c
R src/mainboard/google/slippy/variants/falco/gpio.c
M src/mainboard/google/slippy/variants/falco/romstage.c
R src/mainboard/google/slippy/variants/leon/gpio.c
M src/mainboard/google/slippy/variants/leon/romstage.c
R src/mainboard/google/slippy/variants/peppy/gpio.c
M src/mainboard/google/slippy/variants/peppy/romstage.c
R src/mainboard/google/slippy/variants/wolf/gpio.c
M src/mainboard/google/slippy/variants/wolf/romstage.c
10 files changed, 9 insertions(+), 32 deletions(-)
diff --git a/src/mainboard/google/slippy/Makefile.inc b/src/mainboard/google/slippy/Makefile.inc
index e652dac..8f75d72 100644
--- a/src/mainboard/google/slippy/Makefile.inc
+++ b/src/mainboard/google/slippy/Makefile.inc
@@ -7,6 +7,7 @@
smm-y += smihandler.c
+romstage-y += variants/$(VARIANT_DIR)/gpio.c
romstage-y += variants/$(VARIANT_DIR)/romstage.c
subdirs-y += variants/$(VARIANT_DIR)
diff --git a/src/mainboard/google/slippy/romstage.c b/src/mainboard/google/slippy/romstage.c
index 0b43adf..bc14ee0 100644
--- a/src/mainboard/google/slippy/romstage.c
+++ b/src/mainboard/google/slippy/romstage.c
@@ -5,8 +5,11 @@
#include <northbridge/intel/haswell/haswell.h>
#include <northbridge/intel/haswell/raminit.h>
#include <southbridge/intel/lynxpoint/pch.h>
+#include <southbridge/intel/lynxpoint/lp_gpio.h>
#include "variant.h"
+extern const struct pch_lp_gpio_map mainboard_gpio_map[];
+
void mainboard_config_rcba(void)
{
/*
@@ -74,6 +77,7 @@
struct romstage_params romstage_params = {
.pei_data = &pei_data,
+ .gpio_map = &mainboard_gpio_map,
};
variant_romstage_entry(&romstage_params);
diff --git a/src/mainboard/google/slippy/variants/falco/include/variant/gpio.h b/src/mainboard/google/slippy/variants/falco/gpio.c
similarity index 97%
rename from src/mainboard/google/slippy/variants/falco/include/variant/gpio.h
rename to src/mainboard/google/slippy/variants/falco/gpio.c
index c6fc5ca..86efbb8 100644
--- a/src/mainboard/google/slippy/variants/falco/include/variant/gpio.h
+++ b/src/mainboard/google/slippy/variants/falco/gpio.c
@@ -1,9 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef FALCO_GPIO_H
-#define FALCO_GPIO_H
-
-struct pch_lp_gpio_map;
+#include <southbridge/intel/lynxpoint/lp_gpio.h>
const struct pch_lp_gpio_map mainboard_gpio_map[] = {
LP_GPIO_UNUSED, /* 0: UNUSED */
@@ -103,5 +100,3 @@
LP_GPIO_UNUSED, /* 94: UNUSED */
LP_GPIO_END
};
-
-#endif
diff --git a/src/mainboard/google/slippy/variants/falco/romstage.c b/src/mainboard/google/slippy/variants/falco/romstage.c
index 134c797..96fbbab 100644
--- a/src/mainboard/google/slippy/variants/falco/romstage.c
+++ b/src/mainboard/google/slippy/variants/falco/romstage.c
@@ -10,7 +10,6 @@
#include <northbridge/intel/haswell/raminit.h>
#include <southbridge/intel/lynxpoint/pch.h>
#include <southbridge/intel/lynxpoint/lp_gpio.h>
-#include <variant/gpio.h>
#include "../../variant.h"
/* Copy SPD data for on-board memory */
@@ -86,6 +85,5 @@
memcpy(rp->pei_data->usb2_ports, usb2_ports, sizeof(usb2_ports));
memcpy(rp->pei_data->usb3_ports, usb3_ports, sizeof(usb3_ports));
- rp->gpio_map = &mainboard_gpio_map;
rp->copy_spd = copy_spd;
}
diff --git a/src/mainboard/google/slippy/variants/leon/include/variant/gpio.h b/src/mainboard/google/slippy/variants/leon/gpio.c
similarity index 97%
rename from src/mainboard/google/slippy/variants/leon/include/variant/gpio.h
rename to src/mainboard/google/slippy/variants/leon/gpio.c
index f40341a..63babd6 100644
--- a/src/mainboard/google/slippy/variants/leon/include/variant/gpio.h
+++ b/src/mainboard/google/slippy/variants/leon/gpio.c
@@ -1,9 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef LEON_GPIO_H
-#define LEON_GPIO_H
-
-struct pch_lp_gpio_map;
+#include <southbridge/intel/lynxpoint/lp_gpio.h>
const struct pch_lp_gpio_map mainboard_gpio_map[] = {
LP_GPIO_UNUSED, /* 0: UNUSED */
@@ -103,5 +100,3 @@
LP_GPIO_UNUSED, /* 94: UNUSED */
LP_GPIO_END
};
-
-#endif
diff --git a/src/mainboard/google/slippy/variants/leon/romstage.c b/src/mainboard/google/slippy/variants/leon/romstage.c
index 1e20e09..35c5ef5 100644
--- a/src/mainboard/google/slippy/variants/leon/romstage.c
+++ b/src/mainboard/google/slippy/variants/leon/romstage.c
@@ -9,7 +9,6 @@
#include <northbridge/intel/haswell/raminit.h>
#include <southbridge/intel/lynxpoint/pch.h>
#include <southbridge/intel/lynxpoint/lp_gpio.h>
-#include <variant/gpio.h>
#include "../../variant.h"
/* Copy SPD data for on-board memory */
@@ -80,6 +79,5 @@
memcpy(rp->pei_data->usb2_ports, usb2_ports, sizeof(usb2_ports));
memcpy(rp->pei_data->usb3_ports, usb3_ports, sizeof(usb3_ports));
- rp->gpio_map = &mainboard_gpio_map;
rp->copy_spd = copy_spd;
}
diff --git a/src/mainboard/google/slippy/variants/peppy/include/variant/gpio.h b/src/mainboard/google/slippy/variants/peppy/gpio.c
similarity index 97%
rename from src/mainboard/google/slippy/variants/peppy/include/variant/gpio.h
rename to src/mainboard/google/slippy/variants/peppy/gpio.c
index 825e712..fb9ab95 100644
--- a/src/mainboard/google/slippy/variants/peppy/include/variant/gpio.h
+++ b/src/mainboard/google/slippy/variants/peppy/gpio.c
@@ -1,9 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef PEPPY_GPIO_H
-#define PEPPY_GPIO_H
-
-struct pch_lp_gpio_map;
+#include <southbridge/intel/lynxpoint/lp_gpio.h>
const struct pch_lp_gpio_map mainboard_gpio_map[] = {
LP_GPIO_UNUSED, /* 0: UNUSED */
@@ -103,5 +100,3 @@
LP_GPIO_UNUSED, /* 94: UNUSED */
LP_GPIO_END
};
-
-#endif
diff --git a/src/mainboard/google/slippy/variants/peppy/romstage.c b/src/mainboard/google/slippy/variants/peppy/romstage.c
index e37787c..b7daf89 100644
--- a/src/mainboard/google/slippy/variants/peppy/romstage.c
+++ b/src/mainboard/google/slippy/variants/peppy/romstage.c
@@ -10,7 +10,6 @@
#include <northbridge/intel/haswell/raminit.h>
#include <southbridge/intel/lynxpoint/pch.h>
#include <southbridge/intel/lynxpoint/lp_gpio.h>
-#include <variant/gpio.h>
#include "../../onboard.h"
#include "../../variant.h"
@@ -97,6 +96,5 @@
memcpy(rp->pei_data->usb2_ports, usb2_ports, sizeof(usb2_ports));
memcpy(rp->pei_data->usb3_ports, usb3_ports, sizeof(usb3_ports));
- rp->gpio_map = &mainboard_gpio_map;
rp->copy_spd = copy_spd;
}
diff --git a/src/mainboard/google/slippy/variants/wolf/include/variant/gpio.h b/src/mainboard/google/slippy/variants/wolf/gpio.c
similarity index 97%
rename from src/mainboard/google/slippy/variants/wolf/include/variant/gpio.h
rename to src/mainboard/google/slippy/variants/wolf/gpio.c
index 7b1276a..9be9077 100644
--- a/src/mainboard/google/slippy/variants/wolf/include/variant/gpio.h
+++ b/src/mainboard/google/slippy/variants/wolf/gpio.c
@@ -1,9 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef WOLF_GPIO_H
-#define WOLF_GPIO_H
-
-struct pch_lp_gpio_map;
+#include <southbridge/intel/lynxpoint/lp_gpio.h>
const struct pch_lp_gpio_map mainboard_gpio_map[] = {
LP_GPIO_UNUSED, /* 0: UNUSED */
@@ -103,5 +100,3 @@
LP_GPIO_UNUSED, /* 94: UNUSED */
LP_GPIO_END
};
-
-#endif
diff --git a/src/mainboard/google/slippy/variants/wolf/romstage.c b/src/mainboard/google/slippy/variants/wolf/romstage.c
index fd8e632..b35160f 100644
--- a/src/mainboard/google/slippy/variants/wolf/romstage.c
+++ b/src/mainboard/google/slippy/variants/wolf/romstage.c
@@ -10,7 +10,6 @@
#include <northbridge/intel/haswell/raminit.h>
#include <southbridge/intel/lynxpoint/pch.h>
#include <southbridge/intel/lynxpoint/lp_gpio.h>
-#include <variant/gpio.h>
#include "../../variant.h"
/* Copy SPD data for on-board memory */
@@ -84,6 +83,5 @@
memcpy(rp->pei_data->usb2_ports, usb2_ports, sizeof(usb2_ports));
memcpy(rp->pei_data->usb3_ports, usb3_ports, sizeof(usb3_ports));
- rp->gpio_map = &mainboard_gpio_map;
rp->copy_spd = copy_spd;
}
To view, visit change 43102. To unsubscribe, or for help writing mail filters, visit settings.