diff options
| author | Stefan Roese <sr@denx.de> | 2008-07-14 10:45:47 +0200 | 
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-07-14 10:45:47 +0200 | 
| commit | 4b326101d6cfaeab8250988bc4c7f51e6c92d719 (patch) | |
| tree | d04632af08591263f5cd6fc8a5c6ba8ac3d6d246 /drivers/mtd/dataflash.c | |
| parent | 69e2c6d0d13d7c8cf1612ac090bdc4c59ba6858e (diff) | |
| parent | d5996dd555edf52721b7691a4c59de016251ed39 (diff) | |
| download | olio-uboot-2014.01-4b326101d6cfaeab8250988bc4c7f51e6c92d719.tar.xz olio-uboot-2014.01-4b326101d6cfaeab8250988bc4c7f51e6c92d719.zip | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next
Diffstat (limited to 'drivers/mtd/dataflash.c')
| -rw-r--r-- | drivers/mtd/dataflash.c | 16 | 
1 files changed, 15 insertions, 1 deletions
| diff --git a/drivers/mtd/dataflash.c b/drivers/mtd/dataflash.c index 8247aa03b..0ad48cdae 100644 --- a/drivers/mtd/dataflash.c +++ b/drivers/mtd/dataflash.c @@ -54,6 +54,17 @@ int AT91F_DataflashInit (void)  				&dataflash_info[i].Desc);  		switch (dfcode) { +		case AT45DB021: +			dataflash_info[i].Device.pages_number = 1024; +			dataflash_info[i].Device.pages_size = 263; +			dataflash_info[i].Device.page_offset = 9; +			dataflash_info[i].Device.byte_mask = 0x300; +			dataflash_info[i].Device.cs = cs[i].cs; +			dataflash_info[i].Desc.DataFlash_state = IDLE; +			dataflash_info[i].logical_address = cs[i].addr; +			dataflash_info[i].id = dfcode; +			found[i] += dfcode;; +			break;  		case AT45DB161:  			dataflash_info[i].Device.pages_number = 4096;  			dataflash_info[i].Device.pages_size = 528; @@ -162,7 +173,7 @@ void AT91F_DataflashSetEnv (void)  			if((env & FLAG_SETENV) == FLAG_SETENV) {  				start =  				dataflash_info[i].Device.area_list[j].start; -				sprintf((char*) s,"%X",start); +				sprintf((char*) s,"%lX",start);  				setenv((char*) area_list[part].label,(char*) s);  			}  			part++; @@ -178,6 +189,9 @@ void dataflash_print_info (void)  		if (dataflash_info[i].id != 0) {  			printf("DataFlash:");  			switch (dataflash_info[i].id) { +			case AT45DB021: +				printf("AT45DB021\n"); +				break;  			case AT45DB161:  				printf("AT45DB161\n");  				break; |