summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/soc/amd/cezanne/include/soc/iomap.h6
-rw-r--r--src/soc/amd/picasso/include/soc/iomap.h6
-rw-r--r--src/soc/amd/sabrina/include/soc/iomap.h6
-rw-r--r--src/soc/amd/stoneyridge/include/soc/iomap.h6
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