Migrate CONFIG_SYS_IMMR to Kconfig for MPC83xx.
Signed-off-by: Mario Six <mario....@gdsys.cc>
---
v2 -> v3:
No changes
v1 -> v2:
New in v2
---
arch/powerpc/cpu/mpc83xx/Kconfig | 7 +++++++
configs/TQM834x_defconfig | 1 +
configs/ids8313_defconfig | 1 +
include/configs/MPC8308RDB.h | 5 -----
include/configs/MPC8313ERDB_NAND.h | 2 --
include/configs/MPC8313ERDB_NOR.h | 2 --
include/configs/MPC8315ERDB.h | 5 -----
include/configs/MPC8323ERDB.h | 5 -----
include/configs/MPC832XEMDS.h | 5 -----
include/configs/MPC8349EMDS.h | 2 --
include/configs/MPC8349EMDS_SDRAM.h | 2 --
include/configs/MPC8349ITX.h | 5 -----
include/configs/MPC837XEMDS.h | 5 -----
include/configs/MPC837XERDB.h | 5 -----
include/configs/TQM834x.h | 3 ---
include/configs/caddy2.h | 2 --
include/configs/hrcon.h | 5 -----
include/configs/ids8313.h | 2 --
include/configs/kmcoge5ne.h | 5 -----
include/configs/kmeter1.h | 5 -----
include/configs/kmopti2.h | 5 -----
include/configs/kmsupx5.h | 5 -----
include/configs/kmtegr1.h | 5 -----
include/configs/kmtepr2.h | 5 -----
include/configs/kmvect1.h | 5 -----
include/configs/mpc8308_p1m.h | 5 -----
include/configs/sbc8349.h | 2 --
include/configs/strider.h | 5 -----
include/configs/suvd3.h | 5 -----
include/configs/tuge1.h | 5 -----
include/configs/tuxx1.h | 5 -----
include/configs/ve8313.h | 2 --
include/configs/vme8349.h | 2 --
33 files changed, 9 insertions(+), 121 deletions(-)
diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index 5fb4228076e..96376837abb 100644
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -282,6 +282,13 @@ config ARCH_MPC837X
select MPC83XX_LDP_PIN
select MPC83XX_SECOND_I2C_SUPPORT
+config SYS_IMMR
+ hex "Value for IMMR"
+ default 0xE0000000
+ help
+ Address for the Internal Memory-Mapped Registers (IMMR) window used
+ to configure the features of the SoC.
+
source "arch/powerpc/cpu/mpc83xx/hrcw/Kconfig"
source "arch/powerpc/cpu/mpc83xx/bats/Kconfig"
source "arch/powerpc/cpu/mpc83xx/lblaw/Kconfig"
diff --git a/configs/TQM834x_defconfig b/configs/TQM834x_defconfig
index e85bfaea315..f5746cfad71 100644
--- a/configs/TQM834x_defconfig
+++ b/configs/TQM834x_defconfig
@@ -4,6 +4,7 @@ CONFIG_SYS_CLK_FREQ=66666000
CONFIG_MPC83xx=y
CONFIG_HIGH_BATS=y
CONFIG_TARGET_TQM834X=y
+CONFIG_SYS_IMMR=0xff400000
CONFIG_DDR_MC_CLOCK_MODE_1_1=y
CONFIG_SYSTEM_PLL_FACTOR_4_1=y
CONFIG_CORE_PLL_RATIO_2_1=y
diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig
index 24590d1448b..9c16a1231c6 100644
--- a/configs/ids8313_defconfig
+++ b/configs/ids8313_defconfig
@@ -4,6 +4,7 @@ CONFIG_SYS_CLK_FREQ=66000000
CONFIG_MPC83xx=y
CONFIG_HIGH_BATS=y
CONFIG_TARGET_IDS8313=y
+CONFIG_SYS_IMMR=0xF0000000
CONFIG_CORE_PLL_RATIO_2_1=y
CONFIG_PCI_HOST_MODE_ENABLE=y
CONFIG_BOOT_ROM_INTERFACE_GPCM_8BIT=y
diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h
index 9c4de054403..e825cfbd174 100644
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -52,11 +52,6 @@
SICRL_I2C2_PF0 |\
SICRL_ETSEC1_GTX_CLK125) /* 0x00000040 */
-/*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR 0xE0000000
-
/*
* SERDES
*/
diff --git a/include/configs/MPC8313ERDB_NAND.h
b/include/configs/MPC8313ERDB_NAND.h
index 2f48b135c46..e23df14ec17 100644
--- a/include/configs/MPC8313ERDB_NAND.h
+++ b/include/configs/MPC8313ERDB_NAND.h
@@ -54,8 +54,6 @@
#define CONFIG_VSC7385_ENET
#define CONFIG_TSEC2
-#define CONFIG_SYS_IMMR 0xE0000000
-
#if !defined(CONFIG_SPL_BUILD)
#define CONFIG_DEFAULT_IMMR CONFIG_SYS_IMMR
#endif
diff --git a/include/configs/MPC8313ERDB_NOR.h
b/include/configs/MPC8313ERDB_NOR.h
index bd1e54feec3..17cd8adc859 100644
--- a/include/configs/MPC8313ERDB_NOR.h
+++ b/include/configs/MPC8313ERDB_NOR.h
@@ -30,8 +30,6 @@
#define CONFIG_VSC7385_ENET
#define CONFIG_TSEC2
-#define CONFIG_SYS_IMMR 0xE0000000
-
#define CONFIG_SYS_MEMTEST_START 0x00001000
#define CONFIG_SYS_MEMTEST_END 0x07f00000
diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index 5ce213f5949..fbba2fbb50b 100644
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -31,11 +31,6 @@
#define CONFIG_HWCONFIG
-/*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR 0xE0000000
-
/*
* Arbiter Setup
*/
diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index abc62f7e699..b528c2901b4 100644
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -20,11 +20,6 @@
*/
#define CONFIG_SYS_SICRL 0x00000000
-/*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR 0xE0000000
-
/*
* System performance
*/
diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index a138bd6724f..195d62ce50d 100644
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -17,11 +17,6 @@
*/
#define CONFIG_SYS_SICRL 0x00000000
-/*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR 0xE0000000
-
/*
* DDR Setup
*/
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index d0d6eaf6c21..14ebc8ead3d 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -17,8 +17,6 @@
*/
#define CONFIG_E300 1 /* E300 Family */
-#define CONFIG_SYS_IMMR 0xE0000000
-
#undef CONFIG_SYS_DRAM_TEST /* memory test, takes time */
#define CONFIG_SYS_MEMTEST_START 0x00000000 /* memtest region */
#define CONFIG_SYS_MEMTEST_END 0x00100000
diff --git a/include/configs/MPC8349EMDS_SDRAM.h
b/include/configs/MPC8349EMDS_SDRAM.h
index 976c1e80638..67f3a9bd65f 100644
--- a/include/configs/MPC8349EMDS_SDRAM.h
+++ b/include/configs/MPC8349EMDS_SDRAM.h
@@ -17,8 +17,6 @@
*/
#define CONFIG_E300 1 /* E300 Family */
-#define CONFIG_SYS_IMMR 0xE0000000
-
#undef CONFIG_SYS_DRAM_TEST /* memory test, takes time */
#define CONFIG_SYS_MEMTEST_START 0x00000000 /* memtest region */
#define CONFIG_SYS_MEMTEST_END 0x00100000
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index f37b086b1f1..eef1bdec63a 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -39,11 +39,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/*
- * High Level Configuration Options
- */
-#define CONFIG_SYS_IMMR 0xE0000000 /* The IMMR is relocated to
here */
-
#define CONFIG_MISC_INIT_F
/*
diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index 7361f0e2f67..c1973703c4a 100644
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -39,11 +39,6 @@
#define CONFIG_HWCONFIG
-/*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR 0xE0000000
-
/*
* DDR Setup
*/
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 3f17574cee9..e8173da3233 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -46,11 +46,6 @@
*/
#define CONFIG_SYS_OBIR 0x30100000
-/*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR 0xE0000000
-
/*
* Device configurations
*/
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index dc2bba828c3..d713c695f7c 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -16,9 +16,6 @@
*/
#define CONFIG_E300 1 /* E300 Family */
-/* IMMR Base Address Register, use Freescale default: 0xff400000 */
-#define CONFIG_SYS_IMMR 0xff400000
-
/*
* Local Bus LCRR
* LCRR: DLL bypass, Clock divider is 8
diff --git a/include/configs/caddy2.h b/include/configs/caddy2.h
index 016477c04fb..b4516267f15 100644
--- a/include/configs/caddy2.h
+++ b/include/configs/caddy2.h
@@ -25,8 +25,6 @@
/* Don't enable PCI2 on vme834x - it doesn't exist physically. */
#undef CONFIG_MPC83XX_PCI2 /* support for 2nd PCI controller */
-#define CONFIG_SYS_IMMR 0xE0000000
-
#undef CONFIG_SYS_DRAM_TEST /* memory test, takes time */
#define CONFIG_SYS_MEMTEST_START 0x00000000 /* memtest region */
#define CONFIG_SYS_MEMTEST_END 0x00100000
diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index b28f3c1d45a..e8a4b7adf67 100644
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -40,11 +40,6 @@
SICRL_I2C2_PF0 |\
SICRL_ETSEC1_GTX_CLK125) /* 0x00000000 */
-/*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR 0xE0000000
-
/*
* SERDES
*/
diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 1637ed9646b..b4acee058ca 100644
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -20,8 +20,6 @@
#define CONFIG_BOOT_RETRY_MIN 30
#define CONFIG_RESET_TO_RETRY
-#define CONFIG_SYS_IMMR 0xF0000000
-
#define CONFIG_SYS_ACR_PIPE_DEP 3 /* Arbiter pipeline depth (0-3)
*/
#define CONFIG_SYS_ACR_RPTCNT 3 /* Arbiter repeat count (0-7) */
diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h
index c359d7314de..bd24d78c1db 100644
--- a/include/configs/kmcoge5ne.h
+++ b/include/configs/kmcoge5ne.h
@@ -40,11 +40,6 @@
#define CONFIG_SYS_CLK_FREQ 66000000
#define CONFIG_83XX_PCICLK 66000000
-/*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR 0xE0000000
-
/*
* Bus Arbitration Configuration Register (ACR)
*/
diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h
index aaa0607ed5e..48a6172349d 100644
--- a/include/configs/kmeter1.h
+++ b/include/configs/kmeter1.h
@@ -25,11 +25,6 @@
#include "km/keymile-common.h"
#include "km/km-powerpc.h"
-/*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR 0xE0000000
-
/*
* Bus Arbitration Configuration Register (ACR)
*/
diff --git a/include/configs/kmopti2.h b/include/configs/kmopti2.h
index e9bb3f79835..e34f26e55d6 100644
--- a/include/configs/kmopti2.h
+++ b/include/configs/kmopti2.h
@@ -45,11 +45,6 @@
#define CONFIG_SYS_CLK_FREQ 66000000
#define CONFIG_83XX_PCICLK 66000000
-/*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR 0xE0000000
-
/*
* Bus Arbitration Configuration Register (ACR)
*/
diff --git a/include/configs/kmsupx5.h b/include/configs/kmsupx5.h
index 182357b0c0d..96e10325f0f 100644
--- a/include/configs/kmsupx5.h
+++ b/include/configs/kmsupx5.h
@@ -45,11 +45,6 @@
#define CONFIG_SYS_CLK_FREQ 66000000
#define CONFIG_83XX_PCICLK 66000000
-/*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR 0xE0000000
-
/*
* Bus Arbitration Configuration Register (ACR)
*/
diff --git a/include/configs/kmtegr1.h b/include/configs/kmtegr1.h
index 0855dd152ce..4b407af0364 100644
--- a/include/configs/kmtegr1.h
+++ b/include/configs/kmtegr1.h
@@ -52,11 +52,6 @@
#define CONFIG_SYS_CLK_FREQ 66000000
#define CONFIG_83XX_PCICLK 66000000
-/*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR 0xE0000000
-
/*
* Bus Arbitration Configuration Register (ACR)
*/
diff --git a/include/configs/kmtepr2.h b/include/configs/kmtepr2.h
index 7edb573747f..20cbc1318ab 100644
--- a/include/configs/kmtepr2.h
+++ b/include/configs/kmtepr2.h
@@ -45,11 +45,6 @@
#define CONFIG_SYS_CLK_FREQ 66000000
#define CONFIG_83XX_PCICLK 66000000
-/*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR 0xE0000000
-
/*
* Bus Arbitration Configuration Register (ACR)
*/
diff --git a/include/configs/kmvect1.h b/include/configs/kmvect1.h
index b88f1582656..37acb0245b6 100644
--- a/include/configs/kmvect1.h
+++ b/include/configs/kmvect1.h
@@ -44,11 +44,6 @@
#define CONFIG_SYS_CLK_FREQ 66000000
#define CONFIG_83XX_PCICLK 66000000
-/*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR 0xE0000000
-
/*
* Bus Arbitration Configuration Register (ACR)
*/
diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h
index 8ea3ea11dc8..76846c43d01 100644
--- a/include/configs/mpc8308_p1m.h
+++ b/include/configs/mpc8308_p1m.h
@@ -55,11 +55,6 @@
*/
#define CONFIG_SYS_GPIO1_DAT 0x08008C00
-/*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR 0xE0000000
-
/*
* SERDES
*/
diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index b58628262d3..775bbe417af 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -22,8 +22,6 @@
/* Don't enable PCI2 on sbc834x - it doesn't exist physically. */
#undef CONFIG_MPC83XX_PCI2 /* support for 2nd PCI controller */
-#define CONFIG_SYS_IMMR 0xE0000000
-
#undef CONFIG_SYS_DRAM_TEST /* memory test, takes time */
#define CONFIG_SYS_MEMTEST_START 0x00000000 /* memtest region */
#define CONFIG_SYS_MEMTEST_END 0x00100000
diff --git a/include/configs/strider.h b/include/configs/strider.h
index 96b31741fd2..fe2d89f2a61 100644
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -40,11 +40,6 @@
SICRL_I2C2_PF0 |\
SICRL_ETSEC1_TX_CLK) /* 0x00000000 */
-/*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR 0xE0000000
-
/*
* SERDES
*/
diff --git a/include/configs/suvd3.h b/include/configs/suvd3.h
index 5d7d48dd391..82ebbca4db1 100644
--- a/include/configs/suvd3.h
+++ b/include/configs/suvd3.h
@@ -42,11 +42,6 @@
#define CONFIG_SYS_CLK_FREQ 66000000
#define CONFIG_83XX_PCICLK 66000000
-/*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR 0xE0000000
-
/*
* Bus Arbitration Configuration Register (ACR)
*/
diff --git a/include/configs/tuge1.h b/include/configs/tuge1.h
index d95147d1edb..b196c77c4e7 100644
--- a/include/configs/tuge1.h
+++ b/include/configs/tuge1.h
@@ -45,11 +45,6 @@
#define CONFIG_SYS_CLK_FREQ 66000000
#define CONFIG_83XX_PCICLK 66000000
-/*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR 0xE0000000
-
/*
* Bus Arbitration Configuration Register (ACR)
*/
diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h
index ce6d44e6dd5..8dfff62de56 100644
--- a/include/configs/tuxx1.h
+++ b/include/configs/tuxx1.h
@@ -45,11 +45,6 @@
#define CONFIG_SYS_CLK_FREQ 66000000
#define CONFIG_83XX_PCICLK 66000000
-/*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR 0xE0000000
-
/*
* Bus Arbitration Configuration Register (ACR)
*/
diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h
index 87160f2c341..1ac6cbefd6c 100644
--- a/include/configs/ve8313.h
+++ b/include/configs/ve8313.h
@@ -24,8 +24,6 @@
* On-board devices
*
*/
-#define CONFIG_SYS_IMMR 0xE0000000
-
#define CONFIG_SYS_MEMTEST_START 0x00001000
#define CONFIG_SYS_MEMTEST_END 0x07000000
diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index 2a14f561ed7..1a3a55b707e 100644
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -25,8 +25,6 @@
/* Don't enable PCI2 on vme834x - it doesn't exist physically. */
#undef CONFIG_MPC83XX_PCI2 /* support for 2nd PCI controller */
-#define CONFIG_SYS_IMMR 0xE0000000
-
#undef CONFIG_SYS_DRAM_TEST /* memory test, takes time */
#define CONFIG_SYS_MEMTEST_START 0x00000000 /* memtest region */
#define CONFIG_SYS_MEMTEST_END 0x00100000
--
2.20.1
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
