POST: Add 405EX support to 4xx UART POST test

[u-boot] / board / tqm5200 / cam5200_flash.c

diff --git a/board/tqm5200/cam5200_flash.c b/board/tqm5200/cam5200_flash.c
index 85d310b77df0180a6f5528d4c46744cd8ff504b1..b3f095d807f3366af1412f6b04f77f94f4602bbc 100644 (file)
--- a/board/tqm5200/cam5200_flash.c
+++ b/board/tqm5200/cam5200_flash.c
@@ -25,7 +25,7 @@
 #include <mpc5xxx.h>
 #include <asm/processor.h>
 
-#ifdef CONFIG_CAM5200
+#if defined(CONFIG_CAM5200) && defined(CONFIG_CAM5200_NIOSFLASH)
 
 #if 0
 #define DEBUGF(x...) printf(x)
@@ -46,7 +46,7 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
  * swapping is necessary within each 16 bit wide flash 'word'.
  *
  * This driver's task is to handle both flash devices: 32 bit TQM5200B
- * flash chip and 16 bit NIOS cpu flash chip. In the below 
+ * flash chip and 16 bit NIOS cpu flash chip. In the below
  * flash_addr_table table we use least significant address bit to mark
  * 16 bit flash bank and two sets of routines *_32 and *_16 to handle
  * specifics of both flashes.
@@ -759,7 +759,7 @@ unsigned long flash_init(void)
 
                if (flash_info[i].flash_id == FLASH_UNKNOWN) {
                        printf("## Unknown FLASH on Bank %d - Size = 0x%08lx = %ld MB\n",
-                                       i, size_b[i], size_b[i] << 20);
+                                       i+1, size_b[i], size_b[i] << 20);
                        flash_info[i].sector_count = -1;
                        flash_info[i].size = 0;
                }
@@ -783,4 +783,4 @@ unsigned long flash_init(void)
 
        return total_b;
 }
-#endif /* ifdef CONFIG_CAM5200 */
+#endif /* if defined(CONFIG_CAM5200) && defined(CONFIG_CAM5200_NIOSFLASH) */