All BR/OR option lines should have the same layout to make them easier to migrate to Kconfig. This includes using the same option macros everywhere.
The normalize the lines, * replace function macros with their results, and * replace hardcoded hex values with standard macros Signed-off-by: Mario Six <mario....@gdsys.cc> --- v1 -> v2: No changes --- include/configs/MPC8308RDB.h | 6 +++--- include/configs/MPC8313ERDB_NAND.h | 4 ++-- include/configs/MPC8313ERDB_NOR.h | 4 ++-- include/configs/MPC8323ERDB.h | 2 +- include/configs/MPC832XEMDS.h | 6 +++--- include/configs/MPC8349EMDS.h | 2 +- include/configs/MPC8349EMDS_SDRAM.h | 2 +- include/configs/MPC8349ITX.h | 2 +- include/configs/MPC837XEMDS.h | 2 +- include/configs/MPC837XERDB.h | 2 +- include/configs/caddy2.h | 2 +- include/configs/hrcon.h | 4 ++-- include/configs/ids8313.h | 10 +++++----- include/configs/kmcoge5ne.h | 12 ++++++------ include/configs/kmeter1.h | 8 ++++---- include/configs/kmopti2.h | 8 ++++---- include/configs/kmsupx5.h | 6 +++--- include/configs/kmtegr1.h | 6 +++--- include/configs/kmtepr2.h | 8 ++++---- include/configs/kmvect1.h | 8 ++++---- include/configs/mpc8308_p1m.h | 2 +- include/configs/sbc8349.h | 4 ++-- include/configs/strider.h | 4 ++-- include/configs/suvd3.h | 8 ++++---- include/configs/tuge1.h | 6 +++--- include/configs/tuxx1.h | 8 ++++---- include/configs/vme8349.h | 2 +- 27 files changed, 69 insertions(+), 69 deletions(-) diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index 1953d18e878..e19bcafd5ce 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -180,7 +180,7 @@ | BR_PS_16 /* 16 bit port */ \ | BR_MS_GPCM /* MSEL = GPCM */ \ | BR_V) /* valid */ -#define CONFIG_SYS_OR0_PRELIM (MEG_TO_AM(CONFIG_SYS_FLASH_SIZE) \ +#define CONFIG_SYS_OR0_PRELIM (OR_AM_8MB \ | OR_UPM_XAM \ | OR_GPCM_CSNT \ | OR_GPCM_ACS_DIV2 \ @@ -206,7 +206,7 @@ | BR_PS_8 /* 8 bit Port */ \ | BR_MS_FCM /* MSEL = FCM */ \ | BR_V) /* valid */ -#define CONFIG_SYS_OR1_PRELIM (P2SZ_TO_AM(CONFIG_SYS_NAND_WINDOW_SIZE) \ +#define CONFIG_SYS_OR1_PRELIM (OR_AM_32KB \ | OR_FCM_CSCT \ | OR_FCM_CST \ | OR_FCM_CHT \ @@ -225,7 +225,7 @@ | BR_MS_GPCM /* MSEL = GPCM */ \ | BR_V) /* valid */ /* 0xF0000801 */ -#define CONFIG_SYS_OR2_PRELIM (P2SZ_TO_AM(CONFIG_SYS_VSC7385_SIZE) \ +#define CONFIG_SYS_OR2_PRELIM (OR_AM_128KB \ | OR_GPCM_CSNT \ | OR_GPCM_XACS \ | OR_GPCM_SCY_15 \ diff --git a/include/configs/MPC8313ERDB_NAND.h b/include/configs/MPC8313ERDB_NAND.h index 79c7f12baee..bbb9d4b936c 100644 --- a/include/configs/MPC8313ERDB_NAND.h +++ b/include/configs/MPC8313ERDB_NAND.h @@ -258,7 +258,7 @@ | BR_MS_GPCM /* MSEL = GPCM */ \ | BR_V) /* valid */ /* 0xFA000801 */ -#define CONFIG_SYS_OR3_PRELIM (P2SZ_TO_AM(CONFIG_SYS_BCSR_SIZE) \ +#define CONFIG_SYS_OR3_PRELIM (OR_AM_32KB \ | OR_GPCM_CSNT \ | OR_GPCM_ACS_DIV2 \ | OR_GPCM_XACS \ @@ -279,7 +279,7 @@ | BR_PS_8 /* 8 bit port */ \ | BR_MS_GPCM /* MSEL = GPCM */ \ | BR_V) /* valid */ -#define CONFIG_SYS_OR2_PRELIM (P2SZ_TO_AM(CONFIG_SYS_VSC7385_SIZE) \ +#define CONFIG_SYS_OR2_PRELIM (OR_AM_128KB \ | OR_GPCM_CSNT \ | OR_GPCM_XACS \ | OR_GPCM_SCY_15 \ diff --git a/include/configs/MPC8313ERDB_NOR.h b/include/configs/MPC8313ERDB_NOR.h index 866ac8faf2a..c1bf62e4055 100644 --- a/include/configs/MPC8313ERDB_NOR.h +++ b/include/configs/MPC8313ERDB_NOR.h @@ -230,7 +230,7 @@ | BR_MS_GPCM /* MSEL = GPCM */ \ | BR_V) /* valid */ /* 0xFA000801 */ -#define CONFIG_SYS_OR3_PRELIM (P2SZ_TO_AM(CONFIG_SYS_BCSR_SIZE) \ +#define CONFIG_SYS_OR3_PRELIM (OR_AM_32KB \ | OR_GPCM_CSNT \ | OR_GPCM_ACS_DIV2 \ | OR_GPCM_XACS \ @@ -251,7 +251,7 @@ | BR_PS_8 /* 8 bit port */ \ | BR_MS_GPCM /* MSEL = GPCM */ \ | BR_V) /* valid */ -#define CONFIG_SYS_OR2_PRELIM (P2SZ_TO_AM(CONFIG_SYS_VSC7385_SIZE) \ +#define CONFIG_SYS_OR2_PRELIM (OR_AM_128KB \ | OR_GPCM_CSNT \ | OR_GPCM_XACS \ | OR_GPCM_SCY_15 \ diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index cb17c7644de..30f1e4453d1 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -146,7 +146,7 @@ | BR_PS_16 /* 16 bit port */ \ | BR_MS_GPCM /* MSEL = GPCM */ \ | BR_V) /* valid */ -#define CONFIG_SYS_OR0_PRELIM (MEG_TO_AM(CONFIG_SYS_FLASH_SIZE) \ +#define CONFIG_SYS_OR0_PRELIM (OR_AM_16MB \ | OR_GPCM_XAM \ | OR_GPCM_CSNT \ | OR_GPCM_ACS_DIV2 \ diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index d51d5ce06d5..3a8a3e4fb89 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -137,7 +137,7 @@ | BR_PS_16 /* 16 bit port */ \ | BR_MS_GPCM /* MSEL = GPCM */ \ | BR_V) /* valid */ -#define CONFIG_SYS_OR0_PRELIM (MEG_TO_AM(CONFIG_SYS_FLASH_SIZE) \ +#define CONFIG_SYS_OR0_PRELIM (OR_AM_16MB \ | OR_GPCM_XAM \ | OR_GPCM_CSNT \ | OR_GPCM_ACS_DIV2 \ @@ -188,7 +188,7 @@ | BR_MS_GPCM \ | BR_V) /* 0xF8008801 */ -#define CONFIG_SYS_OR2_PRELIM (P2SZ_TO_AM(CONFIG_SYS_PIB_WINDOW_SIZE) \ +#define CONFIG_SYS_OR2_PRELIM (OR_AM_32KB \ | OR_GPCM_XAM \ | OR_GPCM_CSNT \ | OR_GPCM_XACS \ @@ -207,7 +207,7 @@ | BR_MS_GPCM \ | BR_V) /* 0xF8010801 */ -#define CONFIG_SYS_OR3_PRELIM (P2SZ_TO_AM(CONFIG_SYS_PIB_WINDOW_SIZE) \ +#define CONFIG_SYS_OR3_PRELIM (OR_AM_32KB \ | OR_GPCM_XAM \ | OR_GPCM_CSNT \ | OR_GPCM_XACS \ diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 06017a81bc8..fa73b81c3a0 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -127,7 +127,7 @@ | BR_PS_16 /* 16 bit port */ \ | BR_MS_GPCM /* MSEL = GPCM */ \ | BR_V) /* valid */ -#define CONFIG_SYS_OR0_PRELIM (MEG_TO_AM(CONFIG_SYS_FLASH_SIZE) \ +#define CONFIG_SYS_OR0_PRELIM (OR_AM_32MB \ | OR_UPM_XAM \ | OR_GPCM_CSNT \ | OR_GPCM_ACS_DIV2 \ diff --git a/include/configs/MPC8349EMDS_SDRAM.h b/include/configs/MPC8349EMDS_SDRAM.h index 708a21f1649..218c4b1fc98 100644 --- a/include/configs/MPC8349EMDS_SDRAM.h +++ b/include/configs/MPC8349EMDS_SDRAM.h @@ -127,7 +127,7 @@ | BR_PS_16 /* 16 bit port */ \ | BR_MS_GPCM /* MSEL = GPCM */ \ | BR_V) /* valid */ -#define CONFIG_SYS_OR0_PRELIM (MEG_TO_AM(CONFIG_SYS_FLASH_SIZE) \ +#define CONFIG_SYS_OR0_PRELIM (OR_AM_32MB \ | OR_UPM_XAM \ | OR_GPCM_CSNT \ | OR_GPCM_ACS_DIV2 \ diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 16d615dcc65..0bf179a70b1 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -217,7 +217,7 @@ boards, we say we have two, but don't display a message if we find only one. */ | BR_PS_16 \ | BR_MS_GPCM \ | BR_V) -#define CONFIG_SYS_OR0_PRELIM (MEG_TO_AM(CONFIG_SYS_FLASH_SIZE) \ +#define CONFIG_SYS_OR0_PRELIM (OR_AM_16MB \ | OR_UPM_XAM \ | OR_GPCM_CSNT \ | OR_GPCM_ACS_DIV2 \ diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 9d6dc767ef3..e10c58d7eda 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -166,7 +166,7 @@ | BR_PS_16 /* 16 bit port */ \ | BR_MS_GPCM /* MSEL = GPCM */ \ | BR_V) /* valid */ -#define CONFIG_SYS_OR0_PRELIM (MEG_TO_AM(CONFIG_SYS_FLASH_SIZE) \ +#define CONFIG_SYS_OR0_PRELIM (OR_AM_32MB \ | OR_UPM_XAM \ | OR_GPCM_CSNT \ | OR_GPCM_ACS_DIV2 \ diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index a1de8acc5c7..1e45b5ee3f1 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -192,7 +192,7 @@ | BR_PS_16 /* 16 bit port */ \ | BR_MS_GPCM /* MSEL = GPCM */ \ | BR_V) /* valid */ -#define CONFIG_SYS_OR0_PRELIM (MEG_TO_AM(CONFIG_SYS_FLASH_SIZE) \ +#define CONFIG_SYS_OR0_PRELIM (OR_AM_8MB \ | OR_GPCM_XACS \ | OR_GPCM_SCY_9 \ | OR_GPCM_EHTR_SET \ diff --git a/include/configs/caddy2.h b/include/configs/caddy2.h index b355e56355f..ffd52a200a3 100644 --- a/include/configs/caddy2.h +++ b/include/configs/caddy2.h @@ -74,7 +74,7 @@ BR_MS_GPCM | /* MSEL = GPCM */ \ BR_V) /* valid */ -#define CONFIG_SYS_OR0_PRELIM (MEG_TO_AM(CONFIG_SYS_FLASH_SIZE) \ +#define CONFIG_SYS_OR0_PRELIM (OR_AM_4MB \ | OR_GPCM_XAM \ | OR_GPCM_CSNT \ | OR_GPCM_ACS_DIV2 \ diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index d86de800db7..4193ceb3793 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -174,7 +174,7 @@ | BR_PS_16 /* 16 bit port */ \ | BR_MS_GPCM /* MSEL = GPCM */ \ | BR_V) /* valid */ -#define CONFIG_SYS_OR0_PRELIM (MEG_TO_AM(CONFIG_SYS_FLASH_SIZE) \ +#define CONFIG_SYS_OR0_PRELIM (OR_AM_8MB \ | OR_UPM_XAM \ | OR_GPCM_CSNT \ | OR_GPCM_ACS_DIV2 \ @@ -200,7 +200,7 @@ | BR_PS_16 /* 16 bit port */ \ | BR_MS_GPCM /* MSEL = GPCM */ \ | BR_V) /* valid */ -#define CONFIG_SYS_OR1_PRELIM (MEG_TO_AM(CONFIG_SYS_FPGA0_SIZE) \ +#define CONFIG_SYS_OR1_PRELIM (OR_AM_1MB \ | OR_UPM_XAM \ | OR_GPCM_CSNT \ | OR_GPCM_ACS_DIV2 \ diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index d8973394454..cce94addcb9 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -148,7 +148,7 @@ BR_MS_GPCM |\ BR_V) -#define CONFIG_SYS_OR0_PRELIM (MEG_TO_AM(CONFIG_SYS_FLASH_SIZE) |\ +#define CONFIG_SYS_OR0_PRELIM (OR_AM_8MB |\ OR_GPCM_SCY_10 |\ OR_GPCM_EHTR |\ OR_GPCM_TRLX |\ @@ -172,12 +172,12 @@ #define NAND_CACHE_PAGES 64 #define CONFIG_SYS_BR1_PRELIM ((CONFIG_SYS_NAND_BASE) |\ - (2<<BR_DECC_SHIFT) |\ + BR_DECC_CHK_GEN |\ BR_PS_8 |\ BR_MS_FCM |\ BR_V) -#define CONFIG_SYS_OR1_PRELIM (0xFFFF8000 |\ +#define CONFIG_SYS_OR1_PRELIM (OR_AM_32KB |\ OR_FCM_PGS |\ OR_FCM_CSCT |\ OR_FCM_CST |\ @@ -200,7 +200,7 @@ BR_MS_GPCM |\ BR_V) -#define CONFIG_SYS_OR2_PRELIM 0xFFFE0C74 +#define CONFIG_SYS_OR2_PRELIM (OR_AM_128KB | OR_GPCM_CSNT | OR_GPCM_ACS_DIV4 | OR_GPCM_SCY_7 | OR_GPCM_TRLX_SET) /* * CPLD setup @@ -215,7 +215,7 @@ BR_MS_GPCM |\ BR_V) -#define CONFIG_SYS_OR3_PRELIM 0xFFFF8814 +#define CONFIG_SYS_OR3_PRELIM (OR_AM_32KB | OR_GPCM_CSNT | OR_GPCM_SCY_1 | OR_GPCM_TRLX_SET) /* * HW-Watchdog diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h index dd0027c262b..97a9421cfe9 100644 --- a/include/configs/kmcoge5ne.h +++ b/include/configs/kmcoge5ne.h @@ -117,7 +117,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) @@ -134,7 +134,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_64MB | \ OR_GPCM_CSNT | OR_GPCM_ACS_DIV2 | \ OR_GPCM_SCY_2 | \ OR_GPCM_TRLX_SET | OR_GPCM_EAD) @@ -353,11 +353,11 @@ #define CONFIG_SYS_BR3_PRELIM (\ CONFIG_SYS_PAXE_BASE | \ - (1 << BR_PS_SHIFT) | \ + BR_PS_8 | \ BR_V) #define CONFIG_SYS_OR3_PRELIM (\ - MEG_TO_AM(CONFIG_SYS_PAXE_SIZE) | \ + OR_AM_256MB | \ OR_GPCM_CSNT | \ OR_GPCM_ACS_DIV2 | \ OR_GPCM_SCY_2 | \ @@ -372,11 +372,11 @@ #define CONFIG_SYS_BR4_PRELIM (\ CONFIG_SYS_BFTIC3_BASE |\ - (1 << BR_PS_SHIFT) | \ + BR_PS_8 | \ BR_V) #define CONFIG_SYS_OR4_PRELIM (\ - MEG_TO_AM(CONFIG_SYS_BFTIC3_SIZE) |\ + OR_AM_256MB|\ OR_GPCM_CSNT | \ OR_GPCM_ACS_DIV2 |\ OR_GPCM_SCY_2 |\ diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h index 1cc2ac3b788..c8e837719fd 100644 --- a/include/configs/kmeter1.h +++ b/include/configs/kmeter1.h @@ -102,7 +102,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) @@ -119,7 +119,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_64MB | \ OR_GPCM_CSNT | OR_GPCM_ACS_DIV2 | \ OR_GPCM_SCY_2 | \ OR_GPCM_TRLX_SET | OR_GPCM_EAD) @@ -333,11 +333,11 @@ #define CONFIG_SYS_BR3_PRELIM (\ CONFIG_SYS_PAXE_BASE | \ - (1 << BR_PS_SHIFT) | \ + BR_PS_8 | \ BR_V) #define CONFIG_SYS_OR3_PRELIM (\ - MEG_TO_AM(CONFIG_SYS_PAXE_SIZE) | \ + OR_AM_256MB | \ OR_GPCM_CSNT | \ OR_GPCM_ACS_DIV2 | \ OR_GPCM_SCY_2 | \ diff --git a/include/configs/kmopti2.h b/include/configs/kmopti2.h index c27fa82ea72..442b18d8643 100644 --- a/include/configs/kmopti2.h +++ b/include/configs/kmopti2.h @@ -122,7 +122,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) @@ -139,7 +139,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) @@ -370,7 +370,7 @@ BR_MS_GPCM | \ BR_V) -#define CONFIG_SYS_OR2_PRELIM (MEG_TO_AM(CONFIG_SYS_APP1_SIZE) | \ +#define CONFIG_SYS_OR2_PRELIM (OR_AM_256MB | \ OR_GPCM_CSNT | \ OR_GPCM_ACS_DIV4 | \ OR_GPCM_SCY_2 | \ @@ -385,7 +385,7 @@ BR_PS_16 | \ BR_MS_GPCM | \ BR_V) -#define CONFIG_SYS_OR3_PRELIM (MEG_TO_AM(CONFIG_SYS_APP2_SIZE) | \ +#define CONFIG_SYS_OR3_PRELIM (OR_AM_256MB | \ OR_GPCM_SCY_4 | \ OR_GPCM_TRLX_CLEAR | \ OR_GPCM_EHTR_CLEAR) diff --git a/include/configs/kmsupx5.h b/include/configs/kmsupx5.h index 492f92bea03..cfa10dfef78 100644 --- a/include/configs/kmsupx5.h +++ b/include/configs/kmsupx5.h @@ -122,7 +122,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) @@ -139,7 +139,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) @@ -368,7 +368,7 @@ BR_MS_GPCM | \ BR_V) -#define CONFIG_SYS_OR2_PRELIM (MEG_TO_AM(CONFIG_SYS_APP1_SIZE) | \ +#define CONFIG_SYS_OR2_PRELIM (OR_AM_256MB | \ OR_GPCM_CSNT | \ OR_GPCM_ACS_DIV4 | \ OR_GPCM_SCY_2 | \ diff --git a/include/configs/kmtegr1.h b/include/configs/kmtegr1.h index 3812406a4b4..61a84ac835c 100644 --- a/include/configs/kmtegr1.h +++ b/include/configs/kmtegr1.h @@ -129,7 +129,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) @@ -146,7 +146,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) @@ -420,7 +420,7 @@ BR_MS_GPCM | \ BR_V) -#define CONFIG_SYS_OR3_PRELIM (MEG_TO_AM(CONFIG_SYS_APP2_SIZE) | \ +#define CONFIG_SYS_OR3_PRELIM (OR_AM_256MB | \ OR_GPCM_SCY_5 | \ OR_GPCM_TRLX_CLEAR | \ OR_GPCM_EHTR_CLEAR) diff --git a/include/configs/kmtepr2.h b/include/configs/kmtepr2.h index 43a9ce95257..138f9eb75ed 100644 --- a/include/configs/kmtepr2.h +++ b/include/configs/kmtepr2.h @@ -122,7 +122,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) @@ -139,7 +139,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) @@ -370,7 +370,7 @@ BR_MS_GPCM | \ BR_V) -#define CONFIG_SYS_OR2_PRELIM (MEG_TO_AM(CONFIG_SYS_APP1_SIZE) | \ +#define CONFIG_SYS_OR2_PRELIM (OR_AM_256MB | \ OR_GPCM_CSNT | \ OR_GPCM_ACS_DIV4 | \ OR_GPCM_SCY_2 | \ @@ -385,7 +385,7 @@ BR_PS_16 | \ BR_MS_GPCM | \ BR_V) -#define CONFIG_SYS_OR3_PRELIM (MEG_TO_AM(CONFIG_SYS_APP2_SIZE) | \ +#define CONFIG_SYS_OR3_PRELIM (OR_AM_256MB | \ OR_GPCM_SCY_4 | \ OR_GPCM_TRLX_CLEAR | \ OR_GPCM_EHTR_CLEAR) diff --git a/include/configs/kmvect1.h b/include/configs/kmvect1.h index 69131473a73..bcf093f3626 100644 --- a/include/configs/kmvect1.h +++ b/include/configs/kmvect1.h @@ -121,7 +121,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) @@ -138,7 +138,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) @@ -411,13 +411,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 | \ diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h index aa9710f9c21..046355f6454 100644 --- a/include/configs/mpc8308_p1m.h +++ b/include/configs/mpc8308_p1m.h @@ -184,7 +184,7 @@ | BR_PS_16 /* 16 bit port */ \ | BR_MS_GPCM /* MSEL = GPCM */ \ | BR_V) /* valid */ -#define CONFIG_SYS_OR0_PRELIM (MEG_TO_AM(CONFIG_SYS_FLASH_SIZE) \ +#define CONFIG_SYS_OR0_PRELIM (OR_AM_64MB \ | OR_UPM_XAM \ | OR_GPCM_CSNT \ | OR_GPCM_ACS_DIV2 \ diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index edf76e58519..dffb7c61086 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -103,7 +103,7 @@ | BR_MS_GPCM /* MSEL = GPCM */ \ | BR_V) /* valid */ -#define CONFIG_SYS_OR0_PRELIM (MEG_TO_AM(CONFIG_SYS_FLASH_SIZE) \ +#define CONFIG_SYS_OR0_PRELIM (OR_AM_8MB \ | OR_GPCM_XAM \ | OR_GPCM_CSNT \ | OR_GPCM_ACS_DIV2 \ @@ -190,7 +190,7 @@ * 1111 1100 0000 0000 0110 1001 0000 0001 = FC006901 */ -#define CONFIG_SYS_OR2_PRELIM (MEG_TO_AM(CONFIG_SYS_LBC_SDRAM_SIZE) \ +#define CONFIG_SYS_OR2_PRELIM (OR_AM_64MB \ | OR_SDRAM_XAM \ | ((9 - OR_SDRAM_MIN_COLS) << OR_SDRAM_COLS_SHIFT) \ | ((13 - OR_SDRAM_MIN_ROWS) << OR_SDRAM_ROWS_SHIFT) \ diff --git a/include/configs/strider.h b/include/configs/strider.h index 3b0207488f4..184396e0379 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -172,7 +172,7 @@ | BR_PS_16 /* 16 bit port */ \ | BR_MS_GPCM /* MSEL = GPCM */ \ | BR_V) /* valid */ -#define CONFIG_SYS_OR0_PRELIM (MEG_TO_AM(CONFIG_SYS_FLASH_SIZE) \ +#define CONFIG_SYS_OR0_PRELIM (OR_AM_8MB \ | OR_UPM_XAM \ | OR_GPCM_CSNT \ | OR_GPCM_ACS_DIV2 \ @@ -199,7 +199,7 @@ | BR_MS_GPCM /* MSEL = GPCM */ \ | BR_V) /* valid */ -#define CONFIG_SYS_OR1_PRELIM (MEG_TO_AM(CONFIG_SYS_FPGA0_SIZE) \ +#define CONFIG_SYS_OR1_PRELIM (OR_AM_1MB \ | OR_UPM_XAM \ | OR_GPCM_CSNT \ | OR_GPCM_SCY_5 \ diff --git a/include/configs/suvd3.h b/include/configs/suvd3.h index 1c20a43c932..647e145700b 100644 --- a/include/configs/suvd3.h +++ b/include/configs/suvd3.h @@ -119,7 +119,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) @@ -136,7 +136,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) @@ -364,13 +364,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 | \ diff --git a/include/configs/tuge1.h b/include/configs/tuge1.h index e0df74a16fb..445ad5915f0 100644 --- a/include/configs/tuge1.h +++ b/include/configs/tuge1.h @@ -122,7 +122,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) @@ -139,7 +139,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) @@ -368,7 +368,7 @@ BR_MS_GPCM | \ BR_V) -#define CONFIG_SYS_OR2_PRELIM (MEG_TO_AM(CONFIG_SYS_APP1_SIZE) | \ +#define CONFIG_SYS_OR2_PRELIM (OR_AM_256MB | \ OR_GPCM_CSNT | \ OR_GPCM_ACS_DIV4 | \ OR_GPCM_SCY_2 | \ diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h index 81137c50167..65205d7c238 100644 --- a/include/configs/tuxx1.h +++ b/include/configs/tuxx1.h @@ -122,7 +122,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) @@ -139,7 +139,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) @@ -370,7 +370,7 @@ BR_MS_GPCM | \ BR_V) -#define CONFIG_SYS_OR2_PRELIM (MEG_TO_AM(CONFIG_SYS_APP1_SIZE) | \ +#define CONFIG_SYS_OR2_PRELIM (OR_AM_256MB | \ OR_GPCM_CSNT | \ OR_GPCM_ACS_DIV4 | \ OR_GPCM_SCY_2 | \ @@ -386,7 +386,7 @@ BR_MS_GPCM | \ 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_DIV2 | \ OR_GPCM_SCY_2 | \ diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index ed02661f82a..76821e7a407 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -74,7 +74,7 @@ BR_MS_GPCM | /* MSEL = GPCM */ \ BR_V) /* valid */ -#define CONFIG_SYS_OR0_PRELIM (MEG_TO_AM(CONFIG_SYS_FLASH_SIZE) \ +#define CONFIG_SYS_OR0_PRELIM (OR_AM_128MB \ | OR_GPCM_XAM \ | OR_GPCM_CSNT \ | OR_GPCM_ACS_DIV2 \ -- 2.11.0 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot