[PATCH 02/25] mvebu: Move BOOTROM_ERR_REG out of CONFIG namespace

[Tom Rini]

This register is referenced in one location and does not seem
configurable, so remove it from CONFIG namespace.

Cc: Stefan Roese <sr at denx.de>
Signed-off-by: Tom Rini <trini at konsulko.com>
---
 arch/arm/mach-mvebu/cpu.c              | 2 +-
 arch/arm/mach-mvebu/include/mach/soc.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
index 0272dd7352d8..1e893777b292 100644
--- a/arch/arm/mach-mvebu/cpu.c
+++ b/arch/arm/mach-mvebu/cpu.c
@@ -91,7 +91,7 @@ u32 get_boot_device(void)
 	 * be done, via the bootrom error register. Here the
 	 * MSB marks if the UART mode is active.
 	 */
-	val = readl(CONFIG_BOOTROM_ERR_REG);
+	val = readl(BOOTROM_ERR_REG);
 	boot_device = (val & BOOTROM_ERR_MODE_MASK) >> BOOTROM_ERR_MODE_OFFS;
 	debug("BOOTROM_REG=0x%08x boot_device=0x%x\n", val, boot_device);
 	if (boot_device == BOOTROM_ERR_MODE_UART)
diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h
index aab61f7c15cf..3b9618852c6d 100644
--- a/arch/arm/mach-mvebu/include/mach/soc.h
+++ b/arch/arm/mach-mvebu/include/mach/soc.h
@@ -125,7 +125,7 @@
 #define COMPHY_REFCLK_ALIGNMENT	(MVEBU_REGISTER(0x182f8))
 
 /* BootROM error register (also includes some status infos) */
-#define CONFIG_BOOTROM_ERR_REG	(MVEBU_REGISTER(0x182d0))
+#define BOOTROM_ERR_REG		(MVEBU_REGISTER(0x182d0))
 #define BOOTROM_ERR_MODE_OFFS	28
 #define BOOTROM_ERR_MODE_MASK	(0xf << BOOTROM_ERR_MODE_OFFS)
 #define BOOTROM_ERR_MODE_UART	0x6
-- 
2.25.1