[flashrom] report for Intel QM67 | Winbond W25Q64 - layout patches

[Frei, Thomas (GE Germany)]

Hi,

I tried to clean the build environment (make clean), and reloaded the sources.

With this clean base I started step by step to patch:

Make -> PASS
Patch < 0001....patch -> PASS
Make -> PASS
Patch < 0002....patch -> ERROR!!!

--- snip ---
(Stripping trailing CRs from patch)
patching file cli_classic.c
Hunk #1 FAILED at 226.
Hunk #2 FAILED at 318.
2 out of 2 hunks FAILED -- saving rejects to cli_classic.c.rej
(Stripping trailing CRs from patch)
patching file flash.h
Hunk #1 FAILED at 255.
1 out of 1 hunk FAILED -- saving rejects to flash.h.rej
(Stripping trailing CRs from patch)
patching file layout.c
--- snip ---

Am I doinf wrong, or what else can be?

Best regards

Thomas
-----Original Message-----
From: Frei, Thomas (GE Germany) 
Sent: Freitag, 26. August 2011 11:25
To: 'flashrom at flashrom.org'
Subject: RE: [flashrom] report for Intel QM67 | Winbond W25Q64 - layout patches

Hi,

Now I loaded the Revision 1421 from SVN repository, patched it and tried to compile - nope :-(

Output of GCC:
---snip---
Checking for a C compiler... found.
ARCH is "x86"
Checking for libpci headers... found.
Checking if libpci is present and sufficient... yes.
Checking for FTDI support... not found.
Checking for utsname support... found.
cc -MMD -Os -Wall -Wshadow -Werror  -D'CONFIG_INTERNAL=1' -D'CONFIG_SERPROG=1' -D'CONFIG_RAYER_SPI=1' -D'CONFIG_BITBANG_SPI=1' -D'CONFIG_NIC3COM=1' -D'CONFIG_GFXNVIDIA=1' -D'CONFIG_SATASII=1'  -D'CONFIG_DUMMY=1' -D'CONFIG_DRKAISER=1' -D'CONFIG_NICREALTEK=1' -D'CONFIG_NICINTEL=1' -D'CONFIG_NICINTEL_SPI=1' -D'CONFIG_OGP_SPI=1' -D'CONFIG_BUSPIRATE_SPI=1' -D'CONFIG_SATAMV=1' -D'NEED_PCI=1' -D'HAVE_UTSNAME=1' -D'FLASHROM_VERSION="0.9.4-r1421"' -o layout.o -c layout.c
layout.c:43:20: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘rom_entries’
layout.c: In function ‘read_romlayout’:
layout.c:161:50: error: ‘rom_entries’ undeclared (first use in this function)
layout.c:161:50: note: each undeclared identifier is reported only once for each function it appears in
layout.c: At top level:
layout.c:214:12: error: static declaration of ‘find_romentry’ follows non-static declaration
flash.h:256:5: note: previous declaration of ‘find_romentry’ was here
layout.c: In function ‘find_romentry’:
layout.c:230:15: error: ‘rom_entries’ undeclared (first use in this function)
layout.c: At top level:
layout.c:279:13: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘*’ token
layout.c:309:47: error: expected ‘)’ before ‘*’ token
layout.c: In function ‘build_new_image’:
layout.c:355:2: error: ‘romlayout_t’ undeclared (first use in this function)
layout.c:355:15: error: ‘entry’ undeclared (first use in this function)
cc1: warnings being treated as errors
layout.c:368:3: error: implicit declaration of function ‘get_next_included_romentry’
layout.c:381:3: error: implicit declaration of function ‘read_content_from_file’
make: *** [layout.o] Error 1
---snip---
???

Please help.

Thank you

Thomas

-----Original Message-----
From: Stefan Tauner [mailto:stefan.tauner at student.tuwien.ac.at] 
Sent: Mittwoch, 24. August 2011 17:42
To: Frei, Thomas (GE Germany)
Cc: flashrom at flashrom.org
Subject: Re: [flashrom] report for Intel QM67 | Winbond W25Q64 - layout patches

On Wed, 24 Aug 2011 17:00:43 +0200
"Frei, Thomas (GE Germany)" <Thomas.Frei at ge.com> wrote:

> Hi,
> 
> sorry, msg_gsbg2 is a typo - it is of course msg_gdbg2.
> 
> I'm using the 0.9.4 from http://www.flashrom.org/Downloads.
> 
> Isn't this the latest?
> 

0.9.4 is the latest *stable* release, but the patches floating around here usually are to be applied on the latest *development* source code.
please check out the source code with subversion as described on the download page and retry.
--
Kind regards/Mit freundlichen Grüßen, Stefan Tauner