powerpc: mpc86xx: Convert CONFIG_SYS_CCSRBAR_DEFAULT to Kconfig option

Move default value definitions to Kconfig SYS_CCSRBAR_DEFAULT.

Signed-off-by: York Sun <york.sun@nxp.com>

diff --git a/arch/powerpc/cpu/mpc86xx/Kconfig b/arch/powerpc/cpu/mpc86xx/Kconfig
index 98fb702e860f2840bebd682b0f1e5efbee3ba97d..57e7476ca705bdbaec8f1fbb3ea0dd13594a6571 100644 (file)
--- a/arch/powerpc/cpu/mpc86xx/Kconfig
+++ b/arch/powerpc/cpu/mpc86xx/Kconfig
@@ -32,6 +32,15 @@ config ARCH_MPC8610
 config ARCH_MPC8641
        bool
 
+config SYS_CCSRBAR_DEFAULT
+       hex "Default CCSRBAR address"
+       default 0xff700000 if ARCH_MPC8610 || ARCH_MPC8641
+       help
+               Default value of CCSRBAR comes from power-on-reset. It
+               is fixed on each SoC. Some SoCs can have different value
+               if changed by pre-boot regime. The value here must match
+               the current value in SoC. If not sure, do not change.
+
 source "board/freescale/mpc8610hpcd/Kconfig"
 source "board/freescale/mpc8641hpcn/Kconfig"
 source "board/sbc8641d/Kconfig"

diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 75693a0423af1608ffe3bbbd80f25fae831ff652..4cf9bd6e77fa68970eaf6677894efc28ff444a01 100644 (file)
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -72,7 +72,6 @@
  * Base addresses -- Note these are effective addresses where the
  * actual resources get mapped (not physical addresses)
  */
-#define CONFIG_SYS_CCSRBAR_DEFAULT     0xff700000      /* CCSRBAR Default */
 #define CONFIG_SYS_CCSRBAR             0xe0000000      /* relocated CCSRBAR */
 #define CONFIG_SYS_IMMR                CONFIG_SYS_CCSRBAR      /* PQII uses CONFIG_SYS_IMMR */
 

diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index c94b3296d408c6340d498955850140785b52ee8e..06ef0d9520859473b9910c5ca2f4237ea4c9c7b7 100644 (file)
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -87,7 +87,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
  * Base addresses -- Note these are effective addresses where the
  * actual resources get mapped (not physical addresses)
  */
-#define CONFIG_SYS_CCSRBAR_DEFAULT     0xff700000      /* CCSRBAR Default */
 #define CONFIG_SYS_CCSRBAR             0xffe00000      /* relocated CCSRBAR */
 #define CONFIG_SYS_IMMR                CONFIG_SYS_CCSRBAR      /* PQII uses CONFIG_SYS_IMMR */
 

diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index 2bd89f40fed42c0e08fa2edf483f615bc71b0568..7c8ceb30f2fd7c370a7259f0615c2c3b627fb08e 100644 (file)
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -87,7 +87,6 @@
  * Base addresses -- Note these are effective addresses where the
  * actual resources get mapped (not physical addresses)
  */
-#define CONFIG_SYS_CCSRBAR_DEFAULT     0xff700000      /* CCSRBAR Default */
 #define CONFIG_SYS_CCSRBAR             0xf8000000      /* relocated CCSRBAR */
 #define CONFIG_SYS_IMMR                CONFIG_SYS_CCSRBAR      /* PQII uses CONFIG_SYS_IMMR */
 

diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index 6d957896e64fd87bf8acfa5db8b0c43c4cf52788..86bc1cfdf0d60ee6b93b4ee7fd5c300ba3a8c62c 100644 (file)
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -76,7 +76,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
  * Base addresses -- Note these are effective addresses where the
  * actual resources get mapped (not physical addresses)
  */
-#define CONFIG_SYS_CCSRBAR_DEFAULT     0xff700000      /* CCSRBAR Default */
 #define CONFIG_SYS_CCSRBAR             0xef000000      /* relocated CCSRBAR */
 #define CONFIG_SYS_CCSRBAR_PHYS                CONFIG_SYS_CCSRBAR
 #define CONFIG_SYS_CCSRBAR_PHYS_LOW    CONFIG_SYS_CCSRBAR