diff options
author | Stefan Roese <sr@denx.de> | 2006-11-27 14:11:22 +0100 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2006-11-27 14:11:22 +0100 |
commit | 48c7d6dba9140869a1d644248aa8cfabe01c98a6 (patch) | |
tree | e5dcf79067eb653dcfa5e87667d4af204c0fb554 /board | |
parent | dfc8a9ee0040e53ada125a3c52f241e37f09cf28 (diff) | |
parent | 3b58d9459081ae33885335c645fc0b865584ae4e (diff) | |
download | u-boot-imx-48c7d6dba9140869a1d644248aa8cfabe01c98a6.zip u-boot-imx-48c7d6dba9140869a1d644248aa8cfabe01c98a6.tar.gz u-boot-imx-48c7d6dba9140869a1d644248aa8cfabe01c98a6.tar.bz2 |
Merge with /home/stefan/git/u-boot/denx
Diffstat (limited to 'board')
-rw-r--r-- | board/tqm5200/cam5200_flash.c | 2 | ||||
-rw-r--r-- | board/tqm5200/tqm5200.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/board/tqm5200/cam5200_flash.c b/board/tqm5200/cam5200_flash.c index 1a40633..8c3f62e 100644 --- a/board/tqm5200/cam5200_flash.c +++ b/board/tqm5200/cam5200_flash.c @@ -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; } diff --git a/board/tqm5200/tqm5200.c b/board/tqm5200/tqm5200.c index cb57a5e..a4322b6 100644 --- a/board/tqm5200/tqm5200.c +++ b/board/tqm5200/tqm5200.c @@ -289,7 +289,7 @@ int checkboard (void) #elif defined(CONFIG_TB5200) # define CARRIER_NAME "TB5200" #elif defined(CONFIG_CAM5200) -# define CARRIER_NAME "Cam5200" +# define CARRIER_NAME "CAM5200" #elif defined(CONFIG_FO300) # define CARRIER_NAME "FO300" #else |