Kyösti Mälkki has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31953 )
Change subject: src: Drop unused 'include <cbfs.h>' ......................................................................
src: Drop unused 'include <cbfs.h>'
Change-Id: If5c5ebacd103d7e1f09585cc4c52753b11ce84d0 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr Reviewed-on: https://review.coreboot.org/c/coreboot/+/31953 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/arch/x86/mmap_boot.c M src/lib/fit.c M src/lib/fit_payload.c M src/mainboard/amd/bettong/BiosCallOuts.c M src/mainboard/amd/db-ft3b-lc/BiosCallOuts.c M src/mainboard/amd/lamar/BiosCallOuts.c M src/mainboard/amd/olivehill/BiosCallOuts.c M src/mainboard/amd/olivehillplus/BiosCallOuts.c M src/mainboard/amd/parmer/BiosCallOuts.c M src/mainboard/amd/thatcher/BiosCallOuts.c M src/mainboard/asrock/imb-a180/BiosCallOuts.c M src/mainboard/asus/am1i-a/BiosCallOuts.c M src/mainboard/bap/ode_e20XX/BiosCallOuts.c M src/mainboard/bap/ode_e21XX/BiosCallOuts.c M src/mainboard/biostar/a68n_5200/BiosCallOuts.c M src/mainboard/biostar/am1ml/BiosCallOuts.c M src/mainboard/gizmosphere/gizmo2/BiosCallOuts.c M src/mainboard/google/dragonegg/romstage_fsp_params.c M src/mainboard/hp/abm/BiosCallOuts.c M src/mainboard/pcengines/apu2/BiosCallOuts.c M src/security/vboot/vboot_crtm.c M src/security/vboot/vboot_crtm.h M src/soc/samsung/exynos5250/alternate_cbfs.c M src/soc/samsung/exynos5420/alternate_cbfs.c 24 files changed, 31 insertions(+), 40 deletions(-)
Approvals: build bot (Jenkins): Verified Kyösti Mälkki: Looks good to me, approved
diff --git a/src/arch/x86/mmap_boot.c b/src/arch/x86/mmap_boot.c index 2432201..abfa024 100644 --- a/src/arch/x86/mmap_boot.c +++ b/src/arch/x86/mmap_boot.c @@ -14,7 +14,6 @@ */
#include <boot_device.h> -#include <cbfs.h> #include <endian.h> #include <stdlib.h>
diff --git a/src/lib/fit.c b/src/lib/fit.c index 9184d63..4e2b75c 100644 --- a/src/lib/fit.c +++ b/src/lib/fit.c @@ -21,11 +21,11 @@ #include <bootmem.h> #include <stdlib.h> #include <string.h> -#include <cbfs.h> #include <program_loading.h> #include <memrange.h> #include <fit.h> #include <boardid.h> +#include <commonlib/cbfs_serialized.h> #include <commonlib/include/commonlib/stdlib.h>
static struct list_node image_nodes; diff --git a/src/lib/fit_payload.c b/src/lib/fit_payload.c index 3e1819d..e0158f2 100644 --- a/src/lib/fit_payload.c +++ b/src/lib/fit_payload.c @@ -24,8 +24,8 @@ #include <fit.h> #include <program_loading.h> #include <timestamp.h> -#include <cbfs.h> #include <string.h> +#include <commonlib/cbfs_serialized.h> #include <commonlib/compression.h> #include <lib.h> #include <fit_payload.h> diff --git a/src/mainboard/amd/bettong/BiosCallOuts.c b/src/mainboard/amd/bettong/BiosCallOuts.c index 94897c8..040de9b 100644 --- a/src/mainboard/amd/bettong/BiosCallOuts.c +++ b/src/mainboard/amd/bettong/BiosCallOuts.c @@ -19,15 +19,15 @@ #include <northbridge/amd/agesa/BiosCallOuts.h> #include <northbridge/amd/pi/00660F01/chip.h> #include <FchPlatform.h> -#include <cbfs.h> -#include "imc.h" -#include "hudson.h" #include <stdlib.h> #include <string.h> #include <northbridge/amd/pi/dimmSpd.h> #include <northbridge/amd/pi/agesawrapper.h> #include <boardid.h>
+#include "imc.h" +#include "hudson.h" + static AGESA_STATUS Fch_Oem_config(UINT32 Func, UINTN FchData, VOID *ConfigPtr); static AGESA_STATUS board_ReadSpd(UINT32 Func, UINTN Data, VOID *ConfigPtr);
diff --git a/src/mainboard/amd/db-ft3b-lc/BiosCallOuts.c b/src/mainboard/amd/db-ft3b-lc/BiosCallOuts.c index 83db64c..c6e575d 100644 --- a/src/mainboard/amd/db-ft3b-lc/BiosCallOuts.c +++ b/src/mainboard/amd/db-ft3b-lc/BiosCallOuts.c @@ -18,10 +18,10 @@ #include <northbridge/amd/agesa/BiosCallOuts.h> #include <device/azalia.h> #include <FchPlatform.h> -#include <cbfs.h> +#include <stdlib.h> + #include "imc.h" #include "hudson.h" -#include <stdlib.h>
static AGESA_STATUS Fch_Oem_config(UINT32 Func, UINTN FchData, VOID *ConfigPtr);
diff --git a/src/mainboard/amd/lamar/BiosCallOuts.c b/src/mainboard/amd/lamar/BiosCallOuts.c index 6a4da62..8891abb 100644 --- a/src/mainboard/amd/lamar/BiosCallOuts.c +++ b/src/mainboard/amd/lamar/BiosCallOuts.c @@ -16,12 +16,12 @@ #include <AGESA.h> #include <northbridge/amd/agesa/BiosCallOuts.h> #include <FchPlatform.h> -#include <cbfs.h> -#include "imc.h" -#include "hudson.h" #include <stdlib.h> #include <device/azalia.h>
+#include "imc.h" +#include "hudson.h" + static AGESA_STATUS Fch_Oem_config(UINT32 Func, UINTN FchData, VOID *ConfigPtr);
const BIOS_CALLOUT_STRUCT BiosCallouts[] = diff --git a/src/mainboard/amd/olivehill/BiosCallOuts.c b/src/mainboard/amd/olivehill/BiosCallOuts.c index fa9f7c7..b6a8a3a 100644 --- a/src/mainboard/amd/olivehill/BiosCallOuts.c +++ b/src/mainboard/amd/olivehill/BiosCallOuts.c @@ -17,10 +17,10 @@ #include <northbridge/amd/agesa/BiosCallOuts.h> #include <northbridge/amd/agesa/state_machine.h> #include <FchPlatform.h> -#include <cbfs.h> -#include "imc.h" #include <stdlib.h>
+#include "imc.h" + const BIOS_CALLOUT_STRUCT BiosCallouts[] = { {AGESA_DO_RESET, agesa_Reset }, diff --git a/src/mainboard/amd/olivehillplus/BiosCallOuts.c b/src/mainboard/amd/olivehillplus/BiosCallOuts.c index 2f22f6c..a6f4267 100644 --- a/src/mainboard/amd/olivehillplus/BiosCallOuts.c +++ b/src/mainboard/amd/olivehillplus/BiosCallOuts.c @@ -16,10 +16,10 @@ #include <AGESA.h> #include <northbridge/amd/agesa/BiosCallOuts.h> #include <FchPlatform.h> -#include <cbfs.h> +#include <stdlib.h> + #include "imc.h" #include "hudson.h" -#include <stdlib.h>
static AGESA_STATUS Fch_Oem_config(UINT32 Func, UINTN FchData, VOID *ConfigPtr);
diff --git a/src/mainboard/amd/parmer/BiosCallOuts.c b/src/mainboard/amd/parmer/BiosCallOuts.c index 506a605..0c54211 100644 --- a/src/mainboard/amd/parmer/BiosCallOuts.c +++ b/src/mainboard/amd/parmer/BiosCallOuts.c @@ -17,10 +17,10 @@ #include <northbridge/amd/agesa/BiosCallOuts.h> #include <northbridge/amd/agesa/state_machine.h> #include <FchPlatform.h> -#include <cbfs.h> -#include "imc.h" #include <stdlib.h>
+#include "imc.h" + const BIOS_CALLOUT_STRUCT BiosCallouts[] = { {AGESA_DO_RESET, agesa_Reset }, diff --git a/src/mainboard/amd/thatcher/BiosCallOuts.c b/src/mainboard/amd/thatcher/BiosCallOuts.c index 249f301..f23161d 100644 --- a/src/mainboard/amd/thatcher/BiosCallOuts.c +++ b/src/mainboard/amd/thatcher/BiosCallOuts.c @@ -17,10 +17,10 @@ #include <northbridge/amd/agesa/BiosCallOuts.h> #include <northbridge/amd/agesa/state_machine.h> #include <FchPlatform.h> -#include <cbfs.h> -#include "imc.h" #include <stdlib.h>
+#include "imc.h" + const BIOS_CALLOUT_STRUCT BiosCallouts[] = { {AGESA_DO_RESET, agesa_Reset }, diff --git a/src/mainboard/asrock/imb-a180/BiosCallOuts.c b/src/mainboard/asrock/imb-a180/BiosCallOuts.c index 32a791b..e05d5c0 100644 --- a/src/mainboard/asrock/imb-a180/BiosCallOuts.c +++ b/src/mainboard/asrock/imb-a180/BiosCallOuts.c @@ -18,7 +18,6 @@ #include <northbridge/amd/agesa/BiosCallOuts.h> #include <northbridge/amd/agesa/state_machine.h> #include <FchPlatform.h> -#include <cbfs.h> #include <stdlib.h>
const BIOS_CALLOUT_STRUCT BiosCallouts[] = diff --git a/src/mainboard/asus/am1i-a/BiosCallOuts.c b/src/mainboard/asus/am1i-a/BiosCallOuts.c index c01ea74..a1018b3 100644 --- a/src/mainboard/asus/am1i-a/BiosCallOuts.c +++ b/src/mainboard/asus/am1i-a/BiosCallOuts.c @@ -20,7 +20,6 @@ #include <northbridge/amd/agesa/BiosCallOuts.h> #include <northbridge/amd/agesa/state_machine.h> #include <FchPlatform.h> -#include <cbfs.h> #include <stdlib.h> #include <pc80/mc146818rtc.h> #include <types.h> diff --git a/src/mainboard/bap/ode_e20XX/BiosCallOuts.c b/src/mainboard/bap/ode_e20XX/BiosCallOuts.c index 747b202..9f7fbf8 100644 --- a/src/mainboard/bap/ode_e20XX/BiosCallOuts.c +++ b/src/mainboard/bap/ode_e20XX/BiosCallOuts.c @@ -17,11 +17,11 @@ #include <northbridge/amd/agesa/BiosCallOuts.h> #include <northbridge/amd/agesa/state_machine.h> #include <FchPlatform.h> -#include <cbfs.h> -#include "imc.h" #include <stdlib.h> #include <spd_bin.h>
+#include "imc.h" + static AGESA_STATUS board_ReadSpd_from_cbfs(UINT32 Func, UINTN Data, VOID *ConfigPtr);
const BIOS_CALLOUT_STRUCT BiosCallouts[] = diff --git a/src/mainboard/bap/ode_e21XX/BiosCallOuts.c b/src/mainboard/bap/ode_e21XX/BiosCallOuts.c index 18e5b7c..362b5ba 100644 --- a/src/mainboard/bap/ode_e21XX/BiosCallOuts.c +++ b/src/mainboard/bap/ode_e21XX/BiosCallOuts.c @@ -16,12 +16,12 @@ #include <AGESA.h> #include <northbridge/amd/agesa/BiosCallOuts.h> #include <FchPlatform.h> -#include <cbfs.h> -#include "imc.h" -#include "hudson.h" #include <stdlib.h> #include <spd_bin.h>
+#include "imc.h" +#include "hudson.h" + static AGESA_STATUS Fch_Oem_config(UINT32 Func, UINTN FchData, VOID *ConfigPtr); static AGESA_STATUS board_ReadSpd_from_cbfs(UINT32 Func, UINTN Data, VOID *ConfigPtr);
diff --git a/src/mainboard/biostar/a68n_5200/BiosCallOuts.c b/src/mainboard/biostar/a68n_5200/BiosCallOuts.c index 7044797..8f55fb6 100644 --- a/src/mainboard/biostar/a68n_5200/BiosCallOuts.c +++ b/src/mainboard/biostar/a68n_5200/BiosCallOuts.c @@ -17,10 +17,10 @@ #include <northbridge/amd/agesa/BiosCallOuts.h> #include <northbridge/amd/agesa/state_machine.h> #include <FchPlatform.h> -#include <cbfs.h> -#include "imc.h" #include <stdlib.h>
+#include "imc.h" + const BIOS_CALLOUT_STRUCT BiosCallouts[] = { {AGESA_DO_RESET, agesa_Reset }, diff --git a/src/mainboard/biostar/am1ml/BiosCallOuts.c b/src/mainboard/biostar/am1ml/BiosCallOuts.c index 0390cea..43db0d7 100644 --- a/src/mainboard/biostar/am1ml/BiosCallOuts.c +++ b/src/mainboard/biostar/am1ml/BiosCallOuts.c @@ -19,7 +19,6 @@ #include <northbridge/amd/agesa/BiosCallOuts.h> #include <northbridge/amd/agesa/state_machine.h> #include <FchPlatform.h> -#include <cbfs.h> #include <stdlib.h>
const BIOS_CALLOUT_STRUCT BiosCallouts[] = diff --git a/src/mainboard/gizmosphere/gizmo2/BiosCallOuts.c b/src/mainboard/gizmosphere/gizmo2/BiosCallOuts.c index 0c2c81f..99162d8 100644 --- a/src/mainboard/gizmosphere/gizmo2/BiosCallOuts.c +++ b/src/mainboard/gizmosphere/gizmo2/BiosCallOuts.c @@ -17,10 +17,10 @@ #include <northbridge/amd/agesa/BiosCallOuts.h> #include <northbridge/amd/agesa/state_machine.h> #include <FchPlatform.h> -#include <cbfs.h> -#include "imc.h" #include <stdlib.h>
+#include "imc.h" + const BIOS_CALLOUT_STRUCT BiosCallouts[] = { {AGESA_DO_RESET, agesa_Reset }, diff --git a/src/mainboard/google/dragonegg/romstage_fsp_params.c b/src/mainboard/google/dragonegg/romstage_fsp_params.c index 633f69e..fd797ae 100644 --- a/src/mainboard/google/dragonegg/romstage_fsp_params.c +++ b/src/mainboard/google/dragonegg/romstage_fsp_params.c @@ -15,7 +15,6 @@
#include <assert.h> #include <baseboard/variants.h> -#include <cbfs.h> #include <console/console.h> #include <soc/romstage.h> #include <string.h> diff --git a/src/mainboard/hp/abm/BiosCallOuts.c b/src/mainboard/hp/abm/BiosCallOuts.c index 98ad839..4728c59 100644 --- a/src/mainboard/hp/abm/BiosCallOuts.c +++ b/src/mainboard/hp/abm/BiosCallOuts.c @@ -18,7 +18,6 @@ #include <northbridge/amd/agesa/BiosCallOuts.h> #include <northbridge/amd/agesa/state_machine.h> #include <FchPlatform.h> -#include <cbfs.h> #include <stdlib.h>
const BIOS_CALLOUT_STRUCT BiosCallouts[] = diff --git a/src/mainboard/pcengines/apu2/BiosCallOuts.c b/src/mainboard/pcengines/apu2/BiosCallOuts.c index 3faa462..8fc3d5a 100644 --- a/src/mainboard/pcengines/apu2/BiosCallOuts.c +++ b/src/mainboard/pcengines/apu2/BiosCallOuts.c @@ -17,11 +17,11 @@ #include <spd_bin.h> #include <northbridge/amd/agesa/BiosCallOuts.h> #include <FchPlatform.h> -#include <cbfs.h> +#include <stdlib.h> + #include "gpio_ftns.h" #include "imc.h" #include "hudson.h" -#include <stdlib.h>
static AGESA_STATUS Fch_Oem_config(UINT32 Func, UINTN FchData, VOID *ConfigPtr); static AGESA_STATUS board_ReadSpd_from_cbfs(UINT32 Func, UINTN Data, VOID *ConfigPtr); diff --git a/src/security/vboot/vboot_crtm.c b/src/security/vboot/vboot_crtm.c index f4a6d75..077946a 100644 --- a/src/security/vboot/vboot_crtm.c +++ b/src/security/vboot/vboot_crtm.c @@ -15,6 +15,7 @@
#include <console/console.h> #include <fmap.h> +#include <cbfs.h> #include <security/vboot/vboot_crtm.h> #include <security/vboot/misc.h>
diff --git a/src/security/vboot/vboot_crtm.h b/src/security/vboot/vboot_crtm.h index e1799b8..e675edb 100644 --- a/src/security/vboot/vboot_crtm.h +++ b/src/security/vboot/vboot_crtm.h @@ -16,10 +16,10 @@ #ifndef __SECURITY_VBOOT_CRTM_H__ #define __SECURITY_VBOOT_CRTM_H__
+#include <commonlib/cbfs.h> #include <program_loading.h> #include <security/tpm/tspi.h> #include <types.h> -#include <cbfs.h>
/* CRTM */ #define TPM_CRTM_PCR 2 diff --git a/src/soc/samsung/exynos5250/alternate_cbfs.c b/src/soc/samsung/exynos5250/alternate_cbfs.c index e7ceedb..7d24294 100644 --- a/src/soc/samsung/exynos5250/alternate_cbfs.c +++ b/src/soc/samsung/exynos5250/alternate_cbfs.c @@ -13,10 +13,8 @@ * GNU General Public License for more details. */
- #include <assert.h> #include <boot_device.h> -#include <cbfs.h> /* This driver serves as a CBFS media source. */ #include <console/console.h> #include <soc/alternate_cbfs.h> #include <soc/power.h> diff --git a/src/soc/samsung/exynos5420/alternate_cbfs.c b/src/soc/samsung/exynos5420/alternate_cbfs.c index 98674ba..4ef049e 100644 --- a/src/soc/samsung/exynos5420/alternate_cbfs.c +++ b/src/soc/samsung/exynos5420/alternate_cbfs.c @@ -13,11 +13,9 @@ * GNU General Public License for more details. */
- #include <arch/cache.h> #include <assert.h> #include <boot_device.h> -#include <cbfs.h> /* This driver serves as a CBFS media source. */ #include <console/console.h> #include <soc/alternate_cbfs.h> #include <soc/power.h>