From: Tom Rini <trini@konsulko.com>
Date: Wed, 30 Mar 2022 22:07:29 +0000 (-0400)
Subject: powerpc: mpc83xx: Migrate DEFAULT_IMMR to Kconfig
X-Git-Url: http://git.dujemihanovic.xyz/img/static/git-favicon.png?a=commitdiff_plain;h=1d2893d191337b7adc3493eecc5e3de33fdcea7e;p=u-boot.git

powerpc: mpc83xx: Migrate DEFAULT_IMMR to Kconfig

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

Cc: Mario Six <mario.six@gdsys.cc>
Cc: Wolfgang Denk <wd@denx.de>
Signed-off-by: Tom Rini <trini@konsulko.com>
---

diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index 2ebf8fc221..d1b9ae4c3c 100644
--- 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 0275b3184e..2181a90b59 100644
--- 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 */