Fix my own merge stupidity
PATCH 1/1 Fix my own merge stupidity
Way back in August I merged Heiko's patch:566a494f592: [PCS440EP] upgrade the PCS440EP board
with Jon's CONFIG_COMMANDS patches.
This was done in commit: 6bf6f114dcdd97ec3f80c2761ed40e31229d6b78
However, in the process, I left out some of Heiko's good changes.
Now Heiko's and Jon's patches are properly merged in fat_register_device()
--- fs/fat/fat.c | 63 ++++++++++++++++++++++++++------------------------------- 1 files changed, 29 insertions(+), 34 deletions(-)
fs/fat/fat.c +29 -34
@@ -85,46 +85,41 @@ fat_register_device(block_dev_desc_t *dev_desc, int part_no)/* no signature found */ return -1 ; } -if (!strncmp ((char *)&buffer[DOS_FS_TYPE_OFFSET ],"FAT" ,3 )) { -/* ok, we assume we are on a PBR only */ - cur_part =1 ; - part_offset=0 ; - }else {#if (defined(CONFIG_CMD_IDE ) || \ defined(CONFIG_CMD_SCSI ) || \ defined(CONFIG_CMD_USB ) || \ - (defined(CONFIG_MMC ) && defined(CONFIG_LPC2292 )) || \ - defined(CONFIG_SYSTEMACE ) ) -/* First we assume, there is a MBR */ -if (!get_partition_info (dev_desc, part_no, &info)) { - part_offset = info.start; - cur_part = part_no; - }else if (!strncmp ((char *)&buffer[DOS_FS_TYPE_OFFSET ],"FAT" ,3 )) { -/* ok, we assume we are on a PBR only */ - cur_part =1 ; - part_offset =0 ; - }else { -printf ("** Partition %d not valid on device %d **\n" , + defined(CONFIG_MMC ) || \ + defined(CONFIG_SYSTEMACE ) ) +/* First we assume, there is a MBR */ +if (!get_partition_info (dev_desc, part_no, &info)) { + part_offset = info.start; + cur_part = part_no; + }else if (!strncmp ((char *)&buffer[DOS_FS_TYPE_OFFSET ],"FAT" ,3 )) { +/* ok, we assume we are on a PBR only */ + cur_part =1 ; + part_offset =0 ; + }else { +printf ("** Partition %d not valid on device %d **\n" , part_no, dev_desc->dev); -return -1 ; - } +return -1 ; + } +#else -if (!strncmp ((char *)&buffer[DOS_FS_TYPE_OFFSET ],"FAT" ,3 )) { -/* ok, we assume we are on a PBR only */ - cur_part =1 ; - part_offset =0 ; - info.start = part_offset; - }else { -/* FIXME we need to determine the start block of the -* partition where the DOS FS resides. This can be done -* by using the get_partition_info routine. For this -* purpose the libpart must be included. -*/ - part_offset =32 ; - cur_part =1 ; - } -#endif +if (!strncmp ((char *)&buffer[DOS_FS_TYPE_OFFSET ],"FAT" ,3 )) { +/* ok, we assume we are on a PBR only */ + cur_part =1 ; + part_offset =0 ; + info.start = part_offset; + }else { +/* FIXME we need to determine the start block of the +* partition where the DOS FS resides. This can be done +* by using the get_partition_info routine. For this +* purpose the libpart must be included. +*/ + part_offset =32 ; + cur_part =1 ; } +#endif return 0 ; }
Signature · 1 line
1.5.0.2.230.gfbe3d-dirty
Wolfgang Denk
AppliedPATCH 1/1 Fix my own merge stupidity
Quoted 5 lines · In message <[email protected]> you wrote:
Way back in August I merged Heiko's patch:
566a494f592: [PCS440EP] upgrade the PCS440EP boardwith Jon's
CONFIG_COMMANDSpatches.
Quoted 7 lines
This was done in commit:
6bf6f114dcdd97ec3f80c2761ed40e31229d6b78However, in the process, I left out some of Heiko's good changes.
Now Heiko's and Jon's patches are properly merged in
fat_register_device()Signed-off-by Andy Fleming <[email protected]>
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de I can't understand it. I can't even understand the people who can understand it. - Queen Juliana of the Netherlands.