diff options
| author | Tom Rini <trini@konsulko.com> | 2022-10-28 20:26:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-11-10 09:45:54 -0500 |
| commit | c56289ddafce3d1ec442fb18064f136c2c47d0bb (patch) | |
| tree | ccf160e0d84bb41a5c8dac7142496c4030ef1704 | |
| parent | 14a5d3b50e41e0af9cf70d56e28873f687c7ce52 (diff) | |
| download | u-boot-c56289ddafce3d1ec442fb18064f136c2c47d0bb.zip u-boot-c56289ddafce3d1ec442fb18064f136c2c47d0bb.tar.gz u-boot-c56289ddafce3d1ec442fb18064f136c2c47d0bb.tar.bz2 | |
Convert CONFIG_SYS_INTERLAKEN et al to Kconfig
This converts the following to Kconfig:
CONFIG_SYS_INTERLAKEN
CONFIG_SYS_ISA_IO
CONFIG_SYS_ISA_IO_BASE_ADDRESS
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | drivers/rtc/mc146818.c | 2 | ||||
| -rw-r--r-- | include/configs/T208xQDS.h | 1 | ||||
| -rw-r--r-- | include/configs/T208xRDB.h | 1 | ||||
| -rw-r--r-- | include/configs/T4240RDB.h | 1 | ||||
| -rw-r--r-- | include/configs/edison.h | 3 | ||||
| -rw-r--r-- | include/configs/malta.h | 2 | ||||
| -rw-r--r-- | include/configs/x86-common.h | 6 | ||||
| -rw-r--r-- | include/mk48t59.h | 4 |
8 files changed, 3 insertions, 17 deletions
diff --git a/drivers/rtc/mc146818.c b/drivers/rtc/mc146818.c index 71f96e2..122691b 100644 --- a/drivers/rtc/mc146818.c +++ b/drivers/rtc/mc146818.c @@ -22,7 +22,7 @@ /* Set this to 1 to clear the CMOS RAM */ #define CLEAR_CMOS 0 -#define RTC_PORT_MC146818 CONFIG_SYS_ISA_IO_BASE_ADDRESS + 0x70 +#define RTC_PORT_MC146818 0x70 #define RTC_SECONDS 0x00 #define RTC_SECONDS_ALARM 0x01 #define RTC_MINUTES 0x02 diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index ce641ac..5d5d634 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -405,7 +405,6 @@ #define CONFIG_SYS_PMAN #define CONFIG_SYS_DPAA_DCE #define CONFIG_SYS_DPAA_RMAN /* RMan */ -#define CONFIG_SYS_INTERLAKEN #endif /* CONFIG_NOBQFMAN */ #ifdef CONFIG_SYS_DPAA_FMAN diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 3f215a7..407350c 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -359,7 +359,6 @@ #define CONFIG_SYS_PMAN #define CONFIG_SYS_DPAA_DCE #define CONFIG_SYS_DPAA_RMAN /* RMan */ -#define CONFIG_SYS_INTERLAKEN #endif /* CONFIG_NOBQFMAN */ #ifdef CONFIG_SYS_DPAA_FMAN diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 7fc517d..c8875c8 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -366,7 +366,6 @@ #define CONFIG_SYS_PMAN #define CONFIG_SYS_DPAA_DCE #define CONFIG_SYS_DPAA_RMAN -#define CONFIG_SYS_INTERLAKEN #endif /* CONFIG_NOBQFMAN */ #ifdef CONFIG_SYS_DPAA_FMAN diff --git a/include/configs/edison.h b/include/configs/edison.h index 34536ec..c71ef25 100644 --- a/include/configs/edison.h +++ b/include/configs/edison.h @@ -14,7 +14,4 @@ #define CONFIG_SYS_MONITOR_LEN (256 * 1024) -/* RTC */ -#define CONFIG_SYS_ISA_IO_BASE_ADDRESS 0 - #endif diff --git a/include/configs/malta.h b/include/configs/malta.h index ff70a59..30c2e41 100644 --- a/include/configs/malta.h +++ b/include/configs/malta.h @@ -13,8 +13,6 @@ #define CONFIG_MEMSIZE_IN_BYTES -#define CONFIG_SYS_ISA_IO_BASE_ADDRESS 0 - /* * CPU Configuration */ diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 42b2cb2..8e22d6e 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -19,12 +19,6 @@ #define CONFIG_TPM_TIS_BASE_ADDRESS 0xfed40000 /*----------------------------------------------------------------------- - * Real Time Clock Configuration - */ -#define CONFIG_SYS_ISA_IO_BASE_ADDRESS 0 -#define CONFIG_SYS_ISA_IO CONFIG_SYS_ISA_IO_BASE_ADDRESS - -/*----------------------------------------------------------------------- * Serial Configuration */ #define CONFIG_SYS_NS16550_PORT_MAPPED diff --git a/include/mk48t59.h b/include/mk48t59.h index 5d863ef..f95d349 100644 --- a/include/mk48t59.h +++ b/include/mk48t59.h @@ -11,9 +11,9 @@ #if defined(CONFIG_RTC_MK48T59) && defined(CONFIG_CMD_DATE) -#define RTC_PORT_ADDR0 CONFIG_SYS_ISA_IO + 0x70 +#define RTC_PORT_ADDR0 0x70 #define RTC_PORT_ADDR1 RTC_PORT_ADDR0 + 0x1 -#define RTC_PORT_DATA CONFIG_SYS_ISA_IO + 0x76 +#define RTC_PORT_DATA 0x76 /* RTC Offsets */ #define RTC_SECONDS 0x1FF9 |