Marshall Dawson has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38695 )
Change subject: soc/amd/picasso: Move get_soc_config to common location ......................................................................
soc/amd/picasso: Move get_soc_config to common location
Multiple files can eventually take advantage of the static function in i2c.c. Move get_soc_config() into a new common location for all to use.
Signed-off-by: Marshall Dawson marshalldawson3rd@gmail.com Change-Id: If5d9be2f74cde370979033365af2e355eb6d814e --- M src/soc/amd/picasso/Makefile.inc A src/soc/amd/picasso/cfg_util.c M src/soc/amd/picasso/i2c.c 3 files changed, 31 insertions(+), 13 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/95/38695/1
diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc index 59f8e4c..b4ced2c 100644 --- a/src/soc/amd/picasso/Makefile.inc +++ b/src/soc/amd/picasso/Makefile.inc @@ -84,6 +84,7 @@ ramstage-y += tsc_freq.c ramstage-y += finalize.c
+all-y += cfg_util.c all-y += reset.c
smm-y += smihandler.c diff --git a/src/soc/amd/picasso/cfg_util.c b/src/soc/amd/picasso/cfg_util.c new file mode 100644 index 0000000..60555e4 --- /dev/null +++ b/src/soc/amd/picasso/cfg_util.c @@ -0,0 +1,30 @@ +/* + * This file is part of the coreboot project. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <console/console.h> +#include <device/device.h> +#include <soc/pci_devs.h> +#include "chip.h" + +const config_t *get_soc_config(void) +{ + const struct device *dev = pcidev_path_on_root(GNB_DEVFN); + + if (!dev || !dev->chip_info) { + printk(BIOS_ERR, "%s: Could not find SoC devicetree config!\n", + __func__); + return NULL; + } + + return dev->chip_info; +} diff --git a/src/soc/amd/picasso/i2c.c b/src/soc/amd/picasso/i2c.c index bcdf385..408b60b 100644 --- a/src/soc/amd/picasso/i2c.c +++ b/src/soc/amd/picasso/i2c.c @@ -42,19 +42,6 @@ return i2c_bus_address[bus - APU_I2C_MIN_BUS]; }
-static const struct soc_amd_picasso_config *get_soc_config(void) -{ - const struct device *dev = pcidev_path_on_root(GNB_DEVFN); - - if (!dev || !dev->chip_info) { - printk(BIOS_ERR, "%s: Could not find SoC devicetree config!\n", - __func__); - return NULL; - } - - return dev->chip_info; -} - const struct dw_i2c_bus_config *dw_i2c_get_soc_cfg(unsigned int bus) { const struct soc_amd_picasso_config *config;
Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38695 )
Change subject: soc/amd/picasso: Move get_soc_config to common location ......................................................................
Patch Set 1: Code-Review+2
Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/38695 )
Change subject: soc/amd/picasso: Move get_soc_config to common location ......................................................................
soc/amd/picasso: Move get_soc_config to common location
Multiple files can eventually take advantage of the static function in i2c.c. Move get_soc_config() into a new common location for all to use.
Signed-off-by: Marshall Dawson marshalldawson3rd@gmail.com Change-Id: If5d9be2f74cde370979033365af2e355eb6d814e Reviewed-on: https://review.coreboot.org/c/coreboot/+/38695 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Felix Held felix-coreboot@felixheld.de --- M src/soc/amd/picasso/Makefile.inc A src/soc/amd/picasso/cfg_util.c M src/soc/amd/picasso/i2c.c 3 files changed, 31 insertions(+), 13 deletions(-)
Approvals: build bot (Jenkins): Verified Felix Held: Looks good to me, approved
diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc index 680f0fa..89fd5c4 100644 --- a/src/soc/amd/picasso/Makefile.inc +++ b/src/soc/amd/picasso/Makefile.inc @@ -78,6 +78,7 @@ ramstage-y += tsc_freq.c ramstage-y += finalize.c
+all-y += cfg_util.c all-y += reset.c
smm-y += smihandler.c diff --git a/src/soc/amd/picasso/cfg_util.c b/src/soc/amd/picasso/cfg_util.c new file mode 100644 index 0000000..60555e4 --- /dev/null +++ b/src/soc/amd/picasso/cfg_util.c @@ -0,0 +1,30 @@ +/* + * This file is part of the coreboot project. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <console/console.h> +#include <device/device.h> +#include <soc/pci_devs.h> +#include "chip.h" + +const config_t *get_soc_config(void) +{ + const struct device *dev = pcidev_path_on_root(GNB_DEVFN); + + if (!dev || !dev->chip_info) { + printk(BIOS_ERR, "%s: Could not find SoC devicetree config!\n", + __func__); + return NULL; + } + + return dev->chip_info; +} diff --git a/src/soc/amd/picasso/i2c.c b/src/soc/amd/picasso/i2c.c index bcdf385..408b60b 100644 --- a/src/soc/amd/picasso/i2c.c +++ b/src/soc/amd/picasso/i2c.c @@ -42,19 +42,6 @@ return i2c_bus_address[bus - APU_I2C_MIN_BUS]; }
-static const struct soc_amd_picasso_config *get_soc_config(void) -{ - const struct device *dev = pcidev_path_on_root(GNB_DEVFN); - - if (!dev || !dev->chip_info) { - printk(BIOS_ERR, "%s: Could not find SoC devicetree config!\n", - __func__); - return NULL; - } - - return dev->chip_info; -} - const struct dw_i2c_bus_config *dw_i2c_get_soc_cfg(unsigned int bus) { const struct soc_amd_picasso_config *config;
-
Felix Held (Code Review) -
Marshall Dawson (Code Review)