Change in coreboot[master]: amd/picasso/fsp: fix descriptor types

[Felix Held (Code Review)]

Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41585 )

Change subject: amd/picasso/fsp: fix descriptor types
......................................................................

amd/picasso/fsp: fix descriptor types

Fixup for 31ce1031771237f1b75b901859055f7124fa656c part 1.

Change-Id: I2ddc235b2e227a4a1610b103ccb536bd0e3db5b5
Signed-off-by: Felix Held 
---
M src/soc/amd/picasso/fsp_params.c
M src/soc/amd/picasso/include/soc/platform_descriptors.h
2 files changed, 10 insertions(+), 10 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/85/41585/1

diff --git a/src/soc/amd/picasso/fsp_params.c b/src/soc/amd/picasso/fsp_params.c
index 2d83220..67fe7d8 100644
--- a/src/soc/amd/picasso/fsp_params.c
+++ b/src/soc/amd/picasso/fsp_params.c
@@ -56,13 +56,13 @@
 }

static void fill_pcie_descriptors(FSP_S_CONFIG *scfg,
-			const picasso_fsp_pcie_descriptor *descs, size_t num)
+			const fsp_pcie_descriptor *descs, size_t num)
 {
    size_t i;
-	picasso_fsp_pcie_descriptor *fsp_pcie;
+	fsp_pcie_descriptor *fsp_pcie;

/* FIXME: this violates C rules. */
-	fsp_pcie = (picasso_fsp_pcie_descriptor *)(scfg->dxio_descriptor0);
+	fsp_pcie = (fsp_pcie_descriptor *)(scfg->dxio_descriptor0);

for (i = 0; i < num; i++) {
    	fsp_pcie[i] = descs[i];
@@ -70,13 +70,13 @@
 }

static void fill_ddi_descriptors(FSP_S_CONFIG *scfg,
-			const picasso_fsp_ddi_descriptor *descs, size_t num)
+			const fsp_ddi_descriptor *descs, size_t num)
 {
    size_t i;
-	picasso_fsp_ddi_descriptor *fsp_ddi;
+	fsp_ddi_descriptor *fsp_ddi;

/* FIXME: this violates C rules. */
-	fsp_ddi = (picasso_fsp_ddi_descriptor *)&(scfg->ddi_descriptor0);
+	fsp_ddi = (fsp_ddi_descriptor *)&(scfg->ddi_descriptor0);

for (i = 0; i < num; i++) {
    	fsp_ddi[i] = descs[i];
@@ -84,8 +84,8 @@
 }
 static void fsp_fill_pcie_ddi_descriptors(FSP_S_CONFIG *scfg)
 {
-	const picasso_fsp_pcie_descriptor *fsp_pcie;
-	const picasso_fsp_ddi_descriptor *fsp_ddi;
+	const fsp_pcie_descriptor *fsp_pcie;
+	const fsp_ddi_descriptor *fsp_ddi;
    size_t num_pcie;
    size_t num_ddi;

diff --git a/src/soc/amd/picasso/include/soc/platform_descriptors.h b/src/soc/amd/picasso/include/soc/platform_descriptors.h
index 58d98c1..c217d75 100644
--- a/src/soc/amd/picasso/include/soc/platform_descriptors.h
+++ b/src/soc/amd/picasso/include/soc/platform_descriptors.h
@@ -24,7 +24,7 @@

/* Mainboard callback to obtain PCIe and DDI descriptors. */
 void mainboard_get_pcie_ddi_descriptors(
-		const picasso_fsp_pcie_descriptor **pcie_descs, size_t *pcie_num,
-		const picasso_fsp_ddi_descriptor **ddi_descs, size_t *ddi_num);
+		const fsp_pcie_descriptor **pcie_descs, size_t *pcie_num,
+		const fsp_ddi_descriptor **ddi_descs, size_t *ddi_num);

#endif /* __PICASSO_PLATFORM_DESCRIPTORS_H__ */

[Felix Held (Code Review)]

Felix Held has uploaded a new patch set (#2). ( https://review.coreboot.org/c/coreboot/+/41585 )

Change subject: amd/picasso/fsp: fix descriptor types
......................................................................

amd/picasso/fsp: fix descriptor types

Fixup for 89e51e6178186bce7f602007232980adc28ca510 part 1.

Change-Id: I2ddc235b2e227a4a1610b103ccb536bd0e3db5b5
Signed-off-by: Felix Held 
---
M src/soc/amd/picasso/fsp_params.c
M src/soc/amd/picasso/include/soc/platform_descriptors.h
2 files changed, 10 insertions(+), 10 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/85/41585/2

[Raul Rangel (Code Review)]

Raul Rangel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41585 )

Change subject: amd/picasso/fsp: fix descriptor types
......................................................................

Patch Set 2:

When I copied this from coreboot-zork, I missed the rename of the struct. I had it in a local WIP branch. Here is the fix: https://review.coreboot.org/c/coreboot/+/41579

[Felix Held (Code Review)]

Felix Held has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/41585 )

Change subject: amd/picasso/fsp: fix descriptor types
......................................................................

Abandoned

ok, let's keep the prefix for now to avaoid to messy rebases of the zork code