Merge with /home/git/u-boot
This commit is contained in:
commit
c6676c73dc
5
Makefile
5
Makefile
|
@ -557,6 +557,7 @@ Total5200_Rev2_lowboot_config: unconfig
|
||||||
@$(MKCONFIG) -a Total5200 ppc mpc5xxx total5200
|
@$(MKCONFIG) -a Total5200 ppc mpc5xxx total5200
|
||||||
|
|
||||||
cam5200_config \
|
cam5200_config \
|
||||||
|
cam5200_niosflash_config \
|
||||||
fo300_config \
|
fo300_config \
|
||||||
MiniFAP_config \
|
MiniFAP_config \
|
||||||
TQM5200S_config \
|
TQM5200S_config \
|
||||||
|
@ -574,6 +575,10 @@ TQM5200_STK100_config: unconfig
|
||||||
echo "#define CONFIG_TQM5200_B" >>$(obj)include/config.h ; \
|
echo "#define CONFIG_TQM5200_B" >>$(obj)include/config.h ; \
|
||||||
echo "... TQM5200S on Cam5200" ; \
|
echo "... TQM5200S on Cam5200" ; \
|
||||||
}
|
}
|
||||||
|
@[ -z "$(findstring niosflash,$@)" ] || \
|
||||||
|
{ echo "#define CONFIG_CAM5200_NIOSFLASH" >>$(obj)include/config.h ; \
|
||||||
|
echo "... with NIOS flash driver" ; \
|
||||||
|
}
|
||||||
@[ -z "$(findstring fo300,$@)" ] || \
|
@[ -z "$(findstring fo300,$@)" ] || \
|
||||||
{ echo "#define CONFIG_FO300" >>$(obj)include/config.h ; \
|
{ echo "#define CONFIG_FO300" >>$(obj)include/config.h ; \
|
||||||
echo "... TQM5200 on FO300" ; \
|
echo "... TQM5200 on FO300" ; \
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#include <mpc5xxx.h>
|
#include <mpc5xxx.h>
|
||||||
#include <asm/processor.h>
|
#include <asm/processor.h>
|
||||||
|
|
||||||
#ifdef CONFIG_CAM5200
|
#if defined(CONFIG_CAM5200) && defined(CONFIG_CAM5200_NIOSFLASH)
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
#define DEBUGF(x...) printf(x)
|
#define DEBUGF(x...) printf(x)
|
||||||
|
@ -783,4 +783,4 @@ unsigned long flash_init(void)
|
||||||
|
|
||||||
return total_b;
|
return total_b;
|
||||||
}
|
}
|
||||||
#endif /* ifdef CONFIG_CAM5200 */
|
#endif /* if defined(CONFIG_CAM5200) && defined(CONFIG_CAM5200_NIOSFLASH) */
|
||||||
|
|
|
@ -231,6 +231,17 @@
|
||||||
"protect on FC000000 +${filesize}\0"
|
"protect on FC000000 +${filesize}\0"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef CONFIG_CAM5200
|
||||||
|
#define CUSTOM_ENV_SETTINGS \
|
||||||
|
"bootfile=/tftpboot/tqm5200/uImage\0" \
|
||||||
|
"u-boot=/tftpboot/tqm5200/u-boot.bin\0"
|
||||||
|
#else
|
||||||
|
#define CUSTOM_ENV_SETTINGS \
|
||||||
|
"bootfile=cam5200/uImage\0" \
|
||||||
|
"u-boot=cam5200/u-boot.bin\0" \
|
||||||
|
"setup=tftp 200000 cam5200/setup.img; autoscr 200000\0"
|
||||||
|
#endif
|
||||||
|
|
||||||
#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" \
|
||||||
|
@ -248,8 +259,7 @@
|
||||||
"bootm ${kernel_addr}\0" \
|
"bootm ${kernel_addr}\0" \
|
||||||
"net_nfs=tftp 200000 ${bootfile};run nfsargs addip addcons;" \
|
"net_nfs=tftp 200000 ${bootfile};run nfsargs addip addcons;" \
|
||||||
"bootm\0" \
|
"bootm\0" \
|
||||||
"bootfile=/tftpboot/tqm5200/uImage\0" \
|
CUSTOM_ENV_SETTINGS \
|
||||||
"u-boot=/tftpboot/tqm5200/u-boot.bin\0" \
|
|
||||||
"load=tftp 200000 ${u-boot}\0" \
|
"load=tftp 200000 ${u-boot}\0" \
|
||||||
ENV_UPDT \
|
ENV_UPDT \
|
||||||
""
|
""
|
||||||
|
@ -325,15 +335,7 @@
|
||||||
*/
|
*/
|
||||||
#define CFG_FLASH_BASE 0xFC000000
|
#define CFG_FLASH_BASE 0xFC000000
|
||||||
|
|
||||||
#ifndef CONFIG_CAM5200
|
#if defined(CONFIG_CAM5200) && defined(CONFIG_CAM5200_NIOSFLASH)
|
||||||
/* use CFI flash driver */
|
|
||||||
#define CFG_FLASH_CFI 1 /* Flash is CFI conformant */
|
|
||||||
#define CFG_FLASH_CFI_DRIVER 1 /* Use the common driver */
|
|
||||||
#define CFG_FLASH_BANKS_LIST { CFG_BOOTCS_START }
|
|
||||||
#define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks
|
|
||||||
(= chip selects) */
|
|
||||||
#define CFG_MAX_FLASH_SECT 512 /* max num of sects on one chip */
|
|
||||||
#else /* CONFIG_CAM5200 */
|
|
||||||
#define CFG_MAX_FLASH_BANKS 2 /* max num of flash banks
|
#define CFG_MAX_FLASH_BANKS 2 /* max num of flash banks
|
||||||
(= chip selects) */
|
(= chip selects) */
|
||||||
#define CFG_FLASH_WORD_SIZE unsigned int /* main flash device with */
|
#define CFG_FLASH_WORD_SIZE unsigned int /* main flash device with */
|
||||||
|
@ -344,7 +346,15 @@
|
||||||
#define CFG_FLASH_ADDR1 0x2AA
|
#define CFG_FLASH_ADDR1 0x2AA
|
||||||
#define CFG_FLASH_2ND_16BIT_DEV 1 /* NIOS flash is a 16bit device */
|
#define CFG_FLASH_2ND_16BIT_DEV 1 /* NIOS flash is a 16bit device */
|
||||||
#define CFG_MAX_FLASH_SECT 128
|
#define CFG_MAX_FLASH_SECT 128
|
||||||
#endif /* ifndef CONFIG_CAM5200 */
|
#else
|
||||||
|
/* use CFI flash driver */
|
||||||
|
#define CFG_FLASH_CFI 1 /* Flash is CFI conformant */
|
||||||
|
#define CFG_FLASH_CFI_DRIVER 1 /* Use the common driver */
|
||||||
|
#define CFG_FLASH_BANKS_LIST { CFG_BOOTCS_START }
|
||||||
|
#define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks
|
||||||
|
(= chip selects) */
|
||||||
|
#define CFG_MAX_FLASH_SECT 512 /* max num of sects on one chip */
|
||||||
|
#endif
|
||||||
|
|
||||||
#define CFG_FLASH_EMPTY_INFO
|
#define CFG_FLASH_EMPTY_INFO
|
||||||
#define CFG_FLASH_SIZE 0x04000000 /* 64 MByte */
|
#define CFG_FLASH_SIZE 0x04000000 /* 64 MByte */
|
||||||
|
|
Loading…
Reference in New Issue