mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-11 07:34:31 +00:00
TQM885D: adjust for doubled flash sector size + some minor fixes
Signed-off-by: Martin Krause <martin.krause@tqs.de>
This commit is contained in:
parent
22d1a56cbf
commit
11d9eec479
3 changed files with 20 additions and 13 deletions
|
@ -184,7 +184,7 @@ long int initdram (int board_type)
|
|||
#ifndef CONFIG_CAN_DRIVER
|
||||
if ((board_type != 'L') &&
|
||||
(board_type != 'M') &&
|
||||
(board_type != 'D') ) { /* "L" and "M" type boards have only one bank SDRAM */
|
||||
(board_type != 'D') ) { /* only one SDRAM bank on L, M and D modules */
|
||||
memctl->memc_or3 = CFG_OR3_PRELIM;
|
||||
memctl->memc_br3 = CFG_BR3_PRELIM;
|
||||
}
|
||||
|
@ -260,7 +260,7 @@ long int initdram (int board_type)
|
|||
#ifndef CONFIG_CAN_DRIVER
|
||||
if ((board_type != 'L') &&
|
||||
(board_type != 'M') &&
|
||||
(board_type != 'D') ) { /* "L" and "M" type boards have only one bank SDRAM */
|
||||
(board_type != 'D') ) { /* only one SDRAM bank on L, M and D modules */
|
||||
/*
|
||||
* Check Bank 1 Memory Size
|
||||
* use current column settings
|
||||
|
|
|
@ -129,20 +129,21 @@ typedef void (interrupt_handler_t)(void *);
|
|||
|
||||
/*
|
||||
* enable common handling for all TQM8xxL/M boards:
|
||||
* - CONFIG_TQM8xxM will be defined for all TQM8xxM and TQM885D boards
|
||||
* - CONFIG_TQM8xxM will be defined for all TQM8xxM boards
|
||||
* - CONFIG_TQM8xxL will be defined for all TQM8xxL _and_ TQM8xxM boards
|
||||
* and for the TQM885D board
|
||||
*/
|
||||
#if defined(CONFIG_TQM823M) || defined(CONFIG_TQM850M) || \
|
||||
defined(CONFIG_TQM855M) || defined(CONFIG_TQM860M) || \
|
||||
defined(CONFIG_TQM862M) || defined(CONFIG_TQM866M) || \
|
||||
defined(CONFIG_TQM885D)
|
||||
defined(CONFIG_TQM862M) || defined(CONFIG_TQM866M)
|
||||
# ifndef CONFIG_TQM8xxM
|
||||
# define CONFIG_TQM8xxM
|
||||
# endif
|
||||
#endif
|
||||
#if defined(CONFIG_TQM823L) || defined(CONFIG_TQM850L) || \
|
||||
defined(CONFIG_TQM855L) || defined(CONFIG_TQM860L) || \
|
||||
defined(CONFIG_TQM862L) || defined(CONFIG_TQM8xxM)
|
||||
defined(CONFIG_TQM862L) || defined(CONFIG_TQM8xxM) || \
|
||||
defined(CONFIG_TQM885D)
|
||||
# ifndef CONFIG_TQM8xxL
|
||||
# define CONFIG_TQM8xxL
|
||||
# endif
|
||||
|
|
|
@ -76,9 +76,15 @@
|
|||
"bootm ${kernel_addr} ${ramdisk_addr}\0" \
|
||||
"net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0" \
|
||||
"rootpath=/opt/eldk/ppc_8xx\0" \
|
||||
"bootfile=/tftpboot/TQM866M/uImage\0" \
|
||||
"kernel_addr=40080000\0" \
|
||||
"ramdisk_addr=40180000\0" \
|
||||
"bootfile=/tftpboot/TQM885D/uImage\0" \
|
||||
"fdt_addr=400C0000\0" \
|
||||
"kernel_addr=40100000\0" \
|
||||
"ramdisk_addr=40280000\0" \
|
||||
"load=tftp 200000 ${u-boot}\0" \
|
||||
"update=protect off 40000000 +${filesize};" \
|
||||
"erase 40000000 +${filesize};" \
|
||||
"cp.b 200000 40000000 ${filesize};" \
|
||||
"protect on 40000000 +${filesize}\0" \
|
||||
""
|
||||
#define CONFIG_BOOTCOMMAND "run flash_self"
|
||||
|
||||
|
@ -137,7 +143,7 @@
|
|||
#define CONFIG_MAC_PARTITION
|
||||
#define CONFIG_DOS_PARTITION
|
||||
|
||||
#undef CONFIG_RTC_MPC8xx /* MPC866 does not support RTC */
|
||||
#undef CONFIG_RTC_MPC8xx /* MPC885 does not support RTC */
|
||||
|
||||
#define CONFIG_TIMESTAMP /* but print image timestmps */
|
||||
|
||||
|
@ -223,7 +229,7 @@
|
|||
#define CFG_FLASH_BASE 0x40000000
|
||||
#define CFG_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */
|
||||
#define CFG_MONITOR_BASE CFG_FLASH_BASE
|
||||
#define CFG_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc() */
|
||||
#define CFG_MALLOC_LEN (256 << 10) /* Reserve 128 kB for malloc() */
|
||||
|
||||
/*
|
||||
* For booting Linux, the board info and command line data
|
||||
|
@ -243,8 +249,8 @@
|
|||
|
||||
#define CFG_ENV_IS_IN_FLASH 1
|
||||
#define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */
|
||||
#define CFG_ENV_SIZE 0x08000 /* Total Size of Environment Sector */
|
||||
#define CFG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment Sector */
|
||||
#define CFG_ENV_SIZE 0x08000 /* Total Size of Environment */
|
||||
#define CFG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */
|
||||
|
||||
/* Address and size of Redundant Environment Sector */
|
||||
#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE)
|
||||
|
|
Loading…
Reference in a new issue