From 3f43346f5f2189da340c48a3aaec154a293a54d4 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 14 Nov 2008 10:12:02 +0100 Subject: checksums.ini: add gnome-games 2.25.1 and codec-engine 2.21 --- conf/checksums.ini | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 6d025702e2..8c852b6200 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -2946,6 +2946,10 @@ sha256=4999d3054a04e6cf4847a72316e32e9e98e6152b1fd72adc87d15e305f990f27 md5=32b0df93b285ee094e053552d9301cb6 sha256=eb9f4b4b5973f444d16920201dfea217fb30542fea23107cf80a1f189408b321 +[http://install.tarball.in.source.dir/codec_engine_2_21.tar.gz] +md5=6cacb7db6eb61c64395be4ddc737095d +sha256=d391829686eb002ace3ffbfed75c35e877b42c1884c9359791634b5b57126797 + [http://install.tarball.in.source.dir/codec_engine_2_21_00_06.tar.gz] md5=d8f3bbfbcc337d9776991d9561f451f3 sha256=773ce12045ce98c3be4b1845547435f1b7798996fa3170dea72c7c15aa5ca79d @@ -6502,6 +6506,10 @@ sha256=af2ebf32fe93817e06333b94d3fabcf72fa5675f402c1bbdb7bed3be0b3b3a3e md5=23bf4e795725a74ebb37daacda784adb sha256=3105dfb490c187adbe1c14582daa5a134ec672c396af3dd4e0e29cc9fbb4a6ea +[http://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.25/gnome-games-2.25.1.tar.bz2] +md5=886ab09752d3b420b744865342f07eb0 +sha256=a29eca01be141a9208ef2be3dc497d05faf4d2c0ca3e3d9edeec611ca3388b28 + [http://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.6/gnome-games-2.6.1.tar.bz2] md5=6ea145547bfd8aa828b22cbbe34cbedf sha256=d7a823601f569589437d671d12b1b12f53abc08aeb7d25280bb3242299353086 -- cgit v1.2.3 From e3f304a3e80cb87d34fed098a3ab2006504aef52 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 14 Nov 2008 10:31:27 +0100 Subject: linux-omap git: add DSS2 patch for omap3evm * this is not enabled in the defconfig yet --- .../linux/linux-omap/omap3evm/omap3evm-dss2.diff | 443 +++++++++++++++++++++ packages/linux/linux-omap_git.bb | 3 +- 2 files changed, 445 insertions(+), 1 deletion(-) create mode 100644 packages/linux/linux-omap/omap3evm/omap3evm-dss2.diff diff --git a/packages/linux/linux-omap/omap3evm/omap3evm-dss2.diff b/packages/linux/linux-omap/omap3evm/omap3evm-dss2.diff new file mode 100644 index 0000000000..afcebba10f --- /dev/null +++ b/packages/linux/linux-omap/omap3evm/omap3evm-dss2.diff @@ -0,0 +1,443 @@ +From: hvaibhav@ti.com +To: linux-fbdev-devel@lists.sourceforge.net, linux-omap@vger.kernel.org +Cc: Vaibhav Hiremath +Subject: [REVIEW PATCH] Added OMAP3EVM support on Tomis FBDEV/DSS Patches +Date: Fri, 14 Nov 2008 12:02:32 +0530 + +From: Vaibhav Hiremath + +Tested LCD, TV, DVI (480P) out on OMAP3EVM board. + +Please make sure that you change the option +CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=7 and apply the +Mans Rullgard clock patches to support set_rate and round_rate API. + +Signed-off-by: Vaibhav Hiremath +--- + arch/arm/mach-omap2/board-omap3evm.c | 224 ++++++++++++++++++++++++++++++++-- + drivers/video/omap2/Kconfig | 5 + + drivers/video/omap2/Makefile | 1 + + drivers/video/omap2/panel-omap3evm.c | 110 +++++++++++++++++ + 5 files changed, 341 insertions(+), 53 deletions(-) + create mode 100644 drivers/video/omap2/panel-omap3evm.c + +diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c +index 42ab826..e244fa7 100644 +--- a/arch/arm/mach-omap2/board-omap3evm.c ++++ b/arch/arm/mach-omap2/board-omap3evm.c +@@ -37,6 +37,8 @@ + #include + #include + #include ++#include ++#include + + #include "sdram-micron-mt46h32m32lf-6.h" + #include "twl4030-generic-scripts.h" +@@ -161,14 +163,215 @@ static int __init omap3_evm_i2c_init(void) + omap_register_i2c_bus(3, 400, NULL, 0); + return 0; + } ++static struct omap_fbmem_config evm_fbmem0_config = { ++ .size = 480*720*4, ++ .start = OMAPFB_MEMTYPE_SDRAM, ++}; + +-static struct platform_device omap3_evm_lcd_device = { +- .name = "omap3evm_lcd", +- .id = -1, ++static struct omap_fbmem_config evm_fbmem1_config = { ++ .size = 480*720*4, ++ .start = OMAPFB_MEMTYPE_SDRAM, + }; + +-static struct omap_lcd_config omap3_evm_lcd_config __initdata = { +- .ctrl_name = "internal", ++static struct omap_fbmem_config evm_fbmem2_config = { ++ .size = 480*720*4, ++ .start = OMAPFB_MEMTYPE_SDRAM, ++}; ++#define LCD_PANEL_LR 2 ++#define LCD_PANEL_UD 3 ++#define LCD_PANEL_INI 152 ++#define LCD_PANEL_ENABLE_GPIO 153 ++#define LCD_PANEL_QVGA 154 ++#define LCD_PANEL_RESB 155 ++ ++#define ENABLE_VDAC_DEDICATED 0x03 ++#define ENABLE_VDAC_DEV_GRP 0x20 ++#define ENABLE_VPLL2_DEDICATED 0x05 ++#define ENABLE_VPLL2_DEV_GRP 0xE0 ++ ++#define TWL4030_GPIODATA_IN3 0x03 ++#define TWL4030_GPIODATA_DIR3 0x06 ++#define TWL4030_VPLL2_DEV_GRP 0x33 ++#define TWL4030_VPLL2_DEDICATED 0x36 ++ ++static int lcd_enabled; ++static int dvi_enabled; ++ ++static void __init evm_display_init(void) ++{ ++ int r; ++ r = gpio_request(LCD_PANEL_LR, "lcd_panel_lr"); ++ if (r) { ++ printk(KERN_ERR "failed to get LCD_PANEL_LR\n"); ++ return; ++ } ++ r = gpio_request(LCD_PANEL_UD, "lcd_panel_ud"); ++ if (r) { ++ printk(KERN_ERR "failed to get LCD_PANEL_UD\n"); ++ goto err_1; ++ } ++ ++ r = gpio_request(LCD_PANEL_INI, "lcd_panel_ini"); ++ if (r) { ++ printk(KERN_ERR "failed to get LCD_PANEL_INI\n"); ++ goto err_2; ++ } ++ r = gpio_request(LCD_PANEL_RESB, "lcd_panel_resb"); ++ if (r) { ++ printk(KERN_ERR "failed to get LCD_PANEL_RESB\n"); ++ goto err_3; ++ } ++ r = gpio_request(LCD_PANEL_QVGA, "lcd_panel_qvga"); ++ if (r) { ++ printk(KERN_ERR "failed to get LCD_PANEL_QVGA\n"); ++ goto err_4; ++ } ++ ++ gpio_direction_output(LCD_PANEL_LR, 0); ++ gpio_direction_output(LCD_PANEL_UD, 0); ++ gpio_direction_output(LCD_PANEL_INI, 0); ++ gpio_direction_output(LCD_PANEL_RESB, 0); ++ gpio_direction_output(LCD_PANEL_QVGA, 0); ++ ++#define TWL_LED_LEDEN 0x00 ++#define TWL_PWMA_PWMAON 0x00 ++#define TWL_PWMA_PWMAOFF 0x01 ++ ++ twl4030_i2c_write_u8(TWL4030_MODULE_LED, 0x11, TWL_LED_LEDEN); ++ twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, 0x01, TWL_PWMA_PWMAON); ++ twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, 0x02, TWL_PWMA_PWMAOFF); ++ ++ gpio_direction_output(LCD_PANEL_RESB, 1); ++ gpio_direction_output(LCD_PANEL_INI, 1); ++ gpio_direction_output(LCD_PANEL_QVGA, 0); ++ gpio_direction_output(LCD_PANEL_LR, 1); ++ gpio_direction_output(LCD_PANEL_UD, 1); ++ ++ return; ++ ++err_4: ++ gpio_free(LCD_PANEL_RESB); ++err_3: ++ gpio_free(LCD_PANEL_INI); ++err_2: ++ gpio_free(LCD_PANEL_UD); ++err_1: ++ gpio_free(LCD_PANEL_LR); ++ ++} ++ ++static int panel_enable_lcd(struct omap_display *display) ++{ ++ if (dvi_enabled) { ++ printk(KERN_ERR "cannot enable LCD, DVI is enabled\n"); ++ return -EINVAL; ++ } ++ if (system_rev > OMAP3430_REV_ES1_0) { ++ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, ++ ENABLE_VPLL2_DEDICATED, TWL4030_VPLL2_DEDICATED); ++ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, ++ ENABLE_VPLL2_DEV_GRP, TWL4030_VPLL2_DEV_GRP); ++ } ++ gpio_direction_output(LCD_PANEL_ENABLE_GPIO, 0); ++ lcd_enabled = 1; ++ return 0; ++} ++ ++static void panel_disable_lcd(struct omap_display *display) ++{ ++ if (system_rev > OMAP3430_REV_ES1_0) { ++ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x0, ++ TWL4030_VPLL2_DEDICATED); ++ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x0, ++ TWL4030_VPLL2_DEV_GRP); ++ } ++ omap_set_gpio_dataout(LCD_PANEL_ENABLE_GPIO, 1); ++ lcd_enabled = 0; ++} ++ ++static struct omap_display_data evm_display_data = { ++ .type = OMAP_DISPLAY_TYPE_DPI, ++ .name = "lcd", ++ .panel_name = "panel-evm", ++ .u.dpi.data_lines = 16, ++ .panel_enable = panel_enable_lcd, ++ .panel_disable = panel_disable_lcd, ++}; ++ ++static int panel_enable_tv(struct omap_display *display) ++{ ++ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, ++ ENABLE_VDAC_DEDICATED, TWL4030_VDAC_DEDICATED); ++ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, ++ ENABLE_VDAC_DEV_GRP, TWL4030_VDAC_DEV_GRP); ++ return 0; ++} ++ ++static void panel_disable_tv(struct omap_display *display) ++{ ++ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x00, ++ TWL4030_VDAC_DEDICATED); ++ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x00, ++ TWL4030_VDAC_DEV_GRP); ++} ++ ++static struct omap_display_data evm_display_data_tv = { ++ .type = OMAP_DISPLAY_TYPE_VENC, ++ .name = "tv", ++ .u.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO, ++ .panel_enable = panel_enable_tv, ++ .panel_disable = panel_disable_tv, ++}; ++ ++ ++static int panel_enable_dvi(struct omap_display *display) ++{ ++ if (lcd_enabled) { ++ printk(KERN_ERR "cannot enable DVI, LCD is enabled\n"); ++ return -EINVAL; ++ } ++ twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0x80, ++ TWL4030_GPIODATA_IN3); ++ twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0x80, ++ TWL4030_GPIODATA_DIR3); ++ dvi_enabled = 1; ++ ++ return 0; ++} ++ ++static void panel_disable_dvi(struct omap_display *display) ++{ ++ twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0x00, ++ TWL4030_GPIODATA_IN3); ++ twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0x00, ++ TWL4030_GPIODATA_DIR3); ++ dvi_enabled = 0; ++} ++ ++ ++static struct omap_display_data evm_display_data_dvi = { ++ .type = OMAP_DISPLAY_TYPE_DPI, ++ .name = "dvi", ++ .panel_name = "panel-dvi", ++ .u.dpi.data_lines = 24, ++ .panel_enable = panel_enable_dvi, ++ .panel_disable = panel_disable_dvi, ++}; ++ ++static struct omap_dss_platform_data evm_dss_data = { ++ .num_displays = 3, ++ .displays = { ++ &evm_display_data, ++ &evm_display_data_dvi, ++ &evm_display_data_tv, ++ } ++}; ++static struct platform_device evm_dss_device = { ++ .name = "omap-dss", ++ .id = -1, ++ .dev = { ++ .platform_data = &evm_dss_data, ++ }, + }; + + static void ads7846_dev_init(void) +@@ -227,11 +430,13 @@ static void __init omap3_evm_init_irq(void) + + static struct omap_board_config_kernel omap3_evm_config[] __initdata = { + { OMAP_TAG_UART, &omap3_evm_uart_config }, +- { OMAP_TAG_LCD, &omap3_evm_lcd_config }, ++ { OMAP_TAG_FBMEM, &evm_fbmem0_config }, ++ { OMAP_TAG_FBMEM, &evm_fbmem1_config }, ++ { OMAP_TAG_FBMEM, &evm_fbmem2_config }, + }; + + static struct platform_device *omap3_evm_devices[] __initdata = { +- &omap3_evm_lcd_device, ++ &evm_dss_device, + &omap3evm_smc911x_device, + }; + +@@ -250,8 +455,6 @@ static void __init omap3_evm_init(void) + omap3_evm_i2c_init(); + + platform_add_devices(omap3_evm_devices, ARRAY_SIZE(omap3_evm_devices)); +- omap_board_config = omap3_evm_config; +- omap_board_config_size = ARRAY_SIZE(omap3_evm_config); + + spi_register_board_info(omap3evm_spi_board_info, + ARRAY_SIZE(omap3evm_spi_board_info)); +@@ -262,10 +465,13 @@ static void __init omap3_evm_init(void) + usb_ehci_init(); + omap3evm_flash_init(); + ads7846_dev_init(); ++ evm_display_init(); + } + + static void __init omap3_evm_map_io(void) + { ++ omap_board_config = omap3_evm_config; ++ omap_board_config_size = ARRAY_SIZE(omap3_evm_config); + omap2_set_globals_343x(); + omap2_map_common_io(); + } +diff --git a/drivers/video/omap2/Kconfig b/drivers/video/omap2/Kconfig +index 95691ad..8211ffd 100644 +--- a/drivers/video/omap2/Kconfig ++++ b/drivers/video/omap2/Kconfig +@@ -51,4 +51,9 @@ config PANEL_SDP3430 + help + SDP3430 LCD + ++config PANEL_OMAP3EVM ++ tristate "OMAP3EVM Panel" ++ depends on OMAP2_DSS ++ help ++ OMAP3EVM LCD Panel + endmenu +diff --git a/drivers/video/omap2/Makefile b/drivers/video/omap2/Makefile +index 73ab1c0..668e8c6 100644 +--- a/drivers/video/omap2/Makefile ++++ b/drivers/video/omap2/Makefile +@@ -3,3 +3,4 @@ omapfb-y := omapfb-main.o omapfb-sysfs.o omapfb-ioctl.o + + obj-$(CONFIG_PANEL_DVI) += panel-dvi.o + obj-$(CONFIG_PANEL_SDP3430) += panel-sdp3430.o ++obj-$(CONFIG_PANEL_OMAP3EVM) += panel-omap3evm.o +diff --git a/drivers/video/omap2/panel-omap3evm.c b/drivers/video/omap2/panel-omap3evm.c +new file mode 100644 +index 0000000..4a00b02 +--- /dev/null ++++ b/drivers/video/omap2/panel-omap3evm.c +@@ -0,0 +1,110 @@ ++/* ++ * LCD panel support for the TI OMAP3EVM board ++ * ++ * Copyright (C) 2008 Texas Instruments, Inc. ++ * Author: Vaibhav Hiremath ++ * ++ * Derived from drivers/video/omap2/panel-sdp3430.c ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 as published by ++ * the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for ++ * more details. ++ * ++ * You should have received a copy of the GNU General Public License along with ++ * this program. If not, see . ++ */ ++ ++#include ++#include ++ ++#include ++ ++static int omap3evm_panel_init(struct omap_display *display) ++{ ++ return 0; ++} ++ ++static void omap3evm_panel_cleanup(struct omap_display *display) ++{ ++} ++ ++static int omap3evm_panel_enable(struct omap_display *display) ++{ ++ int r = 0; ++ ++ if (display->hw_config.panel_enable) ++ r = display->hw_config.panel_enable(display); ++ ++ return r; ++} ++ ++static void omap3evm_panel_disable(struct omap_display *display) ++{ ++ if (display->hw_config.panel_disable) ++ display->hw_config.panel_disable(display); ++} ++ ++static int omap3evm_panel_suspend(struct omap_display *display) ++{ ++ omap3evm_panel_disable(display); ++ return 0; ++} ++ ++static int omap3evm_panel_resume(struct omap_display *display) ++{ ++ return omap3evm_panel_enable(display); ++} ++ ++static struct omap_panel omap3evm_panel = { ++ .owner = THIS_MODULE, ++ .name = "panel-evm", ++ .init = omap3evm_panel_init, ++ .cleanup = omap3evm_panel_cleanup, ++ .enable = omap3evm_panel_enable, ++ .disable = omap3evm_panel_disable, ++ .suspend = omap3evm_panel_suspend, ++ .resume = omap3evm_panel_resume, ++ /*.set_mode = omap3evm_set_mode, */ ++ ++ .timings = { ++ .pixel_clock = 26000, ++ ++ .hsw = 4, ++ .hfp = 4, ++ .hbp = 40, ++ ++ .vsw = 2, ++ .vfp = 2, ++ .vbp = 7, ++ }, ++ ++ .acb = 0x28, ++ ++ .config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS | ++ OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IPC, ++ ++ .x_res = 480, ++ .y_res = 640, ++ .bpp = 18, ++}; ++ ++ ++static int __init omap3evm_panel_drv_init(void) ++{ ++ omap_dss_register_panel(&omap3evm_panel); ++ return 0; ++} ++ ++static void __exit omap3evm_panel_drv_exit(void) ++{ ++ omap_dss_unregister_panel(&omap3evm_panel); ++} ++ ++module_init(omap3evm_panel_drv_init); ++module_exit(omap3evm_panel_drv_exit); ++MODULE_LICENSE("GPL"); +-- +1.5.6 + +-- +To unsubscribe from this list: send the line "unsubscribe linux-omap" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb index dd5016336a..81f717ae5e 100644 --- a/packages/linux/linux-omap_git.bb +++ b/packages/linux/linux-omap_git.bb @@ -10,7 +10,7 @@ SRCREV = "444fcab6e8f8bad4ffc50feb91516c246d91e901" PV = "2.6.27+2.6.28-rc3+${PR}+gitr${SRCREV}" #PV = "2.6.27+${PR}+gitr${SRCREV}" -PR = "r3" +PR = "r4" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ file://defconfig" @@ -51,6 +51,7 @@ SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \ SRC_URI_append_omap3evm = " \ file://evm-mcspi-ts.diff;patch=1 \ file://omap3evm-lcd-redtint.diff;patch=1 \ + file://omap3evm-dss2.diff;patch=1 \ " S = "${WORKDIR}/git" -- cgit v1.2.3 From 0833c193ce38d965b5ab4becacb2a9d1520ebf3c Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Fri, 14 Nov 2008 09:35:33 +0100 Subject: openjdk-langtools-native: Rename 'javac' to 'sun-javac' when installing to staging. --- .../openjdk-langtools-native_0.0+jdk7-b31.bb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/openjdk-langtools/openjdk-langtools-native_0.0+jdk7-b31.bb b/packages/openjdk-langtools/openjdk-langtools-native_0.0+jdk7-b31.bb index 3f90e4a7dd..1533818c00 100644 --- a/packages/openjdk-langtools/openjdk-langtools-native_0.0+jdk7-b31.bb +++ b/packages/openjdk-langtools/openjdk-langtools-native_0.0+jdk7-b31.bb @@ -1,7 +1,9 @@ -DESCRIPTION = "Java Language tools (javac, javah, javap, javadoc and apt) from OpenJDK" +DESCRIPTION = "Java Language tools (sun-javac, javah, javap, javadoc and apt) from OpenJDK" HOMEPAGE = "http://http://openjdk.java.net/groups/compiler" LICENSE = "GPL" +PR = "r1" + DEPENDS = "classpath-native fastjar-native ecj-initial" S = "${WORKDIR}/icepick-0.0+hg20080118" @@ -23,3 +25,11 @@ EXTRA_OECONF = "\ " export JAVAC_OPTS="-bootclasspath ${STAGING_DATADIR_JAVA}/share/classpath/glibj.zip -source 5.0" + +do_stage_append() { + # Provide javac as sun-javac to not clash with the binary of the same + # name in ecj-bootstrap-native. + # This way ecj-bootstrap-native and openjdk-langtools-native can coexist + # in staging dir. + mv ${bindir}/javac ${bindir}/sun-javac +} -- cgit v1.2.3 From a0ca3483100b1b8df24c133c2d90cb13320ba9a1 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Fri, 14 Nov 2008 09:36:12 +0100 Subject: openjdk-javac-native: New recipe. --- .../openjdk-langtools/openjdk-javac-native_0.0+jdk7-b31.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 packages/openjdk-langtools/openjdk-javac-native_0.0+jdk7-b31.bb diff --git a/packages/openjdk-langtools/openjdk-javac-native_0.0+jdk7-b31.bb b/packages/openjdk-langtools/openjdk-javac-native_0.0+jdk7-b31.bb new file mode 100644 index 0000000000..8c5537911e --- /dev/null +++ b/packages/openjdk-langtools/openjdk-javac-native_0.0+jdk7-b31.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Java compiler from the OpenJDK project" +HOMEPAGE = "http://http://openjdk.java.net/groups/compiler" +LICENSE = "GPL" + +PR = "r0" + +DEPENDS = "openjdk-langtools-native" + +PROVIDES = "virtual/javac-native" + +do_stage() { + ln -sf ${bindir}/sun-javac ${bindir}/javac +} -- cgit v1.2.3 From 5ebf12cbebaf61fff2cb793bcc041f7b43caa4f4 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Fri, 14 Nov 2008 09:36:33 +0100 Subject: openmoko.conf: Set virtual/javac-native preference to ecj-bootstrap-native. --- conf/distro/openmoko.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index d36a6188df..a4a006f92c 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -60,6 +60,7 @@ PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling" PREFERRED_VERSION_gtk+-fastscaling = "2.10.14" # for jalimo +PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" PREFERRED_PROVIDER_classpath = "classpath" PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial" PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk" -- cgit v1.2.3 From 83a3a4d6da863a37c3b1f8f550564d42e4ea19e9 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Fri, 14 Nov 2008 09:47:13 +0100 Subject: openjdk-javac-native: Inherit native. --- packages/openjdk-langtools/openjdk-javac-native_0.0+jdk7-b31.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/openjdk-langtools/openjdk-javac-native_0.0+jdk7-b31.bb b/packages/openjdk-langtools/openjdk-javac-native_0.0+jdk7-b31.bb index 8c5537911e..e4c916f969 100644 --- a/packages/openjdk-langtools/openjdk-javac-native_0.0+jdk7-b31.bb +++ b/packages/openjdk-langtools/openjdk-javac-native_0.0+jdk7-b31.bb @@ -8,6 +8,8 @@ DEPENDS = "openjdk-langtools-native" PROVIDES = "virtual/javac-native" +inherit native + do_stage() { ln -sf ${bindir}/sun-javac ${bindir}/javac } -- cgit v1.2.3 From 06d6c5c9a035a9ac5c77d9e86d6a27749b72388d Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Fri, 14 Nov 2008 10:39:41 +0100 Subject: openjdk-langtools-native: Add virtual/java-native to DEPENDS (the tools need a runtime otherwise there are useless) --- .../openjdk-langtools/openjdk-langtools-native_0.0+jdk7-b31.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/openjdk-langtools/openjdk-langtools-native_0.0+jdk7-b31.bb b/packages/openjdk-langtools/openjdk-langtools-native_0.0+jdk7-b31.bb index 1533818c00..9b857a171a 100644 --- a/packages/openjdk-langtools/openjdk-langtools-native_0.0+jdk7-b31.bb +++ b/packages/openjdk-langtools/openjdk-langtools-native_0.0+jdk7-b31.bb @@ -2,9 +2,9 @@ DESCRIPTION = "Java Language tools (sun-javac, javah, javap, javadoc and apt) fr HOMEPAGE = "http://http://openjdk.java.net/groups/compiler" LICENSE = "GPL" -PR = "r1" +PR = "r2" -DEPENDS = "classpath-native fastjar-native ecj-initial" +DEPENDS = "classpath-native fastjar-native ecj-initial virtual/java-native" S = "${WORKDIR}/icepick-0.0+hg20080118" @@ -27,9 +27,11 @@ EXTRA_OECONF = "\ export JAVAC_OPTS="-bootclasspath ${STAGING_DATADIR_JAVA}/share/classpath/glibj.zip -source 5.0" do_stage_append() { + [ -f ${bindir}/sun-javac ] && rm ${bindir}/sun-javac + # Provide javac as sun-javac to not clash with the binary of the same # name in ecj-bootstrap-native. # This way ecj-bootstrap-native and openjdk-langtools-native can coexist # in staging dir. - mv ${bindir}/javac ${bindir}/sun-javac + mv -f ${bindir}/javac ${bindir}/sun-javac } -- cgit v1.2.3 From c84c511adf8559df2ed2be13de06b1ba5474cecd Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 14 Nov 2008 11:25:51 +0100 Subject: codec-engine, dsplink: start updating it to the upcoming 2.21 release --- packages/dsplink/cmemk.inc | 55 ++++++++++++++++++++++ packages/dsplink/codec-engine_2.21.bb | 79 ++++---------------------------- packages/dsplink/dsplink.inc | 1 + packages/dsplink/lpm.inc | 61 ++++++++++++++++++++++++ packages/dsplink/ti-cmemk-module_2.21.bb | 63 ++----------------------- packages/dsplink/ti-lpm-module_2.21.bb | 68 ++------------------------- 6 files changed, 134 insertions(+), 193 deletions(-) create mode 100644 packages/dsplink/cmemk.inc create mode 100644 packages/dsplink/lpm.inc diff --git a/packages/dsplink/cmemk.inc b/packages/dsplink/cmemk.inc new file mode 100644 index 0000000000..1b7ea3ae0f --- /dev/null +++ b/packages/dsplink/cmemk.inc @@ -0,0 +1,55 @@ +DESCRIPTION = "Codec Engine for TI ARM/DSP processors - cmemk module" + +DEPENDS = "virtual/kernel perl-native" +RDEPENDS = "update-modules" + +inherit module + +require ti-paths.inc + +export DSPLINK="${S}/cetools/packages/dsplink" + +PARALLEL_MAKE = "" + + +do_compile_append() { + echo "MVTOOL_PREFIX=${TARGET_PREFIX}" > ${S}/Rules.make + echo "UCTOOL_PREFIX=${TARGET_PREFIX}" >> ${S}/Rules.make + echo "LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}" >> ${S}/Rules.make + + # Build the cmem kernel module + # We unset CFLAGS because kernel modules need different ones, this is basically a verbatim copy of kernel.bbclass and module-base.bbclass + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + cd ${S}/cetools/packages/ti/sdo/linuxutils/cmem + + oe_runmake clean + oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ + KERNEL_SRC=${STAGING_KERNEL_DIR} \ + KERNEL_VERSION=${KERNEL_VERSION} \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + AR="${KERNEL_AR}" +} + + +do_install() { + install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp + cp ${S}/cetools/packages/ti/sdo/linuxutils/cmem/src/module/cmemk.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp +} + +INHIBIT_PACKAGE_STRIP = "1" + +FILES_ti-cmemk-module = "${sysconfdir} /lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/cmemk.ko" + +pkg_postinst_ti-cmemk-module () { + if [ -n "$D" ]; then + exit 1 + fi + depmod -a + update-modules || true +} + +pkg_postrm_ti-cmemk-module () { + update-modules || true +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/dsplink/codec-engine_2.21.bb b/packages/dsplink/codec-engine_2.21.bb index b300256a3a..7c81704604 100644 --- a/packages/dsplink/codec-engine_2.21.bb +++ b/packages/dsplink/codec-engine_2.21.bb @@ -1,3 +1,7 @@ +require dsplink.inc +require lpm.inc +require cmemk.inc + DESCRIPTION = "Codec Engine for TI ARM/DSP processors" DEPENDS = "virtual/kernel perl-native" @@ -6,19 +10,18 @@ RDEPENDS = "update-modules" inherit module # tconf from xdctools dislikes '.' in pwd :/ -PR = "r1" +PR = "r2" PV = "221" # Get CE tarball from TI website, place in sources and calculate # md5sum # Look for tarball at https://www-a.ti.com/downloads/sds_support/targetcontent/CE/index.html -SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_21_00_06.tar.gz \ +SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_21.tar.gz \ file://Makefile.dsplink \ - file://cmemk-fix-class-device-api.diff;patch=1 \ " -S = "${WORKDIR}/codec_engine_2_21_00_06" +S = "${WORKDIR}/codec_engine_2_21" require ti-paths.inc @@ -26,72 +29,8 @@ export DSPLINK="${S}/cetools/packages/dsplink" PARALLEL_MAKE = "" -do_configure () { - # Run perl script to create appropriate makefiles (v1.60 and up) - perl ${S}/cetools/packages/dsplink/config/bin/dsplinkcfg.pl --platform=${DSPLINKPLATFORM} --nodsp=1 --dspcfg_0=${DSPCFG} --dspos_0=DSPBIOS5XX --gppos=${GPPOS} --comps=ponslrm -} - -do_compile() { - unset DISPLAY - sed -i -e s:armv7a:armv7-a:g make/Linux/omap3530_2.6.mk || true - - # export various settings to override the defaults in the makefiles - export DSP_BASE_CGTOOLS=${TITOOLSDIR}/${TICGTOOLSDIR} - export DSP_BASE_BIOS=${TITOOLSDIR}/${TIBIOSDIR} - export DSP_BASE_RTDX=${TITOOLSDIR}/${TIBIOSDIR}/packages/ti/rtdx - export GPPTOOL_DIR=${CROSS_DIR} - export LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR} - export LINK_INSTALL_DIR=${DSPLINK} - export VARIANT=${DSPLINKSOC} - export PLATFORM=${DSPLINKPLATFORM} - export BASE_TOOLCHAIN=${CROSS_DIR} - export BASE_CGTOOLS=${BASE_TOOLCHAIN}/bin - # 'OSINC_PLATFORM' is used in both the dsp and gpp sides... - export OSINC_PLATFORM1=${CROSS_DIR}/lib/gcc/${TARGET_SYS}/$(${TARGET_PREFIX}gcc -dumpversion)/include - export OSINC_TARGET=${BASE_TOOLCHAIN}/target/usr/include - - # 'ARCHIVER' is being used in the dsp side of the build as well as gpp - export ARCHIVER_AR=${TARGET_PREFIX}ar - export BASE_SABIOS=${DSP_BASE_BIOS} - - make -e -f ${WORKDIR}/Makefile.dsplink - - echo "MVTOOL_PREFIX=${TARGET_PREFIX}" > ${S}/Rules.make - echo "UCTOOL_PREFIX=${TARGET_PREFIX}" >> ${S}/Rules.make - echo "LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}" >> ${S}/Rules.make - - # Build the cmem kernel module - # We unset CFLAGS because kernel modules need different ones, this is basically a verbatim copy of kernel.bbclass and module-base.bbclass - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - cd ${S}/cetools/packages/ti/sdo/linuxutils/cmem - - oe_runmake clean - oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ - KERNEL_SRC=${STAGING_KERNEL_DIR} \ - KERNEL_VERSION=${KERNEL_VERSION} \ - CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ - AR="${KERNEL_AR}" - - # Build the DSP power manager kernel module - cd ${S}/cetools/packages/ti/bios/power - - # Unpack all kernel sources for the DSP power manager module - for dsp in $(ls | grep bld | awk -F, '{print $2}' | awk -F_ '{print $1}') ; do - if ! [ -e $dsp ] ; then tar xf ti_bios_power,${dsp}_bld.tar ; fi - done - - cd ${DSPPOWERSOC}/lpm - - unset LDFLAGS CFLAGS - make KERNEL_PATH=${STAGING_KERNEL_DIR} \ - KERNEL_SRC=${STAGING_KERNEL_DIR} \ - KERNEL_DIR=${STAGING_KERNEL_DIR} \ - KERNEL_VERSION=${KERNEL_VERSION} \ - TOOL_PREFIX=${TARGET_PREFIX} \ - DSPLINK_REPO=${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ \ - CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ - AR="${KERNEL_AR}" - +# the include files on top define do_compile for the submodules +do_compile_append() { cd ${S}/examples # export some more variable to point to external TI tools # information is duplicated between the js and make based tools diff --git a/packages/dsplink/dsplink.inc b/packages/dsplink/dsplink.inc index 9955d4d038..30d1ca3165 100644 --- a/packages/dsplink/dsplink.inc +++ b/packages/dsplink/dsplink.inc @@ -23,6 +23,7 @@ PARALLEL_MAKE = "" do_compile () { unset DISPLAY sed -i -e s:armv7a:armv7-a:g make/Linux/omap3530_2.6.mk || true + sed -i -e s:armv7a:armv7-a:g cetools/packages/dsplink/make/Linux/omap3530_2.6.mk || true # export various settings to override the defaults in the makefiles export DSP_BASE_CGTOOLS=${TITOOLSDIR}/${TICGTOOLSDIR} diff --git a/packages/dsplink/lpm.inc b/packages/dsplink/lpm.inc new file mode 100644 index 0000000000..211ffd3766 --- /dev/null +++ b/packages/dsplink/lpm.inc @@ -0,0 +1,61 @@ +DESCRIPTION = "Codec Engine for TI ARM/DSP processors - power module" + +DEPENDS = "virtual/kernel perl-native dsplink" +RDEPENDS = "update-modules" + +inherit module + +require ti-paths.inc + +PARALLEL_MAKE = "" + +do_compile_append() { + echo "MVTOOL_PREFIX=${TARGET_PREFIX}" > ${S}/Rules.make + echo "UCTOOL_PREFIX=${TARGET_PREFIX}" >> ${S}/Rules.make + echo "LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}" >> ${S}/Rules.make + + # Build the DSP power manager kernel module + cd ${S}/cetools/packages/ti/bios/power + + # Unpack all kernel sources for the DSP power manager module + for dsp in $(ls | grep bld | awk -F, '{print $2}' | awk -F_ '{print $1}') ; do + if ! [ -e $dsp ] ; then tar xf ti_bios_power,${dsp}_bld.tar ; fi + done + + cd ${DSPPOWERSOC}/lpm + + unset LDFLAGS CFLAGS + make KERNEL_PATH=${STAGING_KERNEL_DIR} \ + KERNEL_SRC=${STAGING_KERNEL_DIR} \ + KERNEL_DIR=${STAGING_KERNEL_DIR} \ + KERNEL_VERSION=${KERNEL_VERSION} \ + TOOL_PREFIX=${TARGET_PREFIX} \ + DSPLINK_REPO=${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + AR="${KERNEL_AR}" +} + + +do_install() { + install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp + cp ${S}/cetools/packages/ti/bios/power/${DSPPOWERSOC}/lpm/*.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp || true +} + +INHIBIT_PACKAGE_STRIP = "1" + +FILES_ti-lpm-module = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/*lpm*ko" + +pkg_postinst_ti-lpm-module () { + if [ -n "$D" ]; then + exit 1 + fi + depmod -a + update-modules || true +} + +pkg_postrm_ti-lpm-module () { + update-modules || true +} + + +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/dsplink/ti-cmemk-module_2.21.bb b/packages/dsplink/ti-cmemk-module_2.21.bb index 4261b140d2..0e9f733c8b 100644 --- a/packages/dsplink/ti-cmemk-module_2.21.bb +++ b/packages/dsplink/ti-cmemk-module_2.21.bb @@ -1,70 +1,15 @@ -DESCRIPTION = "Codec Engine for TI ARM/DSP processors - cmemk module" - -DEPENDS = "virtual/kernel perl-native" -RDEPENDS = "update-modules" - -inherit module - # tconf from xdctools dislikes '.' in pwd :/ -PR = "r1" +PR = "r2" PV = "221" # Get CE tarball from TI website, place in sources and calculate # md5sum # Look for tarball at https://www-a.ti.com/downloads/sds_support/targetcontent/CE/index.html -SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_21_00_06.tar.gz \ +SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_21.tar.gz \ file://Makefile.dsplink \ - file://cmemk-fix-class-device-api.diff;patch=1 \ " -S = "${WORKDIR}/codec_engine_2_21_00_06" - -require ti-paths.inc - -export DSPLINK="${S}/cetools/packages/dsplink" - -PARALLEL_MAKE = "" - - -do_compile() { - echo "MVTOOL_PREFIX=${TARGET_PREFIX}" > ${S}/Rules.make - echo "UCTOOL_PREFIX=${TARGET_PREFIX}" >> ${S}/Rules.make - echo "LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}" >> ${S}/Rules.make - - # Build the cmem kernel module - # We unset CFLAGS because kernel modules need different ones, this is basically a verbatim copy of kernel.bbclass and module-base.bbclass - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - cd ${S}/cetools/packages/ti/sdo/linuxutils/cmem - - oe_runmake clean - oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ - KERNEL_SRC=${STAGING_KERNEL_DIR} \ - KERNEL_VERSION=${KERNEL_VERSION} \ - CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ - AR="${KERNEL_AR}" -} - - -do_install() { - install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp - cp ${S}/cetools/packages/ti/sdo/linuxutils/cmem/src/module/cmemk.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp -} - -INHIBIT_PACKAGE_STRIP = "1" - -FILES_ti-cmemk-module = "${sysconfdir} /lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/cmemk.ko" - -pkg_postinst_ti-cmemk-module () { - if [ -n "$D" ]; then - exit 1 - fi - depmod -a - update-modules || true -} - -pkg_postrm_ti-cmemk-module () { - update-modules || true -} +S = "${WORKDIR}/codec_engine_2_21" -PACKAGE_ARCH = "${MACHINE_ARCH}" +require cmemk.inc diff --git a/packages/dsplink/ti-lpm-module_2.21.bb b/packages/dsplink/ti-lpm-module_2.21.bb index 50e58666bd..9a9791894d 100644 --- a/packages/dsplink/ti-lpm-module_2.21.bb +++ b/packages/dsplink/ti-lpm-module_2.21.bb @@ -1,75 +1,15 @@ -DESCRIPTION = "Codec Engine for TI ARM/DSP processors - power module" - -DEPENDS = "virtual/kernel perl-native dsplink" -RDEPENDS = "update-modules" - -inherit module - # tconf from xdctools dislikes '.' in pwd :/ -PR = "r1" +PR = "r2" PV = "221" # Get CE tarball from TI website, place in sources and calculate # md5sum # Look for tarball at https://www-a.ti.com/downloads/sds_support/targetcontent/CE/index.html -SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_21_00_06.tar.gz \ +SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_21.tar.gz \ file://Makefile.dsplink \ " -S = "${WORKDIR}/codec_engine_2_21_00_06" - -require ti-paths.inc - -PARALLEL_MAKE = "" - -do_compile() { - echo "MVTOOL_PREFIX=${TARGET_PREFIX}" > ${S}/Rules.make - echo "UCTOOL_PREFIX=${TARGET_PREFIX}" >> ${S}/Rules.make - echo "LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}" >> ${S}/Rules.make - - # Build the DSP power manager kernel module - cd ${S}/cetools/packages/ti/bios/power - - # Unpack all kernel sources for the DSP power manager module - for dsp in $(ls | grep bld | awk -F, '{print $2}' | awk -F_ '{print $1}') ; do - if ! [ -e $dsp ] ; then tar xf ti_bios_power,${dsp}_bld.tar ; fi - done - - cd ${DSPPOWERSOC}/lpm - - unset LDFLAGS CFLAGS - make KERNEL_PATH=${STAGING_KERNEL_DIR} \ - KERNEL_SRC=${STAGING_KERNEL_DIR} \ - KERNEL_DIR=${STAGING_KERNEL_DIR} \ - KERNEL_VERSION=${KERNEL_VERSION} \ - TOOL_PREFIX=${TARGET_PREFIX} \ - DSPLINK_REPO=${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ \ - CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ - AR="${KERNEL_AR}" -} - - -do_install() { - install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp - cp ${S}/cetools/packages/ti/bios/power/${DSPPOWERSOC}/lpm/*.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp || true -} - -INHIBIT_PACKAGE_STRIP = "1" - -FILES_ti-lpm-module = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/*lpm*ko" - -pkg_postinst_ti-lpm-module () { - if [ -n "$D" ]; then - exit 1 - fi - depmod -a - update-modules || true -} - -pkg_postrm_ti-lpm-module () { - update-modules || true -} - +S = "${WORKDIR}/codec_engine_2_21" -PACKAGE_ARCH = "${MACHINE_ARCH}" +require lpm.inc -- cgit v1.2.3 From 8d2f8e65e01ea07335c3d172866d1ccbd10ebdcc Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 14 Nov 2008 11:27:07 +0100 Subject: angstrom: switch armv4t to thumb as per RFC on angstrom-devel --- conf/distro/include/angstrom.inc | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 48cbb49d2c..5d250074c5 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -21,6 +21,32 @@ CACHE = "${TMPDIR}/cache/${ANGSTROM_MODE}/${MACHINE}" DEPLOY_DIR = "${TMPDIR}/deploy/${ANGSTROM_MODE}" require conf/distro/include/angstrom-${ANGSTROM_MODE}.inc +# ARM920T and up can use thumb mode to decrease binary size at the expense of speed +# (the complete story is a bit more nuanced due to cache starvation) +# Angstrom turns on thumb for armv4t machine according to this RFC: +# http://lists.linuxtogo.org/pipermail/angstrom-distro-devel/2008-October/002714.html + +# We can't do ARM_INSTRUCTION_SET_armv4t since that will un-overridable in recipes like gcc +ANGSTROM_ARM_INSTRUCTION_SET ?= "arm" +ANGSTROM_ARM_INSTRUCTION_SET_armv4t = "thumb" + +ARM_INSTRUCTION_SET = "${ANGSTROM_ARM_INSTRUCTION_SET}" +# "arm" "thumb" +# The instruction set the compiler should use when generating application +# code. The kernel is always compiled with arm code at present. arm code +# is the original 32 bit ARM instruction set, thumb code is the 16 bit +# encoded RISC sub-set. Thumb code is smaller (maybe 70% of the ARM size) +# but requires more instructions (140% for 70% smaller code) so may be +# slower. + +THUMB_INTERWORK = "yes" +# "yes" "no" +# Whether to compile with code to allow interworking between the two +# instruction sets. This allows thumb code to be executed on a primarily +# arm system and vice versa. It is strongly recommended that DISTROs not +# turn this off - the actual cost is very small. + + #Use this variable in feeds and other parts that need a URI ANGSTROM_URI ?= "http://www.angstrom-distribution.org" -- cgit v1.2.3 From da0d2fe426302edcb6c63ad8e72554ae7267be3c Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Fri, 14 Nov 2008 10:37:11 +0000 Subject: frameworkd-devel git: fix FILESDIR --- packages/freesmartphone/frameworkd-devel_git.bb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/freesmartphone/frameworkd-devel_git.bb b/packages/freesmartphone/frameworkd-devel_git.bb index c46c44ad17..352f849535 100644 --- a/packages/freesmartphone/frameworkd-devel_git.bb +++ b/packages/freesmartphone/frameworkd-devel_git.bb @@ -1,5 +1,8 @@ require frameworkd_git.bb +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/frameworkd" -SRC_URI = "${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master \ - file://frameworkd \ - file://frameworkd.conf" +SRC_URI = "\ + ${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master \ + file://frameworkd \ + file://frameworkd.conf \ +" -- cgit v1.2.3 From ff95dccb3c1617033c698165327e74ebda5f42a1 Mon Sep 17 00:00:00 2001 From: Daniel Willmann Date: Fri, 14 Nov 2008 12:33:15 +0100 Subject: frameworkd-devel: Use FILESPATH of frameworkd --- packages/freesmartphone/frameworkd-devel_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/freesmartphone/frameworkd-devel_git.bb b/packages/freesmartphone/frameworkd-devel_git.bb index 352f849535..e5933ca214 100644 --- a/packages/freesmartphone/frameworkd-devel_git.bb +++ b/packages/freesmartphone/frameworkd-devel_git.bb @@ -1,5 +1,5 @@ require frameworkd_git.bb -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/frameworkd" +FILESPATH = "${FILE_DIRNAME}/frameworkd" SRC_URI = "\ ${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master \ -- cgit v1.2.3 From 5bbc2d06e61847ae30a3f3a87e1ff5c9b2e15652 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 14 Nov 2008 13:03:25 +0100 Subject: linux omap git: bump to 2.6.28rc4, fix evm dss2 patch for upstream changes * dss2 still not enabled in defconfig --- packages/linux/linux-omap/omap3evm/omap3evm-dss2.diff | 8 ++++---- packages/linux/linux-omap_git.bb | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/linux/linux-omap/omap3evm/omap3evm-dss2.diff b/packages/linux/linux-omap/omap3evm/omap3evm-dss2.diff index afcebba10f..60832e72ca 100644 --- a/packages/linux/linux-omap/omap3evm/omap3evm-dss2.diff +++ b/packages/linux/linux-omap/omap3evm/omap3evm-dss2.diff @@ -146,7 +146,7 @@ index 42ab826..e244fa7 100644 + printk(KERN_ERR "cannot enable LCD, DVI is enabled\n"); + return -EINVAL; + } -+ if (system_rev > OMAP3430_REV_ES1_0) { ++ if (omap_rev() > OMAP3430_REV_ES1_0) { + twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, + ENABLE_VPLL2_DEDICATED, TWL4030_VPLL2_DEDICATED); + twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, @@ -159,20 +159,20 @@ index 42ab826..e244fa7 100644 + +static void panel_disable_lcd(struct omap_display *display) +{ -+ if (system_rev > OMAP3430_REV_ES1_0) { ++ if (omap_rev() > OMAP3430_REV_ES1_0) { + twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x0, + TWL4030_VPLL2_DEDICATED); + twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x0, + TWL4030_VPLL2_DEV_GRP); + } -+ omap_set_gpio_dataout(LCD_PANEL_ENABLE_GPIO, 1); ++ gpio_set_value(LCD_PANEL_ENABLE_GPIO, 1); + lcd_enabled = 0; +} + +static struct omap_display_data evm_display_data = { + .type = OMAP_DISPLAY_TYPE_DPI, + .name = "lcd", -+ .panel_name = "panel-evm", ++ .panel_name = "panel-sdp3430", + .u.dpi.data_lines = 16, + .panel_enable = panel_enable_lcd, + .panel_disable = panel_disable_lcd, diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb index 81f717ae5e..c56f87ec00 100644 --- a/packages/linux/linux-omap_git.bb +++ b/packages/linux/linux-omap_git.bb @@ -6,11 +6,11 @@ KERNEL_IMAGETYPE = "uImage" COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|omap3evm" -SRCREV = "444fcab6e8f8bad4ffc50feb91516c246d91e901" +SRCREV = "5ecf98b76fa95078277c9037bb01640fd3de5e2c" -PV = "2.6.27+2.6.28-rc3+${PR}+gitr${SRCREV}" +PV = "2.6.27+2.6.28-rc4+${PR}+gitr${SRCREV}" #PV = "2.6.27+${PR}+gitr${SRCREV}" -PR = "r4" +PR = "r0" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ file://defconfig" @@ -41,7 +41,7 @@ SRC_URI_append = " \ file://0007-DSS-support-for-Beagle-Board.patch;patch=1 \ file://0008-DSS-BEAGLE-Enable-DSS-in-beagle-defconfig.patch;patch=1 \ file://0009-DSS-support-for-OMAP3-SDP-board.patch;patch=1 \ - file://fix-asoc.diff;patch=1 \ +# file://fix-asoc.diff;patch=1 \ " @@ -50,7 +50,7 @@ SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \ SRC_URI_append_omap3evm = " \ file://evm-mcspi-ts.diff;patch=1 \ - file://omap3evm-lcd-redtint.diff;patch=1 \ +# file://omap3evm-lcd-redtint.diff;patch=1 \ file://omap3evm-dss2.diff;patch=1 \ " -- cgit v1.2.3 From d483356a8fa4a369cf1c998916def164fb430af6 Mon Sep 17 00:00:00 2001 From: Daniel Willmann Date: Fri, 14 Nov 2008 14:03:43 +0100 Subject: frameworkd_devel: Use base_set_filespath for machine specific subdirs in FILESPATH --- packages/freesmartphone/frameworkd-devel_git.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/freesmartphone/frameworkd-devel_git.bb b/packages/freesmartphone/frameworkd-devel_git.bb index e5933ca214..9438b6d768 100644 --- a/packages/freesmartphone/frameworkd-devel_git.bb +++ b/packages/freesmartphone/frameworkd-devel_git.bb @@ -1,5 +1,7 @@ require frameworkd_git.bb -FILESPATH = "${FILE_DIRNAME}/frameworkd" +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/frameworkd', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" + +PR="r1" SRC_URI = "\ ${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master \ -- cgit v1.2.3 From 348d24922145daec41d09d3c5d89b47b57f32de0 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 13 Nov 2008 00:54:41 -0200 Subject: evince: add 2.24.1 --- conf/checksums.ini | 4 ++++ packages/evince/evince_2.24.1.bb | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 packages/evince/evince_2.24.1.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 8c852b6200..96309e78e9 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -4418,6 +4418,10 @@ sha256=4dcbdbd253b1978dcd70452780d7804ade912f4ede90f122f30d5322f53c5c3e md5=4e353edd6481f67ee534a40d4b7f3b8c sha256=c424e6dd5cc0d998a311f5c49835de9803da4dbcb74ca7fbda29c1b953bf6d6b +[http://ftp.gnome.org/pub/GNOME/sources/evince/2.24/evince-2.24.1.tar.bz2] +md5=ad0e463ab1fe596fc52c03403a9b9f1e +sha256=d8803313e2a0b3fa3fe20fe613ac3ec85ec6848d5d446dd02e9cc5be8194f65c + [http://enlightenment.freedesktop.org/files/ewl-0.0.4.007.tar.gz] md5=29bc8aec80b53480c2ea53aea1796e15 sha256=0a0dba00517013082b8e094b4b7753162cf5fb71a170eb54cbc2eaa35717d5f6 diff --git a/packages/evince/evince_2.24.1.bb b/packages/evince/evince_2.24.1.bb new file mode 100644 index 0000000000..9dc61c35f7 --- /dev/null +++ b/packages/evince/evince_2.24.1.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Evince is a document viewer for document formats like pdf, ps, djvu." +LICENSE = "GPL" +SECTION = "x11/office" +DEPENDS = "gnome-icon-theme tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring " +RDEPENDS = "espgs gnome-icon-theme" +RRECOMMENDS = "gnome-vfs-plugin-file" +PR = "r1" + +inherit gnome pkgconfig gtk-icon-cache + +SRC_URI += " file://no-help-dir.patch;patch=1" + +EXTRA_OECONF = " --without-libgnome \ + --disable-thumbnailer \ + --disable-scrollkeeper \ + --enable-djvu \ + " +FILES_${PN}-dbg = "${libdir}/evince/backends/.debug" -- cgit v1.2.3 From 28a627e78d957096eb4c16889ec71a51100993f0 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 5 Nov 2008 09:09:00 -0200 Subject: xorg-xserver-common.inc: add default font path to misc fonts --- packages/xorg-xserver/xorg-xserver-common.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index d391ffe60b..0dee7db032 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -23,6 +23,7 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig EXTRA_OECONF += " --enable-xcalibrate \ + --with-default-font-path="/usr/share/fonts/X11/misc" \ ac_cv_file__usr_share_sgml_X11_defs_ent=no" EXTRA_OECONF_append_arm = " ac_cv_header_linux_apm_bios_h=no " -- cgit v1.2.3 From 44a201e095eb1f32c5e2e3f7510ee7a5400f6757 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 12 Nov 2008 22:16:05 -0200 Subject: xorg-xserver-common.inc: build xephyr package It makes sense to build xephyr package from xserver-xorg recipe as well to be sure that the version of both matches. --- packages/xorg-xserver/xorg-xserver-common.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index 0dee7db032..df594133ba 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -23,6 +23,8 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig EXTRA_OECONF += " --enable-xcalibrate \ + --enable-kdrive \ + --enable-xephyr \ --with-default-font-path="/usr/share/fonts/X11/misc" \ ac_cv_file__usr_share_sgml_X11_defs_ent=no" @@ -32,13 +34,14 @@ PACKAGES =+ "xserver-security-policy" FILES_xserver-security-policy += "${libdir}/xserver/SecurityPolicy" RRECOMMENDS_${PN} += "xserver-security-policy xkeyboard-config xorg-minimal-fonts rgb xserver-xorg-conf" -PACKAGES =+ "${PN}-xprint ${PN}-xvfb ${PN}-utils" +PACKAGES =+ "${PN}-xprint ${PN}-xvfb ${PN}-utils ${PN}-xephyr" FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print" FILES_${PN}-xvfb = "${bindir}/Xvfb" FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules ${libdir}/xorg/modules /etc/X11 " FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled" +FILES_${PN}-xephyr = "${bindir}/Xephyr" FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ ${libdir}/xorg/modules/*/.debug \ -- cgit v1.2.3 From 4f5a0a5bea3eedad61ce28ccafc858735306194e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 14 Nov 2008 17:33:21 +0100 Subject: angstrom 2008: while binutils 2.19 works fine on some platforms it breaks thumb, so switch back to 2.18.something --- conf/distro/angstrom-2008.1.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index cf668e9e0f..9bc0273466 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -105,8 +105,8 @@ ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2" #Everybody else can just use this: ANGSTROM_GCC_VERSION ?= "4.2.4" -PREFERRED_VERSION_binutils-cross ?= "2.19" -PREFERRED_VERSION_binutils-cross-sdk ?= "2.19" +PREFERRED_VERSION_binutils-cross ?= "2.18.50.0.7" +PREFERRED_VERSION_binutils-cross-sdk ?= "2.18.50.0.7" PREFERRED_VERSION_gcc ?= "${ANGSTROM_GCC_VERSION}" PREFERRED_VERSION_gcc-cross ?= "${ANGSTROM_GCC_VERSION}" -- cgit v1.2.3 From efaef6b847bd258bc9d8462fe844575bf19274c9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 14 Nov 2008 17:35:04 +0100 Subject: binutils 2.18.50.0.7: bump PR to force rebuild --- packages/binutils/binutils_2.18.50.0.7.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/binutils/binutils_2.18.50.0.7.bb b/packages/binutils/binutils_2.18.50.0.7.bb index d0656f6300..98b389fd53 100644 --- a/packages/binutils/binutils_2.18.50.0.7.bb +++ b/packages/binutils/binutils_2.18.50.0.7.bb @@ -1,4 +1,4 @@ -PR = "r4" +PR = "r5" require binutils.inc -- cgit v1.2.3 From c9ba39c5b65be9731f760160a176bef6acf8d67d Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Fri, 14 Nov 2008 16:49:34 +0000 Subject: xserver-xorg_1.5.3.bb : xserver update to 1.5.3 --- conf/checksums.ini | 4 ++++ packages/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch | 13 +++++++++++++ packages/xorg-xserver/xserver-xorg_1.5.3.bb | 13 +++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 packages/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch create mode 100644 packages/xorg-xserver/xserver-xorg_1.5.3.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 96309e78e9..93002947d4 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1,3 +1,7 @@ +[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.5.3.tar.bz2] +md5=308971036e25250e7fe3cccfd5a120f8 +sha256=a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb + [http://www.directfb.org/downloads/Extras/++DFB-0.9.25.tar.gz] md5=c6a2705f6210d8ede50a947b375f1c0b sha256=b3dbf01563dd60d63cff543ea8cd0c885381e78ecbbab8ff176e46df3f198a88 diff --git a/packages/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch b/packages/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch new file mode 100644 index 0000000000..e0f633bc24 --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch @@ -0,0 +1,13 @@ +Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am +=================================================================== +--- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am 2008-09-23 19:24:59.000000000 +0100 ++++ xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am 2008-10-27 13:27:40.000000000 +0000 +@@ -40,7 +40,7 @@ + + AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES) + +-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack ++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS) + + # FIXME: These need to be added to the build + LNX_EXTRA_SRCS = \ diff --git a/packages/xorg-xserver/xserver-xorg_1.5.3.bb b/packages/xorg-xserver/xserver-xorg_1.5.3.bb new file mode 100644 index 0000000000..92ef22fd63 --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg_1.5.3.bb @@ -0,0 +1,13 @@ +require xorg-xserver-common.inc + +DESCRIPTION = "the X.Org X server" +DEPENDS += "pixman libpciaccess openssl" +PE = "1" +PR = "r1" + +SRC_URI += "file://drmfix.patch;patch=1 \ + file://sysroot_fix.patch;patch=1" + +MESA_VER = "7.2" + +export LDFLAGS += " -ldl " -- cgit v1.2.3 From 4c1f12e0815bb39a80ab0ccc3ff7e346b2707d29 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Fri, 14 Nov 2008 16:50:16 +0000 Subject: preferred-xorg-versions-X11R7.4.inc : add comment about mesa version --- conf/distro/include/preferred-xorg-versions-X11R7.4.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc index 548d8239e8..46fa8d496a 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc @@ -191,6 +191,9 @@ PREFERRED_VERSION_libxxf86dga ?= "1.0.2" PREFERRED_VERSION_libxxf86misc ?= "1.0.1" PREFERRED_VERSION_libxxf86vm ?= "1.0.2" PREFERRED_VERSION_xtrans ?= "1.2.1" + +# This should be here but is needed until bitbake can do +# versioned depends PREFERRED_VERSION_mesa ?= "7.2" # proto -- cgit v1.2.3 From 6e06616b067073a4f0a0daeba22b744ae7c6fb7a Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Fri, 14 Nov 2008 16:51:08 +0000 Subject: angstrom-2008-preferred-versions.inc : dont hardcode xserver here --- conf/distro/include/angstrom-2008-preferred-versions.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index c1dc088ead..e58eb40519 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -28,4 +28,3 @@ PREFERRED_VERSION_pulseaudio = "0.9.10" PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2" PREFERRED_VERSION_udev = "124" PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" -PREFERRED_VERSION_xserver-xorg = "1.5.1" -- cgit v1.2.3 From 1e21bb5cfcc5ad62f7338edf3f0e69f020aa5bd4 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Fri, 14 Nov 2008 16:51:34 +0000 Subject: preferred-xorg-versions-X11R7.4-updates.inc : add file to list updates since release version --- conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc new file mode 100644 index 0000000000..cf999a2a4d --- /dev/null +++ b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc @@ -0,0 +1,3 @@ +# This file is for updates after X11R7.4 was released + +PREFERRED_VERSION_xserver-xorg ?= "1.5.3" -- cgit v1.2.3 From 39603155a14bea4dc83f475e489205c245cb2bff Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Fri, 14 Nov 2008 16:59:22 +0000 Subject: angstrom-2008.1.conf : make use of the X11R7.4 updates file --- conf/distro/angstrom-2008.1.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 9bc0273466..cc5be470d2 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -116,6 +116,7 @@ PREFERRED_VERSION_gcc-cross-intermediate ?= "${ANGSTROM_GCC_VERSION}" #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom require conf/distro/include/preferred-e-versions.inc +require conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc require conf/distro/include/preferred-xorg-versions-X11R7.4.inc #avr32 only has patches for binutils 2.17 in OE -- cgit v1.2.3 From 5f7bde74179a9eac56e874687f4837d3af759878 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 14 Nov 2008 18:39:42 +0100 Subject: linux-omap git: update DSS2 patches, fix mmc --- ...cumentation-for-OMAP2-3-display-subsystem.patch | 2 +- ...-New-display-subsystem-driver-for-OMAP2-3.patch | 14 +- ...MAPFB-fb-driver-for-new-display-subsystem.patch | 2 +- .../0006-DSS-Add-generic-DVI-panel.patch | 24 +- .../0007-DSS-support-for-Beagle-Board.patch | 2 +- ...DSS-BEAGLE-Enable-DSS-in-beagle-defconfig.patch | 2 +- ...09-DSS-Sharp-LS037V7DW01-LCD-Panel-driver.patch | 155 +++++++++++ .../0010-DSS-Support-for-OMAP3-SDP-board.patch | 296 +++++++++++++++++++++ .../0011-DSS-Support-for-OMAP3-EVM-board.patch | 288 ++++++++++++++++++++ packages/linux/linux-omap/fix-mmc.diff | 39 +++ packages/linux/linux-omap_git.bb | 6 +- 11 files changed, 806 insertions(+), 24 deletions(-) create mode 100644 packages/linux/linux-omap/0009-DSS-Sharp-LS037V7DW01-LCD-Panel-driver.patch create mode 100644 packages/linux/linux-omap/0010-DSS-Support-for-OMAP3-SDP-board.patch create mode 100644 packages/linux/linux-omap/0011-DSS-Support-for-OMAP3-EVM-board.patch create mode 100644 packages/linux/linux-omap/fix-mmc.diff diff --git a/packages/linux/linux-omap/0003-DSS-Documentation-for-OMAP2-3-display-subsystem.patch b/packages/linux/linux-omap/0003-DSS-Documentation-for-OMAP2-3-display-subsystem.patch index 2ee2e2acce..6cc8ce12c6 100644 --- a/packages/linux/linux-omap/0003-DSS-Documentation-for-OMAP2-3-display-subsystem.patch +++ b/packages/linux/linux-omap/0003-DSS-Documentation-for-OMAP2-3-display-subsystem.patch @@ -1,4 +1,4 @@ -From b6d4f19ae3192db2d7733fb70c212494bb1e0abd Mon Sep 17 00:00:00 2001 +From e8cc995ace5ef4c8e920ccac6bacc1a0129ad2c4 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Tue, 4 Nov 2008 15:08:07 +0200 Subject: [PATCH] DSS: Documentation for OMAP2/3 display subsystem diff --git a/packages/linux/linux-omap/0004-DSS-New-display-subsystem-driver-for-OMAP2-3.patch b/packages/linux/linux-omap/0004-DSS-New-display-subsystem-driver-for-OMAP2-3.patch index 461890343a..e7beec7898 100644 --- a/packages/linux/linux-omap/0004-DSS-New-display-subsystem-driver-for-OMAP2-3.patch +++ b/packages/linux/linux-omap/0004-DSS-New-display-subsystem-driver-for-OMAP2-3.patch @@ -1,4 +1,4 @@ -From 04b4d27af34373bbb65df19c2c084f117fe54213 Mon Sep 17 00:00:00 2001 +From 6bec28d7c3d7cf97d644c610beadfef354fa596e Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 13 Nov 2008 15:38:15 +0200 Subject: [PATCH] DSS: New display subsystem driver for OMAP2/3 @@ -9,7 +9,7 @@ Signed-off-by: Tomi Valkeinen arch/arm/plat-omap/Makefile | 2 + arch/arm/plat-omap/dss/Kconfig | 66 + arch/arm/plat-omap/dss/Makefile | 6 + - arch/arm/plat-omap/dss/dispc.c | 1720 ++++++++++++++++ + arch/arm/plat-omap/dss/dispc.c | 1722 ++++++++++++++++ arch/arm/plat-omap/dss/display.c | 775 ++++++++ arch/arm/plat-omap/dss/dpi.c | 323 +++ arch/arm/plat-omap/dss/dsi.c | 3020 +++++++++++++++++++++++++++++ @@ -19,7 +19,7 @@ Signed-off-by: Tomi Valkeinen arch/arm/plat-omap/dss/sdi.c | 157 ++ arch/arm/plat-omap/dss/venc.c | 515 +++++ arch/arm/plat-omap/include/mach/display.h | 458 +++++ - 14 files changed, 9086 insertions(+), 0 deletions(-) + 14 files changed, 9088 insertions(+), 0 deletions(-) create mode 100644 arch/arm/plat-omap/dss/Kconfig create mode 100644 arch/arm/plat-omap/dss/Makefile create mode 100644 arch/arm/plat-omap/dss/dispc.c @@ -142,10 +142,10 @@ index 0000000..e98c6c1 +omap-dss-$(CONFIG_OMAP2_DSS_DSI) += dsi.o diff --git a/arch/arm/plat-omap/dss/dispc.c b/arch/arm/plat-omap/dss/dispc.c new file mode 100644 -index 0000000..6d06082 +index 0000000..3738cf3 --- /dev/null +++ b/arch/arm/plat-omap/dss/dispc.c -@@ -0,0 +1,1720 @@ +@@ -0,0 +1,1722 @@ +/* + * linux/arch/arm/plat-omap/dss/dispc.c + * @@ -1261,8 +1261,10 @@ index 0000000..6d06082 + + for (cur_pd = pcd_min; cur_pd <= 255; ++cur_pd) { + unsigned long pck = lck / cur_pd; ++ long old_delta = abs(best_pck - req_pck); ++ long new_delta = abs(pck - req_pck); + -+ if (abs(pck - req_pck) < abs(best_pck - req_pck)) { ++ if (best_pck == 0 || new_delta < old_delta) { + best_pck = pck; + best_ld = cur_ld; + best_pd = cur_pd; diff --git a/packages/linux/linux-omap/0005-DSS-OMAPFB-fb-driver-for-new-display-subsystem.patch b/packages/linux/linux-omap/0005-DSS-OMAPFB-fb-driver-for-new-display-subsystem.patch index d64fe442f9..b9a56afcd9 100644 --- a/packages/linux/linux-omap/0005-DSS-OMAPFB-fb-driver-for-new-display-subsystem.patch +++ b/packages/linux/linux-omap/0005-DSS-OMAPFB-fb-driver-for-new-display-subsystem.patch @@ -1,4 +1,4 @@ -From e2aaa3251054eecf92b8936e704a3581de69bdc7 Mon Sep 17 00:00:00 2001 +From 36ac3fa1184b392dc54024de6d98e4355f2baba8 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Tue, 4 Nov 2008 15:12:21 +0200 Subject: [PATCH] DSS: OMAPFB: fb driver for new display subsystem diff --git a/packages/linux/linux-omap/0006-DSS-Add-generic-DVI-panel.patch b/packages/linux/linux-omap/0006-DSS-Add-generic-DVI-panel.patch index 4925f2437b..bbf96ecc6f 100644 --- a/packages/linux/linux-omap/0006-DSS-Add-generic-DVI-panel.patch +++ b/packages/linux/linux-omap/0006-DSS-Add-generic-DVI-panel.patch @@ -1,4 +1,4 @@ -From ce4676f5a466d991bccfeac2c32316053e86b9a1 Mon Sep 17 00:00:00 2001 +From ff78ff9513a40be30649420bc9833793a6e70b75 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Tue, 11 Nov 2008 13:52:56 +0200 Subject: [PATCH] DSS: Add generic DVI panel @@ -16,7 +16,7 @@ You also need DSI PLL to generate pix clock for 1280x1024. create mode 100644 drivers/video/omap2/panel-dvi.c diff --git a/drivers/video/omap2/Kconfig b/drivers/video/omap2/Kconfig -index 4b72479..996f047 100644 +index 4b72479..11ca6fe 100644 --- a/drivers/video/omap2/Kconfig +++ b/drivers/video/omap2/Kconfig @@ -24,6 +24,29 @@ config FB_OMAP2_FORCE_AUTO_UPDATE @@ -31,18 +31,18 @@ index 4b72479..996f047 100644 +choice + prompt "Default DVI Mode" + depends on PANEL_DVI -+ default PANEL_DVI_HIGHRES ++ default PANEL_DVI_1024X768 + -+config PANEL_DVI_LOWLOWRES ++config PANEL_DVI_640X480 + bool "640 x 480 @ 60" + -+config PANEL_DVI_LOWRES ++config PANEL_DVI_800X600 + bool "800 x 600 @ 60" + -+config PANEL_DVI_HIGHRES ++config PANEL_DVI_1024X768 + bool "1024 x 768 @ 60" + -+config PANEL_DVI_VERYHIGHRES ++config PANEL_DVI_1280X1024 + bool "1280 x 1024 @ 57" + +endchoice @@ -60,7 +60,7 @@ index 51c2e00..7c75340 100644 +obj-$(CONFIG_PANEL_DVI) += panel-dvi.o diff --git a/drivers/video/omap2/panel-dvi.c b/drivers/video/omap2/panel-dvi.c new file mode 100644 -index 0000000..541f588 +index 0000000..393eaf1 --- /dev/null +++ b/drivers/video/omap2/panel-dvi.c @@ -0,0 +1,150 @@ @@ -131,7 +131,7 @@ index 0000000..541f588 + .resume = dvi_panel_resume, + /*.set_mode = dvi_set_mode, */ + -+#if defined(CONFIG_PANEL_DVI_LOWLOWRES) ++#if defined(CONFIG_PANEL_DVI_640X480) + .timings = { + /* 640 x 480 @ 60 hz reduced blanking vesa + * (dunno if these are correct) */ @@ -147,7 +147,7 @@ index 0000000..541f588 + .x_res = 640, + .y_res = 480, + .bpp = 24, -+#elif defined(CONFIG_PANEL_DVI_LOWRES) ++#elif defined(CONFIG_PANEL_DVI_800X600) + .timings = { + /* 800 x 600 @ 60 hz reduced blanking vesa cvt 0.48m3-r */ + .pixel_clock = 35500, @@ -162,7 +162,7 @@ index 0000000..541f588 + .x_res = 800, + .y_res = 600, + .bpp = 24, -+#elif defined(CONFIG_PANEL_DVI_HIGHRES) ++#elif defined(CONFIG_PANEL_DVI_1024X768) + .timings = { + /* 1024 x 768 @ 60 Hz Reduced blanking */ + .pixel_clock = 56000, @@ -177,7 +177,7 @@ index 0000000..541f588 + .x_res = 1024, + .y_res = 768, + .bpp = 24, -+#elif d