diff options
| -rw-r--r-- | src/soc/amd/common/block/include/amdblocks/apob_cache.h | 7 | ||||
| -rw-r--r-- | src/soc/amd/phoenix/Kconfig | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/soc/amd/common/block/include/amdblocks/apob_cache.h b/src/soc/amd/common/block/include/amdblocks/apob_cache.h index e91720fa61..bbb65a72e2 100644 --- a/src/soc/amd/common/block/include/amdblocks/apob_cache.h +++ b/src/soc/amd/common/block/include/amdblocks/apob_cache.h @@ -3,8 +3,15 @@ #ifndef AMD_BLOCK_APOB_CACHE_H #define AMD_BLOCK_APOB_CACHE_H +#include <stddef.h> + +#if CONFIG(SOC_AMD_COMMON_BLOCK_APOB) /* Start loading the APOB as soon as possible so it is ready by the time we need it. */ void start_apob_cache_read(void); void *soc_fill_apob_cache(void); +#else /* CONFIG(SOC_AMD_COMMON_BLOCK_APOB) */ +static inline void start_apob_cache_read(void) {} +static inline void *soc_fill_apob_cache(void) { return NULL; } +#endif /* CONFIG(SOC_AMD_COMMON_BLOCK_APOB) */ #endif /* AMD_BLOCK_APOB_CACHE_H */ diff --git a/src/soc/amd/phoenix/Kconfig b/src/soc/amd/phoenix/Kconfig index 5f4e5d174e..8c4280bbc6 100644 --- a/src/soc/amd/phoenix/Kconfig +++ b/src/soc/amd/phoenix/Kconfig @@ -42,8 +42,9 @@ config SOC_AMD_PHOENIX select SOC_AMD_COMMON_BLOCK_ACPI_GPIO # TODO: Check if this is still correct select SOC_AMD_COMMON_BLOCK_ACPI_IVRS # TODO: Check if this is still correct select SOC_AMD_COMMON_BLOCK_AOAC - select SOC_AMD_COMMON_BLOCK_APOB - select SOC_AMD_COMMON_BLOCK_APOB_HASH + # TODO (b/290763369): Enable APOB after resolving data_abort in ABL + # select SOC_AMD_COMMON_BLOCK_APOB + # select SOC_AMD_COMMON_BLOCK_APOB_HASH select SOC_AMD_COMMON_BLOCK_BANKED_GPIOS select SOC_AMD_COMMON_BLOCK_CPUFREQ_FAM17H_19H select SOC_AMD_COMMON_BLOCK_DATA_FABRIC |