powerpc: mpc83xx: Migrate DEFAULT_IMMR to Kconfig

As no platforms override this value, set it for all mpc83xx platforms.

Cc: Mario Six <[email protected]>
Cc: Wolfgang Denk <[email protected]>
Signed-off-by: Tom Rini <[email protected]>

diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index 2ebf8fc221d6875cf8bdb1f6ba4d65f81ad9c832..d1b9ae4c3c9228c688d7912fd922b4a83009f99a 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -1,6 +1,10 @@
 menu "mpc83xx CPU"
        depends on MPC83xx
 
+config DEFAULT_IMMR
+       hex
+       default 0xFF400000
+
 config E300
        def_bool y
 

diff --git a/include/mpc83xx.h b/include/mpc83xx.h
index 0275b3184ea36cdd6cd44747a0c9238b5a964c77..2181a90b59cf5160de927c575313d1e77c7b07c7 100644 (file)
--- a/include/mpc83xx.h
+++ b/include/mpc83xx.h
@@ -21,10 +21,6 @@
 /*
  * IMMRBAR - Internal Memory Register Base Address
  */
-#ifndef CONFIG_DEFAULT_IMMR
-/* Default IMMR base address */
-#define CONFIG_DEFAULT_IMMR            0xFF400000
-#endif
 /* Register offset to immr */
 #define IMMRBAR                                0x0000
 #define IMMRBAR_BASE_ADDR              0xFFF00000      /* Base addr. mask */