diff options
| -rw-r--r-- | src/soc/intel/elkhartlake/acpi/gpio.asl | 1 | ||||
| -rw-r--r-- | src/soc/intel/elkhartlake/fsp_params.c | 4 | ||||
| -rw-r--r-- | src/soc/intel/elkhartlake/include/soc/gpio.h | 2 | ||||
| -rw-r--r-- | src/soc/intel/elkhartlake/romstage/fsp_params.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/elkhartlake/romstage/romstage.c | 2 |
5 files changed, 4 insertions, 7 deletions
diff --git a/src/soc/intel/elkhartlake/acpi/gpio.asl b/src/soc/intel/elkhartlake/acpi/gpio.asl index ac0d1df5cb..27cb503f45 100644 --- a/src/soc/intel/elkhartlake/acpi/gpio.asl +++ b/src/soc/intel/elkhartlake/acpi/gpio.asl @@ -3,6 +3,7 @@ #include <intelblocks/gpio.h> #include <soc/gpio_defs.h> #include <soc/intel/common/acpi/gpio.asl> +#include <soc/intel/common/block/acpi/acpi/gpio_op.asl> #include <soc/irq.h> #include <soc/pcr_ids.h> diff --git a/src/soc/intel/elkhartlake/fsp_params.c b/src/soc/intel/elkhartlake/fsp_params.c index 3d740fb74c..83a3699dad 100644 --- a/src/soc/intel/elkhartlake/fsp_params.c +++ b/src/soc/intel/elkhartlake/fsp_params.c @@ -44,17 +44,13 @@ static const pci_devfn_t serial_io_dev[] = { static void parse_devicetree(FSP_S_CONFIG *params) { - const struct soc_intel_elkhartlake_config *config = config_of_soc(); /* TODO: Update with UPD override as FSP matures */ } /* UPD parameters to be initialized before SiliconInit */ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd) { - unsigned int i; - struct device *dev; FSP_S_CONFIG *params = &supd->FspsConfig; - struct soc_intel_elkhartlake_config *config = config_of_soc(); /* Parse device tree and fill in FSP UPDs */ parse_devicetree(params); diff --git a/src/soc/intel/elkhartlake/include/soc/gpio.h b/src/soc/intel/elkhartlake/include/soc/gpio.h index 6cca742614..367df82276 100644 --- a/src/soc/intel/elkhartlake/include/soc/gpio.h +++ b/src/soc/intel/elkhartlake/include/soc/gpio.h @@ -3,8 +3,8 @@ #ifndef _SOC_ELKHARTLAKE_GPIO_H_ #define _SOC_ELKHARTLAKE_GPIO_H_ -#include <intelblocks/gpio.h> #include <soc/gpio_defs.h> +#include <intelblocks/gpio.h> #define CROS_GPIO_NAME "INT34C8" #define CROS_GPIO_COMM0_NAME "INT34C8:00" diff --git a/src/soc/intel/elkhartlake/romstage/fsp_params.c b/src/soc/intel/elkhartlake/romstage/fsp_params.c index 3961dfc167..0fa8451b62 100644 --- a/src/soc/intel/elkhartlake/romstage/fsp_params.c +++ b/src/soc/intel/elkhartlake/romstage/fsp_params.c @@ -25,7 +25,7 @@ void platform_fsp_memory_init_params_cb(FSPM_UPD *mupd, uint32_t version) mainboard_memory_init_params(mupd); } -void mainboard_memory_init_params(FSPM_UPD *mupd) +__weak void mainboard_memory_init_params(FSPM_UPD *mupd) { /* TODO: Update later together with UPD updates */ } diff --git a/src/soc/intel/elkhartlake/romstage/romstage.c b/src/soc/intel/elkhartlake/romstage/romstage.c index ae9cc4afe6..7ca031899f 100644 --- a/src/soc/intel/elkhartlake/romstage/romstage.c +++ b/src/soc/intel/elkhartlake/romstage/romstage.c @@ -62,7 +62,7 @@ static void save_dimm_info(void) /* Allow mainboard to override DRAM part number. */ dram_part_num = mainboard_get_dram_part_num(); if (dram_part_num) { - dram_part_num = strlen(dram_part_num); + dram_part_num_len = strlen(dram_part_num); is_dram_part_overridden = true; } |