diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-10-17 09:03:49 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-10-17 09:03:49 +0000 |
| commit | 26ace33323aff802f7a11d91fe789eda80580131 (patch) | |
| tree | a591f1dd7f3e2a095017a39982b6cf729acc09b7 /meta/packages/linux | |
| parent | 81d6b0622b8316fd0949df9065dcad8460eb5786 (diff) | |
| download | openembedded-core-26ace33323aff802f7a11d91fe789eda80580131.tar.gz openembedded-core-26ace33323aff802f7a11d91fe789eda80580131.tar.bz2 openembedded-core-26ace33323aff802f7a11d91fe789eda80580131.zip | |
linux-rp: add no-SCR-check patch to 2.6.23
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2895 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/linux')
| -rw-r--r-- | meta/packages/linux/linux-rp-2.6.23/mmcsd_no_scr_check-r2.patch | 29 | ||||
| -rw-r--r-- | meta/packages/linux/linux-rp_2.6.23.bb | 3 |
2 files changed, 31 insertions, 1 deletions
diff --git a/meta/packages/linux/linux-rp-2.6.23/mmcsd_no_scr_check-r2.patch b/meta/packages/linux/linux-rp-2.6.23/mmcsd_no_scr_check-r2.patch new file mode 100644 index 0000000000..ac2245f088 --- /dev/null +++ b/meta/packages/linux/linux-rp-2.6.23/mmcsd_no_scr_check-r2.patch @@ -0,0 +1,29 @@ +--- + drivers/mmc/core/sd.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +Index: linux-2.6.23/drivers/mmc/core/sd.c +=================================================================== +--- linux-2.6.23.orig/drivers/mmc/core/sd.c 2007-10-17 11:33:26.000000000 +0200 ++++ linux-2.6.23/drivers/mmc/core/sd.c 2007-10-17 11:33:49.000000000 +0200 +@@ -173,14 +173,15 @@ + + scr_struct = UNSTUFF_BITS(resp, 60, 4); + if (scr_struct != 0) { +- printk(KERN_ERR "%s: unrecognised SCR structure version %d\n", ++ printk(KERN_WARNING "%s: unrecognised SCR structure version %d\n", + mmc_hostname(card->host), scr_struct); +- return -EINVAL; ++ scr->sda_vsn = 0; ++ scr->bus_widths = 0; ++ } else { ++ scr->sda_vsn = UNSTUFF_BITS(resp, 56, 4); ++ scr->bus_widths = UNSTUFF_BITS(resp, 48, 4); + } + +- scr->sda_vsn = UNSTUFF_BITS(resp, 56, 4); +- scr->bus_widths = UNSTUFF_BITS(resp, 48, 4); +- + return 0; + } + diff --git a/meta/packages/linux/linux-rp_2.6.23.bb b/meta/packages/linux/linux-rp_2.6.23.bb index e55bc63d65..6dd46e16cb 100644 --- a/meta/packages/linux/linux-rp_2.6.23.bb +++ b/meta/packages/linux/linux-rp_2.6.23.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r2" +PR = "r3" DEFAULT_PREFERENCE_qemuarm = "-1" DEFAULT_PREFERENCE_qemux86 = "-1" @@ -45,6 +45,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \ ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \ ${RPSRC}/mmcsd_large_cards-r1.patch;patch=1;status=hack \ + file://mmcsd_no_scr_check-r2.patch;patch=1 \ ${RPSRC}/integrator_rgb-r1.patch;patch=1;status=hack \ ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \ file://pxa-serial-hack.patch;patch=1;status=hack \ |