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 5fb4228076e0560591077b9e75e7ad83ef26fb33..96376837abb6f397aef84694fe528966d29658ce 100644 (file)
--- 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 e85bfaea31593e3b85c0382e89552fb7080a635b..f5746cfad710c9fb0ffae78c7d3066c58184308c 100644 (file)
--- 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 24590d1448b9b6885109f83d62abefc07e73a17a..9c16a1231c67718bc04d235f1be9aa4cd6279c02 100644 (file)
--- 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 9c4de054403f59d5a28ccea856abb1f66f4eaba7..e825cfbd174fcffe439f09a1e777f6b2b990c057 100644 (file)
--- 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 2f48b135c46e4c6145226a75ade4afa6605e07f1..e23df14ec171edf902820324dbcfcc8e79885178 100644 (file)
--- 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 bd1e54feec32342c9eaae2a443d82c2527a9dffa..17cd8adc8591509f340b74e948bcf699fb3d1eb8 100644 (file)
--- 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 5ce213f59495cdccb0eeb4f22c436008e254a184..fbba2fbb50bada52588d6d9933cd8cfade4211f8 100644 (file)
--- 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 abc62f7e6995ab5e398581d343da1ea0b1da6102..b528c2901b4b55994af7037625048590cdda9931 100644 (file)
--- 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 a138bd6724f1d3f5fcc8fb90e58fb145e04bbd90..195d62ce50d8a6fd74279f1f6c0235f40956e599 100644 (file)
--- 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 d0d6eaf6c215e7207167347afb2ef7bc9d42ef06..14ebc8ead3d7edc50ddcfe1c67d7770e171b952f 100644 (file)
--- 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 976c1e80638a95aca2b19d470ce67232ea8bb5f6..67f3a9bd65f7c3526366b5c31d4a75ddce8e2c8e 100644 (file)
--- 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 f37b086b1f1b9ccce425ee8f2d312d69687a4f81..eef1bdec63a083e3882354bec8f3ab58edd6bb38 100644 (file)
--- 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 7361f0e2f671b69ad9b177acad7e8b9acc6ca2dc..c1973703c4a3a1b5079e46b3fc731f0bdbe59ee9 100644 (file)
--- 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 3f17574cee9d99c34605d79e4ccaa15ffcb8ff7a..e8173da3233c97174de5e27ebfba94bf8aa0fe33 100644 (file)
--- 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 dc2bba828c3e2ab3a771a4d0ba3cbdad3f4442d6..d713c695f7c94c8046a5490f7d7d4d3534783840 100644 (file)
--- 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 016477c04fb1c395167a3730cd2430d981f8bf5c..b4516267f151238b3939262ed737a4d49e3aedb1 100644 (file)
--- 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 b28f3c1d45a0f834442f4780b5d9a5a9fabdfdb6..e8a4b7adf67356beccd4f5daf6b0d2998c1be0b8 100644 (file)
--- 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 1637ed9646baf2a9c6ccf143fe9ad64574d2e8c4..b4acee058caa644e965c57d6d8a0a035ab901947 100644 (file)
--- 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 f3f78de8de16abaa5a48dcbd3be7f0fc049a1038..8e09160f92acba6a6ef970a83c2240baffff136b 100644 (file)
--- 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 aaa0607ed5ee3deeeff81fdfc1fd7dd720cefcb2..48a6172349d1ea44562c4c536fadb32aafeb67fa 100644 (file)
--- 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 e9bb3f798351c3c6808168faaa0d42bf9c98175d..e34f26e55d67bed8def28132232558edc0ea01ca 100644 (file)
--- 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 182357b0c0db272f6d9783486c8da6febba9f400..96e10325f0f7ba7a41652ad6a325f5543e756af4 100644 (file)
--- 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 0855dd152ce0287e73992d5b16b7958ed35036a7..4b407af0364709bad11b6480e45865d48912a281 100644 (file)
--- 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 7edb573747f77ae5042edc6798d2d21dcf57c2dc..20cbc1318abb459e670eaada0e08ed55ee2cb8db 100644 (file)
--- 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 b88f1582656ff01ecac267d35ae15a64f816a39b..37acb0245b69de16b0e89f77c6c5a53e645087e6 100644 (file)
--- 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 8ea3ea11dc81d99139a97426aeac415131812d8e..76846c43d015f7e2f4fac91472616b0e0c957284 100644 (file)
--- 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 b58628262d3192b568d1a7f9787b5b1deb5dc4d8..775bbe417afc57dabb745c741f9bf3fff893e1d4 100644 (file)
--- 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 96b31741fd2f6d56f45b61d9805ca8cb81fd7666..fe2d89f2a61cb2008c5be698f42ff2e440f74aea 100644 (file)
--- 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 5d7d48dd391dbb13fb0121a0996cc79c9835601a..82ebbca4db1f549617498c0407b6a8d965b81401 100644 (file)
--- 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 d95147d1edbf57a992bc9366b3f5123a44d58c7b..b196c77c4e73077eaef1bedf6c37cd4c1a432b51 100644 (file)
--- 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 e6337d98ac695ede6128c91369a443f1e651eaa1..0ce848c911dfe49a6f93cde02e6f28d28e200f75 100644 (file)
--- 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 87160f2c34172914c6368956306e64c1623cafbf..1ac6cbefd6c8e0a6cf86b4ca0b026cd3d2d9f7e0 100644 (file)
--- 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 2a14f561ed77246c635b9d6e301473e3c4ad71de..1a3a55b707e44a92d97f355af47ebff71240850f 100644 (file)
--- 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