From: Mario Six <mario.six@gdsys.cc>
Date: Mon, 21 Jan 2019 08:18:10 +0000 (+0100)
Subject: mpc83xx: Migrate CONFIG_SYS_IMMR to Kconfig
X-Git-Tag: v2025.01-rc5-pxa1908~2967^2~39
X-Git-Url: http://git.dujemihanovic.xyz/img/html/static/%7B%7B?a=commitdiff_plain;h=71da74743180c81c3af31108839b5d0e6a1aff87;p=u-boot.git

mpc83xx: Migrate CONFIG_SYS_IMMR to Kconfig

Migrate CONFIG_SYS_IMMR to Kconfig for MPC83xx.

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

diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index 5fb4228076..96376837ab 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 e85bfaea31..f5746cfad7 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 24590d1448..9c16a1231c 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 9c4de05440..e825cfbd17 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 2f48b135c4..e23df14ec1 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 bd1e54feec..17cd8adc85 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 5ce213f594..fbba2fbb50 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 abc62f7e69..b528c2901b 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 a138bd6724..195d62ce50 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 d0d6eaf6c2..14ebc8ead3 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 976c1e8063..67f3a9bd65 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 f37b086b1f..eef1bdec63 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 7361f0e2f6..c1973703c4 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 3f17574cee..e8173da323 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 dc2bba828c..d713c695f7 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 016477c04f..b4516267f1 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 b28f3c1d45..e8a4b7adf6 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 1637ed9646..b4acee058c 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 f3f78de8de..8e09160f92 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 aaa0607ed5..48a6172349 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 e9bb3f7983..e34f26e55d 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 182357b0c0..96e10325f0 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 0855dd152c..4b407af036 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 7edb573747..20cbc1318a 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 b88f158265..37acb0245b 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 8ea3ea11dc..76846c43d0 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 b58628262d..775bbe417a 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 96b31741fd..fe2d89f2a6 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 5d7d48dd39..82ebbca4db 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 d95147d1ed..b196c77c4e 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 e6337d98ac..0ce848c911 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 87160f2c34..1ac6cbefd6 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 2a14f561ed..1a3a55b707 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