LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates for TQM5200 modules: 

- fix off-by-one error in board/tqm5200/cam5200_flash.c error message
- simplify "udate" definitions
This commit is contained in:
Wolfgang Denk 2006-11-23 22:58:58 +01:00
parent 4ef6251403
commit 78d620ebb5
3 changed files with 13 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/tqm5200/cam5200_flash.c
View File

@ -759,7 +759,7 @@ unsigned long flash_init(void)
if (flash_info[i].flash_id == FLASH_UNKNOWN) { if (flash_info[i].flash_id == FLASH_UNKNOWN) {
printf("## Unknown FLASH on Bank %d - Size = 0x%08lx = %ld MB\n", 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].sector_count = -1;
flash_info[i].size = 0; flash_info[i].size = 0;
} }

2
board/tqm5200/tqm5200.c
View File

@ -289,7 +289,7 @@ int checkboard (void)
#elif defined(CONFIG_TB5200) #elif defined(CONFIG_TB5200)
# define CARRIER_NAME "TB5200" # define CARRIER_NAME "TB5200"
#elif defined(CONFIG_CAM5200) #elif defined(CONFIG_CAM5200)
# define CARRIER_NAME "Cam5200" # define CARRIER_NAME "CAM5200"
#elif defined(CONFIG_FO300) #elif defined(CONFIG_FO300)
# define CARRIER_NAME "FO300" # define CARRIER_NAME "FO300"
#else #else

44
include/configs/TQM5200.h
View File

@ -217,43 +217,19 @@
#undef CONFIG_BOOTARGS #undef CONFIG_BOOTARGS
#ifdef CONFIG_STK52XX #if defined(CONFIG_TQM5200_B) && !defined(CFG_LOWBOOT)
# if defined(CONFIG_TQM5200_B)
# if defined(CFG_LOWBOOT)
# define ENV_UPDT \ # define ENV_UPDT \
"update=protect off FC000000 FC07FFFF;" \ "update=protect off FFF00000 +${filesize};" \
"erase FC000000 FC07FFFF;" \ "erase FFF00000 +${filesize};" \
"cp.b 200000 FC000000 ${filesize};" \
"protect on FC000000 FC07FFFF\0"
# else /* highboot */
# define ENV_UPDT \
"update=protect off FFF00000 FFF7FFFF;" \
"erase FFF00000 FFF7FFFF;" \
"cp.b 200000 FFF00000 ${filesize};" \ "cp.b 200000 FFF00000 ${filesize};" \
"protect on FFF00000 FFF7FFFF\0" "protect on FFF00000 +${filesize}\0"
# endif /* CFG_LOWBOOT */ #else /* default lowboot configuration */
# else /* !CONFIG_TQM5200_B */
# define ENV_UPDT \ # define ENV_UPDT \
"update=protect off FC000000 FC05FFFF;" \ "update=protect off FC000000 +${filesize};" \
"erase FC000000 FC05FFFF;" \ "erase FC000000 +${filesize};" \
"cp.b 200000 FC000000 ${filesize};" \ "cp.b 200000 FC000000 ${filesize};" \
"protect on FC000000 FC05FFFF\0" "protect on FC000000 +${filesize}\0"
# endif /* CONFIG_TQM5200_B */ #endif
#elif defined (CONFIG_CAM5200)
# define ENV_UPDT \
"update=protect off FC000000 FC03FFFF;" \
"erase FC000000 FC03FFFF;" \
"cp.b 200000 FC000000 ${filesize};" \
"protect on FC000000 FC03FFFF\0"
#elif defined (CONFIG_FO300)
# define ENV_UPDT \
"update=protect off FC000000 FC05FFFF;" \
"erase FC000000 FC05FFFF;" \
"cp.b 200000 FC000000 ${filesize};" \
"protect on FC000000 FC05FFFF\0"
#else
# error "Unknown Carrier Board"
#endif /* CONFIG_STK52XX */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \ "netdev=eth0\0" \
@ -432,7 +408,7 @@
*/ */
#define CFG_ENV_IS_IN_FLASH 1 #define CFG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x4000 /* 16 k - keep small for fast booting */ #define CFG_ENV_SIZE 0x4000 /* 16 k - keep small for fast booting */
#if defined(CONFIG_TQM5200_B) #if defined(CONFIG_TQM5200_B) || defined (CONFIG_CAM5200)
#define CFG_ENV_SECT_SIZE 0x40000 #define CFG_ENV_SECT_SIZE 0x40000
#else #else
#define CFG_ENV_SECT_SIZE 0x20000 #define CFG_ENV_SECT_SIZE 0x20000