sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

* Cleanup TQM5200 board configurations: 

- make highboot configurations use environment at high end, too,
    to avoid flash fragmentation
  - always use redundand environment
  - don't enable video code for modules without graphics controller
  - provide useful (though different) mtdparts settings
  - get rid of CONFIG_CS_AUTOCONF which was always set anyway

* Extend mkconfig tool to print more useful target name
This commit is contained in:
Wolfgang Denk 2006-07-21 11:16:34 +02:00
parent 978b10964c
commit 5078cce81c
9 changed files with 166 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG
View File

@ -2,6 +2,16 @@
Changes since U-Boot 1.1.4: Changes since U-Boot 1.1.4:
====================================================================== ======================================================================
* Cleanup TQM5200 board configurations:
- make highboot configurations use environment at high end, too,
to avoid flash fragmentation
- always use redundand environment
- don't enable video code for modules without graphics controller
- provide useful (though different) mtdparts settings
- get rid of CONFIG_CS_AUTOCONF which was always set anyway
* Extend mkconfig tool to print more useful target name
* Add support for high-boot on TQM5200 and TQM5200S boards. * Add support for high-boot on TQM5200 and TQM5200S boards.
Hint: the CPLD on the TQM5200 must be programmed with a software Hint: the CPLD on the TQM5200 must be programmed with a software
version supporting the high boot option! The new TQM5200S is version supporting the high boot option! The new TQM5200S is

1
MAKEALL
View File

@ -29,6 +29,7 @@ LIST_5xxx=" \
icecube_5200 lite5200b mcc200 o2dnt \ icecube_5200 lite5200b mcc200 o2dnt \
pf5200 PM520 TB5200 Total5100 \ pf5200 PM520 TB5200 Total5100 \
Total5200 Total5200_Rev2 TQM5200 TQM5200_B \ Total5200 Total5200_Rev2 TQM5200 TQM5200_B \
TQM5200S \
" "
######################################################################### #########################################################################

30
Makefile
View File

@ -356,8 +356,6 @@ smmaco4_config: unconfig
@./mkconfig -a smmaco4 ppc mpc5xxx tqm5200 @./mkconfig -a smmaco4 ppc mpc5xxx tqm5200
spieval_config: unconfig spieval_config: unconfig
@echo "#define CONFIG_CS_AUTOCONF">>include/config.h
@echo "... with automatic CS configuration"
@./mkconfig -a spieval ppc mpc5xxx tqm5200 @./mkconfig -a spieval ppc mpc5xxx tqm5200
TB5200_B_config \ TB5200_B_config \
@ -366,15 +364,13 @@ TB5200_config: unconfig
{ echo "#define CONFIG_TQM5200_B" >>include/config.h ; \ { echo "#define CONFIG_TQM5200_B" >>include/config.h ; \
echo "... with MPC5200B processor" ; \ echo "... with MPC5200B processor" ; \
} }
@echo "#define CONFIG_CS_AUTOCONF">>include/config.h @./mkconfig -n $@ -a TB5200 ppc mpc5xxx tqm5200
@echo "... with automatic CS configuration"
@./mkconfig -a TB5200 ppc mpc5xxx tqm5200
MINI5200_config \ MINI5200_config \
EVAL5200_config \ EVAL5200_config \
TOP5200_config: unconfig TOP5200_config: unconfig
@ echo "#define CONFIG_$(@:_config=) 1" >include/config.h @ echo "#define CONFIG_$(@:_config=) 1" >include/config.h
@./mkconfig -a TOP5200 ppc mpc5xxx top5200 emk @./mkconfig -n $@ -a TOP5200 ppc mpc5xxx top5200 emk
Total5100_config \ Total5100_config \
Total5200_config \ Total5200_config \
@ -405,29 +401,39 @@ Total5200_Rev2_lowboot_config: unconfig
@./mkconfig -a Total5200 ppc mpc5xxx total5200 @./mkconfig -a Total5200 ppc mpc5xxx total5200
TQM5200_config \ TQM5200_config \
TQM5200_STK100_config \
TQM5200_B_config \ TQM5200_B_config \
TQM5200_B_HIGHBOOT_config \ TQM5200_B_HIGHBOOT_config \
TQM5200S_config \
TQM5200S_HIGHBOOT_config \
TQM5200_STK100_config \
cameron_config \
MiniFAP_config: unconfig MiniFAP_config: unconfig
@ >include/config.h @ >include/config.h
@[ -z "$(findstring MiniFAP,$@)" ] || \ @[ -z "$(findstring MiniFAP,$@)" ] || \
{ echo "#define CONFIG_MINIFAP" >>include/config.h ; \ { echo "#define CONFIG_MINIFAP" >>include/config.h ; \
echo "... TQM5200_AC on MiniFAP" ; \ echo "... TQM5200_AC on MiniFAP" ; \
} }
@[ -z "$(findstring cameron,$@)" ] || \
{ echo "#define CONFIG_CAMERON" >>include/config.h ; \
echo "#define CONFIG_TQM5200S" >>include/config.h ; \
echo "#define CONFIG_TQM5200_B" >>include/config.h ; \
echo "... TQM5200S on Cameron" ; \
}
@[ -z "$(findstring STK100,$@)" ] || \ @[ -z "$(findstring STK100,$@)" ] || \
{ echo "#define CONFIG_STK52XX_REV100" >>include/config.h ; \ { echo "#define CONFIG_STK52XX_REV100" >>include/config.h ; \
echo "... on a STK52XX.100 base board" ; \ echo "... on a STK52XX.100 base board" ; \
} }
@[ -z "$(findstring B,$@)" ] || \ @[ -z "$(findstring TQM5200_B,$@)" ] || \
{ echo "#define CONFIG_TQM5200_B" >>include/config.h ; \ { echo "#define CONFIG_TQM5200_B" >>include/config.h ; \
echo "... with MPC5200B processor" ; \ }
@[ -z "$(findstring TQM5200S,$@)" ] || \
{ echo "#define CONFIG_TQM5200S" >>include/config.h ; \
echo "#define CONFIG_TQM5200_B" >>include/config.h ; \
} }
@[ -z "$(findstring HIGHBOOT,$@)" ] || \ @[ -z "$(findstring HIGHBOOT,$@)" ] || \
{ echo "TEXT_BASE = 0xFFF00000" >board/tqm5200/config.tmp ; \ { echo "TEXT_BASE = 0xFFF00000" >board/tqm5200/config.tmp ; \
} }
@echo "#define CONFIG_CS_AUTOCONF">>include/config.h ; @./mkconfig -n $@ -a TQM5200 ppc mpc5xxx tqm5200
@echo "... with automatic CS configuration" ;
@./mkconfig -a TQM5200 ppc mpc5xxx tqm5200
######################################################################### #########################################################################
## MPC8xx Systems ## MPC8xx Systems

37
board/tqm5200/tqm5200.c
View File

@ -273,27 +273,36 @@ long int initdram (int board_type)
int checkboard (void) int checkboard (void)
{ {
#if defined (CONFIG_AEVFIFO) #if defined(CONFIG_AEVFIFO)
puts ("Board: AEVFIFO\n"); puts ("Board: AEVFIFO\n");
return 0; return 0;
#endif #endif
#if defined (CONFIG_TQM5200)
#if defined(CONFIG_TQM5200_B) #if defined(CONFIG_TQM5200S)
puts ("Board: TQM5200 or TQM5200S (TQ-Components GmbH)\n"); # define MODULE_NAME "TQM5200S"
#else #else
puts ("Board: TQM5200 (TQ-Components GmbH)\n"); # define MODULE_NAME "TQM5200"
#endif /* CONFIG_TQM5200_B */
#endif #endif
#if defined (CONFIG_STK52XX)
puts (" on a STK52XX baseboard\n"); #if defined(CONFIG_STK52XX)
#endif # define CARRIER_NAME "STK52xx"
#if defined (CONFIG_TB5200) #elif defined(CONFIG_TB5200)
puts (" on a TB5200 baseboard\n"); # define CARRIER_NAME "TB5200"
#elif defined(CONFIG_CAMERON)
# define CARRIER_NAME "Cameron"
#else
# error "Unknown carrier board"
#endif #endif
puts ( "Board: " MODULE_NAME " (TQ-Components GmbH)\n"
" on a " CARRIER_NAME " carrier board\n");
return 0; return 0;
} }
#undef MODULE_NAME
#undef CARRIER_NAME
void flash_preinit(void) void flash_preinit(void)
{ {
/* /*
@ -435,7 +444,6 @@ int board_early_init_r (void)
#endif #endif
#endif /* CONFIG_PS2MULT */ #endif /* CONFIG_PS2MULT */
#if defined(CONFIG_CS_AUTOCONF)
int last_stage_init (void) int last_stage_init (void)
{ {
/* /*
@ -530,7 +538,6 @@ int last_stage_init (void)
return 0; return 0;
} }
#endif /* CONFIG_CS_AUTOCONF */
#ifdef CONFIG_VIDEO_SM501 #ifdef CONFIG_VIDEO_SM501
@ -600,10 +607,10 @@ void video_get_info_str (int line_number, char *info)
#if defined (CONFIG_STK52XX) || defined (CONFIG_TB5200) #if defined (CONFIG_STK52XX) || defined (CONFIG_TB5200)
} else if (line_number == 2) { } else if (line_number == 2) {
#if defined (CONFIG_STK52XX) #if defined (CONFIG_STK52XX)
strcpy (info, " on a STK52XX baseboard"); strcpy (info, " on a STK52xx carrier board");
#endif #endif
#if defined (CONFIG_TB5200) #if defined (CONFIG_TB5200)
strcpy (info, " on a TB5200 baseboard"); strcpy (info, " on a TB5200 carrier board");
#endif #endif
#endif #endif
} }

7
include/configs/TB5200.h
View File

@ -440,32 +440,25 @@
#define CFG_CS0_START CFG_FLASH_BASE #define CFG_CS0_START CFG_FLASH_BASE
#define CFG_CS0_SIZE CFG_FLASH_SIZE #define CFG_CS0_SIZE CFG_FLASH_SIZE
/* automatic configuration of chip selects */
#ifdef CONFIG_CS_AUTOCONF
#define CONFIG_LAST_STAGE_INIT #define CONFIG_LAST_STAGE_INIT
#endif
/* /*
* SRAM - Do not map below 2 GB in address space, because this area is used * SRAM - Do not map below 2 GB in address space, because this area is used
* for SDRAM autosizing. * for SDRAM autosizing.
*/ */
#if defined (CONFIG_CS_AUTOCONF)
#define CFG_CS2_START 0xE5000000 #define CFG_CS2_START 0xE5000000
#define CFG_CS2_SIZE 0x100000 /* 1 MByte */ #define CFG_CS2_SIZE 0x100000 /* 1 MByte */
#define CFG_CS2_CFG 0x0004D930 #define CFG_CS2_CFG 0x0004D930
#endif
/* /*
* Grafic controller - Do not map below 2 GB in address space, because this * Grafic controller - Do not map below 2 GB in address space, because this
* area is used for SDRAM autosizing. * area is used for SDRAM autosizing.
*/ */
#if defined (CONFIG_CS_AUTOCONF)
#define SM501_FB_BASE 0xE0000000 #define SM501_FB_BASE 0xE0000000
#define CFG_CS1_START (SM501_FB_BASE) #define CFG_CS1_START (SM501_FB_BASE)
#define CFG_CS1_SIZE 0x4000000 /* 64 MByte */ #define CFG_CS1_SIZE 0x4000000 /* 64 MByte */
#define CFG_CS1_CFG 0x8F48FF70 #define CFG_CS1_CFG 0x8F48FF70
#define SM501_MMIO_BASE CFG_CS1_START + 0x03E00000 #define SM501_MMIO_BASE CFG_CS1_START + 0x03E00000
#endif
#define CFG_CS_BURST 0x00000000 #define CFG_CS_BURST 0x00000000
#define CFG_CS_DEADCYCLE 0x33333311 /* 1 dead cycle for flash and SM501 */ #define CFG_CS_DEADCYCLE 0x33333311 /* 1 dead cycle for flash and SM501 */

182
include/configs/TQM5200.h
View File

@ -32,27 +32,30 @@
* (easy to change) * (easy to change)
*/ */
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
#define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */ #define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */
#define CONFIG_TQM5200 1 /* ... on TQM5200 module */ #define CONFIG_TQM5200 1 /* ... on TQM5200 module */
#undef CONFIG_TQM5200_REV100 /* define for revision 100 modules */ #undef CONFIG_TQM5200_REV100 /* define for revision 100 modules */
#define CONFIG_STK52XX 1 /* ... on a STK52XX base board */
#define CFG_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */ #ifndef CONFIG_CAMERON /* On a Cameron board or ... */
#define CONFIG_STK52XX 1 /* ... on a STK52XX board */
#endif
#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ #define CFG_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
#define BOOTFLAG_WARM 0x02 /* Software reboot */
#define CFG_CACHELINE_SIZE 32 /* For MPC5xxx CPUs */ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */
#define BOOTFLAG_WARM 0x02 /* Software reboot */
#define CFG_CACHELINE_SIZE 32 /* For MPC5xxx CPUs */
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if (CONFIG_COMMANDS & CFG_CMD_KGDB)
# define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */ # define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
#endif #endif
/* /*
* Serial console configuration * Serial console configuration
*/ */
#define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */
#define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ #define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */
#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
#ifdef CONFIG_STK52XX #ifdef CONFIG_STK52XX
@ -96,7 +99,7 @@
/* /*
* Video console * Video console
*/ */
#if 1 #ifndef CONFIG_TQM5200S /* No graphics controller on TQM5200S */
#define CONFIG_VIDEO #define CONFIG_VIDEO
#define CONFIG_VIDEO_SM501 #define CONFIG_VIDEO_SM501
#define CONFIG_VIDEO_SM501_32BPP #define CONFIG_VIDEO_SM501_32BPP
@ -129,10 +132,12 @@
#define ADD_USB_CMD 0 #define ADD_USB_CMD 0
#endif #endif
#ifndef CONFIG_CAMERON
/* POST support */ /* POST support */
#define CONFIG_POST (CFG_POST_MEMORY | \ #define CONFIG_POST (CFG_POST_MEMORY | \
CFG_POST_CPU | \ CFG_POST_CPU | \
CFG_POST_I2C) CFG_POST_I2C)
#endif
#ifdef CONFIG_POST #ifdef CONFIG_POST
#define CFG_CMD_POST_DIAG CFG_CMD_DIAG #define CFG_CMD_POST_DIAG CFG_CMD_DIAG
@ -176,8 +181,8 @@
#define CONFIG_TIMESTAMP /* display image timestamps */ #define CONFIG_TIMESTAMP /* display image timestamps */
#if (TEXT_BASE == 0xFC000000) /* Boot low */ #if (TEXT_BASE != 0xFFF00000)
# define CFG_LOWBOOT 1 # define CFG_LOWBOOT 1 /* Boot low */
#endif #endif
/* /*
@ -191,30 +196,38 @@
#undef CONFIG_BOOTARGS #undef CONFIG_BOOTARGS
#if defined(CONFIG_TQM5200_B) #ifdef CONFIG_STK52XX
#define CONFIG_EXTRA_ENV_SETTINGS \ # if defined(CONFIG_TQM5200_B)
"netdev=eth0\0" \ # if defined(CFG_LOWBOOT)
"rootpath=/opt/eldk/ppc_6xx\0" \ # define ENV_UPDT \
"ramargs=setenv bootargs root=/dev/ram rw\0" \
"nfsargs=setenv bootargs root=/dev/nfs rw " \
"nfsroot=${serverip}:${rootpath}\0" \
"addip=setenv bootargs ${bootargs} " \
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \
":${hostname}:${netdev}:off panic=1\0" \
"flash_self=run ramargs addip;" \
"bootm ${kernel_addr} ${ramdisk_addr}\0" \
"flash_nfs=run nfsargs addip;" \
"bootm ${kernel_addr}\0" \
"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\0" \
"update=protect off FC000000 FC07FFFF;" \ "update=protect off FC000000 FC07FFFF;" \
"erase FC000000 FC07FFFF;" \ "erase FC000000 FC07FFFF;" \
"cp.b 200000 FC000000 ${filesize};" \ "cp.b 200000 FC000000 ${filesize};" \
"protect on FC000000 FC07FFFF\0" \ "protect on FC000000 FC07FFFF\0"
"" # else /* highboot */
# define ENV_UPDT \
"update=protect off FFF00000 FFF7FFFF;" \
"erase FFF00000 FFF7FFFF;" \
"cp.b 200000 FFF00000 ${filesize};" \
"protect on FFF00000 FFF7FFFF\0"
# endif /* CFG_LOWBOOT */
# else /* !CONFIG_TQM5200_B */
# define ENV_UPDT \
"update=protect off FC000000 FC05FFFF;" \
"erase FC000000 FC05FFFF;" \
"cp.b 200000 FC000000 ${filesize};" \
"protect on FC000000 FC05FFFF\0"
# endif /* CONFIG_TQM5200_B */
#elif defined (CONFIG_CAMERON)
# define ENV_UPDT \
"update=protect off FC000000 FC03FFFF;" \
"erase FC000000 FC03FFFF;" \
"cp.b 200000 FC000000 ${filesize};" \
"protect on FC000000 FC03FFFF\0"
#else #else
# error "Unknown Carrier Board"
#endif /* CONFIG_STK52XX */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \ "netdev=eth0\0" \
"rootpath=/opt/eldk/ppc_6xx\0" \ "rootpath=/opt/eldk/ppc_6xx\0" \
@ -224,20 +237,19 @@
"addip=setenv bootargs ${bootargs} " \ "addip=setenv bootargs ${bootargs} " \
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \ "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \
":${hostname}:${netdev}:off panic=1\0" \ ":${hostname}:${netdev}:off panic=1\0" \
"flash_self=run ramargs addip;" \ "addcons=setenv bootargs ${bootargs} " \
"console=ttyS0,${baudrate}\0" \
"flash_self=run ramargs addip addcons;" \
"bootm ${kernel_addr} ${ramdisk_addr}\0" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \
"flash_nfs=run nfsargs addip;" \ "flash_nfs=run nfsargs addip addcons;" \
"bootm ${kernel_addr}\0" \ "bootm ${kernel_addr}\0" \
"net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0" \ "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addcons;" \
"bootm\0" \
"bootfile=/tftpboot/tqm5200/uImage\0" \ "bootfile=/tftpboot/tqm5200/uImage\0" \
"load=tftp 200000 ${u-boot}\0" \
"u-boot=/tftpboot/tqm5200/u-boot.bin\0" \ "u-boot=/tftpboot/tqm5200/u-boot.bin\0" \
"update=protect off FC000000 FC05FFFF;" \ "load=tftp 200000 ${u-boot}\0" \
"erase FC000000 FC05FFFF;" \ ENV_UPDT \
"cp.b 200000 FC000000 ${filesize};" \
"protect on FC000000 FC05FFFF\0" \
"" ""
#endif /* CONFIG_TQM5200_B */
#define CONFIG_BOOTCOMMAND "run net_nfs" #define CONFIG_BOOTCOMMAND "run net_nfs"
@ -319,45 +331,69 @@
#define CFG_MAX_FLASH_SECT 512 /* max num of sects on one chip */ #define CFG_MAX_FLASH_SECT 512 /* max num of sects on one chip */
#define CFG_FLASH_USE_BUFFER_WRITE 1 #define CFG_FLASH_USE_BUFFER_WRITE 1
#if defined(CONFIG_TQM5200_B) #if defined (CONFIG_CAMERON)
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00080000) # define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00040000)
#elif defined(CONFIG_TQM5200_B)
# define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00080000)
#else #else
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00060000) # define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00060000)
#endif /* CONFIG_TQM5200_B */ #endif
#define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks #define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks
(= chip selects) */ (= chip selects) */
/* Dynamic MTD partition support */ /* Dynamic MTD partition support */
#define CONFIG_JFFS2_CMDLINE #define CONFIG_JFFS2_CMDLINE
#define MTDIDS_DEFAULT "nor0=TQM5200-0" #define MTDIDS_DEFAULT "nor0=TQM5200-0"
#if defined(CONFIG_TQM5200_B)
#define MTDPARTS_DEFAULT "mtdparts=TQM5200-0:768k(firmware)," \ #ifdef CONFIG_STK52XX
"1280k(kernel)," \ # if defined(CONFIG_TQM5200_B)
# if defined(CFG_LOWBOOT)
# define MTDPARTS_DEFAULT "mtdparts=TQM5200-0:1m(firmware)," \
"1536k(kernel)," \
"3584k(small-fs)," \
"2m(initrd)," \ "2m(initrd)," \
"4m(small-fs)," \ "8m(misc)," \
"16m(big-fs)," \ "16m(big-fs)"
"8m(misc)" # else /* highboot */
#else # define MTDPARTS_DEFAULT "mtdparts=TQM5200-0:2560k(kernel)," \
#define MTDPARTS_DEFAULT "mtdparts=TQM5200-0:640k(firmware)," \ "3584k(small-fs)," \
"2m(initrd)," \
"8m(misc)," \
"15m(big-fs)," \
"1m(firmware)"
# endif /* CFG_LOWBOOT */
# else /* !CONFIG_TQM5200_B */
# define MTDPARTS_DEFAULT "mtdparts=TQM5200-0:640k(firmware)," \
"1408k(kernel)," \ "1408k(kernel)," \
"2m(initrd)," \ "2m(initrd)," \
"4m(small-fs)," \ "4m(small-fs)," \
"16m(big-fs)," \ "8m(misc)," \
"8m(misc)" "16m(big-fs)"
#endif /* CONFIG_TQM5200_B */ # endif /* CONFIG_TQM5200_B */
#elif defined (CONFIG_CAMERON)
# define MTDPARTS_DEFAULT "mtdparts=TQM5200-0:768k(firmware)," \
"1792k(kernel)," \
"3584k(small-fs)," \
"2m(initrd)," \
"8m(misc)," \
"16m(big-fs)"
#else
# error "Unknown Carrier Board"
#endif /* CONFIG_STK52XX */
/* /*
* Environment settings * Environment settings
*/ */
#define CFG_ENV_IS_IN_FLASH 1 #define CFG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x10000 #define CFG_ENV_SIZE 0x4000 /* 16 k - keep small for fast booting */
#if defined(CONFIG_TQM5200_B) #if defined(CONFIG_TQM5200_B)
#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
#endif /* CONFIG_TQM5200_B */
#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE) #define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) #define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE)
#endif /* CONFIG_TQM5200_B */
/* /*
* Memory map * Memory map
@ -385,12 +421,15 @@
# define CFG_RAMBOOT 1 # define CFG_RAMBOOT 1
#endif #endif
#if defined(CONFIG_TQM5200_B) #if defined (CONFIG_CAMERON)
#define CFG_MONITOR_LEN (512 << 10) /* Reserve 512 kB for Monitor */ # define CFG_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */
#elif defined(CONFIG_TQM5200_B)
# define CFG_MONITOR_LEN (512 << 10) /* Reserve 512 kB for Monitor */
#else #else
#define CFG_MONITOR_LEN (384 << 10) /* Reserve 384 kB for Monitor */ # define CFG_MONITOR_LEN (384 << 10) /* Reserve 384 kB for Monitor */
#endif /* CONFIG_TQM5200_B */ #endif
#define CFG_MALLOC_LEN (256 << 10) /* Reserve 256 kB for malloc() */
#define CFG_MALLOC_LEN (1024 << 10) /* Reserve 1024 kB for malloc() */
#define CFG_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ #define CFG_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
/* /*
@ -462,6 +501,10 @@
*/ */
#define CFG_LONGHELP /* undef to save memory */ #define CFG_LONGHELP /* undef to save memory */
#define CFG_PROMPT "=> " /* Monitor Command Prompt */ #define CFG_PROMPT "=> " /* Monitor Command Prompt */
#define CFG_HUSH_PARSER 1 /* use "hush" command parser */
#define CFG_PROMPT_HUSH_PS2 "> "
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if (CONFIG_COMMANDS & CFG_CMD_KGDB)
#define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
#else #else
@ -508,32 +551,25 @@
#define CFG_CS0_START CFG_FLASH_BASE #define CFG_CS0_START CFG_FLASH_BASE
#define CFG_CS0_SIZE CFG_FLASH_SIZE #define CFG_CS0_SIZE CFG_FLASH_SIZE
/* automatic configuration of chip selects */
#ifdef CONFIG_CS_AUTOCONF
#define CONFIG_LAST_STAGE_INIT #define CONFIG_LAST_STAGE_INIT
#endif
/* /*
* SRAM - Do not map below 2 GB in address space, because this area is used * SRAM - Do not map below 2 GB in address space, because this area is used
* for SDRAM autosizing. * for SDRAM autosizing.
*/ */
#if defined (CONFIG_CS_AUTOCONF)
#define CFG_CS2_START 0xE5000000 #define CFG_CS2_START 0xE5000000
#define CFG_CS2_SIZE 0x100000 /* 1 MByte */ #define CFG_CS2_SIZE 0x100000 /* 1 MByte */
#define CFG_CS2_CFG 0x0004D930 #define CFG_CS2_CFG 0x0004D930
#endif
/* /*
* Grafic controller - Do not map below 2 GB in address space, because this * Grafic controller - Do not map below 2 GB in address space, because this
* area is used for SDRAM autosizing. * area is used for SDRAM autosizing.
*/ */
#if defined (CONFIG_CS_AUTOCONF)
#define SM501_FB_BASE 0xE0000000 #define SM501_FB_BASE 0xE0000000
#define CFG_CS1_START (SM501_FB_BASE) #define CFG_CS1_START (SM501_FB_BASE)
#define CFG_CS1_SIZE 0x4000000 /* 64 MByte */ #define CFG_CS1_SIZE 0x4000000 /* 64 MByte */
#define CFG_CS1_CFG 0x8F48FF70 #define CFG_CS1_CFG 0x8F48FF70
#define SM501_MMIO_BASE CFG_CS1_START + 0x03E00000 #define SM501_MMIO_BASE CFG_CS1_START + 0x03E00000
#endif
#define CFG_CS_BURST 0x00000000 #define CFG_CS_BURST 0x00000000
#define CFG_CS_DEADCYCLE 0x33333311 /* 1 dead cycle for flash and SM501 */ #define CFG_CS_DEADCYCLE 0x33333311 /* 1 dead cycle for flash and SM501 */

5
include/configs/aev.h
View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2003-2005 * (C) Copyright 2003-2006
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* (C) Copyright 2004-2005 * (C) Copyright 2004-2005
@ -370,10 +370,7 @@
#define CFG_CS0_START CFG_FLASH_BASE #define CFG_CS0_START CFG_FLASH_BASE
#define CFG_CS0_SIZE CFG_FLASH_SIZE #define CFG_CS0_SIZE CFG_FLASH_SIZE
/* automatic configuration of chip selects */
#ifdef CONFIG_CS_AUTOCONF
#define CONFIG_LAST_STAGE_INIT #define CONFIG_LAST_STAGE_INIT
#endif
/* /*
* SRAM - Do not map below 2 GB in address space, because this area is used * SRAM - Do not map below 2 GB in address space, because this area is used

7
include/configs/spieval.h
View File

@ -452,32 +452,25 @@
#define CFG_CS0_START CFG_FLASH_BASE #define CFG_CS0_START CFG_FLASH_BASE
#define CFG_CS0_SIZE CFG_FLASH_SIZE #define CFG_CS0_SIZE CFG_FLASH_SIZE
/* automatic configuration of chip selects */
#ifdef CONFIG_CS_AUTOCONF
#define CONFIG_LAST_STAGE_INIT #define CONFIG_LAST_STAGE_INIT
#endif
/* /*
* SRAM - Do not map below 2 GB in address space, because this area is used * SRAM - Do not map below 2 GB in address space, because this area is used
* for SDRAM autosizing. * for SDRAM autosizing.
*/ */
#if defined (CONFIG_CS_AUTOCONF)
#define CFG_CS2_START 0xE5000000 #define CFG_CS2_START 0xE5000000
#define CFG_CS2_SIZE 0x100000 /* 1 MByte */ #define CFG_CS2_SIZE 0x100000 /* 1 MByte */
#define CFG_CS2_CFG 0x0004D930 #define CFG_CS2_CFG 0x0004D930
#endif
/* /*
* Grafic controller - Do not map below 2 GB in address space, because this * Grafic controller - Do not map below 2 GB in address space, because this
* area is used for SDRAM autosizing. * area is used for SDRAM autosizing.
*/ */
#if defined (CONFIG_CS_AUTOCONF)
#define SM501_FB_BASE 0xE0000000 #define SM501_FB_BASE 0xE0000000
#define CFG_CS1_START (SM501_FB_BASE) #define CFG_CS1_START (SM501_FB_BASE)
#define CFG_CS1_SIZE 0x4000000 /* 64 MByte */ #define CFG_CS1_SIZE 0x4000000 /* 64 MByte */
#define CFG_CS1_CFG 0x8F48FF70 #define CFG_CS1_CFG 0x8F48FF70
#define SM501_MMIO_BASE CFG_CS1_START + 0x03E00000 #define SM501_MMIO_BASE CFG_CS1_START + 0x03E00000
#endif
#define CFG_CS_BURST 0x00000000 #define CFG_CS_BURST 0x00000000
#define CFG_CS_DEADCYCLE 0x33333311 /* 1 dead cycle for flash and SM501 */ #define CFG_CS_DEADCYCLE 0x33333311 /* 1 dead cycle for flash and SM501 */

6
mkconfig
View File

@ -9,19 +9,23 @@
# #
APPEND=no # Default: Create new config file APPEND=no # Default: Create new config file
BOARD_NAME="" # Name to print in make output
while [ $# -gt 0 ] ; do while [ $# -gt 0 ] ; do
case "$1" in case "$1" in
--) shift ; break ;; --) shift ; break ;;
-a) shift ; APPEND=yes ;; -a) shift ; APPEND=yes ;;
-n) shift ; BOARD_NAME="${1%%_config}" ; shift ;;
*) break ;; *) break ;;
esac esac
done done
[ "${BOARD_NAME}" ] || BOARD_NAME="$1"
[ $# -lt 4 ] && exit 1 [ $# -lt 4 ] && exit 1
[ $# -gt 6 ] && exit 1 [ $# -gt 6 ] && exit 1
echo "Configuring for $1 board..." echo "Configuring for ${BOARD_NAME} board..."
cd ./include cd ./include