| Submitter | Steffen Sledz |
|---|---|
| Date | Feb. 18, 2011, 2:12 p.m. |
| Message ID | <1298038322-20481-1-git-send-email-sledz@dresearch.de> |
| Download | mbox | patch |
| Permalink | /patch/681/ |
| State | Accepted |
| Headers | show |
Comments
On 02/18/2011 07:12 AM, Steffen Sledz wrote: > From: Mario Schuknecht<m.schuknecht@dresearch.de> > > * AMIC flashes are AMD clones and need the same fixups. > > Signed-off-by: Mario Schuknecht<m.schuknecht@dresearch.de> > Signed-off-by: Steffen Sledz<sledz@dresearch.de> Acked-by: Tom Rini <tom_rini@mentor.com> > --- > recipes/u-boot/u-boot-2009.03/cfi-amic-fixup.patch | 11 +++++++++++ > recipes/u-boot/u-boot-2009.03/hipox/00-hipox.patch | 3 ++- > recipes/u-boot/u-boot_2009.03.bb | 7 +++++-- > 3 files changed, 18 insertions(+), 3 deletions(-) > create mode 100644 recipes/u-boot/u-boot-2009.03/cfi-amic-fixup.patch > > diff --git a/recipes/u-boot/u-boot-2009.03/cfi-amic-fixup.patch b/recipes/u-boot/u-boot-2009.03/cfi-amic-fixup.patch > new file mode 100644 > index 0000000..9d8c7ab > --- /dev/null > +++ b/recipes/u-boot/u-boot-2009.03/cfi-amic-fixup.patch > @@ -0,0 +1,11 @@ > +diff -Nurd u-boot-2009.03.orig//drivers/mtd/cfi_flash.c u-boot-2009.03/drivers/mtd/cfi_flash.c > +--- u-boot-2009.03.orig//drivers/mtd/cfi_flash.c 2011-02-18 14:11:24.870432001 +0100 > ++++ u-boot-2009.03/drivers/mtd/cfi_flash.c 2011-02-18 14:11:45.440432001 +0100 > +@@ -1883,6 +1883,7 @@ > + /* Do manufacturer-specific fixups */ > + switch (info->manufacturer_id) { > + case 0x0001: > ++ case 0x0037: // AMIC > + flash_fixup_amd(info,&qry); > + break; > + case 0x001f: > diff --git a/recipes/u-boot/u-boot-2009.03/hipox/00-hipox.patch b/recipes/u-boot/u-boot-2009.03/hipox/00-hipox.patch > index 5b91d28..20a47da 100644 > --- a/recipes/u-boot/u-boot-2009.03/hipox/00-hipox.patch > +++ b/recipes/u-boot/u-boot-2009.03/hipox/00-hipox.patch > @@ -6190,10 +6190,11 @@ diff -Nurd u-boot-2009.03.orig/cpu/arm926ejs/start.S u-boot-2009.03/cpu/arm926ej > diff -Nurd u-boot-2009.03.orig/drivers/mtd/cfi_flash.c u-boot-2009.03/drivers/mtd/cfi_flash.c > --- u-boot-2009.03.orig/drivers/mtd/cfi_flash.c 2009-04-15 11:05:24.000000000 +0200 > +++ u-boot-2009.03/drivers/mtd/cfi_flash.c 2009-04-15 11:08:18.000000000 +0200 > -@@ -1883,6 +1883,7 @@ > +@@ -1883,7 +1883,8 @@ > /* Do manufacturer-specific fixups */ > switch (info->manufacturer_id) { > case 0x0001: > + case 0x0037: // AMIC > + case 0x00da: // Winbond > flash_fixup_amd(info,&qry); > break; > diff --git a/recipes/u-boot/u-boot_2009.03.bb b/recipes/u-boot/u-boot_2009.03.bb > index 2cbded9..4b822f1 100644 > --- a/recipes/u-boot/u-boot_2009.03.bb > +++ b/recipes/u-boot/u-boot_2009.03.bb > @@ -6,9 +6,12 @@ DEFAULT_PREFERENCE_hipox = "1" > > DEPENDS_append_hipox = " oxnas-boot-tools oxnas-boot-tools-native " > > -SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 " > +SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \ > + file://cfi-amic-fixup.patch \ > +" > > -SRC_URI_append_hipox = "file://00-hipox.patch \ > +SRC_URI_append_hipox = " \ > + file://00-hipox.patch \ > file://01-hipox-fix-gmac-reset.patch \ > file://02-hipox-enable-mmu.patch \ > file://03-hipox-direct-switch.patch \
Patch
diff --git a/recipes/u-boot/u-boot-2009.03/cfi-amic-fixup.patch b/recipes/u-boot/u-boot-2009.03/cfi-amic-fixup.patch new file mode 100644 index 0000000..9d8c7ab --- /dev/null +++ b/recipes/u-boot/u-boot-2009.03/cfi-amic-fixup.patch @@ -0,0 +1,11 @@ +diff -Nurd u-boot-2009.03.orig//drivers/mtd/cfi_flash.c u-boot-2009.03/drivers/mtd/cfi_flash.c +--- u-boot-2009.03.orig//drivers/mtd/cfi_flash.c 2011-02-18 14:11:24.870432001 +0100 ++++ u-boot-2009.03/drivers/mtd/cfi_flash.c 2011-02-18 14:11:45.440432001 +0100 +@@ -1883,6 +1883,7 @@ + /* Do manufacturer-specific fixups */ + switch (info->manufacturer_id) { + case 0x0001: ++ case 0x0037: // AMIC + flash_fixup_amd(info, &qry); + break; + case 0x001f: diff --git a/recipes/u-boot/u-boot-2009.03/hipox/00-hipox.patch b/recipes/u-boot/u-boot-2009.03/hipox/00-hipox.patch index 5b91d28..20a47da 100644 --- a/recipes/u-boot/u-boot-2009.03/hipox/00-hipox.patch +++ b/recipes/u-boot/u-boot-2009.03/hipox/00-hipox.patch @@ -6190,10 +6190,11 @@ diff -Nurd u-boot-2009.03.orig/cpu/arm926ejs/start.S u-boot-2009.03/cpu/arm926ej diff -Nurd u-boot-2009.03.orig/drivers/mtd/cfi_flash.c u-boot-2009.03/drivers/mtd/cfi_flash.c --- u-boot-2009.03.orig/drivers/mtd/cfi_flash.c 2009-04-15 11:05:24.000000000 +0200 +++ u-boot-2009.03/drivers/mtd/cfi_flash.c 2009-04-15 11:08:18.000000000 +0200 -@@ -1883,6 +1883,7 @@ +@@ -1883,7 +1883,8 @@ /* Do manufacturer-specific fixups */ switch (info->manufacturer_id) { case 0x0001: + case 0x0037: // AMIC + case 0x00da: // Winbond flash_fixup_amd(info, &qry); break; diff --git a/recipes/u-boot/u-boot_2009.03.bb b/recipes/u-boot/u-boot_2009.03.bb index 2cbded9..4b822f1 100644 --- a/recipes/u-boot/u-boot_2009.03.bb +++ b/recipes/u-boot/u-boot_2009.03.bb @@ -6,9 +6,12 @@ DEFAULT_PREFERENCE_hipox = "1" DEPENDS_append_hipox = " oxnas-boot-tools oxnas-boot-tools-native " -SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 " +SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \ + file://cfi-amic-fixup.patch \ +" -SRC_URI_append_hipox = "file://00-hipox.patch \ +SRC_URI_append_hipox = " \ + file://00-hipox.patch \ file://01-hipox-fix-gmac-reset.patch \ file://02-hipox-enable-mmu.patch \ file://03-hipox-direct-switch.patch \