mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 23:24:38 +00:00
Adjust TQM5200 make targets
Make the automatic CS configuration the default. The dedicated configurations CONFIG_TQM5200_AA, CONFIG_TQM5200_AB and CONFIG_TQM5200_AC are removed. "TQM5200_config" is now the default for STK52XX.200 base boards. On a STK52XX.100 base board "TQM5200_STK100_config" must be used. Patch by Martin Krause, 07 Nov 2005
This commit is contained in:
Wolfgang Denk
parent
4bdb53cafb
commit
cd65a3dc87
6 changed files with 27 additions and 95 deletions
|
|
@ -2,6 +2,14 @@
|
|||
Changes since U-Boot 1.1.4:
|
||||
======================================================================
|
||||
|
||||
* Adjust TQM5200 make targets
|
||||
Make the automatic CS configuration the default.
|
||||
The dedicated configurations CONFIG_TQM5200_AA, CONFIG_TQM5200_AB
|
||||
and CONFIG_TQM5200_AC are removed.
|
||||
"TQM5200_config" is now the default for STK52XX.200 base boards.
|
||||
On a STK52XX.100 base board "TQM5200_STK100_config" must be used.
|
||||
Patch by Martin Krause, 07 Nov 2005
|
||||
|
||||
* Fix setting of environment variable "ver" on trab board
|
||||
The environment variable "ver" is now set before
|
||||
do_auto_update() is called, so that "ver" can be used
|
||||
|
|
|
|||
2
MAKEALL
2
MAKEALL
|
|
@ -28,7 +28,7 @@ LIST_5xxx=" \
|
|||
BC3450 cpci5200 EVAL5200 icecube_5100 \
|
||||
icecube_5200 lite5200b mcc200 o2dnt \
|
||||
pf5200 PM520 Total5100 Total5200 \
|
||||
Total5200_Rev2 TQM5200_auto \
|
||||
Total5200_Rev2 TQM5200 \
|
||||
"
|
||||
|
||||
#########################################################################
|
||||
|
|
|
|||
33
Makefile
33
Makefile
|
|
@ -356,8 +356,8 @@ smmaco4_config: unconfig
|
|||
@./mkconfig -a smmaco4 ppc mpc5xxx tqm5200
|
||||
|
||||
spieval_config: unconfig
|
||||
echo "#define CONFIG_CS_AUTOCONF">>include/config.h
|
||||
echo "... with automatic CS configuration"
|
||||
@echo "#define CONFIG_CS_AUTOCONF">>include/config.h
|
||||
@echo "... with automatic CS configuration"
|
||||
@./mkconfig -a spieval ppc mpc5xxx tqm5200
|
||||
|
||||
MINI5200_config \
|
||||
|
|
@ -394,35 +394,20 @@ Total5200_Rev2_lowboot_config: unconfig
|
|||
}
|
||||
@./mkconfig -a Total5200 ppc mpc5xxx total5200
|
||||
|
||||
TQM5200_auto_config \
|
||||
TQM5200_AA_config \
|
||||
TQM5200_AB_config \
|
||||
TQM5200_AC_config \
|
||||
TQM5200_config \
|
||||
TQM5200_STK100_config \
|
||||
MiniFAP_config: unconfig
|
||||
@ >include/config.h
|
||||
@[ -z "$(findstring MiniFAP,$@)" ] || \
|
||||
{ echo "#define CONFIG_MINIFAP" >>include/config.h ; \
|
||||
echo "#define CONFIG_TQM5200_AC" >>include/config.h ; \
|
||||
echo "... TQM5200_AC on MiniFAP" ; \
|
||||
}
|
||||
@[ -z "$(findstring AA,$@)" ] || \
|
||||
{ echo "#define CONFIG_TQM5200_AA" >>include/config.h ; \
|
||||
echo "... with 4 MB Flash, 16 MB SDRAM, 32 kB EEPROM" ; \
|
||||
}
|
||||
@[ -z "$(findstring AB,$@)" ] || \
|
||||
{ echo "#define CONFIG_TQM5200_AB" >>include/config.h ; \
|
||||
echo "... with 64 MB Flash, 64 MB SDRAM, 32 kB EEPROM, 512 kB SRAM" ; \
|
||||
echo "... with Graphics Controller"; \
|
||||
}
|
||||
@[ -z "$(findstring AC,$@)" ] || \
|
||||
{ echo "#define CONFIG_TQM5200_AC" >>include/config.h ; \
|
||||
echo "... with 4 MB Flash, 128 MB SDRAM" ; \
|
||||
echo "... with Graphics Controller"; \
|
||||
}
|
||||
@[ -z "$(findstring auto,$@)" ] || \
|
||||
{ echo "#define CONFIG_CS_AUTOCONF" >>include/config.h ; \
|
||||
echo "... with automatic CS configuration" ; \
|
||||
@[ -z "$(findstring STK100,$@)" ] || \
|
||||
{ echo "#define CONFIG_STK52XX_REV100" >>include/config.h ; \
|
||||
echo "... on a STK52XX.100 base board" ; \
|
||||
}
|
||||
@echo "#define CONFIG_CS_AUTOCONF">>include/config.h ;
|
||||
@echo "... with automatic CS configuration" ;
|
||||
@./mkconfig -a TQM5200 ppc mpc5xxx tqm5200
|
||||
|
||||
#########################################################################
|
||||
|
|
|
|||
|
|
@ -254,13 +254,7 @@ int checkboard (void)
|
|||
puts ("Board: AEVFIFO\n");
|
||||
return 0;
|
||||
#endif
|
||||
#if defined (CONFIG_TQM5200_AA)
|
||||
puts ("Board: TQM5200-AA (TQ-Components GmbH)\n");
|
||||
#elif defined (CONFIG_TQM5200_AB)
|
||||
puts ("Board: TQM5200-AB (TQ-Components GmbH)\n");
|
||||
#elif defined (CONFIG_TQM5200_AC)
|
||||
puts ("Board: TQM5200-AC (TQ-Components GmbH)\n");
|
||||
#elif defined (CONFIG_TQM5200)
|
||||
#if defined (CONFIG_TQM5200)
|
||||
puts ("Board: TQM5200 (TQ-Components GmbH)\n");
|
||||
#endif
|
||||
#if defined (CONFIG_STK52XX)
|
||||
|
|
@ -572,17 +566,7 @@ static const SMI_REGS init_regs [] =
|
|||
void video_get_info_str (int line_number, char *info)
|
||||
{
|
||||
if (line_number == 1) {
|
||||
#if defined (CONFIG_TQM5200_AA)
|
||||
strcpy (info, " Board: TQM5200-AA (TQ-Components GmbH)");
|
||||
#elif defined (CONFIG_TQM5200_AB)
|
||||
strcpy (info, " Board: TQM5200-AB (TQ-Components GmbH)");
|
||||
#elif defined (CONFIG_TQM5200_AC)
|
||||
strcpy (info, " Board: TQM5200-AC (TQ-Components GmbH)");
|
||||
#elif defined (CONFIG_TQM5200)
|
||||
strcpy (info, " Board: TQM5200 (TQ-Components GmbH)");
|
||||
#else
|
||||
#error No supported board selected
|
||||
#endif
|
||||
strcpy (info, " Board: TQM5200 (TQ-Components GmbH)");
|
||||
#if defined (CONFIG_STK52XX)
|
||||
} else if (line_number == 2) {
|
||||
strcpy (info, " on a STK52XX baseboard");
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@
|
|||
#define CONFIG_TQM5200 1 /* ... on TQM5200 module */
|
||||
#undef CONFIG_TQM5200_REV100 /* define for revision 100 modules */
|
||||
#define CONFIG_STK52XX 1 /* ... on a STK52XX base board */
|
||||
#define CONFIG_STK52XX_REV100 1 /* define for revision 100 baseboards */
|
||||
|
||||
#define CFG_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
|
||||
|
||||
|
|
@ -83,7 +82,7 @@
|
|||
#define CONFIG_PCI_IO_SIZE 0x01000000
|
||||
|
||||
#define CONFIG_NET_MULTI 1
|
||||
#define CONFIG_EEPRO100
|
||||
#define CONFIG_EEPRO100 1
|
||||
#define CFG_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */
|
||||
#define CONFIG_NS8382X 1
|
||||
#endif /* CONFIG_STK52XX */
|
||||
|
|
@ -192,16 +191,6 @@
|
|||
|
||||
#undef CONFIG_BOOTARGS
|
||||
|
||||
#if defined (CONFIG_TQM5200_AA)
|
||||
# define CONFIG_U_BOOT_SUFFIX "-AA\0"
|
||||
#elif defined (CONFIG_TQM5200_AB)
|
||||
# define CONFIG_U_BOOT_SUFFIX "-AB\0"
|
||||
#elif defined (CONFIG_TQM5200_AC)
|
||||
# define CONFIG_U_BOOT_SUFFIX "-AC\0"
|
||||
#else
|
||||
# define CONFIG_U_BOOT_SUFFIX "\0"
|
||||
#endif
|
||||
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
"netdev=eth0\0" \
|
||||
"rootpath=/opt/eldk/ppc_6xx\0" \
|
||||
|
|
@ -218,7 +207,7 @@
|
|||
"net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0" \
|
||||
"bootfile=/tftpboot/tqm5200/uImage\0" \
|
||||
"load=tftp 200000 ${u-boot}\0" \
|
||||
"u-boot=/tftpboot/tqm5200/u-boot.bin" CONFIG_U_BOOT_SUFFIX \
|
||||
"u-boot=/tftpboot/tqm5200/u-boot.bin\0" \
|
||||
"update=protect off FC000000 FC05FFFF;" \
|
||||
"erase FC000000 FC05FFFF;" \
|
||||
"cp.b 200000 FC000000 ${filesize};" \
|
||||
|
|
@ -284,13 +273,6 @@
|
|||
#endif
|
||||
|
||||
/* List of I2C addresses to be verified by POST */
|
||||
#if defined (CONFIG_TQM5200_AA) || defined (CONFIG_TQM5200_AB)
|
||||
#define I2C_ADDR_LIST { CFG_I2C_EEPROM_ADDR, \
|
||||
CFG_I2C_SLAVE }
|
||||
#elif defined (CONFIG_TQM5200_AC)
|
||||
#define I2C_ADDR_LIST { CFG_I2C_SLAVE }
|
||||
#endif
|
||||
|
||||
#if defined (CONFIG_MINIFAP)
|
||||
#undef I2C_ADDR_LIST
|
||||
#define I2C_ADDR_LIST { CFG_I2C_EEPROM_ADDR, \
|
||||
|
|
@ -493,13 +475,9 @@
|
|||
* SRAM - Do not map below 2 GB in address space, because this area is used
|
||||
* for SDRAM autosizing.
|
||||
*/
|
||||
#if defined CONFIG_TQM5200_AB || defined (CONFIG_CS_AUTOCONF)
|
||||
#if defined (CONFIG_CS_AUTOCONF)
|
||||
#define CFG_CS2_START 0xE5000000
|
||||
#ifdef CONFIG_TQM5200_AB
|
||||
#define CFG_CS2_SIZE 0x80000 /* 512 kByte */
|
||||
#else /* CONFIG_CS_AUTOCONF */
|
||||
#define CFG_CS2_SIZE 0x100000 /* 1 MByte */
|
||||
#endif
|
||||
#define CFG_CS2_CFG 0x0004D930
|
||||
#endif
|
||||
|
||||
|
|
@ -507,8 +485,7 @@
|
|||
* Grafic controller - Do not map below 2 GB in address space, because this
|
||||
* area is used for SDRAM autosizing.
|
||||
*/
|
||||
#if defined (CONFIG_TQM5200_AB) || defined (CONFIG_TQM5200_AC) || \
|
||||
defined (CONFIG_CS_AUTOCONF)
|
||||
#if defined (CONFIG_CS_AUTOCONF)
|
||||
#define SM501_FB_BASE 0xE0000000
|
||||
#define CFG_CS1_START (SM501_FB_BASE)
|
||||
#define CFG_CS1_SIZE 0x4000000 /* 64 MByte */
|
||||
|
|
|
|||
|
|
@ -191,16 +191,6 @@
|
|||
|
||||
#undef CONFIG_BOOTARGS
|
||||
|
||||
#if defined (CONFIG_TQM5200_AA)
|
||||
# define CONFIG_U_BOOT_SUFFIX "-AA\0"
|
||||
#elif defined (CONFIG_TQM5200_AB)
|
||||
# define CONFIG_U_BOOT_SUFFIX "-AB\0"
|
||||
#elif defined (CONFIG_TQM5200_AC)
|
||||
# define CONFIG_U_BOOT_SUFFIX "-AC\0"
|
||||
#else
|
||||
# define CONFIG_U_BOOT_SUFFIX "\0"
|
||||
#endif
|
||||
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
"netdev=eth0\0" \
|
||||
"rootpath=/opt/eldk/ppc_6xx\0" \
|
||||
|
|
@ -217,7 +207,7 @@
|
|||
"net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0" \
|
||||
"bootfile=/tftpboot/tqm5200/uImage\0" \
|
||||
"load=tftp 200000 ${u-boot}\0" \
|
||||
"u-boot=/tftpboot/tqm5200/u-boot.bin" CONFIG_U_BOOT_SUFFIX \
|
||||
"u-boot=/tftpboot/tqm5200/u-boot.bin\0" \
|
||||
"update=protect off FC000000 FC05FFFF;" \
|
||||
"erase FC000000 FC05FFFF;" \
|
||||
"cp.b 200000 FC000000 ${filesize};" \
|
||||
|
|
@ -283,13 +273,6 @@
|
|||
#endif
|
||||
|
||||
/* List of I2C addresses to be verified by POST */
|
||||
#if defined (CONFIG_TQM5200_AA) || defined (CONFIG_TQM5200_AB)
|
||||
#define I2C_ADDR_LIST { CFG_I2C_EEPROM_ADDR, \
|
||||
CFG_I2C_SLAVE }
|
||||
#elif defined (CONFIG_TQM5200_AC)
|
||||
#define I2C_ADDR_LIST { CFG_I2C_SLAVE }
|
||||
#endif
|
||||
|
||||
#if defined (CONFIG_MINIFAP)
|
||||
#undef I2C_ADDR_LIST
|
||||
#define I2C_ADDR_LIST { CFG_I2C_EEPROM_ADDR, \
|
||||
|
|
@ -478,13 +461,9 @@
|
|||
* SRAM - Do not map below 2 GB in address space, because this area is used
|
||||
* for SDRAM autosizing.
|
||||
*/
|
||||
#if defined CONFIG_TQM5200_AB || defined (CONFIG_CS_AUTOCONF)
|
||||
#if defined (CONFIG_CS_AUTOCONF)
|
||||
#define CFG_CS2_START 0xE5000000
|
||||
#ifdef CONFIG_TQM5200_AB
|
||||
#define CFG_CS2_SIZE 0x80000 /* 512 kByte */
|
||||
#else /* CONFIG_CS_AUTOCONF */
|
||||
#define CFG_CS2_SIZE 0x100000 /* 1 MByte */
|
||||
#endif
|
||||
#define CFG_CS2_CFG 0x0004D930
|
||||
#endif
|
||||
|
||||
|
|
@ -492,8 +471,7 @@
|
|||
* Grafic controller - Do not map below 2 GB in address space, because this
|
||||
* area is used for SDRAM autosizing.
|
||||
*/
|
||||
#if defined (CONFIG_TQM5200_AB) || defined (CONFIG_TQM5200_AC) || \
|
||||
defined (CONFIG_CS_AUTOCONF)
|
||||
#if defined (CONFIG_CS_AUTOCONF)
|
||||
#define SM501_FB_BASE 0xE0000000
|
||||
#define CFG_CS1_START (SM501_FB_BASE)
|
||||
#define CFG_CS1_SIZE 0x4000000 /* 64 MByte */
|
||||
|
|
|
|||
Loading…
Reference in a new issue