From 18628c966d73e03d0bcf85e310df8a4c8c33afd3 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 15 Sep 2007 01:48:22 +0000 Subject: task-openmoko[-feed]: add some packages, move some others around --- packages/tasks/task-openmoko-feed.bb | 4 ++++ packages/tasks/task-openmoko.bb | 25 +++++++++++++------------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb index bc4a4ff967..f11f322e39 100644 --- a/packages/tasks/task-openmoko-feed.bb +++ b/packages/tasks/task-openmoko-feed.bb @@ -24,9 +24,13 @@ RDEPENDS_task-openmoko-feed = "\ openssh openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc \ python python-pygtk python-pyserial \ ruby \ + libsdl-x11 libsdl-mixer libsdl-net libsdl-ttf \ synergy \ tzdata \ + timezones \ tor \ vnc \ + wxwidgets \ + x11vnc \ " diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index 4c605dc11d..cc9b67f8d7 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -2,7 +2,7 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution" SECTION = "openmoko/base" LICENSE = "MIT" PROVIDES = "task-openmoko-everything" -PR = "r62" +PR = "r65" inherit task @@ -52,25 +52,26 @@ RDEPENDS_task-openmoko-ui = "\ pango-module-basic-x \ pango-module-basic-fc \ gtk+ \ - libgtkstylus \ - libgtkinput \ matchbox-common \ matchbox-wm \ xserver-kdrive-fbdev \ xserver-kdrive-common \ xserver-nodm-init \ -# x11-c-locale \ ttf-bitstream-vera \ xauth \ xhost \ xset \ xrandr \ + \ settings-daemon \ + notification-daemon \ + neod \ + libnotify \ \ openmoko-session2 \ openmoko-sound-system \ openmoko-sound-theme-standard \ - neod \ + \ gpe-scap \ " @@ -91,24 +92,24 @@ RDEPENDS_task-openmoko-ui += "${THEMES}" # # task-openmoko-base # -DESCRIPTION_task-openmoko-base = "OpenMoko: Main-Menu Launcher, Top Panel, and Footer" +DESCRIPTION_task-openmoko-base = "OpenMoko: Top Panel, Application Launcher, Application Manager" RDEPENDS_task-openmoko-base = "\ matchbox-panel-2 \ matchbox-panel-2-applets \ - matchbox-applet-inputmanager \ -# openmoko-appmanager \ matchbox-keyboard-inputmethod \ matchbox-keyboard-im \ matchbox-keyboard-applet \ matchbox-stroke \ openmoko-terminal2 \ - openmoko-keyboard \ -# openmoko-panel-mainmenu \ +# openmoko-keyboard \ openmoko-panel-battery \ openmoko-panel-bt \ openmoko-panel-clock \ openmoko-panel-usb \ openmoko-panel-gps \ + \ + openmoko-today2 \ +# openmoko-appmanager \ " # @@ -126,7 +127,7 @@ RDEPENDS_task-openmoko-phone = "\ # # task-openmoko-pim # -DESCRIPTION_task-openmoko-pim = "OpenMoko: PIM Applications" +DESCRIPTION_task-openmoko-pim = "OpenMoko: Personal Information Management Suite" RDEPENDS_task-openmoko-pim = "\ eds-dbus \ openmoko-calculator2 \ @@ -134,7 +135,7 @@ RDEPENDS_task-openmoko-pim = "\ openmoko-dates2 \ openmoko-feedreader2 \ openmoko-tasks2 \ - openmoko-today2 \ + openmoko-mediaplayer2 \ # openmoko-messages \ " -- cgit v1.2.3 From 896bd1e5e0478426148ab1aef0c13017f3df8fbf Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 15 Sep 2007 01:51:26 +0000 Subject: openmoko-session: remove libgtkstylus. We will handle right clicks differently --- packages/openmoko2/openmoko-session2.bb | 4 ++-- packages/openmoko2/openmoko-session2/etc/matchbox/session | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index de2d7cdff6..235ca6ad97 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -1,10 +1,10 @@ -DESCRIPTION = "Custom MB session files for OpenMoko" +DESCRIPTION = "Custom Matchbox session files for OpenMoko" LICENSE = "GPL" SECTION = "x11" RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2" RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2" RCONFLICTS = "openmoko-session" -PR = "r31" +PR = "r32" SRC_URI = "file://etc" S = ${WORKDIR} diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session index 4f2f8ae110..558f55ee87 100755 --- a/packages/openmoko2/openmoko-session2/etc/matchbox/session +++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session @@ -1,8 +1,6 @@ #!/bin/sh SHOWCURSOR="no" -export GTK_MODULES="libgtkstylus.so" - openmoko-today & openmoko-dialer & -- cgit v1.2.3 From cd9042bca2dcd29cd7004f9898c5a4361cccac18 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 15 Sep 2007 15:20:05 +0000 Subject: linux-ezx: add 18bpp support to pxafb and enable it for a1200, rokre6 owners will have to make a small change to arch/arm/mach-pxa/ezx-e6.c --- .../patches/lcd_18BPP_support.diff | 270 +++++++++++++++++++++ packages/linux/linux-ezx_2.6.21.bb | 3 +- 2 files changed, 272 insertions(+), 1 deletion(-) create mode 100644 packages/linux/linux-ezx-2.6.21/patches/lcd_18BPP_support.diff diff --git a/packages/linux/linux-ezx-2.6.21/patches/lcd_18BPP_support.diff b/packages/linux/linux-ezx-2.6.21/patches/lcd_18BPP_support.diff new file mode 100644 index 0000000000..a0d89bfee5 --- /dev/null +++ b/packages/linux/linux-ezx-2.6.21/patches/lcd_18BPP_support.diff @@ -0,0 +1,270 @@ +Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c +=================================================================== +--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-a1200.c 2007-08-18 18:35:12.000000000 +0800 ++++ linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c 2007-08-18 18:36:38.000000000 +0800 +@@ -122,7 +122,7 @@ + .pixclock = 192308, + .xres = 240, + .yres = 320, +- .bpp = 8, ++ .bpp = 18, + .hsync_len = 10, + .left_margin = 20, + .right_margin = 10, +@@ -135,8 +135,8 @@ + static struct pxafb_mach_info a1200_fb_info = { + .modes = &mode_a1200, + .num_modes = 1, +- .lccr0 = 0x022008B8, +- .lccr3 = 0xC130FF13, ++ .lccr0 = 0x002008b8, ++ .lccr3 = 0xC630FF13, + .pxafb_backlight_power = ezx_backlight_power, + .pxafb_lcd_power = &ezx_lcd_power, + }; +Index: linux-2.6.21/drivers/video/cfbfillrect.c +=================================================================== +--- linux-2.6.21.orig/drivers/video/cfbfillrect.c 2007-08-18 18:38:36.000000000 +0800 ++++ linux-2.6.21/drivers/video/cfbfillrect.c 2007-08-18 18:39:03.000000000 +0800 +@@ -87,7 +87,10 @@ + return 0x00001001ul*pixel; + case 16: + return 0x00010001ul*pixel; ++ case 18: ++ case 19: + case 24: ++ case 25: + return 0x00000001ul*pixel; + case 32: + return 0x00000001ul*pixel; +Index: linux-2.6.21/drivers/video/pxafb.c +=================================================================== +--- linux-2.6.21.orig/drivers/video/pxafb.c 2007-08-18 17:58:11.000000000 +0800 ++++ linux-2.6.21/drivers/video/pxafb.c 2007-08-18 18:46:50.000000000 +0800 +@@ -9,6 +9,8 @@ + * which in turn is + * Based on acornfb.c Copyright (C) Russell King. + * ++ * Added 18,19,24,25 BPP support by Alex Zhang ++ * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of this archive for + * more details. +@@ -190,6 +192,10 @@ + case 4: ret = LCCR3_4BPP; break; + case 8: ret = LCCR3_8BPP; break; + case 16: ret = LCCR3_16BPP; break; ++ case 18: ret = LCCR3_18BPP; break; ++ case 19: ret = LCCR3_19BPP; break; ++ case 24: ret = LCCR3_24BPP; break; ++ case 25: ret = LCCR3_25BPP; break; + } + return ret; + } +@@ -274,6 +280,8 @@ + if (var->yres < MIN_YRES) + var->yres = MIN_YRES; + ++ if (var->bits_per_pixel == 32) var->bits_per_pixel = 18; // ALEX cheats Xserver ++ + if (inf->fixed_modes) { + struct pxafb_mode_info *mode; + +@@ -306,6 +314,26 @@ + var->green.offset = 5; var->green.length = 6; + var->blue.offset = 0; var->blue.length = 5; + var->transp.offset = var->transp.length = 0; ++ } else if (var->bits_per_pixel == 18) { ++ var->red.offset = 12; var->red.length = 6; ++ var->green.offset = 6; var->green.length = 6; ++ var->blue.offset = 0; var->blue.length = 6; ++ var->transp.offset = var->transp.length = 0; ++ } else if (var->bits_per_pixel == 19) { ++ var->red.offset = 12; var->red.length = 6; ++ var->green.offset = 6; var->green.length = 6; ++ var->blue.offset = 0; var->blue.length = 6; ++ var->transp.offset= 18; var->transp.length = 1; ++ } else if (var->bits_per_pixel == 24) { ++ var->red.offset = 16; var->red.length = 8; ++ var->green.offset = 8; var->green.length = 8; ++ var->blue.offset = 0; var->blue.length = 8; ++ var->transp.offset = var->transp.length = 0; ++ } else if (var->bits_per_pixel == 25) { ++ var->red.offset = 16; var->red.length = 8; ++ var->green.offset = 8; var->green.length = 8; ++ var->blue.offset = 0; var->blue.length = 8; ++ var->transp.offset= 24; var->transp.length = 1; + } else { + var->red.offset = var->green.offset = var->blue.offset = var->transp.offset = 0; + var->red.length = 8; +@@ -341,7 +369,12 @@ + + pr_debug("pxafb: set_par\n"); + +- if (var->bits_per_pixel == 16) ++ if (var->bits_per_pixel == 16 ++ || var->bits_per_pixel == 18 ++ || var->bits_per_pixel == 19 ++ || var->bits_per_pixel == 24 ++ || var->bits_per_pixel == 25 ++ ) + fbi->fb.fix.visual = FB_VISUAL_TRUECOLOR; + else if (!fbi->cmap_static) + fbi->fb.fix.visual = FB_VISUAL_PSEUDOCOLOR; +@@ -354,12 +387,25 @@ + fbi->fb.fix.visual = FB_VISUAL_STATIC_PSEUDOCOLOR; + } + +- fbi->fb.fix.line_length = var->xres_virtual * +- var->bits_per_pixel / 8; +- if (var->bits_per_pixel == 16) +- fbi->palette_size = 0; +- else +- fbi->palette_size = var->bits_per_pixel == 1 ? 4 : 1 << var->bits_per_pixel; ++ switch (var->bits_per_pixel) { ++ case 16: ++ fbi->fb.fix.line_length = var->xres_virtual * 2; ++ fbi->palette_size = 0; ++ break; ++ case 18: ++ case 19: ++ fbi->fb.fix.line_length = var->xres_virtual * 3; ++ fbi->palette_size = 0; ++ break; ++ case 24: ++ case 25: ++ fbi->fb.fix.line_length = var->xres_virtual * 4; ++ fbi->palette_size = 0; ++ break; ++ default: ++ fbi->fb.fix.line_length = var->xres_virtual * var->bits_per_pixel / 8; ++ fbi->palette_size = var->bits_per_pixel == 1 ? 4 : 1 << var->bits_per_pixel; ++ } + + palette_mem_size = fbi->palette_size * sizeof(u16); + +@@ -373,8 +419,13 @@ + */ + pxafb_set_truecolor(fbi->fb.fix.visual == FB_VISUAL_TRUECOLOR); + +- if (fbi->fb.var.bits_per_pixel == 16) +- fb_dealloc_cmap(&fbi->fb.cmap); ++ if (fbi->fb.var.bits_per_pixel == 16 ++ || fbi->fb.var.bits_per_pixel == 18 ++ || fbi->fb.var.bits_per_pixel == 19 ++ || fbi->fb.var.bits_per_pixel == 24 ++ || fbi->fb.var.bits_per_pixel == 25 ++ ) ++ fb_dealloc_cmap(&fbi->fb.cmap); + else + fb_alloc_cmap(&fbi->fb.cmap, 1<fb.var.bits_per_pixel, 0); + +@@ -582,6 +633,9 @@ + case 4: + case 8: + case 16: ++ case 18: ++ case 24: ++ case 25: + break; + default: + printk(KERN_ERR "%s: invalid bit depth %d\n", +@@ -678,7 +732,12 @@ + fbi->dmadesc_palette_cpu->fidr = 0; + fbi->dmadesc_palette_cpu->ldcmd = (fbi->palette_size * 2) | LDCMD_PAL; + +- if (var->bits_per_pixel == 16) { ++ if (var->bits_per_pixel == 16 ++ || var->bits_per_pixel == 18 ++ || var->bits_per_pixel == 19 ++ || var->bits_per_pixel == 24 ++ || var->bits_per_pixel == 25 ++ ) { + /* palette shouldn't be loaded in true-color mode */ + fbi->dmadesc_fbhigh_cpu->fdadr = fbi->dmadesc_fbhigh_dma; + fbi->fdadr0 = fbi->dmadesc_fbhigh_dma; /* no pal just fbhigh */ +@@ -786,6 +845,11 @@ + + for (gpio = 58; ldd_bits; gpio++, ldd_bits--) + pxa_gpio_mode(gpio | GPIO_ALT_FN_2_OUT); ++ if (fbi->fb.var.bits_per_pixel == 18) { ++ pxa_gpio_mode(GPIO86_LDD_16_MD); ++ pxa_gpio_mode(GPIO87_LDD_17_MD); ++ } ++ + pxa_gpio_mode(GPIO74_LCD_FCLK_MD); + pxa_gpio_mode(GPIO75_LCD_LCLK_MD); + pxa_gpio_mode(GPIO76_LCD_PCLK_MD); +@@ -1154,9 +1218,17 @@ + fbi->task_state = (u_char)-1; + + for (i = 0; i < inf->num_modes; i++) { +- smemlen = mode[i].xres * mode[i].yres * mode[i].bpp / 8; ++ if (mode[i].bpp <= 16) /* 8, 16 bpp */ ++ smemlen = mode[i].xres * mode[i].yres * mode[i].bpp / 8; ++ else if (mode[i].bpp > 19) /* 24, 25 bpp */ ++ smemlen = mode[i].xres * mode[i].yres * 4; ++ else /* 18, 19 bpp */ ++ /* packed format */ ++ smemlen = mode[i].xres * mode[i].yres * 3; ++ + if (smemlen > fbi->fb.fix.smem_len) + fbi->fb.fix.smem_len = smemlen; ++ dev_dbg("ALEX::bpp=%d, smemlen=%d, fbi->fb.fix.smem_len=%d\n", mode[i].bpp, smemlen, fbi->fb.fix.smem_len); + } + + init_waitqueue_head(&fbi->ctrlr_wait); +@@ -1225,6 +1297,10 @@ + case 4: + case 8: + case 16: ++ case 18: ++ case 19: ++ case 24: ++ case 25: + inf->modes[0].bpp = bpp; + dev_info(dev, "overriding bit depth: %d\n", bpp); + break; +@@ -1423,6 +1499,9 @@ + */ + set_ctrlr_state(fbi, C_ENABLE); + ++ LCCR4 |= (1 << 31); ++ LCCR4 |= (5 << 17); ++ + return 0; + + failed: +Index: linux-2.6.21/include/asm-arm/arch-pxa/pxa-regs.h +=================================================================== +--- linux-2.6.21.orig/include/asm-arm/arch-pxa/pxa-regs.h 2007-08-18 18:26:01.000000000 +0800 ++++ linux-2.6.21/include/asm-arm/arch-pxa/pxa-regs.h 2007-08-18 18:32:29.000000000 +0800 +@@ -1485,6 +1485,8 @@ + #define GPIO84_NSSP_TX (84 | GPIO_ALT_FN_1_OUT) + #define GPIO84_NSSP_RX (84 | GPIO_ALT_FN_2_IN) + #define GPIO85_nPCE_1_MD (85 | GPIO_ALT_FN_1_OUT) ++#define GPIO86_LDD_16_MD (86 | GPIO_ALT_FN_2_OUT) ++#define GPIO87_LDD_17_MD (87 | GPIO_ALT_FN_2_OUT) + #define GPIO88_SRXD2_MD (88 | GPIO_ALT_FN_2_IN) + #define GPIO89_SRXD3_MD (89 | GPIO_ALT_FN_1_IN) + #define GPIO90_USB_P3_5 (90 | GPIO_ALT_FN_2_IN) +@@ -1869,6 +1871,7 @@ + #define LCCR1 __REG(0x44000004) /* LCD Controller Control Register 1 */ + #define LCCR2 __REG(0x44000008) /* LCD Controller Control Register 2 */ + #define LCCR3 __REG(0x4400000C) /* LCD Controller Control Register 3 */ ++#define LCCR4 __REG(0x44000010) /* LCD Controller Control Register 4 */ + #define DFBR0 __REG(0x44000020) /* DMA Channel 0 Frame Branch Register */ + #define DFBR1 __REG(0x44000024) /* DMA Channel 1 Frame Branch Register */ + #define LCSR __REG(0x44000038) /* LCD Controller Status Register */ +@@ -1881,6 +1884,11 @@ + #define LCCR3_4BPP (2 << 24) + #define LCCR3_8BPP (3 << 24) + #define LCCR3_16BPP (4 << 24) ++#define LCCR3_18BPP_UNPACKED (5 << 24) ++#define LCCR3_18BPP (6 << 24) ++#define LCCR3_19BPP (8 << 24) ++#define LCCR3_24BPP (9 << 24) ++#define LCCR3_25BPP (10<< 24) + + #define FDADR0 __REG(0x44000200) /* DMA Channel 0 Frame Descriptor Address Register */ + #define FSADR0 __REG(0x44000204) /* DMA Channel 0 Frame Source Address Register */ diff --git a/packages/linux/linux-ezx_2.6.21.bb b/packages/linux/linux-ezx_2.6.21.bb index 366c71fccd..99cf0e5d37 100644 --- a/packages/linux/linux-ezx_2.6.21.bb +++ b/packages/linux/linux-ezx_2.6.21.bb @@ -4,7 +4,7 @@ AUTHOR = "Harald Welte and the OpenEZX Team " HOMEPAGE = "http://www.openezx.org" LICENSE = "GPL" EZX = "ezxdev" -PR = "${EZX}-r12" +PR = "${EZX}-r13" inherit kernel @@ -63,6 +63,7 @@ SRC_URI = " \ file://patches/asoc-fix-loopback.patch;patch=1 \ file://patches/ezx-asoc.patch;patch=1 \ file://patches/mtdfix.patch;patch=1 \ + file://patches/lcd_18BPP_support.diff;patch=1 \ file://defconfig \ \ " -- cgit v1.2.3 From f770535aa4bb15e760591249587a67d44f1cf7c3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 15 Sep 2007 16:35:02 +0000 Subject: linux-ezx: fix a1200 and rokre6 defconfig, should fix #3009 --- packages/linux/linux-ezx-2.6.21/a1200/defconfig | 14 ++++++++------ packages/linux/linux-ezx-2.6.21/rokre6/defconfig | 14 ++++++++------ packages/linux/linux-ezx_2.6.21.bb | 2 +- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/packages/linux/linux-ezx-2.6.21/a1200/defconfig b/packages/linux/linux-ezx-2.6.21/a1200/defconfig index ea7475ced2..3e8cba081b 100755 --- a/packages/linux/linux-ezx-2.6.21/a1200/defconfig +++ b/packages/linux/linux-ezx-2.6.21/a1200/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21.4 -# Sun Sep 9 16:54:53 2007 +# Sat Sep 15 18:27:06 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -590,9 +590,11 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 # CONFIG_MTD_ARM_INTEGRATOR is not set # CONFIG_MTD_SHARP_SL is not set CONFIG_MTD_EZX=y -CONFIG_MTD_EZX_A780=y +# CONFIG_MTD_EZX_A780 is not set # CONFIG_MTD_EZX_A780_ALTERNATE is not set +CONFIG_MTD_EZX_A1200=y # CONFIG_MTD_EZX_E2 is not set +# CONFIG_MTD_EZX_E6 is not set # CONFIG_MTD_PLATRAM is not set # @@ -851,8 +853,8 @@ CONFIG_TS0710_MUX_USB=y # # I2C support # -CONFIG_I2C=m -CONFIG_I2C_CHARDEV=m +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y # # I2C Algorithms @@ -864,8 +866,8 @@ CONFIG_I2C_CHARDEV=m # # I2C Hardware Bus support # -CONFIG_I2C_PXA=m -# CONFIG_I2C_PXA_SLAVE is not set +CONFIG_I2C_PXA=y +CONFIG_I2C_PXA_SLAVE=y # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_STUB is not set diff --git a/packages/linux/linux-ezx-2.6.21/rokre6/defconfig b/packages/linux/linux-ezx-2.6.21/rokre6/defconfig index 95a5a25297..10c1207f1e 100755 --- a/packages/linux/linux-ezx-2.6.21/rokre6/defconfig +++ b/packages/linux/linux-ezx-2.6.21/rokre6/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21.4 -# Sun Sep 9 16:52:39 2007 +# Sat Sep 15 18:27:06 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -590,9 +590,11 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 # CONFIG_MTD_ARM_INTEGRATOR is not set # CONFIG_MTD_SHARP_SL is not set CONFIG_MTD_EZX=y -CONFIG_MTD_EZX_A780=y +# CONFIG_MTD_EZX_A780 is not set # CONFIG_MTD_EZX_A780_ALTERNATE is not set +# CONFIG_MTD_EZX_A1200 is not set # CONFIG_MTD_EZX_E2 is not set +CONFIG_MTD_EZX_E6=y # CONFIG_MTD_PLATRAM is not set # @@ -851,8 +853,8 @@ CONFIG_TS0710_MUX_USB=y # # I2C support # -CONFIG_I2C=m -CONFIG_I2C_CHARDEV=m +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y # # I2C Algorithms @@ -864,8 +866,8 @@ CONFIG_I2C_CHARDEV=m # # I2C Hardware Bus support # -CONFIG_I2C_PXA=m -# CONFIG_I2C_PXA_SLAVE is not set +CONFIG_I2C_PXA=y +CONFIG_I2C_PXA_SLAVE=y # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_STUB is not set diff --git a/packages/linux/linux-ezx_2.6.21.bb b/packages/linux/linux-ezx_2.6.21.bb index 99cf0e5d37..7a2d3a47dd 100644 --- a/packages/linux/linux-ezx_2.6.21.bb +++ b/packages/linux/linux-ezx_2.6.21.bb @@ -4,7 +4,7 @@ AUTHOR = "Harald Welte and the OpenEZX Team " HOMEPAGE = "http://www.openezx.org" LICENSE = "GPL" EZX = "ezxdev" -PR = "${EZX}-r13" +PR = "${EZX}-r14" inherit kernel -- cgit v1.2.3 From e17d2f225ed63c45ba56e83a88c19c06c5c722d7 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 15 Sep 2007 17:06:12 +0000 Subject: linux.inc: add sizecheck, add convenient support for root-nfs-over-usb --- packages/linux/linux.inc | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index a25dc44083..4fef1f98ef 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -18,7 +18,7 @@ DEPENDS_append_fic-gta01 = " u-boot-mkimage-openmoko-native " DEPENDS_append_fic-gta02 = " u-boot-mkimage-openmoko-native " -# Specify the commandline for you device +# Specify the commandline for your device #boot from mmc CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=/dev/mmcblk0p1 rootfstype=ext2 rootdelay=5" @@ -28,12 +28,18 @@ CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=/dev/mmcblk0p1 rootfs do_configure_prepend() { echo "" > ${S}/.config + # + # logo support, if you supply logo_linux_clut224.ppm in SRC_URI, then it's going to be used + # if [ -e ${WORKDIR}/logo_linux_clut224.ppm ]; then install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm echo "CONFIG_LOGO=y" >> ${S}/.config echo "CONFIG_LOGO_LINUX_CLUT224=y" >> ${S}/.config fi + # + # oabi / eabi support + # if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config @@ -51,9 +57,36 @@ do_configure_prepend() { -e '/CONFIG_LOGO_LINUX_CLUT224=/d' \ < '${WORKDIR}/defconfig' >>'${S}/.config' + # + # root-over-nfs-over-usbgadget support. Limited, but should cover some cases. + # Note that you need to have a proper CMDLINE_NFSROOT_USB set for this to work. + # + if [ ! -z "${CMDLINE_NFSROOT_USB}" ]; then + oenote "Configuring the kernel for root-over-nfs-over-usbgadget with CMDLINE ${CMDLINE_NFSROOT_USB}" + echo "CONFIG_INET=y" >> ${S}/.config + echo "CONFIG_IP_PNP=y" >> ${S}/.config + echo "CONFIG_USB_GADGET=y" >> ${S}/.config + echo "CONFIG_USB_ETH=y" >> ${S}/.config + echo "CONFIG_NFS_FS=y" >> ${S}/.config + echo "CONFIG_ROOT_NFS=y" >> ${S}/.config + echo "CONFIG_CMDLINE=\"${CMDLINE_NFSROOT_USB}\"" >> ${S}/.config + fi + yes '' | oe_runmake oldconfig } +# Support checking the kernel size since some kernels need to reside in partitions +# with a fixed length or there is a limit in transferring the kernel to memory +do_sizecheck() { + if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then + size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'` + if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then + rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE} + die "This kernel (size=$size) is too big for your device. Please reduce the size of the kernel by making more of it modular." + fi + fi +} + do_install_prepend() { if test -e arch/${ARCH}/boot/Image ; then ln -f arch/${ARCH}/boot/Image arch/${ARCH}/boot/uImage @@ -90,5 +123,6 @@ do_deploy() { do_deploy[dirs] = "${S}" +addtask sizecheck before do_install after do_compile addtask deploy before do_package after do_install -- cgit v1.2.3 From bec9c12894f1f95a367d6b84163653b02081c537 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 15 Sep 2007 17:07:59 +0000 Subject: linux-ezx 2.6.21: fix formatting (please STOP mixing tabs and spaces), catch up with linux.inc improvements --- packages/linux/linux-ezx_2.6.21.bb | 145 +++++++++++++++++-------------------- 1 file changed, 65 insertions(+), 80 deletions(-) diff --git a/packages/linux/linux-ezx_2.6.21.bb b/packages/linux/linux-ezx_2.6.21.bb index 366c71fccd..edca1ed1c9 100644 --- a/packages/linux/linux-ezx_2.6.21.bb +++ b/packages/linux/linux-ezx_2.6.21.bb @@ -1,75 +1,69 @@ DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and E680" -SECTION = "kernel" -AUTHOR = "Harald Welte and the OpenEZX Team " +AUTHOR = "The OpenEZX Team " HOMEPAGE = "http://www.openezx.org" -LICENSE = "GPL" EZX = "ezxdev" -PR = "${EZX}-r12" - -inherit kernel +PR = "${EZX}-r13" require linux.inc SRC_URI = " \ - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ - file://logo_linux_clut224.ppm \ - \ - file://patches/patch-2.6.21.4;patch=1 \ - file://patches/ezx-core.patch;patch=1 \ - file://patches/ezx-bp.patch;patch=1 \ - file://patches/ezx-pm.patch;patch=1 \ - file://patches/ezx-pcap.patch;patch=1 \ - file://patches/a780-pcap.patch;patch=1 \ - file://patches/e680-pcap.patch;patch=1 \ - file://patches/a1200-pcap.patch;patch=1 \ - file://patches/e6-pcap.patch;patch=1 \ - file://patches/a780-mci.patch;patch=1 \ - file://patches/e680-mci.patch;patch=1 \ - file://patches/a1200-mci.patch;patch=1 \ - file://patches/e6-mci.patch;patch=1 \ - file://patches/pxa27x-udc-support.2.patch;patch=1 \ - file://patches/ezx-emu.patch;patch=1 \ - file://patches/a780-emu.patch;patch=1 \ - file://patches/e680-emu.patch;patch=1 \ - file://patches/ezx-mtd-map.patch;patch=1 \ - file://patches/ezx-serial-bug-workaround.patch;patch=1 \ - file://patches/pxa-kbd.patch;patch=1 \ - file://patches/a780-kbd.patch;patch=1 \ - file://patches/e680-kbd.patch;patch=1 \ - file://patches/pcap-ts.patch;patch=1 \ - file://patches/a780-ts.patch;patch=1 \ - file://patches/e680-ts.patch;patch=1 \ - file://patches/a1200-ts.patch;patch=1 \ - file://patches/e6-ts.patch;patch=1 \ - file://patches/ezx-eoc.patch;patch=1 \ - file://patches/a1200-eoc.patch;patch=1 \ - file://patches/e6-eoc.patch;patch=1 \ - file://patches/ezx-backlight.patch;patch=1 \ - file://patches/a780-flip.patch;patch=1 \ - file://patches/e680-locksw.patch;patch=1 \ - file://patches/a780-leds.patch;patch=1 \ - file://patches/e680-leds.patch;patch=1 \ - file://patches/a780-vibrator.patch;patch=1 \ - file://patches/mux_cli.patch;patch=1 \ - file://patches/mux-fix.patch;patch=1 \ - file://patches/mux-fix-init-errorpath.patch;patch=1 \ - file://patches/mux-remove-flipbuffers.patch;patch=1 \ - file://patches/mux-remove-get_halted_bit.patch;patch=1 \ - file://patches/mux-remove-usbh_finished_resume.patch;patch=1 \ - file://patches/mux-fix-makefile.patch;patch=1 \ - file://patches/mux-fix-tty-driver.patch;patch=1 \ - file://patches/mux-linux-2.6.21-fix.patch;patch=1 \ - file://patches/asoc-pxa-ssp.patch;patch=1 \ - file://patches/asoc-fix-loopback.patch;patch=1 \ - file://patches/ezx-asoc.patch;patch=1 \ - file://patches/mtdfix.patch;patch=1 \ - file://defconfig \ - \ - " + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ + file://logo_linux_clut224.ppm \ + \ + file://patches/patch-2.6.21.4;patch=1 \ + file://patches/ezx-core.patch;patch=1 \ + file://patches/ezx-bp.patch;patch=1 \ + file://patches/ezx-pm.patch;patch=1 \ + file://patches/ezx-pcap.patch;patch=1 \ + file://patches/a780-pcap.patch;patch=1 \ + file://patches/e680-pcap.patch;patch=1 \ + file://patches/a1200-pcap.patch;patch=1 \ + file://patches/e6-pcap.patch;patch=1 \ + file://patches/a780-mci.patch;patch=1 \ + file://patches/e680-mci.patch;patch=1 \ + file://patches/a1200-mci.patch;patch=1 \ + file://patches/e6-mci.patch;patch=1 \ + file://patches/pxa27x-udc-support.2.patch;patch=1 \ + file://patches/ezx-emu.patch;patch=1 \ + file://patches/a780-emu.patch;patch=1 \ + file://patches/e680-emu.patch;patch=1 \ + file://patches/ezx-mtd-map.patch;patch=1 \ + file://patches/ezx-serial-bug-workaround.patch;patch=1 \ + file://patches/pxa-kbd.patch;patch=1 \ + file://patches/a780-kbd.patch;patch=1 \ + file://patches/e680-kbd.patch;patch=1 \ + file://patches/pcap-ts.patch;patch=1 \ + file://patches/a780-ts.patch;patch=1 \ + file://patches/e680-ts.patch;patch=1 \ + file://patches/a1200-ts.patch;patch=1 \ + file://patches/e6-ts.patch;patch=1 \ + file://patches/ezx-eoc.patch;patch=1 \ + file://patches/a1200-eoc.patch;patch=1 \ + file://patches/e6-eoc.patch;patch=1 \ + file://patches/ezx-backlight.patch;patch=1 \ + file://patches/a780-flip.patch;patch=1 \ + file://patches/e680-locksw.patch;patch=1 \ + file://patches/a780-leds.patch;patch=1 \ + file://patches/e680-leds.patch;patch=1 \ + file://patches/a780-vibrator.patch;patch=1 \ + file://patches/mux_cli.patch;patch=1 \ + file://patches/mux-fix.patch;patch=1 \ + file://patches/mux-fix-init-errorpath.patch;patch=1 \ + file://patches/mux-remove-flipbuffers.patch;patch=1 \ + file://patches/mux-remove-get_halted_bit.patch;patch=1 \ + file://patches/mux-remove-usbh_finished_resume.patch;patch=1 \ + file://patches/mux-fix-makefile.patch;patch=1 \ + file://patches/mux-fix-tty-driver.patch;patch=1 \ + file://patches/mux-linux-2.6.21-fix.patch;patch=1 \ + file://patches/asoc-pxa-ssp.patch;patch=1 \ + file://patches/asoc-fix-loopback.patch;patch=1 \ + file://patches/ezx-asoc.patch;patch=1 \ + file://patches/mtdfix.patch;patch=1 \ + file://defconfig \ +" S = "${WORKDIR}/linux-${PV}" - ############################################################## # kernel image resides on a seperate flash partition (for now) # @@ -82,31 +76,22 @@ COMPATIBLE_MACHINE = '(a780|e680|a1200|rorkre2|rokre6)' # For now the code for serial console is disabled in compress.c #CMDLINE_CON = "console=ttyS2,115200n8 console=tty1 " CMDLINE_CON = "console=tty1 " - CMDLINE_ROOT = "root=/dev/mmcblk0p1 rootfstype=ext3 rootdelay=5" -# uncomment if you want to boot over NFS -#CMDLINE_ROOT = "root=301 root=/dev/nfs nfsroot=192.168.0.200:/export/ezx-image rootdelay=5 " -# uncomment to enable dyntick +CMDLINE_NFSROOT = "root=/dev/nfs rootfstype=nfs nfsroot=192.168.0.200:/export/ezx-image rootdelay=5 " +# Uncomment to enable dyntick #CMDLINE_OTHER = "dyntick=enable" CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}' CMDLINE_IP = "ip=192.168.0.202:192.168.0.200:192.168.0.200:255.255.255.0" -CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG} mem=32M@0xA0000000 mem=16M@0xAC000000" +CMDLINE_MEM = "mem=32M@0xA0000000 mem=16M@0xAC000000" +CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG} ${CMDLINE_MEM}" +# Uncomment to use root-over-nfs-over-usb +#CMDLINE_NFSROOT_USB = "${CMDLINE_CON} ${CMDLINE_NFSROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG} ${CMDLINE_MEM}" + +# 1024x1024 is the maximum kernel size for boot-over-usb +KERNEL_IMAGE_MAXSIZE = "1294336" ############################################################### # module configs specific to this kernel # #module_autoload_pxaficp_ir = "pxaficp_ir" #module_autoload_snd-pcm-oss = "snd-pcm-oss" - -############################################################### -# check the kernel is below the 1024*1024 byte limit for the boot-over usb -# -do_compile_append() { - size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'` - if [ $size -ge 1294336 ]; then - rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE} - echo "Size is $size" - echo "This kernel is too big for your EZX Phone. Please reduce the size of the kernel by making more of it modular." - fi -} - -- cgit v1.2.3 From c9e9333ccb5a77e0966f3ef7ed716782435b55a5 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 15 Sep 2007 17:21:12 +0000 Subject: preferred-xorg-versions-X11R7.3: fix versions once and for all * the X11R7.x-a.b.c nomenclature is gone --- .../include/preferred-xorg-versions-X11R7.3.inc | 218 ++++++++++----------- 1 file changed, 109 insertions(+), 109 deletions(-) diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc index 7ffa788c91..0ff684ed68 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc @@ -35,99 +35,99 @@ PREFERRED_VERSION_task-xorg ?= "X11R7.3" PREFERRED_VERSION_appres ?= "1.0.1" PREFERRED_VERSION_bdftopcf ?= "1.0.1" PREFERRED_VERSION_beforelight ?= "1.0.2" -PREFERRED_VERSION_bitmap ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_bitmap ?= "1.0.2" PREFERRED_VERSION_editres ?= "1.0.2" PREFERRED_VERSION_fontosfnt ?= "1.0.3" -PREFERRED_VERSION_fslsfonts ?= "X11R7.0-1.0.1" -PREFERRED_VERSION_fstobdf ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_fslsfonts ?= "1.0.1" +PREFERRED_VERSION_fstobdf ?= "1.0.2" PREFERRED_VERSION_iceauth ?= "1.0.2" PREFERRED_VERSION_ico ?= "1.0.2" -PREFERRED_VERSION_lbxproxy ?= "X11R7.0-1.0.1" -PREFERRED_VERSION_listres ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_lbxproxy ?= "1.0.1" +PREFERRED_VERSION_listres ?= "1.0.1" PREFERRED_VERSION_luit ?= "1.0.2" PREFERRED_VERSION_mkfontdir-native ?= "1.0.3" PREFERRED_VERSION_mkfontdir ?= "1.0.3" PREFERRED_VERSION_mkfontscale ?= "1.0.3" -PREFERRED_VERSION_oclock ?= "X11R7.0-1.0.1" -PREFERRED_VERSION_proxymngr ?= "X11R7.0-1.0.1" -PREFERRED_VERSION_rgb ?= "X11R7.1-1.0.1" -PREFERRED_VERSION_rstart ?= "X11R7.1-1.0.2" -PREFERRED_VERSION_scripts ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_oclock ?= "1.0.1" +PREFERRED_VERSION_proxymngr ?= "1.0.1" +PREFERRED_VERSION_rgb ?= "1.0.1" +PREFERRED_VERSION_rstart ?= "1.0.2" +PREFERRED_VERSION_scripts ?= "1.0.1" PREFERRED_VERSION_sessreg ?= "1.0.3" PREFERRED_VERSION_setxkbmap ?= "1.0.4" -PREFERRED_VERSION_smproxy ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_smproxy ?= "1.0.2" PREFERRED_VERSION_twm ?= "1.0.3" -PREFERRED_VERSION_viewres ?= "X11R7.0-1.0.1" -PREFERRED_VERSION_x11perf ?= "X11R7.1-1.4.1" +PREFERRED_VERSION_viewres ?= "1.0.1" +PREFERRED_VERSION_x11perf ?= "1.4.1" PREFERRED_VERSION_xauth ?= "1.0.2" PREFERRED_VERSION_xbacklight ?= "1.1" -PREFERRED_VERSION_xbiff ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xbiff ?= "1.0.1" PREFERRED_VERSION_xcalc ?= "1.0.2" -PREFERRED_VERSION_xclipboard ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xclipboard ?= "1.0.1" PREFERRED_VERSION_xclock ?= "1.0.3" -PREFERRED_VERSION_xcmsdb ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xcmsdb ?= "1.0.1" PREFERRED_VERSION_xconsole ?= "1.0.3" PREFERRED_VERSION_xcursorgen ?= "1.0.2" PREFERRED_VERSION_xdbedizzy ?= "1.0.2" -PREFERRED_VERSION_xditview ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xditview ?= "1.0.1" PREFERRED_VERSION_xdm ?= "1.1.6" -PREFERRED_VERSION_xdpyinfo ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xdpyinfo ?= "1.0.1" PREFERRED_VERSION_xdriinfo ?= "1.0.2" -PREFERRED_VERSION_xedit ?= "X11R7.1-1.0.2" -PREFERRED_VERSION_xev ?= "X11R7.0-1.0.1" -PREFERRED_VERSION_xeyes ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xedit ?= "1.0.2" +PREFERRED_VERSION_xev ?= "1.0.1" +PREFERRED_VERSION_xeyes ?= "1.0.1" PREFERRED_VERSION_xxf86dga ?= "1.0.2" -PREFERRED_VERSION_xfd ?= "X11R7.0-1.0.1" -PREFERRED_VERSION_xfindproxy ?= "X11R7.0-1.0.1" -PREFERRED_VERSION_xfontsel ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xfd ?= "1.0.1" +PREFERRED_VERSION_xfindproxy ?= "1.0.1" +PREFERRED_VERSION_xfontsel ?= "1.0.1" PREFERRED_VERSION_xfs ?= "1.0.4" -PREFERRED_VERSION_xfsinfo ?= "X11R7.0-1.0.1" -PREFERRED_VERSION_xfwp ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xfsinfo ?= "1.0.1" +PREFERRED_VERSION_xfwp ?= "1.0.1" PREFERRED_VERSION_xgamma ?= "1.0.2" -PREFERRED_VERSION_xgc ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xgc ?= "1.0.1" PREFERRED_VERSION_xhost ?= "1.0.2" PREFERRED_VERSION_xinit ?= "1.0.5" PREFERRED_VERSION_xkbcomp ?= "1.0.3" -PREFERRED_VERSION_xkbevd ?= "X11R7.1-1.0.2" -PREFERRED_VERSION_xkbprint ?= "X11R7.0-1.0.1" -PREFERRED_VERSION_xkbutils ?= "X11R7.0-1.0.1" -PREFERRED_VERSION_xkill ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xkbevd ?= "1.0.2" +PREFERRED_VERSION_xkbprint ?= "1.0.1" +PREFERRED_VERSION_xkbutils ?= "1.0.1" +PREFERRED_VERSION_xkill ?= "1.0.1" PREFERRED_VERSION_xload ?= "1.0.2" -PREFERRED_VERSION_xlogo ?= "X11R7.0-1.0.1" -PREFERRED_VERSION_xlsatoms ?= "X11R7.0-1.0.1" -PREFERRED_VERSION_xlsclients ?= "X11R7.0-1.0.1" -PREFERRED_VERSION_xlsfonts ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xlogo ?= "1.0.1" +PREFERRED_VERSION_xlsatoms ?= "1.0.1" +PREFERRED_VERSION_xlsclients ?= "1.0.1" +PREFERRED_VERSION_xlsfonts ?= "1.0.1" PREFERRED_VERSION_xmag ?= "1.0.2" PREFERRED_VERSION_xman ?= "1.0.3" PREFERRED_VERSION_xmessage ?= "1.0.2" -PREFERRED_VERSION_xmh ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xmh ?= "1.0.1" PREFERRED_VERSION_xmodmap ?= "1.0.3" -PREFERRED_VERSION_xmore ?= "X11R7.0-1.0.1" -PREFERRED_VERSION_xphelloworld ?= "X11R7.0-1.0.1" -PREFERRED_VERSION_xplsprinters ?= "X11R7.0-1.0.1" -PREFERRED_VERSION_xpr ?= "X11R7.0-1.0.1" -PREFERRED_VERSION_xprehashprinterlist ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xmore ?= "1.0.1" +PREFERRED_VERSION_xphelloworld ?= "1.0.1" +PREFERRED_VERSION_xplsprinters ?= "1.0.1" +PREFERRED_VERSION_xpr ?= "1.0.1" +PREFERRED_VERSION_xprehashprinterlist ?= "1.0.1" PREFERRED_VERSION_xprop ?= "1.0.3" PREFERRED_VERSION_xrandr ?= "1.2.2" PREFERRED_VERSION_xrdb ?= "1.0.4" -PREFERRED_VERSION_xrefresh ?= "X11R7.1-1.0.2" -PREFERRED_VERSION_xrx ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xrefresh ?= "1.0.2" +PREFERRED_VERSION_xrx ?= "1.0.1" PREFERRED_VERSION_xset ?= "1.0.3" -PREFERRED_VERSION_xsetmode ?= "X11R7.0-1.0.0" -PREFERRED_VERSION_xsetpointer ?= "X11R7.0-1.0.0" +PREFERRED_VERSION_xsetmode ?= "1.0.0" +PREFERRED_VERSION_xsetpointer ?= "1.0.0" PREFERRED_VERSION_xsetroot ?= "1.0.2" -PREFERRED_VERSION_xsm ?= "X11R7.0-1.0.1" -PREFERRED_VERSION_xstdcmap ?= "X11R7.0-1.0.1" -PREFERRED_VERSION_xtrap ?= "X11R7.1-1.0.2" -PREFERRED_VERSION_xvidtune ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xsm ?= "1.0.1" +PREFERRED_VERSION_xstdcmap ?= "1.0.1" +PREFERRED_VERSION_xtrap ?= "1.0.2" +PREFERRED_VERSION_xvidtune ?= "1.0.1" PREFERRED_VERSION_xvinfo ?= "1.0.2" -PREFERRED_VERSION_xwd ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xwd ?= "1.0.1" PREFERRED_VERSION_xwininfo ?= "1.0.3" -PREFERRED_VERSION_xwud ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xwud ?= "1.0.1" #data -PREFERRED_VERSION_xbitmaps ?= "X11R7.0-1.0.1" -PREFERRED_VERSION_xcursor-themes ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xbitmaps ?= "1.0.1" +PREFERRED_VERSION_xcursor-themes ?= "1.0.1" # doc PREFERRED_VERSION_xorg-docs ?= "1.4" @@ -135,76 +135,76 @@ PREFERRED_VERSION_xorg-sgml-doctools ?= "1.2" # driver PREFERRED_VERSION_xf86-input-acecad ?= "1.2.0" -PREFERRED_VERSION_xf86-input-aiptek ?= "X11R7.1-1.0.1" -PREFERRED_VERSION_xf86-input-calcomp ?= "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-citron ?= "X11R7.1-2.2.0" -PREFERRED_VERSION_xf86-input-digitaledge ?= "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-dmc ?= "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-dynapro ?= "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-elo2300 ?= "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-elographics ?= "X11R7.0-1.0.0.5" -PREFERRED_VERSION_xf86-input-evdev ?= "X11R7.1-1.1.2" -PREFERRED_VERSION_xf86-input-fpit ?= "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-hyperpen ?= "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-jamstudio ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-aiptek ?= "1.0.1" +PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.0" +PREFERRED_VERSION_xf86-input-citron ?= "2.2.0" +PREFERRED_VERSION_xf86-input-digitaledge ?= "1.1.0" +PREFERRED_VERSION_xf86-input-dmc ?= "1.1.0" +PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.0" +PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.0" +PREFERRED_VERSION_xf86-input-elographics ?= "1.0.0.5" +PREFERRED_VERSION_xf86-input-evdev ?= "1.1.2" +PREFERRED_VERSION_xf86-input-fpit ?= "1.1.0" +PREFERRED_VERSION_xf86-input-hyperpen ?= "1.1.0" +PREFERRED_VERSION_xf86-input-jamstudio ?= "1.1.0" PREFERRED_VERSION_xf86-input-joystick ?= "1.2.3" PREFERRED_VERSION_xf86-input-keyboard ?= "1.2.2" -PREFERRED_VERSION_xf86-input-magellan ?= "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-magictouch ?= "X11R7.1-1.0.0.5" -PREFERRED_VERSION_xf86-input-microtouch ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-magellan ?= "1.1.0" +PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5" +PREFERRED_VERSION_xf86-input-microtouch ?= "1.1.0" PREFERRED_VERSION_xf86-input-mouse ?= "1.2.2" -PREFERRED_VERSION_xf86-input-mutouch ?= "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-palmax ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-mutouch ?= "1.1.0" +PREFERRED_VERSION_xf86-input-palmax ?= "1.1.0" PREFERRED_VERSION_xf86-input-penmount ?= "1.2.0" -PREFERRED_VERSION_xf86-input-spaceorb ?= "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-summa ?= "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-tek4957 ?= "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-ur98 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.0" +PREFERRED_VERSION_xf86-input-summa ?= "1.1.0" +PREFERRED_VERSION_xf86-input-tek4957 ?= "1.1.0" +PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0" PREFERRED_VERSION_xf86-input-vmmouse ?= "12.4.1" -PREFERRED_VERSION_xf86-input-void ?= "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-apm ?= "X11R7.1-1.1.1" -PREFERRED_VERSION_xf86-video-ark ?= "X11R7.1-0.6.0" -PREFERRED_VERSION_xf86-video-ast ?= "X11R7.1-0.81.0" +PREFERRED_VERSION_xf86-input-void ?= "1.1.0" +PREFERRED_VERSION_xf86-video-apm ?= "1.1.1" +PREFERRED_VERSION_xf86-video-ark ?= "0.6.0" +PREFERRED_VERSION_xf86-video-ast ?= "0.81.0" PREFERRED_VERSION_xf86-video-ati ?= "6.6.193" -PREFERRED_VERSION_xf86-video-chips ?= "X11R7.1-1.1.1" -PREFERRED_VERSION_xf86-video-cirrus ?= "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-cyrix ?= "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-dummy ?= "X11R7.1-0.2.0" +PREFERRED_VERSION_xf86-video-chips ?= "1.1.1" +PREFERRED_VERSION_xf86-video-cirrus ?= "1.1.0" +PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0" +PREFERRED_VERSION_xf86-video-dummy ?= "0.2.0" PREFERRED_VERSION_xf86-video-fbdev ?= "0.3.1" PREFERRED_VERSION_xf86-video-glide ?= "1.0.0" -PREFERRED_VERSION_xf86-video-glint ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-glint ?= "1.1.1" PREFERRED_VERSION_xf86-video-i128 ?= "1.1.0.6" -PREFERRED_VERSION_xf86-video-i740 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-i740 ?= "1.1.0" PREFERRED_VERSION_xf86-video-i810 ?= "1.6.5" -PREFERRED_VERSION_xf86-video-imstt ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0" PREFERRED_VERSION_xf86-video-intel ?= "2.1.1" PREFERRED_VERSION_xf86-video-mga ?= "1.4.6.1" -PREFERRED_VERSION_xf86-video-neomagic ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-neomagic ?= "1.1.1" PREFERRED_VERSION_xf86-video-newport ?= "0.2.1" PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3" PREFERRED_VERSION_xf86-video-nv ?= "2.1.3" PREFERRED_VERSION_xf86-video-rendition ?= "4.1.3" PREFERRED_VERSION_xf86-video-s3 ?= "0.5.0" -PREFERRED_VERSION_xf86-video-s3virge ?= "X11R7.1-1.9.1" +PREFERRED_VERSION_xf86-video-s3virge ?= "1.9.1" PREFERRED_VERSION_xf86-video-savage ?= "2.1.3" PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.4.2" PREFERRED_VERSION_xf86-video-sis ?= "0.9.3" -PREFERRED_VERSION_xf86-video-sisusb ?= "X11R7.1-0.8.1" -PREFERRED_VERSION_xf86-video-sunbw2 ?= "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-suncg14 ?= "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-suncg3 ?= "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-suncg6 ?= "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-sunffb ?= "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-sunleo ?= "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-suntcx ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-sisusb ?= "0.8.1" +PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0" +PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.0" +PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.0" +PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.0" +PREFERRED_VERSION_xf86-video-sunffb ?= "1.1.0" +PREFERRED_VERSION_xf86-video-sunleo ?= "1.1.0" +PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.0" PREFERRED_VERSION_xf86-video-tdfx ?= "1.3.0" -PREFERRED_VERSION_xf86-video-tga ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-tga ?= "1.1.0" PREFERRED_VERSION_xf86-video-trident ?= "1.2.3" PREFERRED_VERSION_xf86-video-tseng ?= "1.1.1" -PREFERRED_VERSION_xf86-video-v4l ?= "X11R7.1-0.1.1" +PREFERRED_VERSION_xf86-video-v4l ?= "0.1.1" PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.0" PREFERRED_VERSION_xf86-video-vesa ?= "1.3.0" -PREFERRED_VERSION_xf86-video-vga ?= "X11R7.1-4.1.0" +PREFERRED_VERSION_xf86-video-vga ?= "4.1.0" PREFERRED_VERSION_xf86-video-via ?= "0.2.2" PREFERRED_VERSION_xf86-video-vmware ?= "10.14.1" PREFERRED_VERSION_xf86-video-voodoo ?= "1.1.1" @@ -212,15 +212,15 @@ PREFERRED_VERSION_xf86-video-voodoo ?= "1.1.1" # font PREFERRED_VERSION_encodings ?= "1.0.2" PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.1" -PREFERRED_VERSION_font-util-native ?= "X11R7.1-1.0.1" -PREFERRED_VERSION_font-util ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_font-util-native ?= "1.0.1" +PREFERRED_VERSION_font-util ?= "1.0.1" # lib PREFERRED_VERSION_diet-x11 ?= "1.1.3" -PREFERRED_VERSION_libdmx ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libdmx ?= "1.0.2" PREFERRED_VERSION_libfontenc ?= "1.0.4" PREFERRED_VERSION_libice ?= "1.0.4" -PREFERRED_VERSION_liblbxutil ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_liblbxutil ?= "1.0.1" PREFERRED_VERSION_libsm ?= "1.0.3" PREFERRED_VERSION_libx11 ?= "1.1.3" PREFERRED_VERSION_libx11-native ?= "1.1.1" @@ -239,7 +239,7 @@ PREFERRED_VERSION_libxfontcache ?= "1.0.4" PREFERRED_VERSION_libxi ?= "1.1.3" PREFERRED_VERSION_libxinerama ?= "1.0.2" PREFERRED_VERSION_libxkbfile ?= "1.0.4" -PREFERRED_VERSION_libxkbui ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libxkbui ?= "1.0.2" PREFERRED_VERSION_libxmu ?= "1.0.3" PREFERRED_VERSION_libxpm ?= "3.5.7" PREFERRED_VERSION_libxrandr ?= "1.2.2" @@ -250,8 +250,8 @@ PREFERRED_VERSION_libxt ?= "1.0.4" PREFERRED_VERSION_libxtst ?= "1.0.3" PREFERRED_VERSION_libxvmc ?= "1.0.4" PREFERRED_VERSION_libxxf86dga ?= "1.0.2" -PREFERRED_VERSION_libxxf86misc ?= "X11R7.1-1.0.1" -PREFERRED_VERSION_libxxf86vm ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxxf86misc ?= "1.0.1" +PREFERRED_VERSION_libxxf86vm ?= "1.0.1" PREFERRED_VERSION_xtrans ?= "1.0.4" # proto @@ -263,18 +263,18 @@ PREFERRED_VERSION_inputproto ?= "1.4.2.1" PREFERRED_VERSION_kbproto ?= "1.0.3" PREFERRED_VERSION_randrproto ?= "1.2.1" PREFERRED_VERSION_renderproto ?= "0.9.3" -PREFERRED_VERSION_scrnsaverproto ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_scrnsaverproto ?= "1.1.0" PREFERRED_VERSION_xf86dgaproto ?= "2.0.3" PREFERRED_VERSION_xproto-native ?= "7.0.10" PREFERRED_VERSION_xproto ?= "7.0.10" # util -PREFERRED_VERSION_gccmakedep ?= "X11R7.1-1.0.2" -PREFERRED_VERSION_imake ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_gccmakedep ?= "1.0.2" +PREFERRED_VERSION_imake ?= "1.0.2" PREFERRED_VERSION_makedepend ?= "1.0.1" PREFERRED_VERSION_util-macros-native ?= "1.1.5" PREFERRED_VERSION_util-macros ?= "1.1.5" -PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xorg-cf-files ?= "1.0.2" # xserver PREFERRED_VERSION_xserver-kdrive ?= "1.4.0" -- cgit v1.2.3 From 651a118bdabb0ee8f6838a7f87276e37c9ea60c2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 15 Sep 2007 17:46:17 +0000 Subject: linux-ezx: more a1200 and rokre6 tweaks, also remove size check since boot_usb can handle 1MB images quite well nowadays and blob2 can flash like 1.3MB to mtd4 --- packages/linux/linux-ezx-2.6.21/a1200/defconfig | 4 ++-- packages/linux/linux-ezx-2.6.21/rokre6/defconfig | 6 +++--- packages/linux/linux-ezx_2.6.21.bb | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/linux/linux-ezx-2.6.21/a1200/defconfig b/packages/linux/linux-ezx-2.6.21/a1200/defconfig index 3e8cba081b..3cf42ac8b1 100755 --- a/packages/linux/linux-ezx-2.6.21/a1200/defconfig +++ b/packages/linux/linux-ezx-2.6.21/a1200/defconfig @@ -590,9 +590,9 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 # CONFIG_MTD_ARM_INTEGRATOR is not set # CONFIG_MTD_SHARP_SL is not set CONFIG_MTD_EZX=y -# CONFIG_MTD_EZX_A780 is not set +CONFIG_MTD_EZX_A780=y # CONFIG_MTD_EZX_A780_ALTERNATE is not set -CONFIG_MTD_EZX_A1200=y +# CONFIG_MTD_EZX_A120 is not set # CONFIG_MTD_EZX_E2 is not set # CONFIG_MTD_EZX_E6 is not set # CONFIG_MTD_PLATRAM is not set diff --git a/packages/linux/linux-ezx-2.6.21/rokre6/defconfig b/packages/linux/linux-ezx-2.6.21/rokre6/defconfig index 10c1207f1e..7a203fa0a7 100755 --- a/packages/linux/linux-ezx-2.6.21/rokre6/defconfig +++ b/packages/linux/linux-ezx-2.6.21/rokre6/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21.4 -# Sat Sep 15 18:27:06 2007 +# Sat Sep 15 19:35:32 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -590,11 +590,11 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 # CONFIG_MTD_ARM_INTEGRATOR is not set # CONFIG_MTD_SHARP_SL is not set CONFIG_MTD_EZX=y -# CONFIG_MTD_EZX_A780 is not set +CONFIG_MTD_EZX_A780=y # CONFIG_MTD_EZX_A780_ALTERNATE is not set # CONFIG_MTD_EZX_A1200 is not set # CONFIG_MTD_EZX_E2 is not set -CONFIG_MTD_EZX_E6=y +# CONFIG_MTD_EZX_E6 is not set # CONFIG_MTD_PLATRAM is not set # diff --git a/packages/linux/linux-ezx_2.6.21.bb b/packages/linux/linux-ezx_2.6.21.bb index 7a2d3a47dd..cf0f246ecc 100644 --- a/packages/linux/linux-ezx_2.6.21.bb +++ b/packages/linux/linux-ezx_2.6.21.bb @@ -4,7 +4,7 @@ AUTHOR = "Harald Welte and the OpenEZX Team " HOMEPAGE = "http://www.openezx.org" LICENSE = "GPL" EZX = "ezxdev" -PR = "${EZX}-r14" +PR = "${EZX}-r15" inherit kernel @@ -105,7 +105,7 @@ CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDL do_compile_append() { size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'` if [ $size -ge 1294336 ]; then - rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE} + #rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE} echo "Size is $size" echo "This kernel is too big for your EZX Phone. Please reduce the size of the kernel by making more of it modular." fi -- cgit v1.2.3 From 7d7fb07b49543bc0f34a25b2c9d543b9304bfd18 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 15 Sep 2007 18:42:08 +0000 Subject: openmoko-sound-theme-standard: add classic ringtone, load on startup, bump PR --- conf/distro/include/sane-srcrevs.inc | 2 +- packages/openmoko-base/openmoko-sound-system/session | 2 ++ packages/openmoko-base/openmoko-sound-system_0.1.0.bb | 2 +- packages/openmoko-base/openmoko-sound-theme-standard_svn.bb | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 145e97e1c1..8eec5cad7c 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -66,7 +66,7 @@ SRCREV_pn-openmoko-panel-mainmenu ?= "2567" SRCREV_pn-openmoko-panel-usb ?= "2893" SRCREV_pn-openmoko-session ?= "152" SRCREV_pn-openmoko-simplemediaplayer ?= "1688" -SRCREV_pn-openmoko-sound-theme-standard ?= "2827" +SRCREV_pn-openmoko-sound-theme-standard ?= "2974" SRCREV_pn-openmoko-stylus-demo ?= "2324" SRCREV_pn-openmoko-stylus-demo-simple ?= "1818" SRCREV_pn-openmoko-taskmanager ?= "1663" diff --git a/packages/openmoko-base/openmoko-sound-system/session b/packages/openmoko-base/openmoko-sound-system/session index 91267b672a..dfef83d934 100644 --- a/packages/openmoko-base/openmoko-sound-system/session +++ b/packages/openmoko-base/openmoko-sound-system/session @@ -24,3 +24,5 @@ load-module module-x11-bell sample=x11-bell # Load samples load-sample startup /usr/share/openmoko/sounds/startup_openmoko.wav load-sample touchscreen /usr/share/openmoko/sounds/touchscreen_click.wav +load-sample ringtone /usr/share/openmoko/sounds/ringtone_classy.wav + diff --git a/packages/openmoko-base/openmoko-sound-system_0.1.0.bb b/packages/openmoko-base/openmoko-sound-system_0.1.0.bb index 671ff37f45..ddb5053f3e 100644 --- a/packages/openmoko-base/openmoko-sound-system_0.1.0.bb +++ b/packages/openmoko-base/openmoko-sound-system_0.1.0.bb @@ -10,7 +10,7 @@ RDEPENDS = "\ pulseaudio-module-native-protocol-unix \ pulseaudio-module-cli-protocol-unix \ " -PR = "r5" +PR = "r6" inherit openmoko-base update-rc.d diff --git a/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb b/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb index f521fe1de6..f42b75ecb0 100644 --- a/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb +++ b/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Standard sound theme for the OpenMoko distribution" SECTION = "openmoko/base" PV = "0.1+svnr${SRCREV}" -PR = "r0" +PR = "r1" inherit openmoko-base autotools @@ -14,7 +14,7 @@ do_install() { for i in *.mp3; do cp -fpPR ${S}/$i ${D}${datadir}/openmoko/sounds/ done - for i in touchscreen_click.wav notify_doorbell.wav startup_openmoko.wav; do + for i in touchscreen_click.wav ringtone_classy.wav notify_doorbell.wav startup_openmoko.wav; do cp -f ${S}/$i ${D}${datadir}/openmoko/sounds/ done } -- cgit v1.2.3 From e92ed4f8aaf41a71b3727e7ad56534a0509b94a9 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 15 Sep 2007 18:49:17 +0000 Subject: linux-ezx 2.6.21: repair formatting again --- packages/linux/linux-ezx_2.6.21.bb | 114 ++++++++++++++++++------------------- 1 file changed, 56 insertions(+), 58 deletions(-) diff --git a/packages/linux/linux-ezx_2.6.21.bb b/packages/linux/linux-ezx_2.6.21.bb index d74a22b652..b708305a1c 100644 --- a/packages/linux/linux-ezx_2.6.21.bb +++ b/packages/linux/linux-ezx_2.6.21.bb @@ -4,67 +4,65 @@ HOMEPAGE = "http://www.openezx.org" EZX = "ezxdev" PR = "${EZX}-r15" - require linux.inc SRC_URI = " \ - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ - file://logo_linux_clut224.ppm \ - \ - file://patches/patch-2.6.21.4;patch=1 \ - file://patches/ezx-core.patch;patch=1 \ - file://patches/ezx-bp.patch;patch=1 \ - file://patches/ezx-pm.patch;patch=1 \ - file://patches/ezx-pcap.patch;patch=1 \ - file://patches/a780-pcap.patch;patch=1 \ - file://patches/e680-pcap.patch;patch=1 \ - file://patches/a1200-pcap.patch;patch=1 \ - file://patches/e6-pcap.patch;patch=1 \ - file://patches/a780-mci.patch;patch=1 \ - file://patches/e680-mci.patch;patch=1 \ - file://patches/a1200-mci.patch;patch=1 \ - file://patches/e6-mci.patch;patch=1 \ - file://patches/pxa27x-udc-support.2.patch;patch=1 \ - file://patches/ezx-emu.patch;patch=1 \ - file://patches/a780-emu.patch;patch=1 \ - file://patches/e680-emu.patch;patch=1 \ - file://patches/ezx-mtd-map.patch;patch=1 \ - file://patches/ezx-serial-bug-workaround.patch;patch=1 \ - file://patches/pxa-kbd.patch;patch=1 \ - file://patches/a780-kbd.patch;patch=1 \ - file://patches/e680-kbd.patch;patch=1 \ - file://patches/pcap-ts.patch;patch=1 \ - file://patches/a780-ts.patch;patch=1 \ - file://patches/e680-ts.patch;patch=1 \ - file://patches/a1200-ts.patch;patch=1 \ - file://patches/e6-ts.patch;patch=1 \ - file://patches/ezx-eoc.patch;patch=1 \ - file://patches/a1200-eoc.patch;patch=1 \ - file://patches/e6-eoc.patch;patch=1 \ - file://patches/ezx-backlight.patch;patch=1 \ - file://patches/a780-flip.patch;patch=1 \ - file://patches/e680-locksw.patch;patch=1 \ - file://patches/a780-leds.patch;patch=1 \ - file://patches/e680-leds.patch;patch=1 \ - file://patches/a780-vibrator.patch;patch=1 \ - file://patches/mux_cli.patch;patch=1 \ - file://patches/mux-fix.patch;patch=1 \ - file://patches/mux-fix-init-errorpath.patch;patch=1 \ - file://patches/mux-remove-flipbuffers.patch;patch=1 \ - file://patches/mux-remove-get_halted_bit.patch;patch=1 \ - file://patches/mux-remove-usbh_finished_resume.patch;patch=1 \ - file://patches/mux-fix-makefile.patch;patch=1 \ - file://patches/mux-fix-tty-driver.patch;patch=1 \ - file://patches/mux-linux-2.6.21-fix.patch;patch=1 \ - file://patches/asoc-pxa-ssp.patch;patch=1 \ - file://patches/asoc-fix-loopback.patch;patch=1 \ - file://patches/ezx-asoc.patch;patch=1 \ - file://patches/mtdfix.patch;patch=1 \ - file://patches/lcd_18BPP_support.diff;patch=1 \ - file://defconfig \ - \ - " - + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ + file://logo_linux_clut224.ppm \ + \ + file://patches/patch-2.6.21.4;patch=1 \ + file://patches/ezx-core.patch;patch=1 \ + file://patches/ezx-bp.patch;patch=1 \ + file://patches/ezx-pm.patch;patch=1 \ + file://patches/ezx-pcap.patch;patch=1 \ + file://patches/a780-pcap.patch;patch=1 \ + file://patches/e680-pcap.patch;patch=1 \ + file://patches/a1200-pcap.patch;patch=1 \ + file://patches/e6-pcap.patch;patch=1 \ + file://patches/a780-mci.patch;patch=1 \ + file://patches/e680-mci.patch;patch=1 \ + file://patches/a1200-mci.patch;patch=1 \ + file://patches/e6-mci.patch;patch=1 \ + file://patches/pxa27x-udc-support.2.patch;patch=1 \ + file://patches/ezx-emu.patch;patch=1 \ + file://patches/a780-emu.patch;patch=1 \ + file://patches/e680-emu.patch;patch=1 \ + file://patches/ezx-mtd-map.patch;patch=1 \ + file://patches/ezx-serial-bug-workaround.patch;patch=1 \ + file://patches/pxa-kbd.patch;patch=1 \ + file://patches/a780-kbd.patch;patch=1 \ + file://patches/e680-kbd.patch;patch=1 \ + file://patches/pcap-ts.patch;patch=1 \ + file://patches/a780-ts.patch;patch=1 \ + file://patches/e680-ts.patch;patch=1 \ + file://patches/a1200-ts.patch;patch=1 \ + file://patches/e6-ts.patch;patch=1 \ + file://patches/ezx-eoc.patch;patch=1 \ + file://patches/a1200-eoc.patch;patch=1 \ + file://patches/e6-eoc.patch;patch=1 \ + file://patches/ezx-backlight.patch;patch=1 \ + file://patches/a780-flip.patch;patch=1 \ + file://patches/e680-locksw.patch;patch=1 \ + file://patches/a780-leds.patch;patch=1 \ + file://patches/e680-leds.patch;patch=1 \ + file://patches/a780-vibrator.patch;patch=1 \ + file://patches/mux_cli.patch;patch=1 \ + file://patches/mux-fix.patch;patch=1 \ + file://patches/mux-fix-init-errorpath.patch;patch=1 \ + file://patches/mux-remove-flipbuffers.patch;patch=1 \ + file://patches/mux-remove-get_halted_bit.patch;patch=1 \ + file://patches/mux-remove-usbh_finished_resume.patch;patch=1 \ + file://patches/mux-fix-makefile.patch;patch=1 \ + file://patches/mux-fix-tty-driver.patch;patch=1 \ + file://patches/mux-linux-2.6.21-fix.patch;patch=1 \ + file://patches/asoc-pxa-ssp.patch;patch=1 \ + file://patches/asoc-fix-loopback.patch;patch=1 \ + file://patches/ezx-asoc.patch;patch=1 \ + file://patches/mtdfix.patch;patch=1 \ + file://patches/lcd_18BPP_support.diff;patch=1 \ + file://defconfig \ + \ + " S = "${WORKDIR}/linux-${PV}" -- cgit v1.2.3 From 0f1c0519d2fa00808ba0bc00092df4f17acdf38c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 15 Sep 2007 19:24:00 +0000 Subject: sane-srcrevs: SRCREV_FORMAT is broken, so work around it by setting a global (and hence bogus for most webkit svn modules) SRCREV --- conf/distro/include/sane-srcrevs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index a4d04886c7..83f72045c7 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -86,5 +86,5 @@ SRCREV_pn-psplash ?= "249" SRCREV_pn-settings-daemon ?= "1615" SRCREV_pn-sjf2410-linux-native ?= "933" SRCREV_pn-sphyrna ?= "44" -SRCREV_pn-webkit-gtk ?= "25582-r25571" +SRCREV_pn-webkit-gtk ?= "25582" SRCREV_pn-xoo ?= "1623" -- cgit v1.2.3 From 7697d33bda31b52b921faab6ef93e2944c8ed00f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 15 Sep 2007 19:31:34 +0000 Subject: remove size check again --- packages/linux/linux-ezx_2.6.21.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux/linux-ezx_2.6.21.bb b/packages/linux/linux-ezx_2.6.21.bb index b708305a1c..f364df8dde 100644 --- a/packages/linux/linux-ezx_2.6.21.bb +++ b/packages/linux/linux-ezx_2.6.21.bb @@ -91,7 +91,7 @@ CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDL #CMDLINE_NFSROOT_USB = "${CMDLINE_CON} ${CMDLINE_NFSROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG} ${CMDLINE_MEM}" # 1024x1024 is the maximum kernel size for boot-over-usb -KERNEL_IMAGE_MAXSIZE = "1294336" +#KERNEL_IMAGE_MAXSIZE = "1294336" ############################################################### # module configs specific to this kernel -- cgit v1.2.3 From ced90dc79b32f3f273b58e35f7660e73c6427b1b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 15 Sep 2007 19:46:13 +0000 Subject: linux-ezx: disable backlight patch for rorkre6 as it only turns of bl at this point --- packages/linux/linux-ezx_2.6.21.bb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/linux/linux-ezx_2.6.21.bb b/packages/linux/linux-ezx_2.6.21.bb index f364df8dde..deaa99d5ad 100644 --- a/packages/linux/linux-ezx_2.6.21.bb +++ b/packages/linux/linux-ezx_2.6.21.bb @@ -2,7 +2,7 @@ DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and AUTHOR = "The OpenEZX Team " HOMEPAGE = "http://www.openezx.org" EZX = "ezxdev" -PR = "${EZX}-r15" +PR = "${EZX}-r16" require linux.inc @@ -40,7 +40,6 @@ SRC_URI = " \ file://patches/ezx-eoc.patch;patch=1 \ file://patches/a1200-eoc.patch;patch=1 \ file://patches/e6-eoc.patch;patch=1 \ - file://patches/ezx-backlight.patch;patch=1 \ file://patches/a780-flip.patch;patch=1 \ file://patches/e680-locksw.patch;patch=1 \ file://patches/a780-leds.patch;patch=1 \ @@ -63,6 +62,13 @@ SRC_URI = " \ file://defconfig \ \ " + +BACKLIGHTPATCH = " file://patches/ezx-backlight.patch;patch=1 " +BACKLIGHTPATCH_rokre6 = "" + +SRC_URI += "${BACKLIGHTPATCH}" + + S = "${WORKDIR}/linux-${PV}" -- cgit v1.2.3 From 316c60b31d41c1e6b8e80909a6588a8d3a040777 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Sat, 15 Sep 2007 20:26:23 +0000 Subject: omap5912osk.conf : Prevent installation of uImage in /boot. --- conf/machine/omap5912osk.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index 7418054f49..ee476b3602 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -25,5 +25,7 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-ide-cs \ kernel-module-nls-base \ kernel-module-vfat" +RDEPENDS_kernel-base = "" + require conf/machine/include/tune-arm926ejs.inc -- cgit v1.2.3 From fbcef11acc6fbd8660650c0da642d121d8bcc128 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Sat, 15 Sep 2007 20:26:53 +0000 Subject: gumstix-verdex.conf : Prevent installation of uImage in /boot. --- conf/machine/gumstix-verdex.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/machine/gumstix-verdex.conf b/conf/machine/gumstix-verdex.conf index ab24552646..dc44342e65 100644 --- a/conf/machine/gumstix-verdex.conf +++ b/conf/machine/gumstix-verdex.conf @@ -1,5 +1,7 @@ require conf/machine/include/gumstix.inc +RDEPENDS_kernel-base = "" + PACKAGE_EXTRA_ARCHS += " iwmmxt " MACHINE_FEATURES += " usbhost " -- cgit v1.2.3 From fdaf5543a35faa250e8d726a19f159b9afa26b76 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Sat, 15 Sep 2007 20:27:17 +0000 Subject: gumstix-connex.conf : Prevent installation of uImage in /boot. --- conf/machine/gumstix-connex.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/machine/gumstix-connex.conf b/conf/machine/gumstix-connex.conf index a431762d0a..5bca152500 100644 --- a/conf/machine/gumstix-connex.conf +++ b/conf/machine/gumstix-connex.conf @@ -1,5 +1,7 @@ require conf/machine/include/gumstix.inc +RDEPENDS_kernel-base = "" + MACHINE_FEATURES += " usbgadget " GUMSTIX_400MHZ = "y" -- cgit v1.2.3 From 76cba2b1b9c4917b25f9c34b5d8c42c9ffd00e01 Mon Sep 17 00:00:00 2001 From: Daniel Willmann Date: Sat, 15 Sep 2007 21:58:46 +0000 Subject: openmoko-sound-theme-standard2: inherit openmoko2 so sources get fetched from the correct location --- conf/distro/include/sane-srcrevs.inc | 2 +- .../openmoko-sound-theme-standard2_svn.bb | 23 ++++++++++++++++++++++ packages/tasks/task-openmoko.bb | 2 +- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 packages/openmoko2/openmoko-sound-theme-standard2_svn.bb diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 83f72045c7..a90ad9e9b6 100644 --- a/conf/distro/include/sane-srcrevs.in