[U-Boot-Users] RE: U-Boot CVS cfi_flash.c -- problem applying your patch...

Tolunay, It looks like there was a check in to cfi_flash.c between the time I made the patch and now. It looks completely cosmetic, just white space changes. Here is a new patch against the head of the tree. Wolfgang, please use this patch(cfi_flash_patch2) instead of the previous patch (cfi_flash_patch).
Here is a patch to the cfi flash driver with all the current fixes. It contains support for x8/x16 bit mode, support for little endean implementations, improved throughput for parallel Intel implementations. All Intel implementation are now reporting no problems, there remains an issue with an AMD implementation.
TODO: There may be room for performance improvements in the x8/x16 support. Other flash vendor support. Brad
-----Original Message----- From: listmember@orkun.us [mailto:listmember@orkun.us] Sent: Wednesday, February 11, 2004 11:57 AM To: Brad Kemp Subject: U-Boot CVS cfi_flash.c -- problem applying your patch...
Brad,
I tried to apply your patch to the HEAD of u-boot CVS which I checked out yesterday but it had problems while applying the patch to cfi_flash.c. Can you check or am I doing something wrong?
I am attaching the files for your review as a tar.gz file. In the tar cfi_flash.c is after patch is applied while cfi_flash.c.orig is the original from CVS as backed up by the patch command.
Well because the patch is not fully applied cfi_flash.c is failing to compile.
Here is the patch output
[torkun@pc-torkun u-boot]$ patch -p0 -b < ../cfi_flash_bradkemp.patch patching file board/ppmc8260/Makefile patching file drivers/cfi_flash.c Hunk #2 FAILED at 30. Hunk #6 succeeded at 195 with fuzz 2. Hunk #15 FAILED at 618. Hunk #20 FAILED at 770. Hunk #24 succeeded at 891 with fuzz 1. Hunk #25 succeeded at 903 with fuzz 2. Hunk #28 FAILED at 952. 4 out of 31 hunks FAILED -- saving rejects to file drivers/cfi_flash.c.rej patching file include/flash.h patching file include/configs/ppmc8260.h [torkun@pc-torkun u-boot]$
BTW, the one from CVS works for me as I am using Intel 28F128J3 flash, single bank, 2 x 16bit. Yesterday, I've submitted by CSB272 board to Wolfgang based on this driver so there is no flash driver in my board directory.
Best regards, Tolunay Orkun

Brad,
This patch worked just fine over CVS version. Thank you.
Tolunay
Tolunay, It looks like there was a check in to cfi_flash.c between the time I made the patch and now. It looks completely cosmetic, just white space changes. Here is a new patch against the head of the tree. Wolfgang, please use this patch(cfi_flash_patch2) instead of the previous patch (cfi_flash_patch).

Dear Brad,
in message CFE1C3BDE1264C4D9E569E89B3AF8FA86C527F@grubber.seranoa.com you wrote:
It looks like there was a check in to cfi_flash.c between the time I made the patch and now. It looks completely cosmetic, just white space changes.
No patch was checked in. It was just me cleaning up all the formatting issues in your code.
Here is a new patch against the head of the tree.
And again this patch is - strictly speaking - violating the for- matting rules as specified in section "Coding Standards" in the README.
Wolfgang, please use this patch(cfi_flash_patch2) instead of the previous patch (cfi_flash_patch).
Done. But please make sure to clean up yoour code next time.
Best regards,
Wolfgang Denk
participants (3)
-
Brad Kemp
-
listmember@orkun.us
-
Wolfgang Denk