diff options
Diffstat (limited to 'packages')
5 files changed, 123 insertions, 17 deletions
diff --git a/packages/gcc/gcc_csl-arm-20050416.bb b/packages/gcc/gcc_csl-arm-20050416.bb index c482861210..87ac9840ce 100644 --- a/packages/gcc/gcc_csl-arm-20050416.bb +++ b/packages/gcc/gcc_csl-arm-20050416.bb @@ -6,6 +6,6 @@ PR = "r3" CVSDATE = "20050416" OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" -DEFAULT_PREFERENCE_arm-linux = "1" +DEFAULT_PREFERENCE_arm-linux = "-1" DEFAULT_PREFERENCE_arm-linuxeabi = "1" diff --git a/packages/gcc/gcc_csl-arm-20050603.bb b/packages/gcc/gcc_csl-arm-20050603.bb index 2efa14186e..142a350a09 100644 --- a/packages/gcc/gcc_csl-arm-20050603.bb +++ b/packages/gcc/gcc_csl-arm-20050603.bb @@ -10,4 +10,4 @@ PR = "r0" CVSDATE = "20050603" OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" -DEFAULT_PREFERENCE_arm = "1" +DEFAULT_PREFERENCE_arm = "-1" diff --git a/packages/linux/linux-openzaurus_2.6.13-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-mm1.bb index 3a5284e069..a1d6305f37 100644 --- a/packages/linux/linux-openzaurus_2.6.13-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r3" +PR = "r4" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -46,24 +46,27 @@ BASRC = "http://www.orca.cx/zaurus/patches" # ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.13-rc5.bz2;patch=1 \ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13/2.6.13-mm1/2.6.13-mm1.bz2;patch=1 \ - ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \ + ${RPSRC}/pxa_pcmcia_init-r1.patch;patch=1 \ + ${RPSRC}/pxafb_hsync-r2.patch;patch=1 \ + ${RPSRC}/borzoi_machtype-r0.patch;patch=1 \ + ${RPSRC}/sharp_multi_pcmcia-r4.patch;patch=1 \ ${RPSRC}/ohci_portcount-r0.patch;patch=1 \ ${RPSRC}/pxa_ohci_power-r0.patch;patch=1 \ + ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \ ${RPSRC}/pxa_ohci_platform-r0.patch;patch=1 \ ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ - ${RPSRC}/pxa_pcmcia_init-r1.patch;patch=1 \ ${RPSRC}/pxa_remove_static-r0.patch;patch=1 \ - ${RPSRC}/pxafb_hsync-r2.patch;patch=1 \ - ${RPSRC}/borzoi_machtype-r0.patch;patch=1 \ - ${RPSRC}/sharp_multi_pcmcia-r3.patch;patch=1 \ ${RPSRC}/sharpsl_detection-r1.patch;patch=1 \ - ${RPSRC}/sharpsl_ssp-r0.patch;patch=1 \ + ${RPSRC}/sharpsl_ssp-r2.patch;patch=1 \ ${RPSRC}/sharpsl_lcd-r2.patch;patch=1 \ ${RPSRC}/sharpsl_ts-r3.patch;patch=1 \ ${RPSRC}/sharpsl_bl-r3.patch;patch=1 \ - ${RPSRC}/sharpsl_pm-r6.patch;patch=1 \ - ${RPSRC}/corgi_pm-r1.patch;patch=1 \ - ${RPSRC}/spitzkbd-r1.patch;patch=1 \ + ${RPSRC}/sharpsl_pm-r7.patch;patch=1 \ + ${RPSRC}/spitz_base-r15.patch;patch=1 \ + ${RPSRC}/spitz_base_extras-r1.patch;patch=1 \ + ${RPSRC}/corgi_pm-r2.patch;patch=1 \ + ${RPSRC}/spitz_pm-r2.patch;patch=1 \ + ${RPSRC}/spitzkbd-r2.patch;patch=1 \ ${RPSRC}/spitzcf-r2.patch;patch=1 \ ${RPSRC}/pxa_rtc-r1.patch;patch=1 \ ${RPSRC}/pxa_irda-r3.patch;patch=1 \ @@ -83,7 +86,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ ${DOSRC}/pxa2xx-ir-dma-r0.patch;patch=1 \ ${DOSRC}/tc6393-device-r4.patch;patch=1 \ ${DOSRC}/tc6393_nand-r6.patch;patch=1 \ - ${DOSRC}/tosa-machine-base-r6.patch;patch=1 \ + ${RPSRC}/temp/tosa-machine-base-r7.patch;patch=1 \ ${DOSRC}/tosa-keyboard-r6.patch;patch=1 \ ${DOSRC}/tc6393fb-r6.patch;patch=1 \ ${DOSRC}/tosa-power-r5.patch;patch=1 \ @@ -93,8 +96,6 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ ${DOSRC}/tosa-lcd-r3.patch;patch=1 \ ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \ ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \ - ${RPSRC}/spitz_base-r11.patch;patch=1 \ - ${RPSRC}/spitz_pm-r1.patch;patch=1 \ ${RPSRC}/scoop_susres-r0.patch;patch=1 \ ${RPSRC}/pcmcia_dev_ids-r1.patch;patch=1 \ ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ diff --git a/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/unb0rk-apm.patch b/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/unb0rk-apm.patch new file mode 100644 index 0000000000..6095ccb604 --- /dev/null +++ b/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/unb0rk-apm.patch @@ -0,0 +1,102 @@ +--- linux/arch/arm/mach-pxa/sharpsl_apm.c 2005-09-07 10:49:06.000000000 +0200 ++++ /home/hrw//devel/diffs/sharpsl_apm.c 2005-09-07 10:46:57.000000000 +0200 +@@ -1876,10 +1876,11 @@ + switch (event) { + case APM_SYS_STANDBY: + case APM_USER_STANDBY: +- if (send_event(event)) { +- queue_event(event, NULL); +- if (standbys_pending <= 0) ++ queue_event(event, NULL); ++ if (standbys_pending <= 0) { ++ if (send_event(event)) { + standby(); ++ } + } + break; + +@@ -1907,13 +1908,12 @@ + */ + if (waiting_for_resume) + return; +- if (send_event(event)) { +- queue_event(event, NULL); +- waiting_for_resume = 1; +- if (suspends_pending <= 0){ ++ queue_event(event, NULL); ++ waiting_for_resume = 1; ++ if (suspends_pending <= 0) ++ if (send_event(event)) { + (void) suspend(); + } +- } + break; + + case APM_NORMAL_RESUME: +@@ -2225,26 +2225,32 @@ + as->standbys_read--; + as->standbys_pending--; + standbys_pending--; +- } else if (!send_event(APM_USER_STANDBY)) +- return -EAGAIN; +- else ++ } else { + queue_event(APM_USER_STANDBY, as); +- if (standbys_pending <= 0) +- standby(); ++ } ++ if (standbys_pending <= 0) { ++ if (send_event(APM_USER_STANDBY)) { ++ standby(); ++ } else { ++ return -EAGAIN; ++ } ++ } + break; + case APM_IOC_SUSPEND: + if (as->suspends_read > 0) { + as->suspends_read--; + as->suspends_pending--; + suspends_pending--; +- } else if (!send_event(APM_USER_SUSPEND)) +- return -EAGAIN; +- else ++ } else { + queue_event(APM_USER_SUSPEND, as); ++ } + if (suspends_pending <= 0) { +- +- if (suspend() != APM_SUCCESS) +- return -EIO; ++ if (send_event(APM_USER_SUSPEND)) { ++ if (suspend() != APM_SUCCESS) ++ return -EIO; ++ } else { ++ return -EAGAIN; ++ } + } else { + as->suspend_wait = 1; + add_wait_queue(&apm_suspend_waitqueue, &wait); +@@ -2483,13 +2489,18 @@ + lock_kernel(); + if (as->standbys_pending > 0) { + standbys_pending -= as->standbys_pending; +- if (standbys_pending <= 0) +- standby(); ++ if (standbys_pending <= 0) { ++ if (send_event(APM_USER_STANDBY)) { ++ standby(); ++ } ++ } + } + if (as->suspends_pending > 0) { + suspends_pending -= as->suspends_pending; +- if (suspends_pending <= 0){ +- (void) suspend(); ++ if (suspends_pending <= 0) { ++ if (send_event(APM_USER_SUSPEND)) { ++ (void) suspend(); ++ } + } + } + if (user_list == as) diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc index 548d87c1a2..dfea2b527e 100644 --- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc +++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc @@ -1,13 +1,15 @@ DESCRIPTION = "Linux kernel for OpenZaurus PXA processor based devices." MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" SECTION = "kernel" -PV = "2.4.18-rmk7-pxa3-embedix" LICENSE = "GPL" +PV = "2.4.18-rmk7-pxa3-embedix" +PR = "r43" + KV = "2.4.18" RMKV = "7" PXAV = "3" SHARPV = "20031107" -PR = "r41" + FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-pxa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ @@ -49,6 +51,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ http://us1.samba.org/samba/ftp/cifs-cvs/cifs-1.20c-2.4.tar.gz \ file://fix_tosa_apm.patch;patch=1 \ file://dumb-hack-for-wlan-ng.patch;patch=1 \ + file://unb0rk-apm.patch;patch=1 \ file://defconfig-${MACHINE} " SRC_URI_append_poodle += " file://smallfonts.diff;patch=1" |