GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-30 11:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

CAM5200 flash driver modifications:

Browse source 
- use CFI driver (replaces custom flash driver) for main 'cam5200' target
- add second build target 'cam5200_niosflash' which still uses custom driver
This commit is contained in:
Marian Balakowicz 2007-01-10 00:26:15 +01:00
parent f4eb54529b
commit d9384de2f5
3 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -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" ; \

4
board/tqm5200/cam5200_flash.c
View file

@ -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) */

20
include/configs/TQM5200.h
View file

@ -325,15 +325,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 +336,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 */