[U-Boot] [PATCH v2 47/58] mpc83xx: Migrate CONFIG_SYS_IMMR to Kconfig

Mario Six mario.six at gdsys.cc
Mon Nov 5 14:45:01 UTC 2018 

Migrate CONFIG_SYS_IMMR to Kconfig for MPC83xx.

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

---

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 7f57a368558..e9333438800 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
@@ -53,11 +53,6 @@
 	SICRL_ETSEC1_GTX_CLK125)	/* 0x00000040 */
 
 /*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR		0xE0000000
-
-/*
  * SERDES
  */
 #define CONFIG_FSL_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 21fbadd7cb9..db6114c33ed 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
@@ -32,11 +32,6 @@
 #define CONFIG_HWCONFIG
 
 /*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR		0xE0000000
-
-/*
  * Arbiter Setup
  */
 #define CONFIG_SYS_ACR_PIPE_DEP	3 /* Arbiter pipeline depth is 4 */
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
@@ -21,11 +21,6 @@
 #define CONFIG_SYS_SICRL		0x00000000
 
 /*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR		0xE0000000
-
-/*
  * System performance
  */
 #define CONFIG_SYS_ACR_PIPE_DEP	3	/* Arbiter pipeline depth (0-3) */
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
@@ -18,11 +18,6 @@
 #define CONFIG_SYS_SICRL		0x00000000
 
 /*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR		0xE0000000
-
-/*
  * DDR Setup
  */
 #define CONFIG_SYS_DDR_BASE	0x00000000	/* DDR is system memory */
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
@@ -40,11 +40,6 @@
 #define CONFIG_HWCONFIG
 
 /*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR		0xE0000000
-
-/*
  * DDR Setup
  */
 #define CONFIG_SYS_DDR_BASE		0x00000000 /* DDR is system memory */
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
@@ -47,11 +47,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
@@ -41,11 +41,6 @@
 	SICRL_ETSEC1_GTX_CLK125)	/* 0x00000000 */
 
 /*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR		0xE0000000
-
-/*
  * SERDES
  */
 #define CONFIG_FSL_SERDES
diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index e839162595b..1930d94e796 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 eb6da42a4ff..68f8cecbae5 100644
--- a/include/configs/kmcoge5ne.h
+++ b/include/configs/kmcoge5ne.h
@@ -41,11 +41,6 @@
 #define CONFIG_83XX_PCICLK		66000000
 
 /*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR		0xE0000000
-
-/*
  * Bus Arbitration Configuration Register (ACR)
  */
 #define CONFIG_SYS_ACR_PIPE_DEP 3       /* pipeline depth 4 transactions */
diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h
index 73f98783a09..0bf84e824ee 100644
--- a/include/configs/kmeter1.h
+++ b/include/configs/kmeter1.h
@@ -26,11 +26,6 @@
 #include "km/km-powerpc.h"
 
 /*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR		0xE0000000
-
-/*
  * Bus Arbitration Configuration Register (ACR)
  */
 #define CONFIG_SYS_ACR_PIPE_DEP 3       /* pipeline depth 4 transactions */
diff --git a/include/configs/kmopti2.h b/include/configs/kmopti2.h
index b5ef31c31f7..b52c06f436e 100644
--- a/include/configs/kmopti2.h
+++ b/include/configs/kmopti2.h
@@ -46,11 +46,6 @@
 #define CONFIG_83XX_PCICLK		66000000
 
 /*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR		0xE0000000
-
-/*
  * Bus Arbitration Configuration Register (ACR)
  */
 #define CONFIG_SYS_ACR_PIPE_DEP 3       /* pipeline depth 4 transactions */
diff --git a/include/configs/kmsupx5.h b/include/configs/kmsupx5.h
index faa62256608..99d8adf462a 100644
--- a/include/configs/kmsupx5.h
+++ b/include/configs/kmsupx5.h
@@ -46,11 +46,6 @@
 #define CONFIG_83XX_PCICLK		66000000
 
 /*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR		0xE0000000
-
-/*
  * Bus Arbitration Configuration Register (ACR)
  */
 #define CONFIG_SYS_ACR_PIPE_DEP 3       /* pipeline depth 4 transactions */
diff --git a/include/configs/kmtegr1.h b/include/configs/kmtegr1.h
index 6b65c35db35..300ba7b55c1 100644
--- a/include/configs/kmtegr1.h
+++ b/include/configs/kmtegr1.h
@@ -53,11 +53,6 @@
 #define CONFIG_83XX_PCICLK		66000000
 
 /*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR		0xE0000000
-
-/*
  * Bus Arbitration Configuration Register (ACR)
  */
 #define CONFIG_SYS_ACR_PIPE_DEP 3       /* pipeline depth 4 transactions */
diff --git a/include/configs/kmtepr2.h b/include/configs/kmtepr2.h
index 25ecf3db2b3..72e9b5a29d2 100644
--- a/include/configs/kmtepr2.h
+++ b/include/configs/kmtepr2.h
@@ -46,11 +46,6 @@
 #define CONFIG_83XX_PCICLK		66000000
 
 /*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR		0xE0000000
-
-/*
  * Bus Arbitration Configuration Register (ACR)
  */
 #define CONFIG_SYS_ACR_PIPE_DEP 3       /* pipeline depth 4 transactions */
diff --git a/include/configs/kmvect1.h b/include/configs/kmvect1.h
index 652ed8c9686..3723d121285 100644
--- a/include/configs/kmvect1.h
+++ b/include/configs/kmvect1.h
@@ -45,11 +45,6 @@
 #define CONFIG_83XX_PCICLK		66000000
 
 /*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR		0xE0000000
-
-/*
  * Bus Arbitration Configuration Register (ACR)
  */
 #define CONFIG_SYS_ACR_PIPE_DEP 3       /* pipeline depth 4 transactions */
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
@@ -56,11 +56,6 @@
 #define CONFIG_SYS_GPIO1_DAT        0x08008C00
 
 /*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR		0xE0000000
-
-/*
  * SERDES
  */
 #define CONFIG_FSL_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
@@ -41,11 +41,6 @@
 	SICRL_ETSEC1_TX_CLK)	/* 0x00000000 */
 
 /*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR		0xE0000000
-
-/*
  * SERDES
  */
 #define CONFIG_FSL_SERDES
diff --git a/include/configs/suvd3.h b/include/configs/suvd3.h
index 5debec8b042..2c7b0abe27d 100644
--- a/include/configs/suvd3.h
+++ b/include/configs/suvd3.h
@@ -43,11 +43,6 @@
 #define CONFIG_83XX_PCICLK		66000000
 
 /*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR		0xE0000000
-
-/*
  * Bus Arbitration Configuration Register (ACR)
  */
 #define CONFIG_SYS_ACR_PIPE_DEP 3       /* pipeline depth 4 transactions */
diff --git a/include/configs/tuge1.h b/include/configs/tuge1.h
index 7266989741d..dd57292a8d1 100644
--- a/include/configs/tuge1.h
+++ b/include/configs/tuge1.h
@@ -46,11 +46,6 @@
 #define CONFIG_83XX_PCICLK		66000000
 
 /*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR		0xE0000000
-
-/*
  * Bus Arbitration Configuration Register (ACR)
  */
 #define CONFIG_SYS_ACR_PIPE_DEP 3       /* pipeline depth 4 transactions */
diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h
index 27aec8ba1a9..7c495941821 100644
--- a/include/configs/tuxx1.h
+++ b/include/configs/tuxx1.h
@@ -46,11 +46,6 @@
 #define CONFIG_83XX_PCICLK		66000000
 
 /*
- * IMMR new address
- */
-#define CONFIG_SYS_IMMR		0xE0000000
-
-/*
  * Bus Arbitration Configuration Register (ACR)
  */
 #define CONFIG_SYS_ACR_PIPE_DEP 3       /* pipeline depth 4 transactions */
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.11.0

More information about the U-Boot mailing list