diff options
| author | Marco Cavallini <m.cavallini@koansoftware.com> | 2010-07-24 09:30:34 +0200 |
|---|---|---|
| committer | Marco Cavallini <m.cavallini@koansoftware.com> | 2010-07-24 09:30:34 +0200 |
| commit | 5b4a88983b3545f8f894fcbaa420b884f4e13631 (patch) | |
| tree | d3e05a16826624d7ca98ab5ff3e21b4b1777f9b7 | |
| parent | ede6af5e1d519f74fc101e9cc9ab76b446d6f19b (diff) | |
| parent | d4f0fb310f7d40f7a50f50fb12083fa258aa1eed (diff) | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev
44 files changed, 751 insertions, 472 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index ebfe19d438..c2bb869d8c 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -2,4 +2,4 @@ # only SRCREVs included in more recipes should be here, otherwise put sane SRCREV to recipe directly OPKG_SRCREV ?= "543" -EFL_SRCREV ?= "49949" +EFL_SRCREV ?= "50438" diff --git a/conf/machine/include/nios2.inc b/conf/machine/include/nios2.inc index 6aa6538135..ccbfc36111 100644 --- a/conf/machine/include/nios2.inc +++ b/conf/machine/include/nios2.inc @@ -21,34 +21,6 @@ MACHINE_FEATURES ?= "kernel26" PREFERRED_PROVIDER_virtual/kernel ?= "linux-nios2" -# for now we pin gcc, glibc and binutils -# as these are the only versions that have -# nios2 support. -PREFERRED_VERSION_gcc-cross = "4.1.2" -PREFERRED_VERSION_gcc-cross-initial = "4.1.2" -PREFERRED_VERSION_gcc-cross-intermediate = "4.1.2" -PREFERRED_VERSION_binutils = "2.17.50.0.12" -PREFERRED_VERSION_binutils-cross = "2.17.50.0.12" -PREFERRED_VERSION_glibc = "2.5" -PREFERRED_VERSION_glibc-initial = "2.5" - -# uclibc does not work yet -# PREFERRED_VERSION_uclibc = "0.9.30.3" -# PREFERRED_VERSION_uclibc-initial = "0.9.30.3" - -# for now busybox 1.13.2 is the only one -# patched and tested for nios2 so pin this -# one too, until the other versions are updated -# for nios2 too. -PREFERRED_VERSION_busybox_nios2 = "1.13.2" - -# there are some issues cross-compiling when -# using linux-libc-headers-native as we get -# some native inc dirs when compiling crt stuff -# ASSUME_PROVIDED fixes this (but breaks compilation -# on old host systems like red hat 4. -ASSUME_PROVIDED += "linux-libc-headers-native" - # Set default for 16MB machines - can be overridden for more or less flash. ROOT_FLASH_SIZE ?= "12" diff --git a/recipes/binutils/binutils_2.20.1.bb b/recipes/binutils/binutils_2.20.1.bb index e4cc15aef6..d75dbb2569 100644 --- a/recipes/binutils/binutils_2.20.1.bb +++ b/recipes/binutils/binutils_2.20.1.bb @@ -3,7 +3,7 @@ LICENSE = "GPLv3" PR = "${INC_PR}.1" -COMPATIBLE_TARGET_SYS = "." +#COMPATIBLE_TARGET_SYS = "." SRC_URI = "\ ${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2;name=tarball \ diff --git a/recipes/freesmartphone/cornucopia.inc b/recipes/freesmartphone/cornucopia.inc index eb2aca4491..cfd14466e7 100644 --- a/recipes/freesmartphone/cornucopia.inc +++ b/recipes/freesmartphone/cornucopia.inc @@ -7,7 +7,7 @@ DEPENDS = "vala-native glib-2.0 dbus dbus-glib libfso-glib libgee" DEPENDS += "${@['libfsoframework', ''][(bb.data.getVar('PN', d, 1) in 'libfsoframework libfsobasics'.split())]}" PV = "invalid, please override" -FSO_CORNUCOPIA_SRCREV ?= "d87dc2ede31f89610a97c0f1833c1c06860f6cd3" +FSO_CORNUCOPIA_SRCREV ?= "bb089b7d8e4916381ce8a70581454349cd137879" INC_PR = "r2" SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia;protocol=git;branch=master" diff --git a/recipes/freesmartphone/fsogsmd_git.bb b/recipes/freesmartphone/fsogsmd_git.bb index e2cbd53e27..b172611e07 100644 --- a/recipes/freesmartphone/fsogsmd_git.bb +++ b/recipes/freesmartphone/fsogsmd_git.bb @@ -1,15 +1,16 @@ require cornucopia.inc inherit fso-plugin SRCREV = "${FSO_CORNUCOPIA_SRCREV}" -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" PV = "0.5.0+gitr${SRCPV}" PE = "1" -DEPENDS += "libfsoresource libgsm0710mux ppp msmcommd" +DEPENDS += "libfsoresource libgsm0710mux ppp" +# DEPENDS += "msmcommd" EXTRA_OECONF_append = "\ --enable-libgsm0710mux \ - --enable-modem-qualcomm-palm \ +# --enable-modem-qualcomm-palm \ " CONFFILES_${PN} = "${sysconfdir}/freesmartphone/conf/openmoko_gta/fsogsmd.conf \ diff --git a/recipes/gcc/gcc-4.1.2.inc b/recipes/gcc/gcc-4.1.2.inc index 2505b09448..000767a417 100644 --- a/recipes/gcc/gcc-4.1.2.inc +++ b/recipes/gcc/gcc-4.1.2.inc @@ -3,6 +3,8 @@ require gcc-common.inc DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" +COMPATIBLE_TARGET_SYS = "." + INC_PR = "r23" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ diff --git a/recipes/gcc/gcc-4.5.inc b/recipes/gcc/gcc-4.5.inc index 3f73c75436..c671cc873b 100644 --- a/recipes/gcc/gcc-4.5.inc +++ b/recipes/gcc/gcc-4.5.inc @@ -8,7 +8,7 @@ DEPENDS = "mpfr gmp libmpc libelf" NATIVEDEPS = "mpfr-native gmp-native libmpc-native" -INC_PR = "r5" +INC_PR = "r6" SRCREV = "162398" PV = "4.5" @@ -30,6 +30,7 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH} \ file://gcc-flags-for-build.patch \ file://libstdc++-emit-__cxa_end_cleanup-in-text.patch \ file://arm-bswapsi2.patch \ + file://gcc-pr43698-arm-rev-instr.patch \ " # Language Overrides diff --git a/recipes/gcc/gcc-4.5/gcc-pr43698-arm-rev-instr.patch b/recipes/gcc/gcc-4.5/gcc-pr43698-arm-rev-instr.patch new file mode 100644 index 0000000000..61c883e1ff --- /dev/null +++ b/recipes/gcc/gcc-4.5/gcc-pr43698-arm-rev-instr.patch @@ -0,0 +1,117 @@ +backport http://gcc.gnu.org/viewcvs?view=revision&revision=162404 +from trunk + +Which fixes http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43698 + +2010-07-22 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com> + + PR target/43698 + * config/arm/arm.md: Split arm_rev into *arm_rev + and *thumb1_rev. Set *arm_rev to be predicable. + +2010-07-22 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com> + + PR target/43698 + * gcc.target/arm/pr43698.c: New test. + + +/scratch/oe/sysroots/i686-linux/usr/share/quilt/compat/date +Usage: date [OPTION]... [+FORMAT] +Display the current time in the given FORMAT. + + -d, --date=STRING display time described by STRING, not `now' + -f, --file=DATEFILE like --date once for each line of DATEFILE + -R, --rfc-822 output RFC-822 compliant date string + -u, --utc, --universal print or set Coordinated Universal Time + --help display this help and exit +date is /scratch/oe/sysroots/i686-linux/usr/share/quilt/compat/date +date is /scratch/oe/sysroots/i686-linux/usr/share/quilt/compat/date +date is /bin/date +date is /scratch/oe/sysroots/i686-linux/usr/share/quilt/compat/date +date is /scratch/oe/sysroots/i686-linux/usr/share/quilt/compat/date +date is /bin/date +date is /scratch/oe/sysroots/i686-linux/usr/share/quilt/compat/date +date is /scratch/oe/sysroots/i686-linux/usr/share/quilt/compat/date +date is /bin/date +date is /scratch/oe/sysroots/i686-linux/usr/share/quilt/compat/date +date is /scratch/oe/sysroots/i686-linux/usr/share/quilt/compat/date +date is /bin/date +date +Khem +Index: gcc-4.5/gcc/config/arm/arm.md +=================================================================== +--- gcc-4.5.orig/gcc/config/arm/arm.md 2010-07-20 20:31:25.000000000 -0700 ++++ gcc-4.5/gcc/config/arm/arm.md 2010-07-22 14:55:54.303169081 -0700 +@@ -11197,15 +11197,21 @@ + (set_attr "length" "4")] + ) + +-(define_insn "arm_rev" ++(define_insn "*arm_rev" + [(set (match_operand:SI 0 "s_register_operand" "=r") + (bswap:SI (match_operand:SI 1 "s_register_operand" "r")))] +- "TARGET_EITHER && arm_arch6" +- "rev\t%0, %1" +- [(set (attr "length") +- (if_then_else (eq_attr "is_thumb" "yes") +- (const_int 2) +- (const_int 4)))] ++ "TARGET_32BIT && arm_arch6" ++ "rev%?\t%0, %1" ++ [(set_attr "predicable" "yes") ++ (set_attr "length" "4")] ++) ++ ++(define_insn "*thumb1_rev" ++ [(set (match_operand:SI 0 "s_register_operand" "=l") ++ (bswap:SI (match_operand:SI 1 "s_register_operand" "l")))] ++ "TARGET_THUMB1 && arm_arch6" ++ "rev\t%0, %1" ++ [(set_attr "length" "2")] + ) + + (define_expand "arm_legacy_rev" +Index: gcc-4.5/gcc/testsuite/gcc.target/arm/pr43698.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gcc-4.5/gcc/testsuite/gcc.target/arm/pr43698.c 2010-07-22 14:56:35.406670213 -0700 +@@ -0,0 +1,39 @@ ++/* { dg-do run } */ ++/* { dg-options "-Os -march=armv7-a" } */ ++#include <stdint.h> ++#include <stdlib.h> ++ ++ ++char do_reverse_endian = 0; ++ ++# define bswap_32(x) \ ++ ((((x) & 0xff000000) >> 24) | \ ++ (((x) & 0x00ff0000) >> 8) | \ ++ (((x) & 0x0000ff00) << 8) | \ ++ (((x) & 0x000000ff) << 24)) ++ ++#define EGET(X) \ ++ (__extension__ ({ \ ++ uint64_t __res; \ ++ if (!do_reverse_endian) { __res = (X); \ ++ } else if (sizeof(X) == 4) { __res = bswap_32((X)); \ ++ } \ ++ __res; \ ++ })) ++ ++void __attribute__((noinline)) X(char **phdr, char **data, int *phoff) ++{ ++ *phdr = *data + EGET(*phoff); ++} ++ ++int main() ++{ ++ char *phdr; ++ char *data = (char *)0x40164000; ++ int phoff = 0x34; ++ X(&phdr, &data, &phoff); ++ if (phdr != (char *)0x40164034) ++ abort (); ++ exit (0); ++} ++ diff --git a/recipes/gcc/gcc-common.inc b/recipes/gcc/gcc-common.inc index 7aee542461..ffd4dd3146 100644 --- a/recipes/gcc/gcc-common.inc +++ b/recipes/gcc/gcc-common.inc @@ -9,6 +9,8 @@ inherit autotools gettext FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" +COMPATIBLE_TARGET_SYS ?= "(?!nios2)" + # 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. diff --git a/recipes/glibc/glibc.inc b/recipes/glibc/glibc.inc index 19b5524293..643ebd30b8 100644 --- a/recipes/glibc/glibc.inc +++ b/recipes/glibc/glibc.inc @@ -10,6 +10,8 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES += "virtual/libintl virtual/libiconv" +COMPATIBLE_TARGET_SYS ?= "(?!nios2)" + # INC_PR for glibc.inc, glibc-initial.inc and glibc-stage.inc INC_PR = "r36" diff --git a/recipes/glibc/glibc_2.5.bb b/recipes/glibc/glibc_2.5.bb index 39551dcc7b..cb3b5474fe 100644 --- a/recipes/glibc/glibc_2.5.bb +++ b/recipes/glibc/glibc_2.5.bb @@ -1,6 +1,8 @@ require glibc.inc PR = "${INC_PR}.2" +COMPATIBLE_TARGET_SYS = "." + ARM_INSTRUCTION_SET = "arm" PACKAGES_DYNAMIC = "libc6*" diff --git a/recipes/kexecboot/linux-kexecboot/spitz/defconfig b/recipes/kexecboot/linux-kexecboot/spitz/defconfig index 73d46130fe..486ea6ba5d 100644 --- a/recipes/kexecboot/linux-kexecboot/spitz/defconfig +++ b/recipes/kexecboot/linux-kexecboot/spitz/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.35-rc3 -# Sun Jun 20 08:56:48 2010 +# Linux kernel version: 2.6.35-rc6 +# Thu Jul 22 23:42:39 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -417,6 +417,7 @@ CONFIG_HAVE_AOUT=y CONFIG_PM=y # CONFIG_PM_DEBUG is not set CONFIG_PM_SLEEP=y +CONFIG_SUSPEND_NVS=y CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y CONFIG_APM_EMULATION=y @@ -557,36 +558,82 @@ CONFIG_BLK_DEV_LOOP=y # CONFIG_MG_DISK is not set # CONFIG_MISC_DEVICES is not set CONFIG_HAVE_IDE=y -CONFIG_IDE=y +# CONFIG_IDE is not set # -# Please see Documentation/ide/ide.txt for help/info on IDE drives +# SCSI device support # -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_IDE_GD=y -CONFIG_IDE_GD_ATA=y -# CONFIG_IDE_GD_ATAPI is not set -CONFIG_BLK_DEV_IDECS=y -# CONFIG_BLK_DEV_IDECD is not set -# CONFIG_BLK_DEV_IDETAPE is not set -# CONFIG_IDE_TASK_IOCTL is not set -# CONFIG_IDE_PROC_FS is not set +CONFIG_SCSI_MOD=y +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y # -# IDE chipset support/bugfixes +# SCSI support type (disk, tape, CD-ROM) # -# CONFIG_BLK_DEV_PLATFORM is not set -# CONFIG_BLK_DEV_IDEDMA is not set +# CONFIG_BLK_DEV_SD is not set +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +# CONFIG_BLK_DEV_SR is not set +# CONFIG_CHR_DEV_SG is not set +# CONFIG_CHR_DEV_SCH is not set +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set # -# SCSI device support +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +CONFIG_SCSI_LOWLEVEL=y +# CONFIG_LIBFC is not set +# CONFIG_LIBFCOE is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set +# CONFIG_SCSI_DH is not set +# CONFIG_SCSI_OSD_INITIATOR is not set +CONFIG_ATA=y +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_SATA_PMP=y + +# +# Controllers with non-SFF native interface +# +# CONFIG_SATA_AHCI_PLATFORM is not set +CONFIG_ATA_SFF=y + +# +# SFF controllers with custom DMA interface +# +CONFIG_ATA_BMDMA=y + +# +# SATA SFF controllers with BMDMA +# +# CONFIG_SATA_MV is not set + +# +# PATA SFF controllers with BMDMA +# + +# +# PIO-only SFF controllers +# +CONFIG_PATA_PCMCIA=y +CONFIG_PATA_PLATFORM=y + +# +# Generic fallback / legacy drivers # -CONFIG_SCSI_MOD=y -# CONFIG_RAID_ATTRS is not set -# CONFIG_SCSI is not set -# CONFIG_SCSI_DMA is not set -# CONFIG_SCSI_NETLINK is not set -# CONFIG_ATA is not set # CONFIG_MD is not set # CONFIG_PHONE is not set @@ -616,7 +663,7 @@ CONFIG_INPUT_APMPOWER=y CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_ADP5588 is not set # CONFIG_KEYBOARD_ATKBD is not set -# CONFIG_QT2160 is not set +# CONFIG_KEYBOARD_QT2160 is not set # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=y # CONFIG_KEYBOARD_TCA6416 is not set @@ -1046,7 +1093,6 @@ CONFIG_LEDS_TRIGGERS=y # LED Triggers # CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set # CONFIG_LEDS_TRIGGER_GPIO is not set diff --git a/recipes/kexecboot/linux-kexecboot_git.bb b/recipes/kexecboot/linux-kexecboot_git.bb index d53baf9842..8631050645 100644 --- a/recipes/kexecboot/linux-kexecboot_git.bb +++ b/recipes/kexecboot/linux-kexecboot_git.bb @@ -1,7 +1,7 @@ require linux-kexecboot.inc -KERNEL_RELEASE = "2.6.35-rc5" -SRCREV = "f469461df6ff822f71b8737bda86eea20f16ff93" +KERNEL_RELEASE = "2.6.35-rc6" +SRCREV = "b37fa16e78d6f9790462b3181602a26b5af36260" PV = "${KERNEL_RELEASE}+gitr${SRCPV}" SRC_URI += "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;branch=master \ diff --git a/recipes/libpcap/libpcap-1.1.1/ieee80215-arphrd.patch b/recipes/libpcap/libpcap-1.1.1/ieee80215-arphrd.patch new file mode 100644 index 0000000000..f29c7cb54c --- /dev/null +++ b/recipes/libpcap/libpcap-1.1.1/ieee80215-arphrd.patch @@ -0,0 +1,22 @@ +Index: libpcap-1.0.0/pcap-linux.c +=================================================================== +--- libpcap-1.0.0.orig/pcap-linux.c 2009-01-28 11:58:54.000000000 +0300 ++++ libpcap-1.0.0/pcap-linux.c 2009-01-28 11:59:04.000000000 +0300 +@@ -1616,6 +1616,17 @@ + * so let's use "Linux-cooked" mode. Jean II */ + //handle->md.cooked = 1; + break; ++#ifndef ARPHRD_IEEE80215 ++#define ARPHRD_IEEE80215 804 ++#endif ++#ifndef ARPHRD_IEEE80215_PHY ++#define ARPHRD_IEEE80215_PHY 805 ++#endif ++ ++ case ARPHRD_IEEE80215: ++ case ARPHRD_IEEE80215_PHY: ++ handle->linktype = DLT_IEEE802_15_4; ++ break; + + /* ARPHRD_LAPD is unofficial and randomly allocated, if reallocation + * is needed, please report it to <daniele@orlandi.com> */ diff --git a/recipes/libpcap/libpcap_1.1.1.bb b/recipes/libpcap/libpcap_1.1.1.bb new file mode 100644 index 0000000000..a1a244ce6a --- /dev/null +++ b/recipes/libpcap/libpcap_1.1.1.bb @@ -0,0 +1,40 @@ +require libpcap.inc + +PR = "r1" +SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz" +SRC_URI += "file://ieee80215-arphrd.patch;patch=1" + +BINCONFIG_GLOB = "pcap-config" + +inherit binconfig + +do_configure_prepend() { + cat ${S}/aclocal.m4 >>${S}/acinclude.m4 +} + +do_compile () { + oe_runmake + rm -f *.o + oe_runmake shared +} + +do_install () { + install -d ${D}${libdir} + install -d ${D}${bindir} + oe_runmake install DESTDIR=${D} + oe_runmake install-shared DESTDIR=${D} + oe_libinstall -a -so libpcap ${D}${libdir} + + install -d ${D}${includedir}/pcap + install -m 0644 pcap/pcap.h ${D}${includedir}/pcap/pcap.h + install -m 0644 pcap/namedb.h ${D}${includedir}/pcap/namedb.h + install -m 0644 pcap/bpf.h ${D}${includedir}/pcap/bpf.h + + install -m 0755 ${S}/pcap-config ${D}${bindir} +} + +FILES_${PN}-dev += "${bindir}/pcap-config" + +SRC_URI[md5sum] = "1bca27d206970badae248cfa471bbb47" +SRC_URI[sha256sum] = "508cca15547e55d1318498b838456a21770c450beb2dc7d7d4a96d90816e5a85" + diff --git a/recipes/linux/linux-openmoko-2.6.32/0001-add-noinline-and-noclone-attributes-to-naked-functio.patch b/recipes/linux/linux-openmoko-2.6.32/0001-add-noinline-and-noclone-attributes-to-naked-functio.patch new file mode 100644 index 0000000000..ac1efaec25 --- /dev/null +++ b/recipes/linux/linux-openmoko-2.6.32/0001-add-noinline-and-noclone-attributes-to-naked-functio.patch @@ -0,0 +1,52 @@ +From 6d97e1b1c2434fb769be7a72813efd11925225a9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 6 Jun 2010 03:28:43 +0200 +Subject: [PATCH 03/22] add noinline and noclone attributes to naked functions + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + include/linux/compiler-gcc.h | 11 ++++++++++- + include/linux/compiler-gcc4.h | 2 ++ + 2 files changed, 12 insertions(+), 1 deletions(-) + +diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h +index a3ed7cb..132a651 100644 +--- a/include/linux/compiler-gcc.h ++++ b/include/linux/compiler-gcc.h +@@ -58,8 +58,12 @@ + * naked functions because then mcount is called without stack and frame pointer + * being set up and there is no chance to restore the lr register to the value + * before mcount was called. ++ * ++ * The asm() bodies of naked functions often depend on standard calling conventions, ++ * therefore they must be noinline and noclone. GCC 4.[56] currently fail to enforce ++ * this, so we must do so ourselves. See GCC PR44290. + */ +-#define __naked __attribute__((naked)) notrace ++#define __naked __attribute__((naked)) noinline __noclone notrace + + #define __noreturn __attribute__((noreturn)) + +@@ -84,3 +88,8 @@ + #define _gcc_header(x) __gcc_header(linux/compiler-gcc##x.h) + #define gcc_header(x) _gcc_header(x) + #include gcc_header(__GNUC__) ++ ++#if !defined(__noclone) ++#define __noclone /* not needed */ ++#endif ++ +diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h +index 450fa59..cd5932a 100644 +--- a/include/linux/compiler-gcc4.h ++++ b/include/linux/compiler-gcc4.h +@@ -36,4 +36,6 @@ + the kernel context */ + #define __cold __attribute__((__cold__)) + ++/* Mark a function definition as prohibited from being cloned. */ ++#define __noclone __attribute__((__noclone__)) + #endif +-- +1.7.1.1 + diff --git a/recipes/linux/linux-openmoko-2.6.32/0006-gta02-defconfigs-enable-LEDS_S3C24XX-and-dummy-batte.patch b/recipes/linux/linux-openmoko-2.6.32/0006-gta02-defconfigs-enable-LEDS_S3C24XX-and-dummy-batte.patch deleted file mode 100644 index 103c06c886..0000000000 --- a/recipes/linux/linux-openmoko-2.6.32/0006-gta02-defconfigs-enable-LEDS_S3C24XX-and-dummy-batte.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 7e4a1fee4f08ef7ccedd4706b4890afc71f37dc4 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Mon, 17 May 2010 12:41:06 +0200 -Subject: [PATCH 06/14] gta02 defconfigs, enable LEDS_S3C24XX and dummy battery driver - ---- - arch/arm/configs/gta02_defconfig | 2 +- - arch/arm/configs/gta02_drm_defconfig | 10 +++++----- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/arch/arm/configs/gta02_defconfig b/arch/arm/configs/gta02_defconfig -index 73d26ba..55832ac 100644 ---- a/arch/arm/configs/gta02_defconfig -+++ b/arch/arm/configs/gta02_defconfig -@@ -1635,7 +1635,7 @@ CONFIG_LEDS_CLASS=y - # - # LED drivers - # --# CONFIG_LEDS_S3C24XX is not set -+CONFIG_LEDS_S3C24XX=y - # CONFIG_LEDS_PCA9532 is not set - CONFIG_LEDS_GPIO=y - CONFIG_LEDS_GPIO_PLATFORM=y -diff --git a/arch/arm/configs/gta02_drm_defconfig b/arch/arm/configs/gta02_drm_defconfig -index 05aa130..62c1ee4 100644 ---- a/arch/arm/configs/gta02_drm_defconfig -+++ b/arch/arm/configs/gta02_drm_defconfig -@@ -1,7 +1,7 @@ - # - # Automatically generated make config: don't edit --# Linux kernel version: 2.6.32.11 --# Sun Apr 11 14:20:07 2010 -+# Linux kernel version: 2.6.32.13 -+# Mon May 17 14:13:35 2010 - # - CONFIG_ARM=y - CONFIG_HAVE_PWM=y -@@ -1233,7 +1233,7 @@ CONFIG_POWER_SUPPLY=y - CONFIG_CHARGER_PCF50633=y - CONFIG_BATTERY_BQ27000_HDQ=y - CONFIG_HDQ_GPIO_BITBANG=y --# CONFIG_BATTERY_PLATFORM is not set -+CONFIG_BATTERY_PLATFORM=y - # CONFIG_HWMON is not set - # CONFIG_THERMAL is not set - CONFIG_WATCHDOG=y -@@ -1681,14 +1681,14 @@ CONFIG_LEDS_CLASS=y - # - # LED drivers - # --# CONFIG_LEDS_S3C24XX is not set -+CONFIG_LEDS_S3C24XX=y - # CONFIG_LEDS_PCA9532 is not set - CONFIG_LEDS_GPIO=y - CONFIG_LEDS_GPIO_PLATFORM=y - # CONFIG_LEDS_LP3944 is not set - # CONFIG_LEDS_PCA955X is not set - # CONFIG_LEDS_DAC124S085 is not set --# CONFIG_LEDS_PWM is not set -+CONFIG_LEDS_PWM=y - # CONFIG_LEDS_BD2802 is not set - - # --- -1.7.1 - diff --git a/recipes/linux/linux-openmoko-2.6.32/0016-jbt6k74-fix-WS.patch b/recipes/linux/linux-openmoko-2.6.32/0016-jbt6k74-fix-WS.patch new file mode 100644 index 0000000000..e96a87d290 --- /dev/null +++ b/recipes/linux/linux-openmoko-2.6.32/0016-jbt6k74-fix-WS.patch @@ -0,0 +1,64 @@ +From 99ce90618a47cdc8c373838b7ee04348cc21d303 Mon Sep 17 00:00:00 2001 +From: Thibaut Girka <thib@sitedethib.com> +Date: Wed, 21 Jul 2010 09:40:29 +0200 +Subject: [PATCH 16/23] jbt6k74: fix WS + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + drivers/video/backlight/jbt6k74.c | 15 +++++++++++---- + 1 files changed, 11 insertions(+), 4 deletions(-) + +diff --git a/drivers/video/backlight/jbt6k74.c b/drivers/video/backlight/jbt6k74.c +index 56a3e3a..4db021f 100644 +--- a/drivers/video/backlight/jbt6k74.c ++++ b/drivers/video/backlight/jbt6k74.c +@@ -268,8 +268,7 @@ static int jbt_off_to_normal(struct jbt_info *jbt) + + gpio_set_value_cansleep(pdata->gpio_reset, 1); + ret = regulator_bulk_enable(ARRAY_SIZE(jbt->supplies), jbt->supplies); +- +- mdelay(120); ++ mdelay(200); + + /* three times command zero */ + ret |= jbt_reg_write_nodata(jbt, 0x00); +@@ -282,10 +281,16 @@ static int jbt_off_to_normal(struct jbt_info *jbt) + /* deep standby out */ + ret |= jbt_reg_write(jbt, JBT_REG_POWER_ON_OFF, 0x11); + mdelay(1); ++ if (ret != 0) ++ printk (KERN_ERR "Ignored ret value:%i",ret); ++ + ret |= jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE, 0x28); + + /* (re)initialize register set */ + ret |= jbt_init_regs(jbt); ++ if (ret != 0) ++ printk (KERN_ERR "Ignored ret value2:%i",ret); ++ + + /* Make sure we are 120 ms after SLEEP_OUT */ + if (time_before(jiffies, jbt->next_sleep)) +@@ -644,7 +649,7 @@ static int jbt6k74_set_power(struct lcd_device *ld, int power) + struct jbt_info *jbt = dev_get_drvdata(&ld->dev); + + jbt->blank_mode = power; +- cancel_rearming_delayed_work(&jbt->blank_work); ++ //cancel_rearming_delayed_work(&jbt->blank_work); + + switch (power) { + case FB_BLANK_UNBLANK: +@@ -658,7 +663,9 @@ static int jbt6k74_set_power(struct lcd_device *ld, int power) + break; + case FB_BLANK_POWERDOWN: + dev_dbg(&jbt->spi->dev, "powerdown\n"); +- ret = jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_OFF); ++ //ret = schedule_delayed_work(&jbt->blank_work, HZ); ++ jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_OFF); ++ ret = 1; + break; + default: + break; +-- +1.7.1.1 + diff --git a/recipes/linux/linux-openmoko-2.6.32/touchscreen_ignoreunexpectedintr29.patch b/recipes/linux/linux-openmoko-2.6.32/0017-s3c2410_ts-ignore-unexpected-interrupts.patch index cb99dd889d..0da1261d39 100644 --- a/recipes/linux/linux-openmoko-2.6.32/touchscreen_ignoreunexpectedintr29.patch +++ b/recipes/linux/linux-openmoko-2.6.32/0017-s3c2410_ts-ignore-unexpected-interrupts.patch @@ -1,5 +1,14 @@ +From fd25a512062b198af666bbdab805e8d6b51ed166 Mon Sep 17 00:00:00 2001 +From: Gennady Kupava <gb@bsdmn.com> +Date: Sun, 27 Jun 2010 10:01:54 +0200 +Subject: [PATCH 17/22] s3c2410_ts: ignore unexpected interrupts + +--- + drivers/input/touchscreen/s3c2410_ts.c | 30 +++++++++++++++++++++++++++++- + 1 files changed, 29 insertions(+), 1 deletions(-) + diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c -index bcfdd00..73994ff 100644 +index 97def9d..fd0b7d4 100644 --- a/drivers/input/touchscreen/s3c2410_ts.c +++ b/drivers/input/touchscreen/s3c2410_ts.c @@ -47,6 +47,9 @@ @@ -12,7 +21,7 @@ index bcfdd00..73994ff 100644 */ #include <linux/errno.h> -@@ -118,10 +121,15 @@ struct s3c2410ts { +@@ -120,10 +123,15 @@ struct s3c2410ts { struct kfifo *event_fifo; struct s3c_adc_client *adc_client; unsigned adc_selected; @@ -28,7 +37,7 @@ index bcfdd00..73994ff 100644 static void __iomem *base_addr; /* -@@ -280,6 +288,19 @@ static irqreturn_t stylus_updown(int irq, void *dev_id) +@@ -282,6 +290,19 @@ static irqreturn_t stylus_updown(int irq, void *dev_id) ts.is_down = !(data0 & S3C2410_ADCDAT0_UPDOWN) && !(data1 & S3C2410_ADCDAT0_UPDOWN); @@ -48,7 +57,7 @@ index bcfdd00..73994ff 100644 event_type = ts.is_down ? 'D' : 'U'; if (unlikely(__kfifo_put(ts.event_fifo, (unsigned char *)&event_type, -@@ -289,8 +310,10 @@ static irqreturn_t stylus_updown(int irq, void *dev_id) +@@ -291,8 +312,10 @@ static irqreturn_t stylus_updown(int irq, void *dev_id) if (ts.is_down) s3c2410_ts_start_adc_conversion(); @@ -60,7 +69,7 @@ index bcfdd00..73994ff 100644 mod_timer(&event_send_timer, jiffies + 1); -@@ -325,6 +348,7 @@ static void stylus_adc_action(unsigned p0, unsigned p1, unsigned *conv_left) +@@ -327,6 +350,7 @@ static void stylus_adc_action(struct s3c_adc_client *client, unsigned p0, unsign case -1: /* Too much noise. Ignore the event. */ ts_filter_chain_clear(ts.chain); @@ -68,7 +77,7 @@ index bcfdd00..73994ff 100644 writel(WAIT4INT(1), base_addr + S3C2410_ADCTSC); return; }; -@@ -334,6 +358,7 @@ static void stylus_adc_action(unsigned p0, unsigned p1, unsigned *conv_left) +@@ -336,6 +360,7 @@ static void stylus_adc_action(struct s3c_adc_client *client, unsigned p0, unsign /* This will only happen if we have a bug. */ TSPRINTK("FIFO full\n"); @@ -76,7 +85,7 @@ index bcfdd00..73994ff 100644 writel(WAIT4INT(1), base_addr + S3C2410_ADCTSC); mod_timer(&event_send_timer, jiffies + 1); -@@ -371,6 +396,7 @@ static int __init s3c2410ts_probe(struct platform_device *pdev) +@@ -373,6 +398,7 @@ static int __init s3c2410ts_probe(struct platform_device *pdev) if (!strcmp(pdev->name, "s3c2410-ts")) s3c2410_ts_connect(); @@ -84,7 +93,7 @@ index bcfdd00..73994ff 100644 writel(WAIT4INT(0), base_addr + S3C2410_ADCTSC); /* Initialise input stuff */ -@@ -481,6 +507,7 @@ static int s3c2410ts_remove(struct platform_device *pdev) +@@ -482,6 +508,7 @@ static int s3c2410ts_remove(struct platform_device *pdev) static int s3c2410ts_suspend(struct platform_device *pdev, pm_message_t state) { @@ -92,7 +101,7 @@ index bcfdd00..73994ff 100644 writel(TSC_SLEEP, base_addr + S3C2410_ADCTSC); writel(readl(base_addr + S3C2410_ADCCON) | S3C2410_ADCCON_STDBM, base_addr + S3C2410_ADCCON); -@@ -492,6 +519,7 @@ static int s3c2410ts_suspend(struct platform_device *pdev, pm_message_t state) +@@ -493,6 +520,7 @@ static int s3c2410ts_suspend(struct platform_device *pdev, pm_message_t state) static int s3c2410ts_resume(struct platform_device *pdev) { ts_filter_chain_clear(ts.chain); @@ -100,3 +109,6 @@ index bcfdd00..73994ff 100644 enable_irq(IRQ_TC); writel(WAIT4INT(0), base_addr + S3C2410_ADCTSC); +-- +1.7.1.1 + diff --git a/recipes/linux/linux-openmoko-2.6.32/0018-glamo-core-initialize-engine-states-as-disabled.patch b/recipes/linux/linux-openmoko-2.6.32/0018-glamo-core-initialize-engine-states-as-disabled.patch new file mode 100644 index 0000000000..4888b94cd5 --- /dev/null +++ b/recipes/linux/linux-openmoko-2.6.32/0018-glamo-core-initialize-engine-states-as-disabled.patch @@ -0,0 +1,36 @@ +From 9615f587ce8ac94732b6473a44d776473c120af6 Mon Sep 17 00:00:00 2001 +From: Thibaut Girka <thib@sitedethib.com> +Date: Fri, 25 Jun 2010 20:17:18 +0200 +Subject: [PATCH 18/22] glamo-core: initialize engine states as disabled + +This should fix random init failures such as white screen on boot. +--- + drivers/mfd/glamo/glamo-core.c | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c +index 33a7a59..f6674f4 100644 +--- a/drivers/mfd/glamo/glamo-core.c ++++ b/drivers/mfd/glamo/glamo-core.c +@@ -916,7 +916,7 @@ static int __devinit glamo_supported(struct glamo_core *glamo) + + static int __devinit glamo_probe(struct platform_device *pdev) + { +- int ret = 0, irq, irq_base; ++ int ret = 0, n, irq, irq_base; + struct glamo_core *glamo; + struct resource *mem; + +@@ -924,6 +924,9 @@ static int __devinit glamo_probe(struct platform_device *pdev) + if (!glamo) + return -ENOMEM; + ++ for (n = 0; n < __NUM_GLAMO_ENGINES; n++) ++ glamo->engine_state[n] = GLAMO_ENGINE_DISABLED; ++ + spin_lock_init(&glamo->lock); + + glamo->pdev = pdev; +-- +1.7.1.1 + diff --git a/recipes/linux/linux-openmoko-2.6.32/hs-jack.patch b/recipes/linux/linux-openmoko-2.6.32/0019-wm8753-use-snd_soc_jack-on-neo1973.patch index c92c3f6481..c3e3d02231 100644 --- a/recipes/linux/linux-openmoko-2.6.32/hs-jack.patch +++ b/recipes/linux/linux-openmoko-2.6.32/0019-wm8753-use-snd_soc_jack-on-neo1973.patch @@ -1,3 +1,12 @@ +From 261e2f00048ea8bfd5c261242c263e5a55401d64 Mon Sep 17 00:00:00 2001 +From: Lars-Peter Clausen <lars@metafoo.de> +Date: Wed, 7 Jul 2010 15:29:33 +0200 +Subject: [PATCH 19/22] wm8753: use snd_soc_jack on neo1973 + +--- + sound/soc/s3c24xx/neo1973_wm8753.c | 46 ++++++++++++++++++++++++++++++++++++ + 1 files changed, 46 insertions(+), 0 deletions(-) + diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c index 5cc1ef2..643dae3 100644 --- a/sound/soc/s3c24xx/neo1973_wm8753.c @@ -83,3 +92,6 @@ index 5cc1ef2..643dae3 100644 platform_device_unregister(neo1973_snd_device); if (machine_is_neo1973_gta01()) +-- +1.7.1.1 + diff --git a/recipes/linux/linux-openmoko-2.6.32/0001-mfd-glamo-Enable-FIFO-stage-for-the-LCD-engine-s-mem.patch b/recipes/linux/linux-openmoko-2.6.32/0020-mfd-glamo-Enable-FIFO-stage-for-the-LCD-engine-s-mem.patch index 8ccf940c6c..71b2dd4ca2 100644 --- a/recipes/linux/linux-openmoko-2.6.32/0001-mfd-glamo-Enable-FIFO-stage-for-the-LCD-engine-s-mem.patch +++ b/recipes/linux/linux-openmoko-2.6.32/0020-mfd-glamo-Enable-FIFO-stage-for-the-LCD-engine-s-mem.patch @@ -1,7 +1,7 @@ -From 135a829c2fe551a7418696138df68eefad5a9b39 Mon Sep 17 00:00:00 2001 +From 9a8375f9f03770c85e635fc5dbde7124efb66154 Mon Sep 17 00:00:00 2001 From: Thomas White <taw@bitwiz.org.uk> Date: Thu, 26 Nov 2009 08:55:33 +0300 -Subject: [PATCH] mfd: glamo: Enable FIFO stage for the LCD engine's memory access +Subject: [PATCH 20/22] mfd: glamo: Enable FIFO stage for the LCD engine's memory access By avoiding conflicts of memory access inside Glamo, this doubles the speed of internal memory access. diff --git a/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig b/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig index 99dc93d20c..39a933c4cb 100644 --- a/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig +++ b/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32.13 -# Mon Jul 19 13:09:20 2010 +# Linux kernel version: 2.6.32.16 +# Wed Jul 21 13:53:15 2010 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -30,7 +30,6 @@ CONFIG_CONSTRUCTORS=y # CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y -CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set @@ -308,9 +307,9 @@ CONFIG_VMSPLIT_3G=y # CONFIG_VMSPLIT_2G is not set # CONFIG_VMSPLIT_1G is not set CONFIG_PAGE_OFFSET=0xC0000000 -# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set -CONFIG_PREEMPT=y +# CONFIG_PREEMPT is not set CONFIG_HZ=200 CONFIG_AEABI=y # CONFIG_OABI_COMPAT is not set @@ -425,8 +424,8 @@ CONFIG_INET_XFRM_MODE_TRANSPORT=m CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_INET_XFRM_MODE_BEET=m # CONFIG_INET_LRO is not set -CONFIG_INET_DIAG=y -CONFIG_INET_TCP_DIAG=y +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m CONFIG_TCP_CONG_ADVANCED=y # CONFIG_TCP_CONG_BIC is not set # CONFIG_TCP_CONG_CUBIC is not set @@ -634,12 +633,12 @@ CONFIG_BRIDGE_EBT_ULOG=m # CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set -CONFIG_STP=y -CONFIG_BRIDGE=y +CONFIG_STP=m +CONFIG_BRIDGE=m # CONFIG_NET_DSA is not set # CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set -CONFIG_LLC=y +CONFIG_LLC=m # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -696,20 +695,20 @@ CONFIG_NET_SCH_FIFO=y # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set # CONFIG_IRDA is not set -CONFIG_BT=y -CONFIG_BT_L2CAP=y -CONFIG_BT_SCO=y -CONFIG_BT_RFCOMM=y +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=y +CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=y +CONFIG_BT_HIDP=m # # Bluetooth device drivers # -CONFIG_BT_HCIBTUSB=y +CONFIG_BT_HCIBTUSB=m # CONFIG_BT_HCIBTSDIO is not set # CONFIG_BT_HCIUART is not set # CONFIG_BT_HCIBCM203X is not set @@ -730,6 +729,10 @@ CONFIG_WIRELESS_EXT_SYSFS=y # # CFG80211 needs to be enabled for MAC80211 # + +# +# Some wireless drivers require a rate control algorithm +# # CONFIG_WIMAX is not set CONFIG_RFKILL=y CONFIG_RFKILL_LEDS=y @@ -1415,47 +1418,47 @@ CONFIG_HID=y # # USB Input Devices # -CONFIG_USB_HID=y +CONFIG_USB_HID=m # CONFIG_HID_PID is not set # CONFIG_USB_HIDDEV is not set # # Special HID drivers # -CONFIG_HID_A4TECH=y -CONFIG_HID_APPLE=y -CONFIG_HID_BELKIN=y -CONFIG_HID_CHERRY=y -CONFIG_HID_CHICONY=y -CONFIG_HID_CYPRESS=y -CONFIG_HID_DRAGONRISE=y +CONFIG_HID_A4TECH=m +CONFIG_HID_APPLE=m +CONFIG_HID_BELKIN=m +CONFIG_HID_CHERRY=m +CONFIG_HID_CHICONY=m +CONFIG_HID_CYPRESS=m +CONFIG_HID_DRAGONRISE=m # CONFIG_DRAGONRISE_FF is not set -CONFIG_HID_EZKEY=y -CONFIG_HID_KYE=y -CONFIG_HID_GYRATION=y -CONFIG_HID_TWINHAN=y -CONFIG_HID_KENSINGTON=y -CONFIG_HID_LOGITECH=y +CONFIG_HID_EZKEY=m +CONFIG_HID_KYE=m +CONFIG_HID_GYRATION=m +CONFIG_HID_TWINHAN=m +CONFIG_HID_KENSINGTON=m +CONFIG_HID_LOGITECH=m # CONFIG_LOGITECH_FF is not set # CONFIG_LOGIRUMBLEPAD2_FF is not set -CONFIG_HID_MICROSOFT=y -CONFIG_HID_MONTEREY=y -CONFIG_HID_NTRIG=y -CONFIG_HID_PANTHERLORD=y +CONFIG_HID_MICROSOFT=m +CONFIG_HID_MONTEREY=m +CONFIG_HID_NTRIG=m +CONFIG_HID_PANTHERLORD=m # CONFIG_PANTHERLORD_FF is not set -CONFIG_HID_PETALYNX=y -CONFIG_HID_SAMSUNG=y -CONFIG_HID_SONY=y -CONFIG_HID_SUNPLUS=y -CONFIG_HID_GREENASIA=y +CONFIG_HID_PETALYNX=m +CONFIG_HID_SAMSUNG=m +CONFIG_HID_SONY=m +CONFIG_HID_SUNPLUS=m +CONFIG_HID_GREENASIA=m # CONFIG_GREENASIA_FF is not set -CONFIG_HID_SMARTJOYPLUS=y +CONFIG_HID_SMARTJOYPLUS=m # CONFIG_SMARTJOYPLUS_FF is not set -CONFIG_HID_TOPSEED=y -CONFIG_HID_THRUSTMASTER=y +CONFIG_HID_TOPSEED=m +CONFIG_HID_THRUSTMASTER=m # CONFIG_THRUSTMASTER_FF is not set -CONFIG_HID_WACOM=y -CONFIG_HID_ZEROPLUS=y +CONFIG_HID_WACOM=m +CONFIG_HID_ZEROPLUS=m # CONFIG_ZEROPLUS_FF is not set CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y @@ -1606,7 +1609,7 @@ CONFIG_USB_IOWARRIOR=m # CONFIG_USB_TEST is not set # CONFIG_USB_ISIGHTFW is not set # CONFIG_USB_VST is not set -CONFIG_USB_GADGET=y +CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG_FILES is not set # CONFIG_USB_GADGET_DEBUG_FS is not set CONFIG_USB_GADGET_VBUS_DRAW=500 @@ -1622,7 +1625,7 @@ CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_S3C_HSOTG is not set # CONFIG_USB_GADGET_IMX is not set CONFIG_USB_GADGET_S3C2410=y -CONFIG_USB_S3C2410=y +CONFIG_USB_S3C2410=m # CONFIG_USB_S3C2410_DEBUG is not set # CONFIG_USB_GADGET_M66592 is not set # CONFIG_USB_GADGET_AMD5536UDC is not set @@ -1635,15 +1638,16 @@ CONFIG_USB_S3C2410=y # CONFIG_USB_GADGET_DUALSPEED is not set # CONFIG_USB_ZERO is not set # CONFIG_USB_AUDIO is not set -CONFIG_USB_ETH=y +CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y # CONFIG_USB_ETH_EEM is not set -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_FILE_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_PRINTER is not set -# CONFIG_USB_CDC_COMPOSITE is not set +CONFIG_USB_CDC_COMPOSITE=m # # OTG and related infrastructure @@ -1778,7 +1782,7 @@ CONFIG_RTC_DRV_S3C=y # TI VLYNQ # # CONFIG_STAGING is not set -CONFIG_AR6000_WLAN=y +CONFIG_AR6000_WLAN=m # CONFIG_AR6000_WLAN_DEBUG is not set # CONFIG_AR6000_WLAN_RESET is not set @@ -1908,7 +1912,7 @@ CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_LOCKD=m CONFIG_LOCKD_V4=y -CONFIG_EXPORTFS=y +CONFIG_EXPORTFS=m CONFIG_NFS_ACL_SUPPORT=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m @@ -2133,7 +2137,7 @@ CONFIG_BITREVERSE=y CONFIG_GENERIC_FIND_LAST_BIT=y CONFIG_CRC_CCITT=y CONFIG_CRC16=y -CONFIG_CRC_T10DIF=y +CONFIG_CRC_T10DIF=m CONFIG_CRC_ITU_T=y CONFIG_CRC32=y CONFIG_CRC7=y diff --git a/recipes/linux/linux-openmoko-2.6.32/use-noclone-attribute-for-naked.patch b/recipes/linux/linux-openmoko-2.6.32/use-noclone-attribute-for-naked.patch deleted file mode 100644 index 110a13572a..0000000000 --- a/recipes/linux/linux-openmoko-2.6.32/use-noclone-attribute-for-naked.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 583c7d937789398cb6e37989ef91cf96c16da204 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 6 Jun 2010 03:28:43 +0200 -Subject: [PATCH] add noinline and noclone attributes to naked functions - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - arch/arm/mm/copypage-feroceon.c | 4 ++-- - arch/arm/mm/copypage-v4wb.c | 4 ++-- - arch/arm/mm/copypage-v4wt.c | 4 ++-- - arch/arm/mm/copypage-xsc3.c | 4 ++-- - include/linux/compiler-gcc.h | 11 ++++++++++- - include/linux/compiler-gcc4.h | 2 ++ - 6 files changed, 20 insertions(+), 9 deletions(-) - -diff --git a/arch/arm/mm/copypage-feroceon.c b/arch/arm/mm/copypage-feroceon.c -index 70997d5..dd9598b 100644 ---- a/arch/arm/mm/copypage-feroceon.c -+++ b/arch/arm/mm/copypage-feroceon.c -@@ -18,7 +18,7 @@ feroceon_copy_user_page(void *kto, const void *kfrom) - { - asm("\ - stmfd sp!, {r4-r9, lr} \n\ -- mov ip, %0 \n\ -+ mov ip, %2 \n\ - 1: mov lr, r1 \n\ - ldmia r1!, {r2 - r9} \n\ - pld [lr, #32] \n\ -@@ -64,7 +64,7 @@ feroceon_copy_user_page(void *kto, const void *kfrom) - mcr p15, 0, ip, c7, c10, 4 @ drain WB\n\ - ldmfd sp!, {r4-r9, pc}" - : -- : "I" (PAGE_SIZE)); -+ : "r" (kto), "r" (kfrom), "I" (PAGE_SIZE)); - } - - void feroceon_copy_user_highpage(struct page *to, struct page *from, -diff --git a/arch/arm/mm/copypage-v4wb.c b/arch/arm/mm/copypage-v4wb.c -index 9ab0984..7bc0ac7 100644 ---- a/arch/arm/mm/copypage-v4wb.c -+++ b/arch/arm/mm/copypage-v4wb.c -@@ -27,7 +27,7 @@ v4wb_copy_user_page(void *kto, const void *kfrom) - { - asm("\ - stmfd sp!, {r4, lr} @ 2\n\ -- mov r2, %0 @ 1\n\ -+ mov r2, %2 @ 1\n\ - ldmia r1!, {r3, r4, ip, lr} @ 4\n\ - 1: mcr p15, 0, r0, c7, c6, 1 @ 1 invalidate D line\n\ - stmia r0!, {r3, r4, ip, lr} @ 4\n\ -@@ -44,7 +44,7 @@ v4wb_copy_user_page(void *kto, const void *kfrom) - mcr p15, 0, r1, c7, c10, 4 @ 1 drain WB\n\ - ldmfd sp!, {r4, pc} @ 3" - : -- : "I" (PAGE_SIZE / 64)); -+ : "r" (kto), "r" (kfrom), "I" (PAGE_SIZE / 64)); - } - - void v4wb_copy_user_highpage(struct page *to, struct page *from, -diff --git a/arch/arm/mm/copypage-v4wt.c b/arch/arm/mm/copypage-v4wt.c -index 300efaf..35bf609 100644 ---- a/arch/arm/mm/copypage-v4wt.c -+++ b/arch/arm/mm/copypage-v4wt.c -@@ -25,7 +25,7 @@ v4wt_copy_user_page(void *kto, const void *kfrom) - { - asm("\ - stmfd sp!, {r4, lr} @ 2\n\ -- mov r2, %0 @ 1\n\ -+ mov r2, %2 @ 1\n\ - ldmia r1!, {r3, r4, ip, lr} @ 4\n\ - 1: stmia r0!, {r3, r4, ip, lr} @ 4\n\ - ldmia r1!, {r3, r4, ip, lr} @ 4+1\n\ -@@ -40,7 +40,7 @@ v4wt_copy_user_page(void *kto, const void *kfrom) - mcr p15, 0, r2, c7, c7, 0 @ flush ID cache\n\ - ldmfd sp!, {r4, pc} @ 3" - : -- : "I" (PAGE_SIZE / 64)); -+ : "r" (kto), "r" (kfrom), "I" (PAGE_SIZE / 64)); - } - - void v4wt_copy_user_highpage(struct page *to, struct page *from, -diff --git a/arch/arm/mm/copypage-xsc3.c b/arch/arm/mm/copypage-xsc3.c -index bc4525f..27dc363 100644 ---- a/arch/arm/mm/copypage-xsc3.c -+++ b/arch/arm/mm/copypage-xsc3.c -@@ -34,7 +34,7 @@ xsc3_mc_copy_user_page(void *kto, const void *kfrom) - { - asm("\ - stmfd sp!, {r4, r5, lr} \n\ -- mov lr, %0 \n\ -+ mov lr, %2 \n\ - \n\ - pld [r1, #0] \n\ - pld [r1, #32] \n\ -@@ -67,7 +67,7 @@ xsc3_mc_copy_user_page(void *kto, const void *kfrom) - \n\ - ldmfd sp!, {r4, r5, pc}" - : -- : "I" (PAGE_SIZE / 64 - 1)); -+ : "r" (kto), "r" (kfrom), "I" (PAGE_SIZE / 64 - 1)); - } - - void xsc3_mc_copy_user_highpage(struct page *to, struct page *from, -diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h -index a3ed7cb..132a651 100644 ---- a/include/linux/compiler-gcc.h -+++ b/include/linux/compiler-gcc.h -@@ -58,8 +58,12 @@ - * naked functions because then mcount is called without stack and frame pointer - * being set up and there is no chance to restore the lr register to the value - * before mcount was called. -+ * -+ * The asm() bodies of naked functions often depend on standard calling conventions, -+ * therefore they must be noinline and noclone. GCC 4.[56] currently fail to enforce -+ * this, so we must do so ourselves. See GCC PR44290. - */ --#define __naked __attribute__((naked)) notrace -+#define __naked __attribute__((naked)) noinline __noclone notrace - - #define __noreturn __attribute__((noreturn)) - -@@ -84,3 +88,8 @@ - #define _gcc_header(x) __gcc_header(linux/compiler-gcc##x.h) - #define gcc_header(x) _gcc_header(x) - #include gcc_header(__GNUC__) -+ -+#if !defined(__noclone) -+#define __noclone /* not needed */ -+#endif -+ -diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h -index 450fa59..cd5932a 100644 ---- a/include/linux/compiler-gcc4.h -+++ b/include/linux/compiler-gcc4.h -@@ -36,4 +36,6 @@ - the kernel context */ - #define __cold __attribute__((__cold__)) - -+/* Mark a function definition as prohibited from being cloned. */ -+#define __noclone __attribute__((__noclone__)) - #endif --- -1.7.1 - diff --git a/recipes/linux/linux-openmoko-2.6.32_git.bb b/recipes/linux/linux-openmoko-2.6.32_git.bb index 0aae209848..3c237f2d37 100644 --- a/recipes/linux/linux-openmoko-2.6.32_git.bb +++ b/recipes/linux/linux-openmoko-2.6.32_git.bb @@ -1,7 +1,7 @@ require linux.inc require linux-openmoko.inc -KERNEL_RELEASE="2.6.32.13" +KERNEL_RELEASE="2.6.32.16" SRCREV = "a9254be10ac2294ea20165a87c09ea6afcf66d94" OEV = "oe3.3" @@ -12,10 +12,10 @@ SRC_URI = "\ file://0001-Revert-s3cmci-initialize-default-platform-data-no_wp.patch \ # latest stable patch for ubi fix 943e167cb3e8fb191894bde8a4a75db78531a7c8 ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;apply=yes;name=stablepatch \ -# build fix +# build fix - only when snd is as module file://0001-wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch \ # fix runtime issue when built with gcc-4.5 - file://use-noclone-attribute-for-naked.patch \ + file://0001-add-noinline-and-noclone-attributes-to-naked-functio.patch \ # patches from Radek Polak used in qtmoko file://0002-accels.patch.patch \ file://0003-usbhost.patch.patch \ @@ -30,19 +30,20 @@ SRC_URI = "\ file://0012-Fix-dynamic-command-queue-allocation.patch \ file://0013-Debug-statements-for-testing.patch \ file://0014-Fix-claim-of-2D-register-resource.patch \ +# fix HS Jack + file://0019-wm8753-use-snd_soc_jack-on-neo1973.patch \ # fix for lost touchscreen https://docs.openmoko.org/trac/ticket/2328 - file://touchscreen_ignoreunexpectedintr29.patch \ + file://0017-s3c2410_ts-ignore-unexpected-interrupts.patch \ # fix WS - file://0001-glamo-core-initialize-engine-states-as-disabled.patch \ -# fix HS Jack - file://hs-jack.patch \ + file://0016-jbt6k74-fix-WS.patch \ + file://0018-glamo-core-initialize-engine-states-as-disabled.patch \ # faster glamo - file://0001-mfd-glamo-Enable-FIFO-stage-for-the-LCD-engine-s-mem.patch \ + file://0020-mfd-glamo-Enable-FIFO-stage-for-the-LCD-engine-s-mem.patch \ file://defconfig \ " -SRC_URI[stablepatch.md5sum] = "ba6abb1ffee513a1d4f831599ddae490" -SRC_URI[stablepatch.sha256sum] = "baf6dff5d1c478e65decf2e8b704c60e546ea37c4de59ee8eb6af9dd3d63f145" +SRC_URI[stablepatch.md5sum] = "744890f9651962ceae7663d44b19df65" +SRC_URI[stablepatch.sha256sum] = "e744aaa87d2daee6d10b76f411d9efa13db24f779981890b482d72364694aa08" S = "${WORKDIR}/git" diff --git a/recipes/linux/linux/spitz/defconfig b/recipes/linux/linux/spitz/defconfig index f098d75d1a..312952f1ae 100644 --- a/recipes/linux/linux/spitz/defconfig +++ b/recipes/linux/linux/spitz/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.35-rc4 -# Thu Jul 8 10:27:47 2010 +# Linux kernel version: 2.6.35-rc6 +# Thu Jul 22 23:22:01 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1015,7 +1015,7 @@ CONFIG_ATA_BMDMA=y # PIO-only SFF controllers # CONFIG_PATA_PCMCIA=y -# CONFIG_PATA_PLATFORM is not set +CONFIG_PATA_PLATFORM=y # # Generic fallback / legacy drivers @@ -1161,7 +1161,7 @@ CONFIG_INPUT_APMPOWER=y CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_ADP5588 is not set # CONFIG_KEYBOARD_ATKBD is not set -# CONFIG_QT2160 is not set +# CONFIG_KEYBOARD_QT2160 is not set # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=y # CONFIG_KEYBOARD_TCA6416 is not set diff --git a/recipes/linux/linux_git.bb b/recipes/linux/linux_git.bb index 231383e972..2b029d361a 100644 --- a/recipes/linux/linux_git.bb +++ b/recipes/linux/linux_git.bb @@ -1,7 +1,7 @@ require linux.inc -KERNEL_RELEASE = "2.6.35-rc5" -SRCREV = "f469461df6ff822f71b8737bda86eea20f16ff93" +KERNEL_RELEASE = "2.6.35-rc6" +SRCREV = "b37fa16e78d6f9790462b3181602a26b5af36260" PV = "${KERNEL_RELEASE}+gitr${SRCPV}" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;branch=master \ diff --git a/recipes/maxima/maxima_5.21.1.bb b/recipes/maxima/maxima_5.21.1.bb new file mode 100644 index 0000000000..ae89bead05 --- /dev/null +++ b/recipes/maxima/maxima_5.21.1.bb @@ -0,0 +1,9 @@ +DESCRIPTION="Free computer algebra environment based on Macsyma" +HOMEPAGE="http://maxima.sourceforge.net/" +SRC_URI="http://www.sfr-fresh.com/unix/misc/${P}.tar.gz" +LICENSE="GPLv2" + +inherit autotools + +SRC_URI[md5sum] = "e08ed533f3059cec52788ef35198bdcc" +SRC_URI[sha256sum] = "1dae887e1787871437d699a6b1acc1c1f7428729487492a07c6a31e26bf53a1b" diff --git a/recipes/opencv/opencv-dsp-acceleration_svn.bb b/recipes/opencv/opencv-dsp-acceleration_svn.bb index c225c5102a..788e8e21ee 100644 --- a/recipes/opencv/opencv-dsp-acceleration_svn.bb +++ b/recipes/opencv/opencv-dsp-acceleration_svn.bb @@ -2,7 +2,7 @@ LICENSE = "BSD" DEPENDS = "ti-codec-engine ti-dsplib" PV = "0+svnr${SRCPV}" -SRCREV = "105" +SRCREV = "128" SRC_URI = "svn://opencv-dsp-acceleration.googlecode.com/svn/;proto=http;module=trunk \ http://focus.ti.com/lit/sw/sprc264/sprc264.zip;name=imglib \ @@ -22,7 +22,7 @@ export OPENCV_PATH = "${STAGING_INCDIR}" export DSPLIB_PATH = "${DSPLIB_INSTALL_DIR}" # You need to extract the imglib from the .exe manually and place it in /OE/tmp (or somewhere else and change the patch below) -export IMGLIB_PATH = "/OE/tmp/imglib" +export IMGLIB_PATH = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${installdir}/imglib_v201" do_configure() { echo "-l ${DSPLIB_INSTALL_DIR}/dsplib64plus.lib" >> ${S}/beagle/server/opencv_unitserver_evm3530/link.cmd diff --git a/recipes/quilt/quilt-native.inc b/recipes/quilt/quilt-native.inc index 02f6c3bc56..10d81835c3 100644 --- a/recipes/quilt/quilt-native.inc +++ b/recipes/quilt/quilt-native.inc @@ -9,7 +9,7 @@ INHIBIT_AUTOTOOLS_DEPS = "1" inherit autotools native PATCHTOOL = "patch" -EXTRA_OECONF = "--disable-nls --without-date" +EXTRA_OECONF = "--disable-nls" do_configure () { oe_runconf diff --git a/recipes/quilt/quilt-native_0.48.bb b/recipes/quilt/quilt-native_0.48.bb index 5b4449b2ac..b180e58b9b 100644 --- a/recipes/quilt/quilt-native_0.48.bb +++ b/recipes/quilt/quilt-native_0.48.bb @@ -1,6 +1,6 @@ require quilt-native.inc -PR="r3" +PR="r4" SRC_URI_append = "file://fix_new_GNU_patch_detection.patch" diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb index 5552a429b5..eec6ea7516 100644 --- a/recipes/tasks/task-shr-feed.bb +++ b/recipes/tasks/task-shr-feed.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SHR Feed" -PR = "r61" +PR = "r62" PV = "1.0" LICENSE = "GPL" @@ -293,6 +293,7 @@ RDEPENDS_${PN} += "\ spojegui \ dbus-daemon-proxy \ unixbench \ + maxima \ " # this is only usefull on gta02 and on other devices it's trying to pull mesa-dri (not respecting DEFAULT_PROVIDER for virtual/libgl) diff --git a/recipes/tcpdump/tcpdump-4.1.1/0001-minimal-IEEE802.15.4-allowed.patch b/recipes/tcpdump/tcpdump-4.1.1/0001-minimal-IEEE802.15.4-allowed.patch new file mode 100644 index 0000000000..9d3d60d4d7 --- /dev/null +++ b/recipes/tcpdump/tcpdump-4.1.1/0001-minimal-IEEE802.15.4-allowed.patch @@ -0,0 +1,22 @@ +From: Sergey Lapin <slapin@slind.org> +Date: Wed, 28 Jan 2009 16:34:15 +0300 +Subject: [PATCH] minimal IEEE802.15.4 allowed + +--- + tcpdump.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/tcpdump.c b/tcpdump.c +index 06683af..fbc944c 100644 +--- a/tcpdump.c ++++ b/tcpdump.c +@@ -282,6 +282,9 @@ static struct printer printers[] = { + #ifdef DLT_MFR + { mfr_if_print, DLT_MFR }, + #endif ++#ifdef DLT_IEEE802_15_4 ++ { raw_if_print, DLT_IEEE802_15_4 }, ++#endif + #if defined(DLT_BLUETOOTH_HCI_H4_WITH_PHDR) && defined(HAVE_PCAP_BLUETOOTH_H) + { bt_if_print, DLT_BLUETOOTH_HCI_H4_WITH_PHDR}, + #endif diff --git a/recipes/tcpdump/tcpdump-4.1.1/configure.patch b/recipes/tcpdump/tcpdump-4.1.1/configure.patch new file mode 100644 index 0000000000..3697420fd3 --- /dev/null +++ b/recipes/tcpdump/tcpdump-4.1.1/configure.patch @@ -0,0 +1,29 @@ +--- + aclocal.m4 | 1 - + configure.in | 1 + + 2 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 40b5866..0c662b0 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -40,7 +40,6 @@ dnl + AC_DEFUN(AC_LBL_C_INIT_BEFORE_CC, + [AC_PREREQ(2.50) + AC_BEFORE([$0], [AC_LBL_C_INIT]) +- AC_BEFORE([$0], [AC_PROG_CC]) + AC_BEFORE([$0], [AC_LBL_FIXINCLUDES]) + AC_BEFORE([$0], [AC_LBL_DEVEL]) + AC_ARG_WITH(gcc, [ --without-gcc don't use gcc]) +diff --git a/configure.in b/configure.in +index 11257c9..7f9591c 100644 +--- a/configure.in ++++ b/configure.in +@@ -19,6 +19,7 @@ AC_REVISION($Revision: 1.204 $) + AC_PREREQ(2.50) + AC_INIT(tcpdump.c) + ++AC_PROG_CC + AC_CANONICAL_HOST + + AC_LBL_C_INIT_BEFORE_CC(V_CCOPT, V_INCLS) diff --git a/recipes/tcpdump/tcpdump-4.1.1/ipv6-cross.patch b/recipes/tcpdump/tcpdump-4.1.1/ipv6-cross.patch new file mode 100644 index 0000000000..7eba2c5a6d --- /dev/null +++ b/recipes/tcpdump/tcpdump-4.1.1/ipv6-cross.patch @@ -0,0 +1,41 @@ +--- + configure.in | 12 ++++++++---- + 1 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/configure.in b/configure.in +index eb3e5e8..11257c9 100644 +--- a/configure.in ++++ b/configure.in +@@ -181,8 +181,9 @@ yes) AC_MSG_RESULT(yes) + ipv6=no + ;; + esac ], +- +- AC_TRY_RUN([ /* AF_INET6 available check */ ++[ ++ if test x"$cross_compiling" != "xyes"; then ++ AC_TRY_RUN([ /* AF_INET6 avalable check */ + #include <sys/types.h> + #include <sys/socket.h> + main() +@@ -201,7 +202,10 @@ main() + ipv6=no], + [ AC_MSG_RESULT(no) + ipv6=no] +-)) ++ ) ++else ++ AC_MSG_FAILURE([Unable to check for ipv6 when crosscompiling, please specify.]) ++fi]) + + ipv6type=unknown + ipv6lib=none +@@ -316,7 +320,7 @@ if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then + fi + + +-if test "$ipv6" = "yes"; then ++if test x"$cross_compiling" != "xyes" -a "$ipv6" = "yes"; then + # + # XXX - on Tru64 UNIX 5.1, there is no "getaddrinfo()" + # function in libc; there are "ngetaddrinfo()" and diff --git a/recipes/tcpdump/tcpdump-4.1.1/tcpdump_configure_no_-O2.patch b/recipes/tcpdump/tcpdump-4.1.1/tcpdump_configure_no_-O2.patch new file mode 100644 index 0000000000..7929da5b1f --- /dev/null +++ b/recipes/tcpdump/tcpdump-4.1.1/tcpdump_configure_no_-O2.patch @@ -0,0 +1,42 @@ +--- + configure | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index cb51d19..73d51af 100755 +--- a/configure ++++ b/configure +@@ -2691,13 +2691,13 @@ if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS + elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then +- CFLAGS="-g -O2" ++ CFLAGS="-g" + else + CFLAGS="-g" + fi + else + if test "$GCC" = yes; then +- CFLAGS="-O2" ++ CFLAGS="" + else + CFLAGS= + fi +@@ -2830,7 +2830,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test "$GCC" = yes ; then + if test "$SHLICC2" = yes ; then + ac_cv_lbl_gcc_vers=2 +- V_CCOPT="-O2" ++ V_CCOPT="" + else + { echo "$as_me:$LINENO: checking gcc version" >&5 + echo $ECHO_N "checking gcc version... $ECHO_C" >&6; } +@@ -2847,7 +2847,7 @@ fi + { echo "$as_me:$LINENO: result: $ac_cv_lbl_gcc_vers" >&5 + echo "${ECHO_T}$ac_cv_lbl_gcc_vers" >&6; } + if test $ac_cv_lbl_gcc_vers -gt 1 ; then +- V_CCOPT="-O2" ++ V_CCOPT="" + fi + fi + else diff --git a/recipes/tcpdump/tcpdump_4.1.1.bb b/recipes/tcpdump/tcpdump_4.1.1.bb new file mode 100644 index 0000000000..21fcf8548f --- /dev/null +++ b/recipes/tcpdump/tcpdump_4.1.1.bb @@ -0,0 +1,38 @@ +DESCRIPTION = "A sophisticated network protocol analyzer" +HOMEPAGE = "http://www.tcpdump.org/" +LICENSE = "BSD" +SECTION = "console/network" +PRIORITY = "optional" +DEPENDS = "libpcap" +PR = "r1" + +SRC_URI = " \ + http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \ + file://tcpdump_configure_no_-O2.patch;patch=1 \ + file://0001-minimal-IEEE802.15.4-allowed.patch;patch=1 \ + file://ipv6-cross.patch;patch=1 \ + file://configure.patch;patch=1 \ +" + +inherit autotools +# ac_cv_linux_vers=${ac_cv_linux_vers=2} + +EXTRA_OECONF = "--without-crypto \ + ${@base_contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6', '--disable-ipv6', d)}" + +do_configure() { + gnu-configize + autoconf + oe_runconf + sed -i 's:/usr/lib:${STAGING_LIBDIR}:' ./Makefile + sed -i 's:/usr/include:${STAGING_INCDIR}:' ./Makefile +} + +do_install_append() { + # tcpdump 4.0.0 installs a copy to /usr/sbin/tcpdump.4.0.0 + rm -f ${D}${sbindir}/tcpdump.${PV} +} + +SRC_URI[md5sum] = "d0dd58bbd6cd36795e05c6f1f74420b0" +SRC_URI[sha256sum] = "e6cd4bbd61ec7adbb61ba8352c4b4734f67b8caaa845d88cb826bc0b9f1e7f0a" + diff --git a/recipes/uclibc/uclibc-git/fix-thumb1-PIE.patch b/recipes/uclibc/uclibc-git/fix-thumb1-PIE.patch deleted file mode 100644 index 3bb88891df..0000000000 --- a/recipes/uclibc/uclibc-git/fix-thumb1-PIE.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/Rules.mak b/Rules.mak -index f6fa818..fe03c81 100644 ---- a/Rules.mak -+++ b/Rules.mak -@@ -339,7 +339,7 @@ ifeq ($(TARGET_ARCH),arm) - CPU_CFLAGS-$(CONFIG_ARM720T)+=-mtune=arm7tdmi -march=armv4t - CPU_CFLAGS-$(CONFIG_ARM920T)+=-mtune=arm9tdmi -march=armv4t - CPU_CFLAGS-$(CONFIG_ARM922T)+=-mtune=arm9tdmi -march=armv4t -- CPU_CFLAGS-$(CONFIG_ARM926T)+=-mtune=arm9tdmi -march=armv5t -+ CPU_CFLAGS-$(CONFIG_ARM926T)+=-mtune=arm9e -march=armv5te - CPU_CFLAGS-$(CONFIG_ARM10T)+=-mtune=arm10tdmi -march=armv5t - CPU_CFLAGS-$(CONFIG_ARM1136JF_S)+=-mtune=arm1136jf-s -march=armv6 - CPU_CFLAGS-$(CONFIG_ARM1176JZ_S)+=-mtune=arm1176jz-s -march=armv6 -@@ -598,7 +598,7 @@ endif - - LDFLAGS:=$(LDFLAGS_NOSTRIP) -Wl,-z,defs - ifeq ($(DODEBUG),y) --CFLAGS += -O0 -g3 -DDEBUG -+CFLAGS += -O0 -g -DDEBUG - else - CFLAGS += $(OPTIMIZATION) - endif -diff --git a/libc/sysdeps/linux/arm/crt1.S b/libc/sysdeps/linux/arm/crt1.S -index 18e3686..f2d9507 100644 ---- a/libc/sysdeps/linux/arm/crt1.S -+++ b/libc/sysdeps/linux/arm/crt1.S -@@ -133,7 +133,6 @@ _start: - - #ifdef __PIC__ - ldr r4, .L_GOT --.L_GOT_OFF: - adr r5, .L_GOT - add r4, r5, r4 - -@@ -201,8 +200,8 @@ _start: - - #ifdef __PIC__ - ldr sl, .L_GOT --.L_GOT_OFF: -- add sl, pc, sl -+ adr a4, .L_GOT -+ add sl, sl, a4 - - ldr ip, .L_GOT+4 /* _fini */ - ldr a1, [sl, ip] -@@ -238,11 +237,7 @@ _start: - - #ifdef __PIC__ - .L_GOT: --#ifdef __thumb__ -- .word _GLOBAL_OFFSET_TABLE_-(.L_GOT_OFF+4) --#else /* __thumb2__ */ -- .word _GLOBAL_OFFSET_TABLE_-(.L_GOT_OFF+8) --#endif -+ .word _GLOBAL_OFFSET_TABLE_ - .L_GOT - .word _fini(GOT) - .word _init(GOT) - .word main(GOT) diff --git a/recipes/uclibc/uclibc_git.bb b/recipes/uclibc/uclibc_git.bb index b2c91244be..23982cd098 100644 --- a/recipes/uclibc/uclibc_git.bb +++ b/recipes/uclibc/uclibc_git.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.31" -SRCREV="fb6ca14d4d53657a4cde0d3f881f02c0d54fe17b" +SRCREV="37aec506502e14dcddd6ca190929bbc8d33d8e07" PR_append = "+gitr${SRCPV}" DEFAULT_PREFERENCE = "-1" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take @@ -31,6 +31,5 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \ file://uclibc-arm-ftruncate64.patch \ file://uclibc_enable_log2_test.patch \ file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch \ - file://fix-thumb1-PIE.patch \ " S = "${WORKDIR}/git" diff --git a/recipes/yaffs2/yaffs2-utils-native_cvs.bb b/recipes/yaffs2/yaffs2-utils-native_cvs.bb deleted file mode 100644 index d192b52d03..0000000000 --- a/recipes/yaffs2/yaffs2-utils-native_cvs.bb +++ /dev/null @@ -1,15 +0,0 @@ -require yaffs2-utils_cvs.bb -inherit native -DEPENDS = "mtd-utils-native" - -CFLAGS += "-I.. -DCONFIG_YAFFS_UTIL" - -do_stage() { - for i in mkyaffsimage mkyaffs2image; do - install -m 0755 utils/$i ${STAGING_BINDIR_NATIVE} - done -} - -do_install() { - : -} diff --git a/recipes/yaffs2/yaffs2-utils.inc b/recipes/yaffs2/yaffs2-utils.inc new file mode 100644 index 0000000000..a451f968c1 --- /dev/null +++ b/recipes/yaffs2/yaffs2-utils.inc @@ -0,0 +1,28 @@ +DESCRIPTION = "Tools for managing 'yaffs2' file systems." +SECTION = "base" +HOMEPAGE = "http://www.yaffs.net" +LICENSE = "GPLv2" +PV = "0.0.0+cvs${SRCDATE}" +PR = "r0" +DEPENDS = "mtd-utils" + +SRC_URI = "cvs://anonymous@cvs.aleph1.co.uk/home/aleph1/cvs;module=yaffs2 \ + file://mkyaffs2image.patch;patch=1" +S = "${WORKDIR}/yaffs2" + +CFLAGS += "-I.. -DCONFIG_YAFFS_UTIL" +CFLAGS_append_virtclass-native = " -I.. -DCONFIG_YAFFS_UTIL" + +do_compile() { + cd utils && oe_runmake +} + +NATIVE_INSTALL_WORKS = "1" +do_install() { + install -d ${D}${sbindir}/ + for i in mkyaffsimage mkyaffs2image; do + install -m 0755 utils/$i ${D}${sbindir}/ + done +} + +BBCLASSEXTEND = "native" diff --git a/recipes/yaffs2/yaffs2-utils_cvs.bb b/recipes/yaffs2/yaffs2-utils_cvs.bb index bb974907ca..6171fe55bd 100644 --- a/recipes/yaffs2/yaffs2-utils_cvs.bb +++ b/recipes/yaffs2/yaffs2-utils_cvs.bb @@ -1,28 +1,3 @@ -DESCRIPTION = "Tools for managing 'yaffs2' file systems." -SECTION = "base" -HOMEPAGE = "http://www.yaffs.net" -LICENSE = "GPLv2" -SRCDATE = "20080331" -PV = "0.0.0+cvs${SRCDATE}" -PR = "r0" +require yaffs2-utils.inc +PR = "r1" -# -# NOTE: This needs pretty recent mtd-utils otherwise it fails to compile -# - -SRC_URI = "cvs://anonymous@cvs.aleph1.co.uk/home/aleph1/cvs;module=yaffs2 \ - file://mkyaffs2image.patch" -S = "${WORKDIR}/yaffs2" - -CFLAGS += "-I.. -DCONFIG_YAFFS_UTIL" - -do_compile() { - cd utils && oe_runmake -} - -do_install() { - install -d ${D}${sbindir} - for i in mkyaffsimage mkyaffs2image; do - install -m 0755 utils/$i ${D}${sbindir} - done -} diff --git a/recipes/zaurus-utils/encdec-updater-native.bb b/recipes/zaurus-utils/encdec-updater-native.bb index 3bf49d5010..d2b719ca02 100644 --- a/recipes/zaurus-utils/encdec-updater-native.bb +++ b/recipes/zaurus-utils/encdec-updater-native.bb @@ -1,6 +1,2 @@ require encdec-updater.bb inherit native - -do_stage() { - install -m 0755 encdec-updater ${STAGING_BINDIR} -} diff --git a/recipes/zbedic/libbedic_1.1.bb b/recipes/zbedic/libbedic_1.1.bb index f01304dc95..f498024ff4 100644 --- a/recipes/zbedic/libbedic_1.1.bb +++ b/recipes/zbedic/libbedic_1.1.bb @@ -7,7 +7,7 @@ LICENSE = "GPL" DEPENDS = "sqlite3" APPTYPE = "binary" APPDESKTOP = "${WORKDIR}/zbedic/misc" -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/bedic/libbedic_${PV}-0.tgz" @@ -33,12 +33,6 @@ do_install() { oe_libinstall -a libbedic ${D}${libdir} } -do_stage() { - install -d ${STAGING_INCDIR}/libbedic/ - install -m 0644 ${S}/include/*.h ${STAGING_INCDIR}/libbedic/ - oe_libinstall -a libbedic ${STAGING_LIBDIR} -} - FILES_${PN}-dev = "${includedir} ${libdir}" SRC_URI[md5sum] = "211ea5a881b5691ec7a1aedbe7fc406c" |