gdsys: mpc8308: Migrate SYS_FPGA{0, 1}_{BASE, SIZE} to Kconfig

Move CONFIG_SYS_FPGA0_BASE, CONFIG_SYS_FPGA0_SIZE, CONFIG_SYS_FPGA1_BASE, and
CONFIG_SYS_FPGA1_SIZE to Kconfig.

Signed-off-by: Mario Six <mario.six@gdsys.cc>

diff --git a/board/gdsys/mpc8308/Kconfig b/board/gdsys/mpc8308/Kconfig
index 9d99f686923a130b23f6e31612f3f834301d7ac8..cad458ac7107e41773fb9658e7661c7bbd7226d7 100644 (file)
--- a/board/gdsys/mpc8308/Kconfig
+++ b/board/gdsys/mpc8308/Kconfig
@@ -4,6 +4,28 @@ config GDSYS_LEGACY_OSD_CMDS
          Use the 'osdw', 'osdp', and 'osdsize' legacy commands required by
          gdsys devices.
 
+config SYS_FPGA0_BASE
+       hex
+       default E0600000
+       help
+         The base address of the first FPGA's register map.
+
+config SYS_FPGA0_SIZE
+       hex
+       default 1
+       help
+         The base address of the first FPGA's register map.
+
+config SYS_FPGA1_BASE
+       hex
+       help
+         The base address of the second FPGA's register map.
+
+config SYS_FPGA1_SIZE
+       hex
+       help
+         The base address of the second FPGA's register map.
+
 if TARGET_HRCON
 
 config SYS_BOARD

diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index 8029ae9dd7518fb048d62213f4c52977d06da97b..6e6c1714ce99966ea4414935064f639a8cd804ca 100644 (file)
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -129,14 +129,6 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000 /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500 /* Flash Write Timeout (ms) */
 
-/*
- * FPGA
- */
-#define CONFIG_SYS_FPGA0_BASE          0xE0600000
-#define CONFIG_SYS_FPGA0_SIZE          1 /* FPGA size is 1M */
-
-
-#define CONFIG_SYS_FPGA_BASE(k)                CONFIG_SYS_FPGA0_BASE
 #define CONFIG_SYS_FPGA_DONE(k)                0x0010
 
 #define CONFIG_SYS_FPGA_COUNT          1

diff --git a/include/configs/strider.h b/include/configs/strider.h
index 22d255aabb869ed35f15e19fef55f0bdd5123506..8b942e3446af5dd7a28b2f93113f1f7d20293d17 100644 (file)
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -127,14 +127,6 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000 /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500 /* Flash Write Timeout (ms) */
 
-/*
- * FPGA
- */
-#define CONFIG_SYS_FPGA0_BASE          0xE0600000
-#define CONFIG_SYS_FPGA0_SIZE          1 /* FPGA size is 1M */
-
-
-#define CONFIG_SYS_FPGA_BASE(k)                CONFIG_SYS_FPGA0_BASE
 #define CONFIG_SYS_FPGA_DONE(k)                0x0010
 
 #define CONFIG_SYS_FPGA_COUNT          1