tqm834x: Expand CONFIG_SYS_OR_TIMING_FLASH macro

We want to normalize all BR/OR config lines as much as possible.

The TQM834x board uses CONFIG_SYS_OR_TIMING_FLASH in a OR definition,
which we want to remove. But CONFIG_SYS_OR_TIMING_FLASH is also used
outside of the config file.

Replace these usages with the definition of the variable, so we can
remove the variable in the next patch.

Signed-off-by: Mario Six <mario.six@gdsys.cc>

diff --git a/board/tqc/tqm834x/tqm834x.c b/board/tqc/tqm834x/tqm834x.c
index 7c92f4f54c16a6cff53f42c13a5c8e150d34e38b..c75251e132c91d5d68154cde347e79883b761b75 100644 (file)
--- a/board/tqc/tqm834x/tqm834x.c
+++ b/board/tqc/tqm834x/tqm834x.c
@@ -235,8 +235,8 @@ static int detect_num_flash_banks(void)
        debug("Number of flash banks detected: %d\n", cfi_flash_num_flash_banks);
 
        /* set OR0 and BR0 */
-       set_lbc_or(0, CONFIG_SYS_OR_TIMING_FLASH |
-                  (-(total_size) & OR_GPCM_AM));
+       set_lbc_or(0, OR_GPCM_CSNT | OR_GPCM_ACS_DIV4 | OR_GPCM_SCY_5 |
+                  OR_GPCM_TRLX | (-(total_size) & OR_GPCM_AM));
        set_lbc_br(0, (CONFIG_SYS_FLASH_BASE & BR_BA) |
                   (BR_MS_GPCM | BR_PS_32 | BR_V));