diff options
| author | Felix Held <felix-coreboot@felixheld.de> | 2022-02-22 23:00:18 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2022-02-24 00:14:02 +0000 |
| commit | 6f413d1c3fdc0edbbe52fef0a035b4ac89e3c5c6 (patch) | |
| tree | 6d184f5e1e3236d2fc7b44228667dee74369c3f6 | |
| parent | 47722cfe554dc9f1f9ca56a88c57a283357f71ce (diff) | |
| download | coreboot-6f413d1c3fdc0edbbe52fef0a035b4ac89e3c5c6.tar.gz coreboot-6f413d1c3fdc0edbbe52fef0a035b4ac89e3c5c6.tar.bz2 coreboot-6f413d1c3fdc0edbbe52fef0a035b4ac89e3c5c6.zip | |
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 <felix-coreboot@felixheld.de>
Change-Id: Icf1832eb36c031e93ba24f342e9a8a7bf13faecc
Reviewed-on: https://review.coreboot.org/c/coreboot/+/62275
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/soc/amd/cezanne/include/soc/iomap.h | 6 | ||||
| -rw-r--r-- | src/soc/amd/picasso/include/soc/iomap.h | 6 | ||||
| -rw-r--r-- | src/soc/amd/sabrina/include/soc/iomap.h | 6 | ||||
| -rw-r--r-- | 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 f83f13aa2da4..490e27c883c2 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 93f2874fe029..2d6999dfa51c 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 0ea2a52fe95e..9854986bca9c 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 93e218df9787..a678bb2dce6e 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 |