Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix some build errors on .25

Browse source 
SVN-Revision: 11008
This commit is contained in:
Gabor Juhos 2008-05-02 15:18:02 +00:00
parent 1b90498e69
commit e654a28575
2 changed files with 56 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
target/linux/adm5120/patches-2.6.25/102-jedec_pmc_39lvxxx_chips.patch
View file

@ -1,7 +1,7 @@
Index: linux-2.6.25/drivers/mtd/chips/jedec_probe.c Index: linux-2.6.25.1/drivers/mtd/chips/jedec_probe.c
=================================================================== ===================================================================
--- linux-2.6.25.orig/drivers/mtd/chips/jedec_probe.c --- linux-2.6.25.1.orig/drivers/mtd/chips/jedec_probe.c
+++ linux-2.6.25/drivers/mtd/chips/jedec_probe.c +++ linux-2.6.25.1/drivers/mtd/chips/jedec_probe.c
@@ -121,6 +121,10 @@ @@ -121,6 +121,10 @@
#define UPD29F064115 0x221C #define UPD29F064115 0x221C
@ -13,7 +13,7 @@ Index: linux-2.6.25/drivers/mtd/chips/jedec_probe.c
#define PM49FL002 0x006D #define PM49FL002 0x006D
#define PM49FL004 0x006E #define PM49FL004 0x006E
#define PM49FL008 0x006A #define PM49FL008 0x006A
@@ -1170,6 +1174,58 @@ static const struct amd_flash_info jedec @@ -1170,6 +1174,54 @@ static const struct amd_flash_info jedec
ERASEINFO(0x02000,2), ERASEINFO(0x02000,2),
ERASEINFO(0x04000,1), ERASEINFO(0x04000,1),
} }
@ -21,12 +21,11 @@ Index: linux-2.6.25/drivers/mtd/chips/jedec_probe.c
+ .mfr_id = MANUFACTURER_PMC, + .mfr_id = MANUFACTURER_PMC,
+ .dev_id = PM39LV512, + .dev_id = PM39LV512,
+ .name = "PMC Pm39LV512", + .name = "PMC Pm39LV512",
+ .uaddr = { + .devtypes = CFI_DEVICETYPE_X8,
+ [0] = MTD_UADDR_0x0555_0x02AA /* x8 */ + .uaddr = MTD_UADDR_0x0555_0x02AA,
+ }, + .dev_size = SIZE_64KiB,
+ .DevSize = SIZE_64KiB, + .cmd_set = P_ID_AMD_STD,
+ .CmdSet = P_ID_AMD_STD, + .nr_regions = 1,
+ .NumEraseRegions= 1,
+ .regions = { + .regions = {
+ ERASEINFO(0x01000,16), + ERASEINFO(0x01000,16),
+ } + }
@ -34,12 +33,11 @@ Index: linux-2.6.25/drivers/mtd/chips/jedec_probe.c
+ .mfr_id = MANUFACTURER_PMC, + .mfr_id = MANUFACTURER_PMC,
+ .dev_id = PM39LV010, + .dev_id = PM39LV010,
+ .name = "PMC Pm39LV010", + .name = "PMC Pm39LV010",
+ .uaddr = { + .devtypes = CFI_DEVICETYPE_X8,
+ [0] = MTD_UADDR_0x0555_0x02AA /* x8 */ + .uaddr = MTD_UADDR_0x0555_0x02AA,
+ }, + .dev_size = SIZE_128KiB,
+ .DevSize = SIZE_128KiB, + .cmd_set = P_ID_AMD_STD,
+ .CmdSet = P_ID_AMD_STD, + .nr_regions = 1,
+ .NumEraseRegions= 1,
+ .regions = { + .regions = {
+ ERASEINFO(0x01000,32), + ERASEINFO(0x01000,32),
+ } + }
@ -47,12 +45,11 @@ Index: linux-2.6.25/drivers/mtd/chips/jedec_probe.c
+ .mfr_id = MANUFACTURER_PMC, + .mfr_id = MANUFACTURER_PMC,
+ .dev_id = PM39LV020, + .dev_id = PM39LV020,
+ .name = "PMC Pm39LV020", + .name = "PMC Pm39LV020",
+ .uaddr = { + .devtypes = CFI_DEVICETYPE_X8,
+ [0] = MTD_UADDR_0x0555_0x02AA /* x8 */ + .uaddr = MTD_UADDR_0x0555_0x02AA,
+ }, + .dev_size = SIZE_256KiB,
+ .DevSize = SIZE_256KiB, + .cmd_set = P_ID_AMD_STD,
+ .CmdSet = P_ID_AMD_STD, + .nr_regions = 1,
+ .NumEraseRegions= 1,
+ .regions = { + .regions = {
+ ERASEINFO(0x01000,64), + ERASEINFO(0x01000,64),
+ } + }
@ -60,12 +57,11 @@ Index: linux-2.6.25/drivers/mtd/chips/jedec_probe.c
+ .mfr_id = MANUFACTURER_PMC, + .mfr_id = MANUFACTURER_PMC,
+ .dev_id = PM39LV040, + .dev_id = PM39LV040,
+ .name = "PMC Pm39LV040", + .name = "PMC Pm39LV040",
+ .uaddr = { + .devtypes = CFI_DEVICETYPE_X8,
+ [0] = MTD_UADDR_0x0555_0x02AA /* x8 */ + .uaddr = MTD_UADDR_0x0555_0x02AA,
+ }, + .dev_size = SIZE_512KiB,
+ .DevSize = SIZE_512KiB, + .cmd_set = P_ID_AMD_STD,
+ .CmdSet = P_ID_AMD_STD, + .nr_regions = 1,
+ .NumEraseRegions= 1,
+ .regions = { + .regions = {
+ ERASEINFO(0x01000,128), + ERASEINFO(0x01000,128),
+ } + }

32
target/linux/adm5120/patches-2.6.25/910-pata_rb153_cf_fix_compiler_warning.patch Normal file
View file

@ -0,0 +1,32 @@
Index: linux-2.6.25.1/drivers/ata/pata_rb153_cf.c
===================================================================
--- linux-2.6.25.1.orig/drivers/ata/pata_rb153_cf.c
+++ linux-2.6.25.1/drivers/ata/pata_rb153_cf.c
@@ -68,20 +68,23 @@ static void rb153_pata_exec_command(stru
rb153_pata_finish_io(ap);
}
-static void rb153_pata_data_xfer(struct ata_device *adev, unsigned char *buf,
+static unsigned int rb153_pata_data_xfer(struct ata_device *adev, unsigned char *buf,
unsigned int buflen, int write_data)
{
void __iomem *ioaddr = adev->link->ap->ioaddr.data_addr;
-
+ unsigned int t;
+
+ t = buflen;
if (write_data) {
- for (; buflen > 0; buflen--, buf++)
+ for (; t > 0; t--, buf++)
writeb(*buf, ioaddr);
} else {
- for (; buflen > 0; buflen--, buf++)
+ for (; t > 0; t--, buf++)
*buf = readb(ioaddr);
}
rb153_pata_finish_io(adev->link->ap);
+ return buflen;
}
static void rb153_pata_freeze(struct ata_port *ap)