]> pilppa.org Git - familiar-h63xx-build.git/blob - org.handhelds.familiar/packages/linux/handhelds-pxa-2.6-2.6.13-hh2/h2200_pm.patch
OE tree imported from monotone branch org.openembedded.oz354fam083 at revision 8b12e3...
[familiar-h63xx-build.git] / org.handhelds.familiar / packages / linux / handhelds-pxa-2.6-2.6.13-hh2 / h2200_pm.patch
1 Index: kernel26/arch/arm/mach-pxa/h2200/h2200_pm.c
2 This patch makes the kernel try every 30 seconds to load the bootloader
3 firmware until successful. Also, it changes the bootloader filename that is
4 requested from hamcop_bootloader.bin to the more appropriate
5 h2200_bootloader.bin.
6
7 There isn't a 2.6.13-hh1 branch in hh.org CVS where we can commit this patch,
8 so we'll just apply it here.
9
10 ===================================================================
11 RCS file: /cvs/linux/kernel26/arch/arm/mach-pxa/h2200/h2200_pm.c,v
12 retrieving revision 1.13
13 diff -u -p -r1.13 h2200_pm.c
14 --- kernel26/arch/arm/mach-pxa/h2200/h2200_pm.c 29 Oct 2005 23:13:04 -0000      1.13
15 +++ kernel26/arch/arm/mach-pxa/h2200/h2200_pm.c 10 Feb 2006 00:11:20 -0000
16 @@ -148,9 +148,12 @@ static void h2200_load_bootloader(void *
17  {
18         const struct firmware *fw;
19  
20 -       if (request_firmware(&fw, "hamcop_bootloader.bin", &h2200_hamcop.dev))
21 -               printk(KERN_ERR "h2200_pm: request_firmware failed\n");
22 -       else {
23 +       if (request_firmware(&fw, "h2200_bootloader.bin", &h2200_hamcop.dev)) {
24 +               printk(KERN_ERR "h2200_pm: request_firmware failed; "
25 +                      "will try again in %d seconds\n",
26 +                      BOOTLOADER_LOAD_DELAY / HZ);
27 +               schedule_delayed_work(&fw_work, BOOTLOADER_LOAD_DELAY);
28 +       } else {
29                 printk("h2200_pm: bootloader loaded\n");
30                 memcpy(bootloader, fw->data, fw->size < HAMCOP_SRAM_Size ?
31                                                fw->size : HAMCOP_SRAM_Size);