[PATCH 04/21] Convert CONFIG_SYS_INTERLAKEN et al to Kconfig

[Tom Rini]

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 at konsulko.com>
---
 drivers/rtc/mc146818.c       | 2 +-
 include/configs/T208xQDS.h   | 1 -
 include/configs/T208xRDB.h   | 1 -
 include/configs/T4240RDB.h   | 1 -
 include/configs/edison.h     | 3 ---
 include/configs/malta.h      | 2 --
 include/configs/x86-common.h | 6 ------
 include/mk48t59.h            | 4 ++--
 8 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/drivers/rtc/mc146818.c b/drivers/rtc/mc146818.c
index 71f96e282e82..122691b97842 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 7c83423f99ff..6700560123b7 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 78ff50196c2f..4de4a72999e9 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 53641fad543a..dc507473b259 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 34536ecf8505..c71ef25233bd 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 5a42ceef2121..8ffd1f372044 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 42b2cb2fc85a..8e22d6e5d876 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -18,12 +18,6 @@
 /* Generic TPM interfaced through LPC bus */
 #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
  */
diff --git a/include/mk48t59.h b/include/mk48t59.h
index 5d863ef94160..f95d349c17fb 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
-- 
2.25.1