From 43b7f416783ccc98952a4eb5f9274907442b03e5 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 7 Mar 2022 04:34:52 +0100 Subject: src: Make PCI ID define names shorter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Shorten define names containing PCI_{DEVICE,VENDOR}_ID_ with PCI_{DID,VID}_ using the commands below, which also take care of some spacing issues. An additional clean up of pci_ids.h is done in CB:61531. Used commands: * find -type f -exec sed -i 's/PCI_\([DV]\)\(EVICE\|ENDOR\)_ID_\([_0-9A-Za-z]\{2\}\([_0-9A-Za-z]\{8\}\)*[_0-9A-Za-z]\{0,5\}\)\t/PCI_\1ID_\3\t\t/g' * find -type f -exec sed -i 's/PCI_\([DV]\)\(EVICE\|ENDOR\)_ID_\([_0-9A-Za-z]*\)/PCI_\1ID_\3/g' Change-Id: If9027700f53b6d0d3964c26a41a1f9b8f62be178 Signed-off-by: Felix Singer Reviewed-on: https://review.coreboot.org/c/coreboot/+/39331 Tested-by: build bot (Jenkins) Reviewed-by: Michael Niewöhner --- src/soc/intel/alderlake/cpu.c | 60 +++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'src/soc/intel/alderlake/cpu.c') diff --git a/src/soc/intel/alderlake/cpu.c b/src/soc/intel/alderlake/cpu.c index 426f6216b6..66db16b6ed 100644 --- a/src/soc/intel/alderlake/cpu.c +++ b/src/soc/intel/alderlake/cpu.c @@ -174,43 +174,43 @@ void soc_init_cpus(struct bus *cpu_bus) enum adl_cpu_type get_adl_cpu_type(void) { const uint16_t adl_m_mch_ids[] = { - PCI_DEVICE_ID_INTEL_ADL_M_ID_1, - PCI_DEVICE_ID_INTEL_ADL_M_ID_2, + PCI_DID_INTEL_ADL_M_ID_1, + PCI_DID_INTEL_ADL_M_ID_2, }; const uint16_t adl_p_mch_ids[] = { - PCI_DEVICE_ID_INTEL_ADL_P_ID_1, - PCI_DEVICE_ID_INTEL_ADL_P_ID_3, - PCI_DEVICE_ID_INTEL_ADL_P_ID_4, - PCI_DEVICE_ID_INTEL_ADL_P_ID_5, - PCI_DEVICE_ID_INTEL_ADL_P_ID_6, - PCI_DEVICE_ID_INTEL_ADL_P_ID_7, - PCI_DEVICE_ID_INTEL_ADL_P_ID_8, - PCI_DEVICE_ID_INTEL_ADL_P_ID_9, - PCI_DEVICE_ID_INTEL_ADL_P_ID_10 + PCI_DID_INTEL_ADL_P_ID_1, + PCI_DID_INTEL_ADL_P_ID_3, + PCI_DID_INTEL_ADL_P_ID_4, + PCI_DID_INTEL_ADL_P_ID_5, + PCI_DID_INTEL_ADL_P_ID_6, + PCI_DID_INTEL_ADL_P_ID_7, + PCI_DID_INTEL_ADL_P_ID_8, + PCI_DID_INTEL_ADL_P_ID_9, + PCI_DID_INTEL_ADL_P_ID_10 }; const uint16_t adl_s_mch_ids[] = { - PCI_DEVICE_ID_INTEL_ADL_S_ID_1, - PCI_DEVICE_ID_INTEL_ADL_S_ID_2, - PCI_DEVICE_ID_INTEL_ADL_S_ID_3, - PCI_DEVICE_ID_INTEL_ADL_S_ID_4, - PCI_DEVICE_ID_INTEL_ADL_S_ID_5, - PCI_DEVICE_ID_INTEL_ADL_S_ID_6, - PCI_DEVICE_ID_INTEL_ADL_S_ID_7, - PCI_DEVICE_ID_INTEL_ADL_S_ID_8, - PCI_DEVICE_ID_INTEL_ADL_S_ID_9, - PCI_DEVICE_ID_INTEL_ADL_S_ID_10, - PCI_DEVICE_ID_INTEL_ADL_S_ID_11, - PCI_DEVICE_ID_INTEL_ADL_S_ID_12, - PCI_DEVICE_ID_INTEL_ADL_S_ID_13, - PCI_DEVICE_ID_INTEL_ADL_S_ID_14, - PCI_DEVICE_ID_INTEL_ADL_S_ID_15, + PCI_DID_INTEL_ADL_S_ID_1, + PCI_DID_INTEL_ADL_S_ID_2, + PCI_DID_INTEL_ADL_S_ID_3, + PCI_DID_INTEL_ADL_S_ID_4, + PCI_DID_INTEL_ADL_S_ID_5, + PCI_DID_INTEL_ADL_S_ID_6, + PCI_DID_INTEL_ADL_S_ID_7, + PCI_DID_INTEL_ADL_S_ID_8, + PCI_DID_INTEL_ADL_S_ID_9, + PCI_DID_INTEL_ADL_S_ID_10, + PCI_DID_INTEL_ADL_S_ID_11, + PCI_DID_INTEL_ADL_S_ID_12, + PCI_DID_INTEL_ADL_S_ID_13, + PCI_DID_INTEL_ADL_S_ID_14, + PCI_DID_INTEL_ADL_S_ID_15, }; const uint16_t adl_n_mch_ids[] = { - PCI_DEVICE_ID_INTEL_ADL_N_ID_1, - PCI_DEVICE_ID_INTEL_ADL_N_ID_2, - PCI_DEVICE_ID_INTEL_ADL_N_ID_3, - PCI_DEVICE_ID_INTEL_ADL_N_ID_4, + PCI_DID_INTEL_ADL_N_ID_1, + PCI_DID_INTEL_ADL_N_ID_2, + PCI_DID_INTEL_ADL_N_ID_3, + PCI_DID_INTEL_ADL_N_ID_4, }; const uint16_t mchid = pci_s_read_config16(PCI_DEV(0, PCI_SLOT(SA_DEVFN_ROOT), -- cgit v1.2.3