From 6f413d1c3fdc0edbbe52fef0a035b4ac89e3c5c6 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Tue, 22 Feb 2022 23:00:18 +0100 Subject: [PATCH] soc/amd/*/include/soc/iomap.h: rework HPET base address check The AMD SoCs had a check to make sure that HPET_ADDRESS_OVERRIDE isn't set so that the HPET_ADDRESS Kconfig option will have the right default value. Instead check if the HPET_ADDRESS Kconfig value matches the HPET_BASE_ADDRESS define in the SoC code which is the case if HPET_ADDRESS_OVERRIDE isn't selected. Signed-off-by: Felix Held Change-Id: Icf1832eb36c031e93ba24f342e9a8a7bf13faecc Reviewed-on: https://review.coreboot.org/c/coreboot/+/62275 Reviewed-by: Raul Rangel Reviewed-by: Fred Reitberger Tested-by: build bot (Jenkins) --- src/soc/amd/cezanne/include/soc/iomap.h | 6 +++--- src/soc/amd/picasso/include/soc/iomap.h | 6 +++--- src/soc/amd/sabrina/include/soc/iomap.h | 6 +++--- src/soc/amd/stoneyridge/include/soc/iomap.h | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/soc/amd/cezanne/include/soc/iomap.h b/src/soc/amd/cezanne/include/soc/iomap.h index f83f13aa2d..490e27c883 100644 --- a/src/soc/amd/cezanne/include/soc/iomap.h +++ b/src/soc/amd/cezanne/include/soc/iomap.h @@ -15,10 +15,10 @@ #define GNB_IO_APIC_ADDR 0xfec01000 #define SPI_BASE_ADDRESS 0xfec10000 -#if CONFIG(HPET_ADDRESS_OVERRIDE) -#error HPET address override is not allowed and must be fixed at 0xfed00000 -#endif #define HPET_BASE_ADDRESS 0xfed00000 +#if CONFIG_HPET_ADDRESS != HPET_BASE_ADDRESS +#error HPET address must be 0xfed00000 +#endif /* FCH AL2AHB Registers */ #define ALINK_AHB_ADDRESS 0xfedc0000 diff --git a/src/soc/amd/picasso/include/soc/iomap.h b/src/soc/amd/picasso/include/soc/iomap.h index 93f2874fe0..2d6999dfa5 100644 --- a/src/soc/amd/picasso/include/soc/iomap.h +++ b/src/soc/amd/picasso/include/soc/iomap.h @@ -10,10 +10,10 @@ #define GNB_IO_APIC_ADDR 0xfec01000 #define SPI_BASE_ADDRESS 0xfec10000 -#if CONFIG(HPET_ADDRESS_OVERRIDE) -#error HPET address override is not allowed and must be fixed at 0xfed00000 -#endif #define HPET_BASE_ADDRESS 0xfed00000 +#if CONFIG_HPET_ADDRESS != HPET_BASE_ADDRESS +#error HPET address must be 0xfed00000 +#endif /* FCH AL2AHB Registers */ #define ALINK_AHB_ADDRESS 0xfedc0000 diff --git a/src/soc/amd/sabrina/include/soc/iomap.h b/src/soc/amd/sabrina/include/soc/iomap.h index 0ea2a52fe9..9854986bca 100644 --- a/src/soc/amd/sabrina/include/soc/iomap.h +++ b/src/soc/amd/sabrina/include/soc/iomap.h @@ -15,10 +15,10 @@ #define GNB_IO_APIC_ADDR 0xfec01000 #define SPI_BASE_ADDRESS 0xfec10000 -#if CONFIG(HPET_ADDRESS_OVERRIDE) -#error HPET address override is not allowed and must be fixed at 0xfed00000 -#endif #define HPET_BASE_ADDRESS 0xfed00000 +#if CONFIG_HPET_ADDRESS != HPET_BASE_ADDRESS +#error HPET address must be 0xfed00000 +#endif /* FCH AL2AHB Registers */ #define ALINK_AHB_ADDRESS 0xfedc0000 diff --git a/src/soc/amd/stoneyridge/include/soc/iomap.h b/src/soc/amd/stoneyridge/include/soc/iomap.h index 93e218df97..a678bb2dce 100644 --- a/src/soc/amd/stoneyridge/include/soc/iomap.h +++ b/src/soc/amd/stoneyridge/include/soc/iomap.h @@ -16,10 +16,10 @@ #define APU_I2C2_BASE 0xfedc4000 #define APU_I2C3_BASE 0xfedc5000 -#if CONFIG(HPET_ADDRESS_OVERRIDE) -#error HPET address override is not allowed and must be fixed at 0xfed00000 -#endif #define HPET_BASE_ADDRESS 0xfed00000 +#if CONFIG_HPET_ADDRESS != HPET_BASE_ADDRESS +#error HPET address must be 0xfed00000 +#endif #define APU_UART0_BASE 0xfedc6000 #define APU_UART1_BASE 0xfedc8000