[oe-commits] org.oe.dev merge of '6b8b18ee5d630cef0d9e1ebea010f36e7bdb083c'
mickeyl commit
openembedded-commits at lists.openembedded.org
Sat Sep 15 19:04:02 UTC 2007
merge of '6b8b18ee5d630cef0d9e1ebea010f36e7bdb083c'
and 'a3ee5d88f6d1100cd285c2fead8e37018bd42a9f'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: bcaff404e2422e67faa9ea607d29e78334495cde
ViewMTN: http://monotone.openembedded.org/revision/info/bcaff404e2422e67faa9ea607d29e78334495cde
Files:
1
packages/glibc/eglibc-svn/export-fcntl2.patch
packages/pointercal/files/a780
packages/linux/linux-ezx-2.6.21/patches/lcd_18BPP_support.diff
packages/pointercal/files/a780/pointercal
packages/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-1.3-18bpp.patch
conf/distro/include/insane-srcrevs.inc
conf/distro/include/moko-autorev.inc
conf/distro/include/preferred-xorg-versions-X11R7.3.inc
conf/distro/include/sane-srcrevs.inc
packages/glibc/eglibc_svn.bb
packages/glibc/glibc-package.bbclass
packages/gnome/gconf-dbus_svn.bb
packages/linux/linux-ezx-2.6.21/a1200/defconfig
packages/linux/linux-ezx-2.6.21/rokre6/defconfig
packages/linux/linux-ezx_2.6.21.bb
packages/linux/linux-handhelds-2.6/h2200/defconfig
packages/linux/linux-handhelds-2.6_2.6.21-hh16.bb
packages/openocd/openocd_svn.bb
packages/pointercal/pointercal_0.0.bb
packages/linux/linux.inc
packages/openmoko-base/openmoko-sound-system/session
packages/openmoko-base/openmoko-sound-system_0.1.0.bb
packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
Diffs:
#
# mt diff -r6b8b18ee5d630cef0d9e1ebea010f36e7bdb083c -rbcaff404e2422e67faa9ea607d29e78334495cde
#
#
#
# delete "packages/glibc/eglibc-svn/export-fcntl2.patch"
#
# add_dir "packages/pointercal/files/a780"
#
# add_file "packages/linux/linux-ezx-2.6.21/patches/lcd_18BPP_support.diff"
# content [789a83493fc58a4dbafa14e25bf11c3f15ace873]
#
# add_file "packages/pointercal/files/a780/pointercal"
# content [746ced31da69780530c774d54918e4a349c92224]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-1.3-18bpp.patch"
# content [2f7599315f4267047fc44ddb7832c91f37d90cfd]
#
# patch "conf/distro/include/insane-srcrevs.inc"
# from [63ea6dbb957d94e0f729963a34f021d69c8a2f5a]
# to [77f0eea1a733be785bb5acfaed64815e5f62f68a]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [5709f08bc2fb571ee70795901ea2c48568d7653a]
# to [7ab3e4a626dd86961455dfee876c957f998cfb14]
#
# patch "conf/distro/include/preferred-xorg-versions-X11R7.3.inc"
# from [3ecc9d70639781883037e151c1d10b3622fd366a]
# to [e17728838422c7e739af9d24b6c0fd5a4d84811f]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [b405ee927543b5e606d3af8d67923ec2db003794]
# to [a42add69b174c63471672d00f575ac0dcea10e0b]
#
# patch "packages/glibc/eglibc_svn.bb"
# from [d271198997ba4fa58ec16de91362b22a79f8d84f]
# to [bb25ed1e0fdfd432e265209f03dfaf36f79bdf1b]
#
# patch "packages/glibc/glibc-package.bbclass"
# from [6fd787a481dfe0225e24a491cb5fb0b7937c3b58]
# to [71e532d510413de3e18dd2b598fc5523ea29f7a9]
#
# patch "packages/gnome/gconf-dbus_svn.bb"
# from [ac71d333e0e42e01c188b5c90a4374123f6b96b5]
# to [736ff2e0f199bacf3c0368448f9d7fcbd6de5973]
#
# patch "packages/linux/linux-ezx-2.6.21/a1200/defconfig"
# from [9e8c88b007bf864832fb39e66adebdb694fdefdf]
# to [54fc215efd04504bd6949f6c853b8291ab31bf05]
#
# patch "packages/linux/linux-ezx-2.6.21/rokre6/defconfig"
# from [e76c158c332dcdd6e636e5b628f7f86daac14a22]
# to [b79ae70ebd4748e59c20b3a234ba65c2360a45dd]
#
# patch "packages/linux/linux-ezx_2.6.21.bb"
# from [58decdcd43b8525deab1092a4e9d591d459a470a]
# to [debc0c006f764beb247f7264984dfa3d64f8ecc2]
#
# patch "packages/linux/linux-handhelds-2.6/h2200/defconfig"
# from [6f60622a6c3257b507d66772637c986adf0fef66]
# to [9e5d87c9de74314746322b4c36a4eb1a9789853a]
#
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh16.bb"
# from [252b9c26ddd2fda4271f4352999ce0facbfece99]
# to [07839c0797b5ba09b5aae7fcdbb3232965b3f8e3]
#
# patch "packages/openocd/openocd_svn.bb"
# from [a0cc3e78ddf617567092bc819022548cfb0fd186]
# to [ff4b08ed923a74c3efa4730980288907a11baeb7]
#
# patch "packages/pointercal/pointercal_0.0.bb"
# from [eabe88f64e9db5eb9c843878fc7ee328e8043d85]
# to [b8790bb4f4ba0f5d19f857367be5e221745356d0]
#
============================================================
--- packages/linux/linux-ezx-2.6.21/patches/lcd_18BPP_support.diff 789a83493fc58a4dbafa14e25bf11c3f15ace873
+++ packages/linux/linux-ezx-2.6.21/patches/lcd_18BPP_support.diff 789a83493fc58a4dbafa14e25bf11c3f15ace873
@@ -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 <celeber2 at gmail.com>
++ *
+ * 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<<fbi->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 */
============================================================
--- packages/pointercal/files/a780/pointercal 746ced31da69780530c774d54918e4a349c92224
+++ packages/pointercal/files/a780/pointercal 746ced31da69780530c774d54918e4a349c92224
@@ -0,0 +1 @@
+-19857 -412 18085522 189 -23922 22734294 65536
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-1.3-18bpp.patch 2f7599315f4267047fc44ddb7832c91f37d90cfd
+++ packages/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-1.3-18bpp.patch 2f7599315f4267047fc44ddb7832c91f37d90cfd
@@ -0,0 +1,419 @@
+diff -Nurd xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c xorg-server-1.3.0.0.patched/hw/kdrive/fbdev/fbdev.c
+--- xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c 2006-11-16 19:01:23.000000000 +0100
++++ xorg-server-1.3.0.0.patched/hw/kdrive/fbdev/fbdev.c 2007-09-15 16:53:20.152045000 +0200
+@@ -213,6 +213,24 @@
+
+ /* Now get the new screeninfo */
+ ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var);
++ /* Special treatment of 18bpp */
++ if ((priv->var.red.length == 6) && (priv->var.green.length == 6) &&
++ (priv->var.blue.length == 6))
++ {
++ priv->var.red.length = 8;
++ if (priv->var.red.offset != 0)
++ priv->var.red.offset = 16;
++ priv->var.green.length = 8;
++ priv->var.green.offset = 8;
++ priv->var.blue.length = 8;
++ if (priv->var.blue.offset != 0)
++ priv->var.blue.offset = 16;
++ priv->var.bits_per_pixel = 32;
++ priv->Have18Bpp = TRUE;
++ }
++ else
++ priv->Have18Bpp = FALSE;
++
+ depth = priv->var.bits_per_pixel;
+ gray = priv->var.grayscale;
+
+@@ -334,7 +352,7 @@
+ KdMouseMatrix m;
+ FbdevPriv *priv = screen->card->driver;
+
+- if (scrpriv->randr != RR_Rotate_0)
++ if (scrpriv->randr != RR_Rotate_0 || priv->Have18Bpp)
+ scrpriv->shadow = TRUE;
+ else
+ scrpriv->shadow = FALSE;
+@@ -398,6 +416,354 @@
+ return TRUE;
+ }
+
++void
++shadowUpdatePacked18 (ScreenPtr pScreen,
++ shadowBufPtr pBuf)
++{
++ RegionPtr damage = shadowDamage (pBuf);
++ PixmapPtr pShadow = pBuf->pPixmap;
++ int nbox = REGION_NUM_RECTS (damage);
++ BoxPtr pbox = REGION_RECTS (damage);
++ FbBits *shaBase, *shaLine, *sha;
++ FbStride shaStride;
++ int scrBase, scrLine, scr;
++ int shaBpp;
++ int shaXoff, shaYoff; /* XXX assumed to be zero */
++ int x, y, w, h, width;
++ int i;
++ char *winBase = NULL, *win;
++ CARD32 winSize;
++
++ fbGetDrawable (&pShadow->drawable, shaBase, shaStride, shaBpp, shaXoff, shaYoff);
++ while (nbox--)
++ {
++ x = pbox->x1 * shaBpp;
++ y = pbox->y1;
++ w = (pbox->x2 - pbox->x1) * shaBpp;
++ h = pbox->y2 - pbox->y1;
++
++ scrLine = (x >> FB_SHIFT);
++ shaLine = shaBase + y * shaStride + (x >> FB_SHIFT);
++
++ x &= FB_MASK;
++ w = (w + x + FB_MASK) >> FB_SHIFT;
++
++ while (h--)
++ {
++ winSize = 0;
++ scrBase = 0;
++ width = w;
++ scr = scrLine;
++ sha = shaLine;
++ while (width) {
++ /* how much remains in this window */
++ i = scrBase + winSize - scr;
++ if (i <= 0 || scr < scrBase)
++ {
++ winBase = (char *) (*pBuf->window) (pScreen,
++ y,
++ scr * 3,
++ SHADOW_WINDOW_WRITE,
++ &winSize,
++ pBuf->closure);
++ if(!winBase)
++ return;
++ scrBase = scr;
++ winSize /= 3;
++ i = winSize;
++ }
++ win = winBase + (scr - scrBase);
++ if (i > width)
++ i = width;
++ width -= i;
++ scr += i;
++#define PickBit(a,i%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -ra3ee5d88f6d1100cd285c2fead8e37018bd42a9f -rbcaff404e2422e67faa9ea607d29e78334495cde
#
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [f0d002ed3a278d1600db6fd5e6ae2ebd83db0402]
# to [a42add69b174c63471672d00f575ac0dcea10e0b]
#
# patch "packages/linux/linux-ezx_2.6.21.bb"
# from [1d457e3d15115be8bccec1e3d50203380c0e066a]
# to [debc0c006f764beb247f7264984dfa3d64f8ecc2]
#
# patch "packages/linux/linux.inc"
# from [47bdad4587ba5a4eecb2eb3c827967a56828c9ae]
# to [eeda309489292a9867f8339d7e9cface90455b79]
#
# patch "packages/openmoko-base/openmoko-sound-system/session"
# from [2d729d476a1b9fa1ab08c40c8f8d00ff7e126359]
# to [440f08023fd2111ebd3ab7b3914fba30c36e0d59]
#
# patch "packages/openmoko-base/openmoko-sound-system_0.1.0.bb"
# from [b17f4014d9d87df4e995907d56b14ff983834d1d]
# to [97eccb1347577824e44ae717d9c252f5c9712e4d]
#
# patch "packages/openmoko-base/openmoko-sound-theme-standard_svn.bb"
# from [ffdd2c4eb73a274c31f10be81ceaea91f36b1bf0]
# to [cc26de0759df303d921d485edb20c50d06019574]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc f0d002ed3a278d1600db6fd5e6ae2ebd83db0402
+++ conf/distro/include/sane-srcrevs.inc a42add69b174c63471672d00f575ac0dcea10e0b
@@ -66,7 +66,7 @@ SRCREV_pn-openmoko-simplemediaplayer ?=
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"
============================================================
--- packages/linux/linux-ezx_2.6.21.bb 1d457e3d15115be8bccec1e3d50203380c0e066a
+++ packages/linux/linux-ezx_2.6.21.bb debc0c006f764beb247f7264984dfa3d64f8ecc2
@@ -1,12 +1,9 @@ DESCRIPTION = "2.6 Linux Development Ker
DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and E680"
-SECTION = "kernel"
-AUTHOR = "Harald Welte and the OpenEZX Team <openezx-devel at lists.openezx.org>"
+AUTHOR = "The OpenEZX Team <openezx-devel at lists.openezx.org>"
HOMEPAGE = "http://www.openezx.org"
-LICENSE = "GPL"
EZX = "ezxdev"
PR = "${EZX}-r15"
-inherit kernel
require linux.inc
@@ -85,29 +82,22 @@ CMDLINE_ROOT = "root=/dev/mmcblk0p1 root
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 at 0xA0000000 mem=16M at 0xAC000000"
+CMDLINE_MEM = "mem=32M at 0xA0000000 mem=16M at 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
-}
-
============================================================
--- packages/linux/linux.inc 47bdad4587ba5a4eecb2eb3c827967a56828c9ae
+++ packages/linux/linux.inc eeda309489292a9867f8339d7e9cface90455b79
@@ -18,7 +18,7 @@ DEPENDS_append_fic-gta02 = " u-boot
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 @@ do_configure_prepend() {
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[dirs] = "${S}"
do_deploy[dirs] = "${S}"
+addtask sizecheck before do_install after do_compile
addtask deploy before do_package after do_install
============================================================
--- packages/openmoko-base/openmoko-sound-system/session 2d729d476a1b9fa1ab08c40c8f8d00ff7e126359
+++ packages/openmoko-base/openmoko-sound-system/session 440f08023fd2111ebd3ab7b3914fba30c36e0d59
@@ -24,3 +24,5 @@ load-sample touchscreen /usr/share/openm
# 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
+
============================================================
--- packages/openmoko-base/openmoko-sound-system_0.1.0.bb b17f4014d9d87df4e995907d56b14ff983834d1d
+++ packages/openmoko-base/openmoko-sound-system_0.1.0.bb 97eccb1347577824e44ae717d9c252f5c9712e4d
@@ -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
============================================================
--- packages/openmoko-base/openmoko-sound-theme-standard_svn.bb ffdd2c4eb73a274c31f10be81ceaea91f36b1bf0
+++ packages/openmoko-base/openmoko-sound-theme-standard_svn.bb cc26de0759df303d921d485edb20c50d06019574
@@ -1,7 +1,7 @@ PV = "0.1+svnr${SRCREV}"
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
}
More information about the Openembedded-commits
mailing list