mpc83xx: Normalize BR/OR option lines

[platform/kernel/u-boot.git] / include / configs / suvd3.h

diff --git a/include/configs/suvd3.h b/include/configs/suvd3.h
index 987b2d7..ad270de 100644 (file)
--- a/include/configs/suvd3.h
+++ b/include/configs/suvd3.h
@@ -115,7 +115,7 @@
                                BR_MS_GPCM | /* MSEL = GPCM */ \
                                BR_V)
 
-#define CONFIG_SYS_OR0_PRELIM  (MEG_TO_AM(CONFIG_SYS_FLASH_SIZE) | \
+#define CONFIG_SYS_OR0_PRELIM  (OR_AM_256MB | \
                                OR_GPCM_CSNT | OR_GPCM_ACS_DIV2 | \
                                OR_GPCM_SCY_5 | \
                                OR_GPCM_TRLX_SET | OR_GPCM_EAD)
@@ -132,7 +132,7 @@
                                BR_PS_8 | /* 8 bit port size */ \
                                BR_MS_GPCM | /* MSEL = GPCM */ \
                                BR_V)
-#define CONFIG_SYS_OR1_PRELIM  (MEG_TO_AM(CONFIG_SYS_KMBEC_FPGA_SIZE) | \
+#define CONFIG_SYS_OR1_PRELIM  (OR_AM_128MB | \
                                OR_GPCM_CSNT | OR_GPCM_ACS_DIV2 | \
                                OR_GPCM_SCY_2 | \
                                OR_GPCM_TRLX_SET | OR_GPCM_EAD)
@@ -360,13 +360,13 @@
                                 BR_PS_16 | \
                                 BR_MS_UPMA | \
                                 BR_V)
-#define CONFIG_SYS_OR2_PRELIM  (MEG_TO_AM(CONFIG_SYS_APP1_SIZE))
+#define CONFIG_SYS_OR2_PRELIM  (OR_AM_256MB)
 
 #define CONFIG_SYS_BR3_PRELIM  (CONFIG_SYS_APP2_BASE | \
                                 BR_PS_16 | \
                                 BR_V)
 
-#define CONFIG_SYS_OR3_PRELIM  (MEG_TO_AM(CONFIG_SYS_APP2_SIZE) | \
+#define CONFIG_SYS_OR3_PRELIM  (OR_AM_256MB | \
                                 OR_GPCM_CSNT | \
                                 OR_GPCM_ACS_DIV4 | \
                                 OR_GPCM_SCY_3 | \