diff options
| author | Angel Pons <th3fanbus@gmail.com> | 2021-02-19 20:38:37 +0100 |
|---|---|---|
| committer | Angel Pons <th3fanbus@gmail.com> | 2021-03-01 19:41:17 +0000 |
| commit | 53496e69ece91d388d66cf26ccc49a1e0a52f833 (patch) | |
| tree | e1873cb23b54f058183ab22b795564503923c446 /src/soc/intel/cannonlake | |
| parent | ec1b37decc207f95f7d0cd9680d1f2aab4b9d1c5 (diff) | |
soc/intel: Drop `romstage_pch_init()` function
It only calls `smbus_common_init()`, so just call that directly.
Change-Id: I0237f52bb9b0503e83f5dbf31c4064bd0f5bae28
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50947
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/intel/cannonlake')
| -rw-r--r-- | src/soc/intel/cannonlake/include/soc/romstage.h | 1 | ||||
| -rw-r--r-- | src/soc/intel/cannonlake/romstage/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/soc/intel/cannonlake/romstage/pch.c | 10 | ||||
| -rw-r--r-- | src/soc/intel/cannonlake/romstage/romstage.c | 5 |
4 files changed, 3 insertions, 14 deletions
diff --git a/src/soc/intel/cannonlake/include/soc/romstage.h b/src/soc/intel/cannonlake/include/soc/romstage.h index 3772db4bc1..ba44f2df26 100644 --- a/src/soc/intel/cannonlake/include/soc/romstage.h +++ b/src/soc/intel/cannonlake/include/soc/romstage.h @@ -7,7 +7,6 @@ void mainboard_memory_init_params(FSPM_UPD *mupd); void systemagent_early_init(void); -void romstage_pch_init(void); /* Board type */ enum board_type { diff --git a/src/soc/intel/cannonlake/romstage/Makefile.inc b/src/soc/intel/cannonlake/romstage/Makefile.inc index 261e5b352b..3db91900b7 100644 --- a/src/soc/intel/cannonlake/romstage/Makefile.inc +++ b/src/soc/intel/cannonlake/romstage/Makefile.inc @@ -4,4 +4,3 @@ romstage-y += ../../../../cpu/intel/car/romstage.c romstage-y += romstage.c romstage-y += fsp_params.c romstage-y += systemagent.c -romstage-y += pch.c diff --git a/src/soc/intel/cannonlake/romstage/pch.c b/src/soc/intel/cannonlake/romstage/pch.c deleted file mode 100644 index f94d611abe..0000000000 --- a/src/soc/intel/cannonlake/romstage/pch.c +++ /dev/null @@ -1,10 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <intelblocks/smbus.h> -#include <soc/romstage.h> - -void romstage_pch_init(void) -{ - /* Program SMBUS_BASE_ADDRESS and enable it */ - smbus_common_init(); -} diff --git a/src/soc/intel/cannonlake/romstage/romstage.c b/src/soc/intel/cannonlake/romstage/romstage.c index 0bf0404ab9..a83cf616e8 100644 --- a/src/soc/intel/cannonlake/romstage/romstage.c +++ b/src/soc/intel/cannonlake/romstage/romstage.c @@ -7,6 +7,7 @@ #include <intelblocks/cfg.h> #include <intelblocks/cse.h> #include <intelblocks/pmclib.h> +#include <intelblocks/smbus.h> #include <memory_info.h> #include <soc/intel/common/smbios.h> #include <soc/iomap.h> @@ -121,8 +122,8 @@ void mainboard_romstage_entry(void) /* Program MCHBAR, DMIBAR, GDXBAR and EDRAMBAR */ systemagent_early_init(); - /* Program PCH init */ - romstage_pch_init(); + /* Program SMBus base address and enable it */ + smbus_common_init(); /* initialize Heci interface */ heci_init(HECI1_BASE_ADDRESS); |