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 |
