diff options
| -rw-r--r-- | conf/bitbake.conf | 2 | ||||
| -rw-r--r-- | conf/checksums.ini | 20 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 1 | ||||
| -rw-r--r-- | conf/machine/overo.conf | 15 | ||||
| -rw-r--r-- | packages/evtest/evtest_1.23.bb | 21 | ||||
| -rw-r--r-- | packages/gcc/gcc-common.inc | 5 | ||||
| -rw-r--r-- | packages/linux/linux-omap-2.6.28/overo/defconfig | 110 | ||||
| -rw-r--r-- | packages/linux/linux-omap-2.6.28/overo/overo-ehci.patch | 113 | ||||
| -rw-r--r-- | packages/linux/linux-omap_2.6.28.bb | 7 | ||||
| -rw-r--r-- | packages/neon/files/gnutls-2.patch | 11 | ||||
| -rw-r--r-- | packages/popt/popt-1.13/iconv.patch | 25 | ||||
| -rw-r--r-- | packages/popt/popt-native_1.14.bb | 16 | ||||
| -rw-r--r-- | packages/popt/popt-native_1.7.bb | 17 | ||||
| -rw-r--r-- | packages/popt/popt_1.14.bb | 17 | ||||
| -rw-r--r-- | packages/popt/popt_1.7.bb | 17 | ||||
| -rw-r--r-- | packages/xorg-driver/xf86-video-glamo_git.bb | 11 | ||||
| -rw-r--r-- | packages/yasr/files/yasr-0.6.9-gcc43.patch | 26 | ||||
| -rw-r--r-- | packages/yasr/files/yasr-0.6.9-remove-m4.patch | 29 | ||||
| -rw-r--r-- | packages/yasr/yasr_0.6.9.bb | 16 |
19 files changed, 377 insertions, 102 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 9c187c0757..9aefb63172 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -577,6 +577,8 @@ export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig" export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}" export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" +export XDG_DATA_DIRS = "${STAGING_DATADIR}" + export QMAKE_MKSPEC_PATH = "${STAGING_DATADIR_NATIVE}/qmake" export STAGING_SIPDIR = "${STAGING_DATADIR_NATIVE}/sip" export STAGING_IDLDIR = "${STAGING_DATADIR}/idl" diff --git a/conf/checksums.ini b/conf/checksums.ini index 17ffc72993..6f816079e9 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -5102,6 +5102,10 @@ sha256=c424e6dd5cc0d998a311f5c49835de9803da4dbcb74ca7fbda29c1b953bf6d6b md5=ad0e463ab1fe596fc52c03403a9b9f1e sha256=d8803313e2a0b3fa3fe20fe613ac3ec85ec6848d5d446dd02e9cc5be8194f65c +[http://beagleboard.googlecode.com/files/evtest.c] +md5=da26fda6df8835a7cb95182e1fabe912 +sha256=ba2bdf6887eb0ef606402d51a2f4e68510d68dec5afd9f4d30d787950dece770 + [http://enlightenment.freedesktop.org/files/ewl-0.0.4.007.tar.gz] md5=29bc8aec80b53480c2ea53aea1796e15 sha256=0a0dba00517013082b8e094b4b7753162cf5fb71a170eb54cbc2eaa35717d5f6 @@ -17410,6 +17414,10 @@ sha256=175be17571e9af3ad622531b494a0738ae632c60c8c6329273778b2b6fbbad74 md5=5988e7aeb0ae4dac8d83561265984cc9 sha256=4e75cb28793f0d44134f71fae53057d5f250805e6268fbd9c9780654b73b0dc1 +[http://rpm.org/releases/historical/rpm-4.1.x/popt-1.7.tar.gz] +md5=5988e7aeb0ae4dac8d83561265984cc9 +sha256=4e75cb28793f0d44134f71fae53057d5f250805e6268fbd9c9780654b73b0dc1 + [http://downloads.sourceforge.net/poqetp/poqetp_0.0.6_src.tar.gz] md5=b003614237445d23b512cb9571565524 sha256=4347a70fe84bd2ccecc90738fb121d28298cf0bfdb4963ceee088c56d3109899 @@ -22050,14 +22058,14 @@ sha256=6fb80935fe208538131ce2c4178221bab1078a1656306bce8909c19887e2e5a1 md5=05fada181e12bfa94b52f0b10395b28c sha256=a4f15c73e2b67c888cbedfaa8093661dff6cb859357c197c60f3026baddb939e -[http://downloads.sourceforge.net/wireshark/wireshark-1.0.5.tar.bz2] -md5=4c6a93e00123d8bb7af48a009519aca4 -sha256=4f923e24d674ac62ded3da402a4de6d402886d80e3d7cac91cf026921f32fcf7 - [http://heanet.dl.sourceforge.net/wireshark/wireshark-0.99.4.tar.bz2] md5=05fada181e12bfa94b52f0b10395b28c sha256=a4f15c73e2b67c888cbedfaa8093661dff6cb859357c197c60f3026baddb939e +[http://downloads.sourceforge.net/wireshark/wireshark-1.0.5.tar.bz2] +md5=4c6a93e00123d8bb7af48a009519aca4 +sha256=4f923e24d674ac62ded3da402a4de6d402886d80e3d7cac91cf026921f32fcf7 + [ftp://ftp.elmeg.de/artem/ClientCards/11b/linux/wl_lkm_718_release.tar.gz] md5=049c6c3d410e9f46884627b57485d3e7 sha256=a28c7ea94d57a5354b7de06cf5f6416d80a40596911c129d4b6a4087dc916831 @@ -25178,6 +25186,10 @@ sha256=5beb94529cc7ac79b17e354f9b03aea311f5af17be5d48bc39e6f1db5059f70f md5=43c606bbd27c500b0022471ed704ab78 sha256=014e744f40c773bf225328bce1ca80f5dde4835c1f6671e989a4f8c4ed24555f +[http://downloads.sourceforge.net/yasr/yasr-0.6.9.tar.gz] +md5=daec224676fb2db5a1936b399f559473 +sha256=41f17cfab8e88824a8dc1476602a0944b9030a8f8da2538a7a6549e3534e3bdf + [http://download.devbase.at/voip/yeaphone-0.1.tar.gz] md5=476552b3b88b651ba161d22c1db5314d sha256=2f596ef4c57e29708d6246949289341d9f9756d162bf49e89f0828180329aa51 diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 54c96b00f3..15baf2b144 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -237,6 +237,7 @@ SRCREV_pn-webkit-qtopia ?= "28656" SRCREV_pn-wlan-ng-modules ?= "1859" SRCREV_pn-wlan-ng-utils ?= "1859" SRCREV_pn-wmiconfig ?= "4522" +SRCREV_pn-xf86-video-glamo ?= "8062d7aa7bac7e06c1a00bd88ca78098550606ed" SRCREV_pn-xoo ?= "1971" SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52" SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924" diff --git a/conf/machine/overo.conf b/conf/machine/overo.conf index 91413ec903..2a93ab069d 100644 --- a/conf/machine/overo.conf +++ b/conf/machine/overo.conf @@ -29,4 +29,17 @@ XSERVER = "xserver-xorg \ GUI_MACHINE_CLASS = "bigscreen" - +# do ubiattach /dev/ubi_ctrl -m 4 +# From dmesg: +# UBI: smallest flash I/O unit: 2048 +# UBI: logical eraseblock size: 129024 bytes +# from ubiattach stdout: +# UBI device number 0, total 1996 LEBs +MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996" + +# do ubiattach /dev/ubi_ctrl -m 4 +# from dmesg: +# UBI: smallest flash I/O unit: 2048 +# UBI: physical eraseblock size: 131072 bytes (128 KiB) +# UBI: sub-page size: 512 +UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" diff --git a/packages/evtest/evtest_1.23.bb b/packages/evtest/evtest_1.23.bb new file mode 100644 index 0000000000..4c5d195277 --- /dev/null +++ b/packages/evtest/evtest_1.23.bb @@ -0,0 +1,21 @@ +# Copyright (C) 2009 Khem Raj <raj.khem@gmail.com> +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "Event device test program" +AUTHOR = "Vojtech Pavlik <vojtech@suse.cz>" +SECTION = "console/utils" +PRIORITY = "optional" +LICENSE = "GPLv2" +PR = "r0" + +SRC_URI = "http://beagleboard.googlecode.com/files/evtest.c" +S = "${WORKDIR}" + +do_compile() { + ${CC} evtest.c -o evtest -I${STAGING_INCDIR} -L${STAGING_LIBDIR} +} + +do_install() { + install -d ${D}${bindir} + install -m 0755 evtest ${D}${bindir} +} diff --git a/packages/gcc/gcc-common.inc b/packages/gcc/gcc-common.inc index 73bc327507..9e70af71a5 100644 --- a/packages/gcc/gcc-common.inc +++ b/packages/gcc/gcc-common.inc @@ -7,8 +7,11 @@ inherit autotools gettext FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" +# When making a Canadian SDK, we use these files too to make the compiler +# for building for the new host part. So only obey TARGET_FPU for the +# real target. def get_gcc_fpu_setting(bb, d): - if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: + if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ] and bb.data.getVar('TARGET_OS', d, 1) in [ 'linux' ]: return "--with-float=soft" return "" diff --git a/packages/linux/linux-omap-2.6.28/overo/defconfig b/packages/linux/linux-omap-2.6.28/overo/defconfig index c92e425140..0a8821e97c 100644 --- a/packages/linux/linux-omap-2.6.28/overo/defconfig +++ b/packages/linux/linux-omap-2.6.28/overo/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.28-omap1 -# Wed Feb 4 12:40:38 2009 +# Mon Feb 16 13:35:13 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -588,7 +588,7 @@ CONFIG_MTD_NAND=y # CONFIG_MTD_NAND_ECC_SMC is not set # CONFIG_MTD_NAND_MUSEUM_IDS is not set # CONFIG_MTD_NAND_GPIO is not set -# CONFIG_MTD_NAND_OMAP2 is not set +CONFIG_MTD_NAND_OMAP2=y CONFIG_MTD_NAND_IDS=y # CONFIG_MTD_NAND_DISKONCHIP is not set # CONFIG_MTD_NAND_NANDSIM is not set @@ -599,7 +599,15 @@ CONFIG_MTD_NAND_IDS=y # # UBI - Unsorted block images # -# CONFIG_MTD_UBI is not set +CONFIG_MTD_UBI=y +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set + +# +# UBI debugging options +# +# CONFIG_MTD_UBI_DEBUG is not set # CONFIG_PARPORT is not set CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_COW_COMMON is not set @@ -616,6 +624,7 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_CDROM_PKTCDVD_WCACHE is not set # CONFIG_ATA_OVER_ETH is not set # CONFIG_MISC_DEVICES is not set +CONFIG_EEPROM_93CX6=y CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -696,8 +705,36 @@ CONFIG_NETDEV_10000=y # Wireless LAN # # CONFIG_WLAN_PRE80211 is not set -# CONFIG_WLAN_80211 is not set +CONFIG_WLAN_80211=y +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_DEBUG is not set +CONFIG_LIBERTAS_THINFIRM=m +CONFIG_LIBERTAS_THINFIRM_USB=m +CONFIG_USB_ZD1201=m +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_RTL8187=y +# CONFIG_MAC80211_HWSIM is not set +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m # CONFIG_IWLWIFI_LEDS is not set +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set +# CONFIG_B43 is not set +# CONFIG_B43LEGACY is not set +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_RT2X00=m +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y +# CONFIG_RT2X00_DEBUG is not set # # USB Network Adapters @@ -1243,8 +1280,42 @@ CONFIG_FONT_8x16=y # CONFIG_FONT_10x18 is not set # CONFIG_LOGO is not set CONFIG_SOUND=y -# CONFIG_SOUND_OSS_CORE is not set -# CONFIG_SND is not set +CONFIG_SOUND_OSS_CORE=y +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_SEQUENCER=m +# CONFIG_SND_SEQ_DUMMY is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +# CONFIG_SND_SEQUENCER_OSS is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_DRIVERS=y +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_VIRMIDI is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set +# CONFIG_SND_ARM is not set +# CONFIG_SND_SPI is not set +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y +CONFIG_SND_SOC=y +CONFIG_SND_OMAP_SOC=y +CONFIG_SND_OMAP_SOC_MCBSP=y +CONFIG_SND_OMAP_SOC_OVERO=y +# CONFIG_SND_SOC_ALL_CODECS is not set +CONFIG_SND_SOC_TWL4030=y # CONFIG_SOUND_PRIME is not set CONFIG_HID_SUPPORT=y CONFIG_HID=y @@ -1601,14 +1672,25 @@ CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XIP is not set CONFIG_EXT3_FS=y # CONFIG_EXT3_FS_XATTR is not set -# CONFIG_EXT4_FS is not set +CONFIG_EXT4_FS=m +# CONFIG_EXT4DEV_COMPAT is not set +CONFIG_EXT4_FS_XATTR=y +# CONFIG_EXT4_FS_POSIX_ACL is not set +# CONFIG_EXT4_FS_SECURITY is not set CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set +CONFIG_JBD2=m +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=m # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set CONFIG_FS_POSIX_ACL=y CONFIG_FILE_LOCKING=y -# CONFIG_XFS_FS is not set +CONFIG_XFS_FS=m +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_XFS_RT is not set +# CONFIG_XFS_DEBUG is not set # CONFIG_OCFS2_FS is not set CONFIG_DNOTIFY=y CONFIG_INOTIFY=y @@ -1681,6 +1763,12 @@ CONFIG_JFFS2_RUBIN=y CONFIG_JFFS2_CMODE_PRIORITY=y # CONFIG_JFFS2_CMODE_SIZE is not set # CONFIG_JFFS2_CMODE_FAVOURLZO is not set +CONFIG_UBIFS_FS=y +CONFIG_UBIFS_FS_XATTR=y +CONFIG_UBIFS_FS_ADVANCED_COMPR=y +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_UBIFS_FS_DEBUG is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set # CONFIG_MINIX_FS is not set @@ -1937,8 +2025,8 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m # # Compression # -CONFIG_CRYPTO_DEFLATE=m -# CONFIG_CRYPTO_LZO is not set +CONFIG_CRYPTO_DEFLATE=y +CONFIG_CRYPTO_LZO=y # # Random Number Generation @@ -1951,7 +2039,7 @@ CONFIG_CRYPTO_HW=y # CONFIG_BITREVERSE=y CONFIG_CRC_CCITT=y -CONFIG_CRC16=m +CONFIG_CRC16=y CONFIG_CRC_T10DIF=y CONFIG_CRC_ITU_T=y CONFIG_CRC32=y diff --git a/packages/linux/linux-omap-2.6.28/overo/overo-ehci.patch b/packages/linux/linux-omap-2.6.28/overo/overo-ehci.patch new file mode 100644 index 0000000000..ff81d98095 --- /dev/null +++ b/packages/linux/linux-omap-2.6.28/overo/overo-ehci.patch @@ -0,0 +1,113 @@ +diff --git a/arch/arm/mach-omap2/usb-ehci.c b/arch/arm/mach-omap2/usb-ehci.c +index 489439d..2c6305b 100644 +--- a/arch/arm/mach-omap2/usb-ehci.c ++++ b/arch/arm/mach-omap2/usb-ehci.c +@@ -152,9 +152,7 @@ static void setup_ehci_io_mux(void) + void __init usb_ehci_init(void) + { + #if defined(CONFIG_USB_EHCI_HCD) || defined(CONFIG_USB_EHCI_HCD_MODULE) +- /* Setup Pin IO MUX for EHCI */ +- if (cpu_is_omap34xx()) +- setup_ehci_io_mux(); ++ /* TODO: Setup Pin IO MUX for EHCI - moved this temporarily to U-boot */ + + if (platform_device_register(&ehci_device) < 0) { + printk(KERN_ERR "Unable to register HS-USB (EHCI) device\n"); + +diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c +index 1b3266c..8472996 100644 +--- a/drivers/usb/host/ehci-omap.c ++++ b/drivers/usb/host/ehci-omap.c +@@ -48,16 +48,26 @@ + * to get the PHY state machine in working state + */ + #define EXTERNAL_PHY_RESET ++#ifdef CONFIG_MACH_OVERO ++#define EXT_PHY_RESET_GPIO_PORT2 (183) ++#else + #define EXT_PHY_RESET_GPIO_PORT1 (57) + #define EXT_PHY_RESET_GPIO_PORT2 (61) ++#endif + #define EXT_PHY_RESET_DELAY (10) + ++#define PHY_STP_PULLUP_ENABLE (0x10) ++#define PHY_STP_PULLUP_DISABLE (0x90) ++ ++ + /* ISSUE2: + * USBHOST supports External charge pump PHYs only + * Use the VBUS from Port1 to power VBUS of Port2 externally + * So use Port2 as the working ULPI port + */ ++#ifndef CONFIG_MACH_OVERO + #define VBUS_INTERNAL_CHARGEPUMP_HACK ++#endif + + #endif /* CONFIG_OMAP_EHCI_PHY_MODE */ + +@@ -225,14 +235,43 @@ static int omap_start_ehc(struct platform_device *dev, struct usb_hcd *hcd) + + #ifdef EXTERNAL_PHY_RESET + /* Refer: ISSUE1 */ ++#ifndef CONFIG_MACH_OVERO + gpio_request(EXT_PHY_RESET_GPIO_PORT1, "USB1 PHY reset"); + gpio_direction_output(EXT_PHY_RESET_GPIO_PORT1, 0); ++#endif + gpio_request(EXT_PHY_RESET_GPIO_PORT2, "USB2 PHY reset"); + gpio_direction_output(EXT_PHY_RESET_GPIO_PORT2, 0); ++ gpio_set_value(EXT_PHY_RESET_GPIO_PORT2, 0); + /* Hold the PHY in RESET for enough time till DIR is high */ + udelay(EXT_PHY_RESET_DELAY); + #endif + ++ /* ++ * The PHY register 0x7 - Interface Control register is ++ * configured to disable the integrated STP pull-up resistor ++ * used for interface protection. ++ * ++ * May not need to be here. ++ */ ++ omap_writel((0x7 << EHCI_INSNREG05_ULPI_REGADD_SHIFT) |/* interface reg */ ++ (2 << EHCI_INSNREG05_ULPI_OPSEL_SHIFT) |/* Write */ ++ (1 << EHCI_INSNREG05_ULPI_PORTSEL_SHIFT) |/* Port1 */ ++ (1 << EHCI_INSNREG05_ULPI_CONTROL_SHIFT) |/* Start */ ++ (PHY_STP_PULLUP_DISABLE), ++ EHCI_INSNREG05_ULPI); ++ ++ while (!(omap_readl(EHCI_INSNREG05_ULPI) & (1<<EHCI_INSNREG05_ULPI_CONTROL_SHIFT))); ++ ++ /* Force PHY to HS */ ++ omap_writel((0x4 << EHCI_INSNREG05_ULPI_REGADD_SHIFT) |/* function ctrl */ ++ (2 << EHCI_INSNREG05_ULPI_OPSEL_SHIFT) |/* Write */ ++ (1 << EHCI_INSNREG05_ULPI_PORTSEL_SHIFT) |/* Port1 */ ++ (1 << EHCI_INSNREG05_ULPI_CONTROL_SHIFT) |/* Start */ ++ (0x40), ++ EHCI_INSNREG05_ULPI); ++ ++ while (!(omap_readl(EHCI_INSNREG05_ULPI) & (1<<EHCI_INSNREG05_ULPI_CONTROL_SHIFT))); ++ + /* Configure TLL for 60Mhz clk for ULPI */ + ehci_clocks->usbtll_fck_clk = clk_get(&dev->dev, USBHOST_TLL_FCLK); + if (IS_ERR(ehci_clocks->usbtll_fck_clk)) +@@ -307,7 +346,9 @@ static int omap_start_ehc(struct platform_device *dev, struct usb_hcd *hcd) + * Hold the PHY in RESET for enough time till PHY is settled and ready + */ + udelay(EXT_PHY_RESET_DELAY); ++#ifndef CONFIG_MACH_OVERO + gpio_set_value(EXT_PHY_RESET_GPIO_PORT1, 1); ++#endif + gpio_set_value(EXT_PHY_RESET_GPIO_PORT2, 1); + #endif + +@@ -393,7 +434,9 @@ static void omap_stop_ehc(struct platform_device *dev, struct usb_hcd *hcd) + + + #ifdef EXTERNAL_PHY_RESET ++#ifndef CONFIG_MACH_OVERO + gpio_free(EXT_PHY_RESET_GPIO_PORT1); ++#endif + gpio_free(EXT_PHY_RESET_GPIO_PORT2); + #endif + +-- +1.6.0.4.790.gaa14a diff --git a/packages/linux/linux-omap_2.6.28.bb b/packages/linux/linux-omap_2.6.28.bb index 0924772d1a..ff1c5d2521 100644 --- a/packages/linux/linux-omap_2.6.28.bb +++ b/packages/linux/linux-omap_2.6.28.bb @@ -7,6 +7,7 @@ COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard| DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_beagleboard = "1" +DEFAULT_PREFERENCE_overo = "1" SRCREV = "79d042a081d3e467c735bb0d9569ed6296f85a3c" @@ -47,19 +48,23 @@ SRC_URI_append = " \ file://0013-DSS-OMAPFB-remove-extra-spaces.patch;patch=1 \ file://0014-DSS-fix-clk_get_usecount.patch;patch=1 \ file://0001-ASoC-Add-support-for-OMAP3-EVM.patch;patch=1 \ - file://0001-This-merges-Steve-Kipisz-USB-EHCI-support.-He-star.patch;patch=1 \ file://0001-board-omap3beagle-set-i2c-3-to-100kHz.patch;patch=1 \ file://add-resizer-driver.patch;patch=1 \ " SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \ + file://0001-This-merges-Steve-Kipisz-USB-EHCI-support.-He-star.patch;patch=1 \ " SRC_URI_append_omap3evm = " \ file://evm-mcspi-ts.diff;patch=1 \ " +SRC_URI_append_overo = " \ + file://overo-ehci.patch;patch=1 \ +" + S = "${WORKDIR}/git" diff --git a/packages/neon/files/gnutls-2.patch b/packages/neon/files/gnutls-2.patch new file mode 100644 index 0000000000..2b37dfc889 --- /dev/null +++ b/packages/neon/files/gnutls-2.patch @@ -0,0 +1,11 @@ +diff -Nurd neon-0.25.5/macros/neon.m4 neon-0.25.5-patched/macros/neon.m4 +--- neon-0.25.5/macros/neon.m4 2009-02-03 16:23:40.000000000 +0100 ++++ neon-0.25.5-patched/macros/neon.m4 2009-02-03 16:24:00.000000000 +0100 +@@ -895,6 +895,7 @@ + 1.0.?|1.0.1?|1.0.20|1.0.21) + AC_MSG_ERROR([GNU TLS version $ne_gnutls_ver is too old -- 1.0.22 or later required]) ;; + 1.*) ;; ++ 2.*) ;; + *) AC_MSG_ERROR([GNU TLS version $ne_gnutls_ver is not supported]) ;; + esac + diff --git a/packages/popt/popt-1.13/iconv.patch b/packages/popt/popt-1.13/iconv.patch deleted file mode 100644 index 4faf4c4a1d..0000000000 --- a/packages/popt/popt-1.13/iconv.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: popt-1.13/Makefile.am -=================================================================== ---- popt-1.13.orig/Makefile.am 2007-11-14 20:42:27.000000000 +0000 -+++ popt-1.13/Makefile.am 2008-03-26 22:14:05.000000000 +0000 -@@ -39,7 +39,7 @@ - usrlib_LTLIBRARIES = libpopt.la - - libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c poptint.c --libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ -+libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@ - - if HAVE_LD_VERSION_SCRIPT - libpopt_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpopt.vers -Index: popt-1.13/configure.ac -=================================================================== ---- popt-1.13.orig/configure.ac 2007-11-14 20:42:27.000000000 +0000 -+++ popt-1.13/configure.ac 2008-03-26 22:20:16.000000000 +0000 -@@ -95,6 +95,7 @@ - AC_CHECK_FUNCS(getuid geteuid mtrace __secure_getenv setregid strerror iconv) - - AM_GNU_GETTEXT([external]) -+AM_ICONV_LINK - - popt_sysconfdir="${sysconfdir}" - eval "popt_sysconfdir=\"${popt_sysconfdir}\"" # expand contained ${prefix} diff --git a/packages/popt/popt-native_1.14.bb b/packages/popt/popt-native_1.14.bb deleted file mode 100644 index 54712ab812..0000000000 --- a/packages/popt/popt-native_1.14.bb +++ /dev/null @@ -1,16 +0,0 @@ -require popt.inc - -DEPENDS = "gettext-native" - -PR = "r0" - -inherit native autotools - -SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz" - -S = "${WORKDIR}/popt-${PV}" - -do_install() { - oe_libinstall -a -so libpopt ${STAGING_LIBDIR_NATIVE} - install -m 0644 popt.h ${STAGING_INCDIR_NATIVE} -} diff --git a/packages/popt/popt-native_1.7.bb b/packages/popt/popt-native_1.7.bb index a83d384eee..320a2112e8 100644 --- a/packages/popt/popt-native_1.7.bb +++ b/packages/popt/popt-native_1.7.bb @@ -1,20 +1,7 @@ -require popt.inc - +require popt_${PV}.bb DEPENDS = "gettext-native" - -PR = "r5" - -inherit native autotools - -SRC_URI = "ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-${PV}.tar.gz \ - file://m4.patch;patch=1 \ - file://intl.patch;patch=1" +inherit native S = "${WORKDIR}/popt-${PV}" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/popt-${PV}" - -do_install() { - oe_libinstall -a -so libpopt ${STAGING_LIBDIR_NATIVE} - install -m 0644 popt.h ${STAGING_INCDIR_NATIVE} -} diff --git a/packages/popt/popt_1.14.bb b/packages/popt/popt_1.14.bb deleted file mode 100644 index 240ac52275..0000000000 --- a/packages/popt/popt_1.14.bb +++ /dev/null @@ -1,17 +0,0 @@ -require popt.inc - -DEPENDS = "gettext-native virtual/libintl" - -PR = "r1" - -inherit autotools - -SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz" - - -do_stage() { - oe_libinstall -a -so libpopt ${STAGING_LIBDIR} - install -m 0644 popt.h ${STAGING_INCDIR} -} - - diff --git a/packages/popt/popt_1.7.bb b/packages/popt/popt_1.7.bb index 7992db56e7..313e31b8fc 100644 --- a/packages/popt/popt_1.7.bb +++ b/packages/popt/popt_1.7.bb @@ -2,15 +2,10 @@ require popt.inc DEPENDS = "gettext virtual/libintl" -PR = "r5" +inherit autotools autotools_stage -inherit autotools - -SRC_URI = "ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-${PV}.tar.gz \ - file://m4.patch;patch=1 \ - file://intl.patch;patch=1" - -do_stage() { - oe_libinstall -a -so libpopt ${STAGING_LIBDIR} - install -m 0644 popt.h ${STAGING_INCDIR} -} +SRC_URI = "\ + http://rpm.org/releases/historical/rpm-4.1.x/popt-${PV}.tar.gz \ + file://m4.patch;patch=1 \ + file://intl.patch;patch=1 \ +" diff --git a/packages/xorg-driver/xf86-video-glamo_git.bb b/packages/xorg-driver/xf86-video-glamo_git.bb new file mode 100644 index 0000000000..fecba818a5 --- /dev/null +++ b/packages/xorg-driver/xf86-video-glamo_git.bb @@ -0,0 +1,11 @@ +require xorg-driver-video.inc +SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo;protocol=git;branch=master" +PV = "0.1+gitr${SRCREV}" +PE = "1" + +DESCRIPTION = "X.Org X server -- fbdev display driver" + +S = "${WORKDIR}/git" + +ARM_INSTRUCTION_SET = "arm" + diff --git a/packages/yasr/files/yasr-0.6.9-gcc43.patch b/packages/yasr/files/yasr-0.6.9-gcc43.patch new file mode 100644 index 0000000000..ee2b1a6ef7 --- /dev/null +++ b/packages/yasr/files/yasr-0.6.9-gcc43.patch @@ -0,0 +1,26 @@ +diff -NrU5 yasr-0.6.9.orig/yasr/yasr.h yasr-0.6.9/yasr/yasr.h +--- yasr-0.6.9.orig/yasr/yasr.h 2008-06-29 01:23:44.000000000 +0200 ++++ yasr-0.6.9/yasr/yasr.h 2008-06-29 01:37:00.000000000 +0200 +@@ -306,22 +306,10 @@ + extern void opt_say(int num, int flag); + extern void opt_set(int num, void *val); + extern void opt_queue_empty(int ll); + extern void opt_write(FILE * fp); + +-/* openpty.c prototypes */ +-extern int openpty(int *, int *, char *, struct termios *, struct winsize *); +- +-/* cfmakeraw.c prototypes */ +-extern void cfmakeraw(struct termios *); +- +-/* login_tty.c prototypes */ +-extern int login_tty(int); +- +-/* forkpty.c prototypes */ +-extern int forkpty(int *, char *, struct termios *, struct winsize *); +- + /* tbc - Would it be more efficient to ensure that "blank" grids always held + ascii 0x20 rather than ascii 0x00? */ + #define y_isblank(ch) ((ch & 0xdf) == 0) + #define cblank(r, c) ((win->row[r][c] & 0xdf) == 0) + #define ttssend(x) if (x) tts_send(x, strlen(x)) diff --git a/packages/yasr/files/yasr-0.6.9-remove-m4.patch b/packages/yasr/files/yasr-0.6.9-remove-m4.patch new file mode 100644 index 0000000000..fa05f0791f --- /dev/null +++ b/packages/yasr/files/yasr-0.6.9-remove-m4.patch @@ -0,0 +1,29 @@ +diff -Naur yasr-0.6.9.orig/Makefile.am yasr-0.6.9/Makefile.am +--- yasr-0.6.9.orig/Makefile.am 2008-02-02 06:44:05.000000000 -0600 ++++ yasr-0.6.9/Makefile.am 2009-02-06 08:37:07.000000000 -0600 +@@ -7,7 +7,6 @@ + + SUBDIRS = \ + $(yasr_DDIRS) \ +-m4 \ + po + + pkgdata_DATA = \ +@@ -25,4 +24,3 @@ + README-fr \ + README-ru + +-ACLOCAL_AMFLAGS = -I m4 +diff -Naur yasr-0.6.9.orig/configure.in yasr-0.6.9/configure.in +--- yasr-0.6.9.orig/configure.in 2008-02-02 07:09:04.000000000 -0600 ++++ yasr-0.6.9/configure.in 2009-02-06 08:36:43.000000000 -0600 +@@ -59,8 +59,7 @@ + AM_GNU_GETTEXT(external) + AM_GNU_GETTEXT_VERSION([0.17]) + +-AC_OUTPUT([ m4/Makefile +-Makefile ++AC_OUTPUT([ Makefile + yasr/Makefile + acclogin/Makefile + po/Makefile.in diff --git a/packages/yasr/yasr_0.6.9.bb b/packages/yasr/yasr_0.6.9.bb new file mode 100644 index 0000000000..4d6fd28ede --- /dev/null +++ b/packages/yasr/yasr_0.6.9.bb @@ -0,0 +1,16 @@ +# Copyright (C) 2009 Khem Raj <raj.khem@gmail.com> +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "Yet Another Screen Reader(yasr) is a \ + general-purpose console screen reader" +HOMEPAGE = "http://yasr.sf.net" +LICENSE = "GPLv2" +SECTION = "console/utils" +SUGGESTS = "speech-dispatcher" + +SRC_URI = "${SOURCEFORGE_MIRROR}/yasr/yasr-${PV}.tar.gz \ + file://yasr-0.6.9-gcc43.patch;patch=1 \ + file://yasr-0.6.9-remove-m4.patch;patch=1 \ + " + +inherit autotools |