| Message ID | 1370361554-91658-1-git-send-email-emaste@freebsd.org |
|---|---|
| State | New |
| Headers | show |
Hi Ed, On Wed, Jun 5, 2013 at 1:59 AM, Ed Maste <emaste@freebsd.org> wrote: > - Split 32Mb and 256Mb parts into a11 and a13 variants. > - Add the 4K sector flag to the 128Mb parts. (These entries were taken from > the Linux kernel list, which is missing the flag.) > - Fill out the table of sizes with entries for 64Mb parts. > > Prodded by Peter Crosthwaite. > > Signed-off-by: Ed Maste <emaste@freebsd.org> > --- > hw/block/m25p80.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c > index a927a6b..8c3b7f0 100644 > --- a/hw/block/m25p80.c > +++ b/hw/block/m25p80.c > @@ -123,10 +123,14 @@ static const FlashPartInfo known_devices[] = { > { INFO("mx25l25655e", 0xc22619, 0, 64 << 10, 512, 0) }, > > /* Micron */ > - { INFO("n25q032a", 0x20bb16, 0, 64 << 10, 64, ER_4K) }, > - { INFO("n25q128a11", 0x20bb18, 0, 64 << 10, 256, 0) }, > - { INFO("n25q128a13", 0x20ba18, 0, 64 << 10, 256, 0) }, > - { INFO("n25q256a", 0x20ba19, 0, 64 << 10, 512, ER_4K) }, > + { INFO("n25q032a11", 0x20bb16, 0, 64 << 10, 64, ER_4K) }, > + { INFO("n25q032a13", 0x20ba16, 0, 64 << 10, 64, ER_4K) }, > + { INFO("n25q064a11", 0x20bb17, 0, 64 << 10, 128, ER_4K) }, > + { INFO("n25q064a13", 0x20ba17, 0, 64 << 10, 128, ER_4K) }, > + { INFO("n25q128a11", 0x20bb18, 0, 64 << 10, 256, ER_4K) }, > + { INFO("n25q128a13", 0x20ba18, 0, 64 << 10, 256, ER_4K) }, > + { INFO("n25q256a11", 0x20bb19, 0, 64 << 10, 512, ER_4K) }, > + { INFO("n25q256a13", 0x20ba19, 0, 64 << 10, 512, ER_4K) }, > Thanks for the patch. Ive copied this hunk to LKML to see what they think (I got one reply but off list unfortunately) about synchronising with us. Id like to give it a few days to see what they say before we merge this. Ideally we have agreement between the two source trees, so we can continue the copy-paste based update strategy. Regards, Peter > /* Spansion -- single (large) sector size only, at least > * for the chips listed here (without boot sectors). > -- > 1.7.11.5 > >
07.06.2013 07:51, Peter Crosthwaite wrote: [] > Id like to give it a few days to see what they say before we merge > this. Ideally we have agreement between the two source trees, so we > can continue the copy-paste based update strategy. Do we have any agreement yet? :) Thanks, /mjt
10.06.2013 19:40, Michael Tokarev wrote: > 07.06.2013 07:51, Peter Crosthwaite wrote: > [] >> Id like to give it a few days to see what they say before we merge >> this. Ideally we have agreement between the two source trees, so we >> can continue the copy-paste based update strategy. > > Do we have any agreement yet? :) Ping^2 ? Should I apply the initial patch? Thanks, /mjt
Ping^3 ? 28.06.2013 14:37, Michael Tokarev wrote: > 10.06.2013 19:40, Michael Tokarev wrote: >> 07.06.2013 07:51, Peter Crosthwaite wrote: >> [] >>> Id like to give it a few days to see what they say before we merge >>> this. Ideally we have agreement between the two source trees, so we >>> can continue the copy-paste based update strategy. >> >> Do we have any agreement yet? :) > > Ping^2 ? > > Should I apply the initial patch? > > Thanks, > > /mjt >
Sorry about the delay, Ack. We arent getting the long term fix to this soon, so lets apply the patch. Regards, Peter On Wed, Jul 17, 2013 at 3:56 AM, Michael Tokarev <mjt@tls.msk.ru> wrote: > Ping^3 ? > > 28.06.2013 14:37, Michael Tokarev wrote: >> 10.06.2013 19:40, Michael Tokarev wrote: >>> 07.06.2013 07:51, Peter Crosthwaite wrote: >>> [] >>>> Id like to give it a few days to see what they say before we merge >>>> this. Ideally we have agreement between the two source trees, so we >>>> can continue the copy-paste based update strategy. >>> >>> Do we have any agreement yet? :) >> >> Ping^2 ? >> >> Should I apply the initial patch? >> >> Thanks, >> >> /mjt >> > >
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index a927a6b..8c3b7f0 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -123,10 +123,14 @@ static const FlashPartInfo known_devices[] = { { INFO("mx25l25655e", 0xc22619, 0, 64 << 10, 512, 0) }, /* Micron */ - { INFO("n25q032a", 0x20bb16, 0, 64 << 10, 64, ER_4K) }, - { INFO("n25q128a11", 0x20bb18, 0, 64 << 10, 256, 0) }, - { INFO("n25q128a13", 0x20ba18, 0, 64 << 10, 256, 0) }, - { INFO("n25q256a", 0x20ba19, 0, 64 << 10, 512, ER_4K) }, + { INFO("n25q032a11", 0x20bb16, 0, 64 << 10, 64, ER_4K) }, + { INFO("n25q032a13", 0x20ba16, 0, 64 << 10, 64, ER_4K) }, + { INFO("n25q064a11", 0x20bb17, 0, 64 << 10, 128, ER_4K) }, + { INFO("n25q064a13", 0x20ba17, 0, 64 << 10, 128, ER_4K) }, + { INFO("n25q128a11", 0x20bb18, 0, 64 << 10, 256, ER_4K) }, + { INFO("n25q128a13", 0x20ba18, 0, 64 << 10, 256, ER_4K) }, + { INFO("n25q256a11", 0x20bb19, 0, 64 << 10, 512, ER_4K) }, + { INFO("n25q256a13", 0x20ba19, 0, 64 << 10, 512, ER_4K) }, /* Spansion -- single (large) sector size only, at least * for the chips listed here (without boot sectors).
- Split 32Mb and 256Mb parts into a11 and a13 variants. - Add the 4K sector flag to the 128Mb parts. (These entries were taken from the Linux kernel list, which is missing the flag.) - Fill out the table of sizes with entries for 64Mb parts. Prodded by Peter Crosthwaite. Signed-off-by: Ed Maste <emaste@freebsd.org> --- hw/block/m25p80.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)