arm: socfpga: Add onchip RAM size macro

[oweals/u-boot.git] / arch / arm / mach-imx / init.c

diff --git a/arch/arm/mach-imx/init.c b/arch/arm/mach-imx/init.c
index b8d8d12372933505f1b806ce04cc509913ddd405..693b724429944e80ef29bc050cfb05cd8e508af5 100644 (file)
--- a/arch/arm/mach-imx/init.c
+++ b/arch/arm/mach-imx/init.c
@@ -108,9 +108,9 @@ void boot_mode_apply(unsigned cfg_val)
        writel(cfg_val, &psrc->gpr9);
        reg = readl(&psrc->gpr10);
        if (cfg_val)
-               reg |= 1 << 28;
+               reg |= IMX6_SRC_GPR10_BMODE;
        else
-               reg &= ~(1 << 28);
+               reg &= ~IMX6_SRC_GPR10_BMODE;
        writel(reg, &psrc->gpr10);
 }
 #endif
@@ -118,7 +118,7 @@ void boot_mode_apply(unsigned cfg_val)
 #if defined(CONFIG_MX6)
 u32 imx6_src_get_boot_mode(void)
 {
-       if (imx6_is_bmode_from_gpr9())
+       if (readl(&src_base->gpr10) & IMX6_SRC_GPR10_BMODE)
                return readl(&src_base->gpr9);
        else
                return readl(&src_base->sbmr1);