diff options
27 files changed, 344 insertions, 145 deletions
diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index 44c74a0354..7aabe04283 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -98,6 +98,12 @@ def check_sanity(e): if not check_app_exists("qemu-arm", e.data): messages = messages + "qemu-native was in ASSUME_PROVIDED but the QEMU binaries (qemu-arm) can't be found in PATH" + if os.path.exists("/proc/sys/vm/mmap_min_addr"): + f = file("/proc/sys/vm/mmap_min_addr", "r") + if (f.read().strip() != "0"): + messages = messages + "/proc/sys/vm/mmap_min_addr is not 0. This will cause problems with qemu so please fix the value (as root).\n" + f.close() + for util in required_utilities.split(): if not check_app_exists( util, e.data ): missing = missing + "%s," % util diff --git a/conf/machine/include/qemu.inc b/conf/machine/include/qemu.inc index fbf6ba2384..190066bca0 100644 --- a/conf/machine/include/qemu.inc +++ b/conf/machine/include/qemu.inc @@ -2,7 +2,7 @@ PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" GUI_MACHINE_CLASS = "bigscreen" -MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen keyboard" +MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen keyboard touchscreen" IMAGE_FSTYPES ?= "tar.bz2 ext2" diff --git a/conf/machine/qemux86.conf b/conf/machine/qemux86.conf index 7fbdbfb1a7..ad1138f422 100644 --- a/conf/machine/qemux86.conf +++ b/conf/machine/qemux86.conf @@ -9,6 +9,7 @@ PACKAGE_EXTRA_ARCHS = "x86" require conf/machine/include/qemu.inc MACHINE_FEATURES += "x86" +MACHINE_EXTRA_RRECOMMENDS = "kernel-module-uvesafb v86d" KERNEL_IMAGETYPE = "bzImage" diff --git a/packages/frobtads/.mtn2git_empty b/packages/frobtads/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/frobtads/.mtn2git_empty diff --git a/packages/frobtads/frobtads_0.8.bb b/packages/frobtads/frobtads_0.8.bb new file mode 100644 index 0000000000..46d9e6b9bd --- /dev/null +++ b/packages/frobtads/frobtads_0.8.bb @@ -0,0 +1,7 @@ +DESCRIPTION = "A TADS interpreter." +HOMEPAGE = "http://www.tads.org +SECTION = "console/network" + +SRC_URI = "http://www.tads.org/frobtads/${PN}-${PV}.tar.gz" + +inherit autotools diff --git a/packages/gnome/epiphany_2.22.1.bb b/packages/gnome/epiphany_2.22.1.bb index 82f158eae2..d2d45475b7 100644 --- a/packages/gnome/epiphany_2.22.1.bb +++ b/packages/gnome/epiphany_2.22.1.bb @@ -1,5 +1,5 @@ DESCRIPTION = "GNOME default webbrowser" -DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification" +DEPENDS = "libsoup-2.4 gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification" RDEPENDS = "gnome-vfs-plugin-http" inherit gnome diff --git a/packages/gnome/libsoup_2.4.1.bb b/packages/gnome/libsoup-2.4_2.4.1.bb index 42e5decb05..24de169e6f 100644 --- a/packages/gnome/libsoup_2.4.1.bb +++ b/packages/gnome/libsoup-2.4_2.4.1.bb @@ -1,17 +1,19 @@ -DEFAULT_PREFERENCE = "-1" - DESCRIPTION = "An HTTP library implementation in C" SECTION = "x11/gnome/libs" LICENSE = "GPL" DEPENDS = "glib-2.0 gnutls libxml2" -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.4/${PN}-${PV}.tar.bz2" +PR = "r1" + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.4/libsoup-${PV}.tar.bz2" +S = "${WORKDIR}/libsoup-${PV}" + +inherit autotools -inherit autotools pkgconfig +AUTOTOOLS_STAGE_PKGCONFIG = "1" do_stage() { - autotools_stage_all - cp ${PKG_CONFIG_DIR}/libsoup.pc ${PKG_CONFIG_DIR}/libsoup-2.4.pc + autotools_stage_all } FILES_${PN} = "${libdir}/lib*.so.*" diff --git a/packages/gnome/libsoup_2.2.100.bb b/packages/gnome/libsoup_2.2.100.bb index a7d96ec8e4..d69a985627 100644 --- a/packages/gnome/libsoup_2.2.100.bb +++ b/packages/gnome/libsoup_2.2.100.bb @@ -2,17 +2,20 @@ DESCRIPTION = "An HTTP library implementation in C" LICENSE = "GPL" SECTION = "x11/gnome/libs" +PR = "r1" + DEPENDS = "glib-2.0 gnutls libxml2" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2" -inherit autotools pkgconfig +inherit autotools FILES_${PN} = "${libdir}/lib*.so.*" FILES_${PN}-dev = "${includedir}/ ${libdir}/" FILES_${PN}-doc = "${datadir}/" +AUTOTOOLS_STAGE_PKGCONFIG = "1" + do_stage() { autotools_stage_all - cp ${PKG_CONFIG_DIR}/libsoup.pc ${PKG_CONFIG_DIR}/libsoup-2.2.pc } diff --git a/packages/linux/linux-omap2-git/beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig index 135e9c48d2..9e2c6d4034 100644 --- a/packages/linux/linux-omap2-git/beagleboard/defconfig +++ b/packages/linux/linux-omap2-git/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.25-omap1 -# Wed Apr 30 11:44:55 2008 +# Linux kernel version: 2.6.26-rc1-omap1 +# Wed May 7 10:17:18 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -88,12 +88,14 @@ CONFIG_HAVE_OPROFILE=y # CONFIG_KPROBES is not set CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y +# CONFIG_HAVE_DMA_ATTRS is not set CONFIG_PROC_PAGE_MONITOR=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y @@ -230,6 +232,10 @@ CONFIG_ARM_THUMB=y # CONFIG_ARM_THUMBEE is not set # CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_LOCKDOWN_TO_64K_L2 is not set +# CONFIG_CPU_LOCKDOWN_TO_128K_L2 is not set +CONFIG_CPU_LOCKDOWN_TO_256K_L2=y +# CONFIG_CPU_L2CACHE_DISABLE is not set # CONFIG_CPU_BPREDICT_DISABLE is not set CONFIG_HAS_TLS_REG=y # CONFIG_OUTER_CACHE is not set @@ -261,6 +267,7 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set +CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_RESOURCES_64BIT is not set CONFIG_ZONE_DMA_FLAG=1 @@ -288,6 +295,7 @@ CONFIG_CPU_FREQ_TABLE=y CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_STAT_DETAILS=y CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set @@ -319,7 +327,6 @@ CONFIG_BINFMT_MISC=y # Power management options # CONFIG_PM=y -# CONFIG_PM_LEGACY is not set # CONFIG_PM_DEBUG is not set CONFIG_PM_SLEEP=y CONFIG_SUSPEND=y @@ -499,6 +506,7 @@ CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_REDBOOT_PARTS is not set # CONFIG_MTD_CMDLINE_PARTS is not set # CONFIG_MTD_AFS_PARTS is not set +# CONFIG_MTD_AR7_PARTS is not set # # User Modules And Translation Layers @@ -588,7 +596,8 @@ CONFIG_MISC_DEVICES=y # CONFIG_EEPROM_93CX6 is not set # CONFIG_OMAP_STI is not set # CONFIG_ENCLOSURE_SERVICES is not set -# CONFIG_HAVE_IDE is not set +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set # # SCSI device support @@ -679,6 +688,7 @@ CONFIG_USB_ZD1201=m # CONFIG_USB_NET_RNDIS_WLAN is not set # CONFIG_RTL8187 is not set # CONFIG_P54_COMMON is not set +# CONFIG_IWLWIFI is not set # CONFIG_IWLWIFI_LEDS is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y @@ -794,6 +804,7 @@ CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_DEVKMEM=y # CONFIG_SERIAL_NONSTANDARD is not set # @@ -864,10 +875,6 @@ CONFIG_TWL4030_PWRBUTTON=y # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set # CONFIG_I2C_DEBUG_CHIP is not set - -# -# SPI support -# CONFIG_SPI=y # CONFIG_SPI_DEBUG is not set CONFIG_SPI_MASTER=y @@ -939,12 +946,41 @@ CONFIG_SSB_POSSIBLE=y # # Multimedia devices # + +# +# Multimedia core support +# CONFIG_VIDEO_DEV=y CONFIG_VIDEO_V4L2_COMMON=y CONFIG_VIDEO_ALLOW_V4L1=y CONFIG_VIDEO_V4L1_COMPAT=y +CONFIG_DVB_CORE=m +CONFIG_VIDEO_MEDIA=y + +# +# Multimedia drivers +# +# CONFIG_MEDIA_ATTACH is not set +CONFIG_MEDIA_TUNER=y +# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set +CONFIG_MEDIA_TUNER_SIMPLE=y +CONFIG_MEDIA_TUNER_TDA8290=y +CONFIG_MEDIA_TUNER_TDA9887=y +CONFIG_MEDIA_TUNER_TEA5761=y +CONFIG_MEDIA_TUNER_TEA5767=y +CONFIG_MEDIA_TUNER_MT20XX=y +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=y +CONFIG_MEDIA_TUNER_XC5000=y CONFIG_VIDEO_V4L2=y CONFIG_VIDEO_V4L1=y +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEO_IR_I2C=m +CONFIG_VIDEO_IR=m +CONFIG_VIDEO_TVEEPROM=m CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set @@ -1022,8 +1058,6 @@ CONFIG_VIDEO_SAA5249=m # CONFIG_VIDEO_AU0828 is not set CONFIG_V4L_USB_DRIVERS=y CONFIG_VIDEO_PVRUSB2=m -CONFIG_VIDEO_PVRUSB2_ONAIR_CREATOR=y -CONFIG_VIDEO_PVRUSB2_ONAIR_USB2=y CONFIG_VIDEO_PVRUSB2_SYSFS=y # CONFIG_VIDEO_PVRUSB2_DVB is not set # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set @@ -1048,8 +1082,6 @@ CONFIG_USB_ZR364XX=m CONFIG_USB_STKWEBCAM=m # CONFIG_SOC_CAMERA is not set # CONFIG_RADIO_ADAPTERS is not set -CONFIG_DVB_CORE=m -CONFIG_DVB_CORE_ATTACH=y CONFIG_DVB_CAPTURE_DRIVERS=y # CONFIG_TTPCI_EEPROM is not set @@ -1100,14 +1132,17 @@ CONFIG_DVB_CINERGYT2=m # # DVB-S (satellite) frontends # -CONFIG_DVB_STV0299=m CONFIG_DVB_CX24110=m CONFIG_DVB_CX24123=m -CONFIG_DVB_TDA8083=m CONFIG_DVB_MT312=m -CONFIG_DVB_VES1X93=m CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0299=m +CONFIG_DVB_TDA8083=m CONFIG_DVB_TDA10086=m +CONFIG_DVB_VES1X93=m +# CONFIG_DVB_TUNER_ITD1000 is not set +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TUA6100=m # # DVB-T (terrestrial) frontends @@ -1145,43 +1180,20 @@ CONFIG_DVB_BCM3510=m CONFIG_DVB_LGDT330X=m CONFIG_DVB_S5H1409=m # CONFIG_DVB_AU8522 is not set +# CONFIG_DVB_S5H1411 is not set # -# Tuners/PLL support +# Digital terrestrial only tuners/PLL # CONFIG_DVB_PLL=m -CONFIG_DVB_TDA826X=m -CONFIG_DVB_TDA827X=m -CONFIG_DVB_TDA18271=m -CONFIG_DVB_TUNER_QT1010=m -CONFIG_DVB_TUNER_MT2060=m -CONFIG_DVB_TUNER_MT2266=m -CONFIG_DVB_TUNER_MT2131=m CONFIG_DVB_TUNER_DIB0070=m -CONFIG_DVB_TUNER_XC5000=m -# CONFIG_DVB_TUNER_ITD1000 is not set # -# Miscellaneous devices +# SEC control devices for DVB-S # CONFIG_DVB_LNBP21=m # CONFIG_DVB_ISL6405 is not set CONFIG_DVB_ISL6421=m -CONFIG_DVB_TUA6100=m -CONFIG_VIDEO_TUNER=m -# CONFIG_VIDEO_TUNER_CUSTOMIZE is not set -CONFIG_TUNER_XC2028=m -CONFIG_TUNER_MT20XX=m -CONFIG_TUNER_TDA8290=m -CONFIG_TUNER_TEA5761=m -CONFIG_TUNER_TEA5767=m -CONFIG_TUNER_SIMPLE=m -CONFIG_TUNER_TDA9887=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_VMALLOC=m -CONFIG_VIDEO_IR_I2C=m -CONFIG_VIDEO_IR=m -CONFIG_VIDEO_TVEEPROM=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -1200,6 +1212,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_SYS_FILLRECT is not set # CONFIG_FB_SYS_COPYAREA is not set # CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_SYS_FOPS is not set CONFIG_FB_DEFERRED_IO=y # CONFIG_FB_SVGALIB is not set @@ -1337,18 +1350,21 @@ CONFIG_USB_DEVICEFS=y CONFIG_USB_DEVICE_CLASS=y # CONFIG_USB_DYNAMIC_MINORS is not set CONFIG_USB_SUSPEND=y -# CONFIG_USB_PERSIST is not set # CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set # # USB Host Controller Drivers # +# CONFIG_USB_C67X00_HCD is not set CONFIG_USB_EHCI_HCD=m CONFIG_OMAP_EHCI_PHY_MODE=y # CONFIG_OMAP_EHCI_TLL_MODE is not set CONFIG_USB_EHCI_ROOT_HUB_TT=y # CONFIG_USB_EHCI_TT_NEWSCHED is not set # CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_ISP1760_HCD is not set # CONFIG_USB_OHCI_HCD is not set # CONFIG_USB_SL811_HCD is not set # CONFIG_USB_R8A66597_HCD is not set @@ -1391,7 +1407,9 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_SDDR55 is not set # CONFIG_USB_STORAGE_JUMPSHOT is not set # CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_ONETOUCH is not set # CONFIG_USB_STORAGE_KARMA is not set +# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set # CONFIG_USB_LIBUSUAL is not set # @@ -1437,6 +1455,7 @@ CONFIG_USB_SERIAL=m # CONFIG_USB_SERIAL_NAVMAN is not set # CONFIG_USB_SERIAL_PL2303 is not set # CONFIG_USB_SERIAL_OTI6858 is not set +# CONFIG_USB_SERIAL_SPCP8X5 is not set # CONFIG_USB_SERIAL_HP4X is not set # CONFIG_USB_SERIAL_SAFE is not set # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set @@ -1481,6 +1500,7 @@ CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_NET2280 is not set # CONFIG_USB_GADGET_PXA2XX is not set # CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_PXA27X is not set # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LH7A40X is not set # CONFIG_USB_GADGET_OMAP is not set @@ -1529,6 +1549,7 @@ CONFIG_LEDS_GPIO=m CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m +# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y @@ -1754,6 +1775,7 @@ CONFIG_NLS_ISO8859_1=y # CONFIG_PRINTK_TIME is not set CONFIG_ENABLE_WARN_DEPRECATED=y CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set # CONFIG_DEBUG_FS is not set @@ -1764,6 +1786,7 @@ CONFIG_DETECT_SOFTLOCKUP=y CONFIG_SCHED_DEBUG=y # CONFIG_SCHEDSTATS is not set # CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_OBJECTS is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set @@ -1887,6 +1910,8 @@ CONFIG_CRYPTO_HW=y # Library routines # CONFIG_BITREVERSE=y +# CONFIG_GENERIC_FIND_FIRST_BIT is not set +# CONFIG_GENERIC_FIND_NEXT_BIT is not set CONFIG_CRC_CCITT=y CONFIG_CRC16=m CONFIG_CRC_ITU_T=y diff --git a/packages/linux/linux-omap2-git/beagleboard/l2-cache.patch b/packages/linux/linux-omap2-git/beagleboard/l2-cache.patch index 7e93c29036..f35252283b 100644 --- a/packages/linux/linux-omap2-git/beagleboard/l2-cache.patch +++ b/packages/linux/linux-omap2-git/beagleboard/l2-cache.patch @@ -1,38 +1,162 @@ -diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig -index 15066c2..70f85c1 100644 ---- a/arch/arm/mm/Kconfig -+++ b/arch/arm/mm/Kconfig -@@ -665,6 +665,12 @@ config CPU_CACHE_ROUND_ROBIN - Say Y here to use the predictable round-robin cache replacement - policy. Unless you specifically require this or are unsure, say N. - +From: "Syed Mohammed, Khasim" <khasim@ti.com> +To: Koen Kooi <k.kooi@student.utwente.nl> +CC: "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>, + "Woodruff, + Richard" <r-woodruff2@ti.com> +Date: Wed, 7 May 2008 13:12:13 +0530 +Subject: RE: public git l2 cache off. + +The below patch should get you going with L2 Cache enabled on GIT kernel, tested on Beagle board. + +Regards, +Khasim + + +--- my_linux_omap/arch/arm/mm/Kconfig 2008-05-06 16:37:17.000000000 +0530 ++++ git/arch/arm/mm/Kconfig 2008-05-07 12:40:05.000000000 +0530 +@@ -659,6 +659,20 @@ config CPU_DCACHE_SIZE + If your SoC is configured to have a different size, define the value + here with proper conditions. + ++choice ++ prompt "L2 Cache Size" ++ depends on ARCH_OMAP34XX ++ ++config CPU_LOCKDOWN_TO_64K_L2 ++ bool "Lock down L2 Cache to 64K" ++ ++config CPU_LOCKDOWN_TO_128K_L2 ++ bool "Lock down L2 Cache to 128K" ++ ++config CPU_LOCKDOWN_TO_256K_L2 ++ bool "Lock down L2 Cache to 256K" ++endchoice ++ + config CPU_DCACHE_WRITETHROUGH + bool "Force write through D-cache" + depends on (CPU_ARM740T || CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM940T || CPU_ARM946E || CPU_ARM1020) && !CPU_DCACHE_DISABLE +@@ -674,6 +688,12 @@ config CPU_CACHE_ROUND_ROBIN + Say Y here to use the predictable round-robin cache replacement + policy. Unless you specifically require this or are unsure, say N. + +config CPU_L2CACHE_DISABLE -+ bool "Disable level 2 cache" -+ depends on CPU_V7 -+ help -+ Say Y here to disable the level 2 cache. If unsure, say N. ++ bool "Disable level 2 cache" ++ depends on CPU_V7 ++ help ++ Say Y here to disable the level 2 cache. If unsure, say N. + config CPU_BPREDICT_DISABLE - bool "Disable branch prediction" - depends on CPU_ARM1020 || CPU_V6 || CPU_XSC3 || CPU_V7 -diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S -index a1d7331..432ddab 100644 ---- a/arch/arm/mm/proc-v7.S -+++ b/arch/arm/mm/proc-v7.S -@@ -181,6 +181,16 @@ __v7_setup: - mcr p15, 0, r4, c2, c0, 1 @ load TTB1 + bool "Disable branch prediction" + depends on CPU_ARM1020 || CPU_V6 || CPU_XSC3 || CPU_V7 + +--- /tmp/proc-v7.S 2008-05-07 10:05:37.949232951 +0200 ++++ git/arch/arm/mm/proc-v7.S 2008-05-07 10:13:18.626067909 +0200 +@@ -182,11 +182,72 @@ mov r10, #0x1f @ domains 0, 1 = manager mcr p15, 0, r10, c3, c0, 0 @ load domain access register -+#ifndef CONFIG_CPU_L2CACHE_DISABLE -+ @ L2 cache configuration in the L2 aux control register -+ mrc p15, 1, r10, c9, c0, 2 -+ bic r10, r10, #(1 << 16) @ L2 outer cache -+ mcr p15, 1, r10, c9, c0, 2 + #endif ++#if defined(CONFIG_ARCH_OMAP3) + @ L2 cache is enabled in the aux control register -+ mrc p15, 0, r10, c1, c0, 1 -+ orr r10, r10, #2 -+ mcr p15, 0, r10, c1, c0, 1 ++ mrc p15, 0, r0, c1, c0, 1 ++ orr r0, r0, #0x11 @ speculative+no-alais protection ++#ifdef CONFIG_CPU_L2CACHE_DISABLE ++ bic r0, r0, #0x2 @ disable L2 Cache. ++#else ++ orr r0, r0, #0x2 @ enaable L2 Cache. +#endif - #endif ++ ++/* On 3430 ES2.0 ZeBu and silicon, Aux Ctrl Reg can be written outside ++ * Secure mode also ++ */ ++ mcr p15, 0, r0, c1, c0, 1 ++ ++#ifdef CONFIG_ARCH_OMAP34XX ++#ifdef CONFIG_CPU_LOCKDOWN_TO_64K_L2 ++ mov r10, #0xfc ++ mcr p15, 1, r10, c9, c0, 0 ++#endif ++ ++#ifdef CONFIG_CPU_LOCKDOWN_TO_128K_L2 ++ mov r10, #0xf0 ++ mcr p15, 1, r10, c9, c0, 0 ++#endif ++ ++#ifdef CONFIG_CPU_LOCKDOWN_TO_256K_L2 ++ mov r10, #0x00 ++ mcr p15, 1, r10, c9, c0, 0 ++#endif ++#endif ++ adr r5, v7_crval ldmia r5, {r5, r6} +- mrc p15, 0, r0, c1, c0, 0 @ read control register +- bic r0, r0, r5 @ clear bits them +- orr r0, r0, r6 @ set them ++ mrc p15, 0, r0, c1, c0, 0 @ read control register ++ bic r0, r0, r5 @ clear bits them ++ orr r0, r0, r6 @ set them ++ mov pc, lr @ return to head.S:__ret ++ ++ /* ++ * TAT N EV F H R ++ * .EFR M.EE .UI. ..A. .RVI Z... B... .CAM ++ * 0xxx x0xx 11x0 01x1 0xxx x000 0111 1xxx < forced typical ++ * r rr rr r rr r r rrr rrrr r < always read only ++ * .000 ..00 ..0. ..0. .011 1... .... .101 < we want ++ */ ++ .type v7_crval, #object ++v7_crval: ++ crval clear=0x7322f006, mmuset=0x00003805, ucset=0x00001804 ++#else ++ ++#ifndef CONFIG_CPU_L2CACHE_DISABLE ++ @ L2 cache configuration in the L2 aux control register ++ mrc p15, 1, r10, c9, c0, 2 ++ bic r10, r10, #(1 << 16) @ L2 outer cache ++ mcr p15, 1, r10, c9, c0, 2 ++ @ L2 cache is enabled in the aux control register ++ mrc p15, 0, r10, c1, c0, 1 ++ orr r10, r10, #2 ++ mcr p15, 0, r10, c1, c0, 1 ++#endif ++ mrc p15, 0, r0, c1, c0, 0 @ read control register ++ ldr r10, cr1_clear @ get mask for bits to clear ++ bic r0, r0, r10 @ clear bits them ++ ldr r10, cr1_set @ get mask for bits to set ++ orr r0, r0, r10 @ set them + mov pc, lr @ return to head.S:__ret + + /* +@@ -195,9 +256,13 @@ + * rrrr rrrx xxx0 0101 xxxx xxxx x111 xxxx < forced + * 0 110 0011 1.00 .111 1101 < we want + */ +- .type v7_crval, #object +-v7_crval: +- crval clear=0x0120c302, mmuset=0x00c0387d, ucset=0x00c0187c ++ .type cr1_clear, #object ++ .type cr1_set, #object ++cr1_clear: ++ .word 0x0120c302 ++cr1_set: ++ .word 0x00c0387d ++#endif + + __v7_setup_stack: + .space 4 * 11 @ 11 registers +@@ -205,7 +270,6 @@ + .type v7_processor_functions, #object + ENTRY(v7_processor_functions) + .word v7_early_abort +- .word pabort_ifar + .word cpu_v7_proc_init + .word cpu_v7_proc_fin + .word cpu_v7_reset +@@ -213,6 +277,7 @@ + .word cpu_v7_dcache_clean_area + .word cpu_v7_switch_mm + .word cpu_v7_set_pte_ext ++ .word pabort_ifar + .size v7_processor_functions, . - v7_processor_functions + + .type cpu_arch_name, #object diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index a949d58baf..4dccf29eae 100644 --- a/packages/linux/linux-omap2_git.bb +++ b/packages/linux/linux-omap2_git.bb @@ -2,10 +2,10 @@ require linux-omap.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}" -SRCREV = "3f35ebfdc4b987abe923eee79d25a04e336dee56" +SRCREV = "1abd28c86f1771d4f31fc73e6ef83fedaa8f4ec2" PV = "2.6.25+2.6.26-rc1+git${SRCREV}" -PR = "r8" +PR = "r9" SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \ @@ -13,7 +13,7 @@ SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \ SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \ file://usb-timout.patch;patch=1 \ -# file://l2-cache.patch;patch=1 \ + file://l2-cache.patch;patch=1 \ " COMPATIBLE_MACHINE = "omap2430sdp|omap2420h4|beagleboard" diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb index 2bce56492c..6e6ebca51b 100644 --- a/packages/meta/meta-toolchain.bb +++ b/packages/meta/meta-toolchain.bb @@ -10,7 +10,7 @@ SDK_OUTPUT2 = "${SDK_DIR}/image-extras" SDK_DEPLOY = "${TMPDIR}/deploy/sdk" IPKG_HOST = "opkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}" -IPKG_TARGET = "opkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/temp-target" +IPKG_TARGET = "opkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/${SDK_PREFIX}/${TARGET_SYS}" TOOLCHAIN_HOST_TASK ?= "task-sdk-host" TOOLCHAIN_TARGET_TASK ?= "task-sdk-bare" @@ -37,40 +37,15 @@ do_populate_sdk() { ${IPKG_TARGET} update ${IPKG_TARGET} install ${TOOLCHAIN_TARGET_TASK} - mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include - mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/.debug/ - mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/share - mv ${SDK_OUTPUT}/temp-target/usr/lib/opkg/status ${SDK_OUTPUT}/${prefix}/package-status - rm -rf ${SDK_OUTPUT}/temp-target/usr/lib/opkg/ - cp -pPR ${SDK_OUTPUT}/temp-target/usr/include/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ - cp -pPR ${SDK_OUTPUT}/temp-target/usr/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/ - if [ -d ${SDK_OUTPUT}/temp-target/usr/lib/.debug ]; then - cp -pPR ${SDK_OUTPUT}/temp-target/usr/lib/.debug/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/.debug/ - fi - cp -pPR ${SDK_OUTPUT}/temp-target/usr/share/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/share/ - cp -pPR ${SDK_OUTPUT}/temp-target/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/ - if [ -d ${SDK_OUTPUT}/temp-target/lib/.debug ]; then - cp -pPR ${SDK_OUTPUT}/temp-target/lib/.debug/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/.debug/ - fi - rm -rf ${SDK_OUTPUT}/temp-target/ - - for fn in `ls ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/`; do - if [ -h ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/$fn ]; then - link=`readlink ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/$fn` - bname=`basename $link` - if [ ! -e $link -a -e ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/$bame ]; then - rm ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/$fn - ln -s $bname ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/$fn - fi - fi - done + install -d ${SDK_OUTPUT}/${prefix}/usr/lib/opkg + mv ${SDK_OUTPUT}/usr/lib/opkg/* ${SDK_OUTPUT}/${prefix}/usr/lib/opkg/ + rm -Rf ${SDK_OUTPUT}/usr/lib - echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libpthread.so - echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so + install -d ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/${layout_sysconfdir} + install -m 0644 ${IPKGCONF_TARGET} ${IPKGCONF_SDK} ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/${layout_sysconfdir}/ - # remove unwanted housekeeping files - mv ${SDK_OUTPUT}/usr/lib/opkg/status ${SDK_OUTPUT}/${prefix}/package-status-host - rm -Rf ${SDK_OUTPUT}/usr/lib + install -d ${SDK_OUTPUT}/${sysconfdir} + install -m 0644 ${IPKGCONF_SDK} ${SDK_OUTPUT}/${sysconfdir}/ # extract and store ipks, pkgdata and shlibs data target_pkgs=`cat ${SDK_OUTPUT}/${prefix}/package-status | grep Package: | cut -f 2 -d ' '` @@ -108,25 +83,15 @@ do_populate_sdk() { # gcc-cross-sdk get built :( (30/11/07) ln -sf libgcc_s.so.1 ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libgcc_s.so - # Remove broken .la files - rm -f ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/*.la - - # Generate link for sysroot use - # /usr/local/poky/eabi-glibc/arm/arm-poky-linux-gnueabi/usr -> . - cd ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} - ln -sf . usr - - # fix pkgconfig data files - if [ -e ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig ]; then - cd ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig - for f in *.pc ; do - sed -i 's%=/usr%=${prefix}/${TARGET_SYS}%g' "$f" - done - for f in *.pc ; do - sed -i 's%${STAGING_DIR}%${prefix}%g' "$f" - done - fi - + # Fix or remove broken .la files + for i in `find ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} -name \*.la`; do + sed -i -e "/^dependency_libs=/s,\([[:space:]']\)${layout_base_libdir},\1${prefix}/${TARGET_SYS}${layout_base_libdir},g" \ + -e "/^dependency_libs=/s,\([[:space:]']\)${layout_libdir},\1${prefix}/${TARGET_SYS}${layout_libdir},g" \ + -e "/^dependency_libs=/s,\-\([LR]\)${layout_base_libdir},-\1${prefix}/${TARGET_SYS}${layout_base_libdir},g" \ + -e "/^dependency_libs=/s,\-\([LR]\)${layout_libdir},-\1${prefix}/${TARGET_SYS}${layout_libdir},g" \ + -e 's/^installed=yes$/installed=no/' $i + done + rm -f ${SDK_OUTPUT}/${prefix}/lib/*.la # Setup site file for external use siteconfig=${SDK_OUTPUT}/${prefix}/site-config @@ -140,8 +105,10 @@ do_populate_sdk() { touch $script echo 'export PATH=${prefix}/bin:$PATH' >> $script echo 'export PKG_CONFIG_SYSROOT_DIR=${prefix}/${TARGET_SYS}' >> $script - echo 'export PKG_CONFIG_PATH=${prefix}/${TARGET_SYS}/lib/pkgconfig' >> $script + echo 'export PKG_CONFIG_PATH=${prefix}/${TARGET_SYS}${layout_libdir}/pkgconfig' >> $script echo 'export CONFIG_SITE=${prefix}/site-config' >> $script + echo "alias opkg='LD_LIBRARY_PATH=${prefix}/lib ${prefix}/bin/opkg-cl -f ${sysconfdir}/opkg-sdk.conf -o ${prefix}'" >> $script + echo "alias opkg-target='LD_LIBRARY_PATH=${prefix}/lib ${prefix}/bin/opkg-cl -f ${prefix}/${TARGET_SYS}${layout_sysconfdir}/opkg.conf -o ${prefix}/${TARGET_SYS}'" >> $script # Add version information versionfile=${SDK_OUTPUT}/${prefix}/version diff --git a/packages/naim/.mtn2git_empty b/packages/naim/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/naim/.mtn2git_empty diff --git a/packages/naim/naim_0.11.8.3.1.bb b/packages/naim/naim_0.11.8.3.1.bb new file mode 100644 index 0000000000..f145f721c7 --- /dev/null +++ b/packages/naim/naim_0.11.8.3.1.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "A console AIM/IRC/ICQ and Lily client" +SECTION = "console/apps" +LICENSE = "GPL" +DEPENDS = "ncurses" + +SRC_URI = "http://naim.googlecode.com/files/naim-0.11.8.3.1.tar.bz2" + +inherit autotools diff --git a/packages/omniorb/omniorb_4.0.7.bb b/packages/omniorb/omniorb_4.0.7.bb index d98ab581ac..89e98e3534 100644 --- a/packages/omniorb/omniorb_4.0.7.bb +++ b/packages/omniorb/omniorb_4.0.7.bb @@ -8,10 +8,11 @@ PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/omniorb/omniORB-${PV}.tar.gz \ file://omniORB.cfg \ file://omniORB-cross.patch;patch=1 \ -file://omniORB_embedded_appl.patch;patch=1" \ +file://omniORB_embedded_appl.patch;patch=1 \ file://rm_LongDouble.patch;patch=1 \ file://arm_double.patch;patch=1;pnum=0 \ -file://dynskel.patch;patch=1;pnum=0" +file://dynskel.patch;patch=1;pnum=0 \ +" S = "${WORKDIR}/omniORB-${PV}" diff --git a/packages/pointercal/files/qemux86/.mtn2git_empty b/packages/pointercal/files/qemux86/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/pointercal/files/qemux86/.mtn2git_empty diff --git a/packages/pointercal/files/qemux86/pointercal b/packages/pointercal/files/qemux86/pointercal new file mode 100644 index 0000000000..640053d393 --- /dev/null +++ b/packages/pointercal/files/qemux86/pointercal @@ -0,0 +1 @@ +1280 0 1002 0 960 328 65536 diff --git a/packages/pointercal/pointercal_0.0.bb b/packages/pointercal/pointercal_0.0.bb index 42aae8c0c0..4f421888fa 100644 --- a/packages/pointercal/pointercal_0.0.bb +++ b/packages/pointercal/pointercal_0.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Touchscreen calibration data" SECTION = "base" -PR = "r6" +PR = "r7" SRC_URI = "file://pointercal" S = "${WORKDIR}" diff --git a/packages/quake/quetoo_0.6.1.bb b/packages/quake/quetoo_0.6.1.bb index 9428f501f4..931b002d1c 100644 --- a/packages/quake/quetoo_0.6.1.bb +++ b/packages/quake/quetoo_0.6.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Initially a fork of the Quake2Forge project, this engine aims to LICENSE = "GPLv2" DEPENDS = "libsdl-x11 zlib mesa" -SRC_URI = "http://tastyspleen.net/~jdolan/quetoo-${PV}-full.tar.bz2" +SRC_URI = "http://tastyspleen.net/~jdolan/quetoo-${PV}.tar.bz2" inherit autotools pkgconfig diff --git a/packages/scummvm/files/scummvm-targetcheck.patch b/packages/scummvm/files/scummvm-targetcheck.patch new file mode 100644 index 0000000000..6f245294b4 --- /dev/null +++ b/packages/scummvm/files/scummvm-targetcheck.patch @@ -0,0 +1,17 @@ +upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1959138&group_id=37116&atid=418820 +status: accepted in revision 31912 (less than an hour for turnaround, fantastic!) +origin: adapted from http://bugs.openembedded.net/show_bug.cgi?id=3522 +comment: the strict check for targets needs to be relaxed to compile for some of OE targets + +diff -uNr scummvm-0.9.1.vanilla/configure scummvm-0.9.1/configure +--- scummvm-0.9.1.vanilla/configure 2007-12-23 00:08:23.000000000 +0100 ++++ scummvm-0.9.1/configure 2007-12-23 00:08:35.000000000 +0100 +@@ -763,7 +763,7 @@ + type_2_byte='short' + type_4_byte='int' + ;; +- arm-linux|arm-*-linux-gnueabi) ++ arm-linux|arm*-linux-gnueabi|arm-*-linux|*-angstrom-linux) + echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes" + DEFINES="$DEFINES -DUNIX" + #not true for all ARM systems, but the interesting ones are all LE. Most (if not all) BE arm devices don't have a screen diff --git a/packages/scummvm/scummvm_0.9.1.bb b/packages/scummvm/scummvm_0.9.1.bb index 41c7832acc..39f3a76d14 100644 --- a/packages/scummvm/scummvm_0.9.1.bb +++ b/packages/scummvm/scummvm_0.9.1.bb @@ -1,7 +1,9 @@ require scummvm.inc + DEPENDS = "virtual/libsdl libmad libvorbis libogg zlib mpeg2dec" -SRC_URI += "file://makefile-nostrip.patch;patch=1" +SRC_URI += "file://makefile-nostrip.patch;patch=1 \ + file://scummvm-targetcheck.patch;patch=1" SRC_URI_append_openmoko = " file://openmoko-scummvm \ file://scummvm.desktop" diff --git a/packages/udev/udev-118/init b/packages/udev/udev-118/init index a6b8fa174f..e44c675f2f 100644 --- a/packages/udev/udev-118/init +++ b/packages/udev/udev-118/init @@ -53,9 +53,9 @@ mount_tmpfs() { fi } -# I hate this hack. -- Md make_extra_nodes() { - mknod -m 666 /dev/null c 1 3 + [ -c /dev/null ] || mknod -m 666 /dev/null c 1 3 +# I hate this hack. -- Md if [ "$(echo /lib/udev/devices/*)" != "/lib/udev/devices/*" ]; then cp -a /lib/udev/devices/* /dev/ fi diff --git a/packages/udev/udev_118.bb b/packages/udev/udev_118.bb index 18479a3d13..20fef83d74 100644 --- a/packages/udev/udev_118.bb +++ b/packages/udev/udev_118.bb @@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod the hotplug package and requires a kernel not older than 2.6.12." RPROVIDES_${PN} = "hotplug" -PR = "r2" +PR = "r3" DEFAULT_PREFERENCE = "-118" diff --git a/packages/v86d/.mtn2git_empty b/packages/v86d/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/v86d/.mtn2git_empty diff --git a/packages/v86d/v86d/.mtn2git_empty b/packages/v86d/v86d/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/v86d/v86d/.mtn2git_empty diff --git a/packages/v86d/v86d/fbsetup b/packages/v86d/v86d/fbsetup new file mode 100755 index 0000000000..2a409cc529 --- /dev/null +++ b/packages/v86d/v86d/fbsetup @@ -0,0 +1,3 @@ +#!/bin/sh + +/sbin/modprobe uvesafb diff --git a/packages/v86d/v86d_0.1.3.bb b/packages/v86d/v86d_0.1.3.bb new file mode 100644 index 0000000000..f870376029 --- /dev/null +++ b/packages/v86d/v86d_0.1.3.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "User support binary for the uvesafb kernel module" +SRC_URI = "http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-0.1.3.tar.bz2 \ + file://fbsetup" +DEPENDS = "virtual/kernel" +LICENSE = "GPLv2" +PR = "r3" + +RRECOMMENDS_${PN} = "kernel-module-uvesafb" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = "(qemux86|bootcdx86)" + +INITSCRIPT_NAME = "fbsetup" +INITSCRIPT_PARAMS = "start 0 S ." + +do_configure () { + ./configure --default +} + +do_compile () { + KDIR="${STAGING_KERNEL_DIR}" make +} + +do_install () { + install -d ${D}${base_sbindir} + install v86d ${D}${base_sbindir}/ + + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/fbsetup ${D}${sysconfdir}/init.d/fbsetup +} + +inherit update-rc.d |