diff options
Diffstat (limited to 'packages')
43 files changed, 1891 insertions, 109 deletions
diff --git a/packages/curl/curl_7.16.4.bb b/packages/curl/curl_7.16.4.bb index ce6175b419..0053a12fdb 100644 --- a/packages/curl/curl_7.16.4.bb +++ b/packages/curl/curl_7.16.4.bb @@ -12,6 +12,7 @@ inherit autotools pkgconfig binconfig EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ --with-gnutls=${STAGING_BINDIR_CROSS}/ \ --without-ssl \ + --without-libssh2 \ --with-random=/dev/urandom \ --without-libidn \ --enable-crypto-auth \ diff --git a/packages/gcc/files/gcc4-mtune-compat.patch b/packages/gcc/files/gcc4-mtune-compat.patch new file mode 100644 index 0000000000..0da2811d37 --- /dev/null +++ b/packages/gcc/files/gcc4-mtune-compat.patch @@ -0,0 +1,14 @@ +Patch for gcc3 to support gcc4-compatible (and consistent) values for -mtune= option. + +--- gcc-3.4.4/gcc/config/arm/arm.c.org 2007-12-15 23:58:35.000000000 +0200 ++++ gcc-3.4.4/gcc/config/arm/arm.c 2007-12-16 00:20:39.000000000 +0200 +@@ -432,7 +432,9 @@ + {"arm10tdmi", FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_LDSCHED | FL_ARCH5 }, + {"arm1020t", FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_LDSCHED | FL_ARCH5 }, + {"arm926ejs", FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_ARCH5 | FL_ARCH5E }, ++ {"arm926ej-s", FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_ARCH5 | FL_ARCH5E }, + {"arm1026ejs", FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_ARCH5 | FL_ARCH5E }, ++ {"arm1026ej-s", FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_ARCH5 | FL_ARCH5E }, + {"xscale", FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_LDSCHED | FL_STRONG | FL_ARCH5 | FL_ARCH5E | FL_XSCALE }, + {"iwmmxt", FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_LDSCHED | FL_STRONG | FL_ARCH5 | FL_ARCH5E | FL_XSCALE | FL_IWMMXT }, + /* V6 Architecture Processors */ diff --git a/packages/gcc/gcc-cross-sdk_3.4.4.bb b/packages/gcc/gcc-cross-sdk_3.4.4.bb index a8e9a67a96..038d39040b 100644 --- a/packages/gcc/gcc-cross-sdk_3.4.4.bb +++ b/packages/gcc/gcc-cross-sdk_3.4.4.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" require gcc_${PV}.bb -PR = "r1" +PR = "r2" inherit sdk diff --git a/packages/gcc/gcc-cross_3.4.4.bb b/packages/gcc/gcc-cross_3.4.4.bb index 7021b0fdd3..83c0055017 100644 --- a/packages/gcc/gcc-cross_3.4.4.bb +++ b/packages/gcc/gcc-cross_3.4.4.bb @@ -5,7 +5,7 @@ inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r6" +PR = "r7" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc_3.4.4.bb b/packages/gcc/gcc_3.4.4.bb index e9e073b1ae..4694d3ac5e 100644 --- a/packages/gcc/gcc_3.4.4.bb +++ b/packages/gcc/gcc_3.4.4.bb @@ -1,4 +1,4 @@ -PR = "r6" +PR = "r7" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" @@ -23,7 +23,8 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://15342.patch;patch=1 \ file://always-fixincperm.patch;patch=1 \ file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1 \ - file://zecke-xgcc-cpp.patch;patch=1 " + file://zecke-xgcc-cpp.patch;patch=1 \ + file://gcc4-mtune-compat.patch;patch=1" SRC_URI += "file://gcc34-configure.in.patch;patch=1" SRC_URI += "file://gcc34-thumb-support.patch;patch=1" diff --git a/packages/gtk-webcore/midori_0.0.15.bb b/packages/gtk-webcore/midori_0.0.15.bb new file mode 100644 index 0000000000..23d0179375 --- /dev/null +++ b/packages/gtk-webcore/midori_0.0.15.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Midori is a lightweight web browser." +LICENSE = "GPLv2" + +DEPENDS = "webkit-gtk libsexy" + +inherit autotools pkgconfig + +SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \ + " + + diff --git a/packages/images/poky-base-image.bb b/packages/images/poky-base-image.bb new file mode 100644 index 0000000000..0980fc46bf --- /dev/null +++ b/packages/images/poky-base-image.bb @@ -0,0 +1,29 @@ +DISTRO_SSH_DAEMON ?= "dropbear" +DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral" + +IMAGE_INSTALL = "\ + task-base-extended \ + ${DISTRO_SSH_DAEMON} \ + ${DISTRO_PACKAGE_MANAGER} \ + pointercal \ + matchbox-wm \ + matchbox-keyboard matchbox-keyboard-applet matchbox-keyboard-im \ + matchbox-desktop \ + ${XSERVER} \ + xserver-kdrive-common xserver-nodm-init \ + ttf-liberation \ + xauth xhost xset xrandr \ + matchbox-sato \ + matchbox-config-gtk \ + matchbox-themes-gtk \ + matchbox-applet-startup-monitor \ + xcursor-transparent-theme \ + sato-icon-theme \ + settings-daemon \ +" + +export IMAGE_BASENAME = "poky-base-image" +IMAGE_LINGUAS = "" + +inherit image + diff --git a/packages/libxml/files/no-testapi.patch b/packages/libxml/files/no-testapi.patch deleted file mode 100644 index 15a4dea0ee..0000000000 --- a/packages/libxml/files/no-testapi.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- /tmp/Makefile.am 2005-11-13 14:33:15.844432536 +0100 -+++ libxml2-2.6.22/Makefile.am 2005-11-13 14:33:25.796919528 +0100 -@@ -8,7 +8,7 @@ - - noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \ - testThreads testC14N testAutomata testRegexp \ -- testReader testapi testModule runtest runsuite -+ testReader testModule runtest runsuite - - bin_PROGRAMS = xmllint xmlcatalog - -@@ -135,20 +135,9 @@ - testdso_la_LDFLAGS = -module -rpath $(libdir) - - # that one forces the rebuild when "make rebuild" is run on doc/ --rebuild_testapi: -- -@(if [ "$(PYTHON)" != "" ] ; then \ -- $(PYTHON) $(srcdir)/gentest.py $(srcdir) ; fi ) - - # that one is just to make sure it is rebuilt if missing - # but adding the dependances generate mess --testapi.c: -- -@(if [ "$(PYTHON)" != "" ] ; then \ -- $(PYTHON) $(srcdir)/gentest.py $(srcdir) ; fi ) -- --testapi_SOURCES=testapi.c --testapi_LDFLAGS = --testapi_DEPENDENCIES = $(DEPS) --testapi_LDADD= $(LDADDS) - - #testOOM_SOURCES=testOOM.c testOOMlib.h testOOMlib.c - #testOOM_LDFLAGS = -@@ -169,9 +158,6 @@ - @echo '## Go get a cup of coffee it is gonna take a while ...' - $(MAKE) CHECKER='valgrind' tests - --APItests: testapi$(EXEEXT) -- @echo "## Running the API regression tests this may take a little while" -- -@($(CHECKER) $(top_builddir)/testapi -q) - - HTMLtests : testHTML$(EXEEXT) - @(echo > .memdump) -@@ -1116,7 +1102,7 @@ - dist-test: distdir - (mkdir -p $(distdir)) - (cd $(srcdir) ; tar -cf - --exclude CVS xstc/Tests) | (cd $(distdir); tar xf -) -- tar -cf - $(distdir)/test $(distdir)/result $(distdir)/xstc/Tests $(distdir)/Makefile.tests $(distdir)/README $(distdir)/README.tests $(distdir)/AUTHORS $(distdir)/testapi.c $(distdir)/runtest.c $(distdir)/runsuite.c | GZIP=$(GZIP_ENV) gzip -c >`echo "$(distdir)" | sed "s+libxml2+libxml2-tests+"`.tar.gz -+ tar -cf - $(distdir)/test $(distdir)/result $(distdir)/xstc/Tests $(distdir)/Makefile.tests $(distdir)/README $(distdir)/README.tests $(distdir)/AUTHORS $(distdir)/runtest.c $(distdir)/runsuite.c | GZIP=$(GZIP_ENV) gzip -c >`echo "$(distdir)" | sed "s+libxml2+libxml2-tests+"`.tar.gz - @(rm -rf $(distdir)/xstc/Test) - - cleantar: diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb index f65bf1459e..014fd23705 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb @@ -2,7 +2,7 @@ require linux-libc-headers.inc INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" -PR = "r1" +PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ file://arm-syscall-define.patch;patch=1" @@ -38,7 +38,7 @@ do_compile () { do_install() { set_arch - oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=${ARCH} + oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=${ARCH} } do_install_append_arm() { @@ -51,7 +51,7 @@ do_stage () { set_arch rm -rf ${STAGE_TEMP} mkdir -p ${STAGE_TEMP} - oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=${ARCH} + oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}${exec_prefix} ARCH=${ARCH} if [ "${ARCH}" == "arm" ]; then cp include/asm-arm/procinfo.h ${STAGE_TEMP}${includedir}/asm fi diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb index 0b6112884e..8794b17d96 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb @@ -2,7 +2,7 @@ require linux-libc-headers.inc INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" -PR = "r7" +PR = "r8" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://procinfo.h" @@ -40,7 +40,7 @@ do_compile () { do_install() { set_arch - oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=$ARCH + oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH } do_install_append_arm() { @@ -54,7 +54,7 @@ do_stage () { echo $ARCH rm -rf ${STAGE_TEMP} mkdir -p ${STAGE_TEMP} - oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=$ARCH + oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}${exec_prefix} ARCH=$ARCH if [ "$ARCH" = "arm" ]; then cp ${WORKDIR}/procinfo.h ${STAGE_TEMP}${includedir}/asm/ fi diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb index 43a5cb9ef1..595edde810 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb @@ -2,7 +2,7 @@ require linux-libc-headers.inc INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" -PR = "r0" +PR = "r1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://procinfo.h" @@ -40,7 +40,7 @@ do_compile () { do_install() { set_arch - oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=$ARCH + oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH } do_install_append_arm() { @@ -54,7 +54,7 @@ do_stage () { echo $ARCH rm -rf ${STAGE_TEMP} mkdir -p ${STAGE_TEMP} - oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=$ARCH + oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}${exec_prefix} ARCH=$ARCH if [ "$ARCH" = "arm" ]; then cp ${WORKDIR}/procinfo.h ${STAGE_TEMP}${includedir}/asm/ fi diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb index 43a5cb9ef1..595edde810 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb @@ -2,7 +2,7 @@ require linux-libc-headers.inc INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" -PR = "r0" +PR = "r1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://procinfo.h" @@ -40,7 +40,7 @@ do_compile () { do_install() { set_arch - oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=$ARCH + oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH } do_install_append_arm() { @@ -54,7 +54,7 @@ do_stage () { echo $ARCH rm -rf ${STAGE_TEMP} mkdir -p ${STAGE_TEMP} - oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=$ARCH + oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}${exec_prefix} ARCH=$ARCH if [ "$ARCH" = "arm" ]; then cp ${WORKDIR}/procinfo.h ${STAGE_TEMP}${includedir}/asm/ fi diff --git a/packages/linux/linux-2.6.23+2.6.24-rc5/.mtn2git_empty b/packages/linux/linux-2.6.23+2.6.24-rc5/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-2.6.23+2.6.24-rc5/.mtn2git_empty diff --git a/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/.mtn2git_empty b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/.mtn2git_empty diff --git a/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0001-cm-x270-match-type.patch b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0001-cm-x270-match-type.patch new file mode 100644 index 0000000000..0124b75e4b --- /dev/null +++ b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0001-cm-x270-match-type.patch @@ -0,0 +1,25 @@ +From 2a3b2dd055b235eb14f7654eeef217222cdb8e00 Mon Sep 17 00:00:00 2001 +From: Cliff Brake <cbrake@happy.dev.bec-systems.com> +Date: Fri, 20 Jul 2007 18:58:27 -0400 +Subject: [PATCH] cm-x270-match-type + +--- + arch/arm/boot/compressed/head-xscale.S | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/boot/compressed/head-xscale.S b/arch/arm/boot/compressed/head-xscale.S +index 67ea99e..2e63ba2 100644 +--- a/arch/arm/boot/compressed/head-xscale.S ++++ b/arch/arm/boot/compressed/head-xscale.S +@@ -44,3 +44,8 @@ __XScale_start: + str r1, [r0, #0x18] + #endif + ++#if defined(CONFIG_MACH_ARMCORE) ++ mov r7, #(MACH_TYPE_ARMCORE & 0xFF00) ++ add r7, r7, #(MACH_TYPE_ARMCORE & 0xFF) ++#endif ++ +-- +1.5.2.5 + diff --git a/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0002-ramdisk_load.patch b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0002-ramdisk_load.patch new file mode 100644 index 0000000000..74451c4454 --- /dev/null +++ b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0002-ramdisk_load.patch @@ -0,0 +1,81 @@ +From 7d874d6bb1c1210402938a21ab51a4b64e2d68e5 Mon Sep 17 00:00:00 2001 +From: Cliff Brake <cbrake@happy.dev.bec-systems.com> +Date: Fri, 20 Jul 2007 19:01:50 -0400 +Subject: [PATCH] ramdisk_load + +--- + arch/arm/mach-pxa/cm-x270.c | 6 ++++++ + include/asm-arm/arch-pxa/cm-x270.h | 4 ++++ + init/initramfs.c | 16 ++++++++++++++++ + 3 files changed, 26 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c +index 177664c..fb607e9 100644 +--- a/arch/arm/mach-pxa/cm-x270.c ++++ b/arch/arm/mach-pxa/cm-x270.c +@@ -239,6 +239,12 @@ static struct map_desc cmx270_io_desc[] __initdata = { + .length = SZ_64M, + .type = MT_DEVICE + }, ++ [2] = { /* NOR flash */ ++ .virtual = CMX270_FLASH_VIRT, ++ .pfn = __phys_to_pfn(PXA_CS0_PHYS), ++ .length = (8<<20), /* up to 8 MByte flash */ ++ .type = MT_DEVICE ++ }, + }; + + /* +diff --git a/include/asm-arm/arch-pxa/cm-x270.h b/include/asm-arm/arch-pxa/cm-x270.h +index f8fac9e..70e0dce 100644 +--- a/include/asm-arm/arch-pxa/cm-x270.h ++++ b/include/asm-arm/arch-pxa/cm-x270.h +@@ -20,6 +20,10 @@ + #define CMX270_VIRT_BASE (0xe8000000) + #define CMX270_IT8152_VIRT (CMX270_VIRT_BASE) + #define CMX270_IDE104_VIRT (CMX270_IT8152_VIRT + SZ_64M) ++#define CMX270_FLASH_VIRT (CMX270_IDE104_VIRT + SZ_64M) ++ ++#define CMX270_FLASH_RAMDISK_VIRT (CMX270_FLASH_VIRT + 0x1c0000) ++ + + /* GPIO related definitions */ + #define GPIO_IT8152_IRQ (22) +diff --git a/init/initramfs.c b/init/initramfs.c +index 1db02a0..d875fbc 100644 +--- a/init/initramfs.c ++++ b/init/initramfs.c +@@ -7,6 +7,9 @@ + #include <linux/string.h> + #include <linux/syscalls.h> + ++// HACK for compulab cm-x270 ++#include <asm/arch/cm-x270.h> ++ + static __initdata char *message; + static void __init error(char *x) + { +@@ -550,7 +553,20 @@ static int __init populate_rootfs(void) + #ifdef CONFIG_BLK_DEV_INITRD + if (initrd_start) { + #ifdef CONFIG_BLK_DEV_RAM ++ ++ /* hack to make initramfs work because the ++ * compulab BL does not zero out the ++ * initrd memory. This only seems to affect loading ++ * initramfs (cpio.gz) archives. Does not seem to ++ * affect ramdisks. ++ */ ++ int initrd_size = *(int *)(CMX270_FLASH_RAMDISK_VIRT); + int fd; ++ ++ initrd_end = initrd_start + initrd_size; ++ //printk("CLIFF: initrd_start = 0x%x\n", initrd_start); ++ //printk("CLIFF: initrd_end = 0x%x\n", initrd_end); ++ + printk(KERN_INFO "checking if image is initramfs..."); + err = unpack_to_rootfs((char *)initrd_start, + initrd_end - initrd_start, 1); +-- +1.5.2.5 + diff --git a/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0003-mmcsd_large_cards-r0.patch b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0003-mmcsd_large_cards-r0.patch new file mode 100644 index 0000000000..1fe3eb5d0a --- /dev/null +++ b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0003-mmcsd_large_cards-r0.patch @@ -0,0 +1,36 @@ +From caad105a5732f7ca8ea88d4448aa5d9f4d7eb2c4 Mon Sep 17 00:00:00 2001 +From: Cliff Brake <cbrake@happy.dev.bec-systems.com> +Date: Fri, 20 Jul 2007 19:02:55 -0400 +Subject: [PATCH] mmcsd_large_cards-r0 + +--- + drivers/mmc/card/block.c | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + +diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c +index aeb32a9..d854b0c 100644 +--- a/drivers/mmc/card/block.c ++++ b/drivers/mmc/card/block.c +@@ -423,6 +423,7 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card) + { + struct mmc_blk_data *md; + int devidx, ret; ++ unsigned long cap; + + devidx = find_first_zero_bit(dev_use, MMC_NUM_MINORS); + if (devidx >= MMC_NUM_MINORS) +@@ -486,6 +487,11 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card) + + sprintf(md->disk->disk_name, "mmcblk%d", devidx); + ++ if (card->csd.read_blkbits > 9) ++ md->block_bits = 9; ++ else ++ md->block_bits = card->csd.read_blkbits; ++ + blk_queue_hardsect_size(md->queue.queue, 1 << md->block_bits); + + if (!mmc_card_sd(card) && mmc_card_blockaddr(card)) { +-- +1.5.2.5 + diff --git a/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0004-cm-x270-nand-simplify-name.patch b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0004-cm-x270-nand-simplify-name.patch new file mode 100644 index 0000000000..f060a963a4 --- /dev/null +++ b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0004-cm-x270-nand-simplify-name.patch @@ -0,0 +1,25 @@ +From deb5c78d6625c6fd5ce25ac3c8ac396e7e61ebf7 Mon Sep 17 00:00:00 2001 +From: Cliff Brake <cbrake@happy.dev.bec-systems.com> +Date: Fri, 20 Jul 2007 19:04:12 -0400 +Subject: [PATCH] cm-x270-nand-simplify-name + +--- + drivers/mtd/nand/cmx270_nand.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/drivers/mtd/nand/cmx270_nand.c b/drivers/mtd/nand/cmx270_nand.c +index cb663ef..3654ce4 100644 +--- a/drivers/mtd/nand/cmx270_nand.c ++++ b/drivers/mtd/nand/cmx270_nand.c +@@ -191,6 +191,8 @@ static int cmx270_init(void) + cmx270_nand_mtd->owner = THIS_MODULE; + cmx270_nand_mtd->priv = this; + ++ cmx270_nand_mtd->name = "cm-x270-nand"; ++ + /* insert callbacks */ + this->IO_ADDR_R = cmx270_nand_io; + this->IO_ADDR_W = cmx270_nand_io; +-- +1.5.2.5 + diff --git a/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0005-cmx270-pci.patch b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0005-cmx270-pci.patch new file mode 100644 index 0000000000..8a6b5dfc91 --- /dev/null +++ b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0005-cmx270-pci.patch @@ -0,0 +1,150 @@ +From 416e9cca1903f4a6f26c241c3393ad635015e7f6 Mon Sep 17 00:00:00 2001 +From: Cliff Brake <cbrake@happy.(none)> +Date: Sat, 15 Dec 2007 12:24:05 -0500 +Subject: [PATCH] cmx270-pci + +--- + arch/arm/Kconfig | 8 +++++++- + arch/arm/common/it8152.c | 10 ++-------- + arch/arm/mach-pxa/cm-x270-pci.c | 18 ++++++++---------- + 3 files changed, 17 insertions(+), 19 deletions(-) + +diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig +index a7e9fea..c4de2d4 100644 +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -537,7 +537,7 @@ config ISA_DMA_API + bool + + config PCI +- bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695 ++ bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695 || MACH_ARMCORE + help + Find out whether you have a PCI motherboard. PCI is the name of a + bus system, i.e. the way the CPU talks to the other stuff inside +@@ -558,6 +558,12 @@ config PCI_HOST_VIA82C505 + depends on PCI && ARCH_SHARK + default y + ++config PCI_HOST_ITE8152 ++ bool ++ depends on PCI && MACH_ARMCORE ++ default y ++ select DMABOUNCE ++ + source "drivers/pci/Kconfig" + + source "drivers/pcmcia/Kconfig" +diff --git a/arch/arm/common/it8152.c b/arch/arm/common/it8152.c +index c03de9b..97b7dc1 100644 +--- a/arch/arm/common/it8152.c ++++ b/arch/arm/common/it8152.c +@@ -70,8 +70,6 @@ static inline void it8152_irq(int irq) + { + struct irq_desc *desc; + +- printk(KERN_DEBUG "===> %s: irq=%d\n", __FUNCTION__, irq); +- + desc = irq_desc + irq; + desc_handle_irq(irq, desc); + } +@@ -106,8 +104,6 @@ void it8152_irq_demux(unsigned int irq, struct irq_desc *desc) + int bits_pd, bits_lp, bits_ld; + int i; + +- printk(KERN_DEBUG "=> %s: irq = %d\n", __FUNCTION__, irq); +- + while (1) { + /* Read all */ + bits_pd = __raw_readl(IT8152_INTC_PDCNIRR); +@@ -293,8 +289,7 @@ int dma_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size) + */ + int pci_set_dma_mask(struct pci_dev *dev, u64 mask) + { +- printk(KERN_DEBUG "%s: %s %llx\n", +- __FUNCTION__, dev->dev.bus_id, mask); ++ dev_dbg(&dev->dev, "%s: %llx\n", __FUNCTION__, mask); + if (mask >= PHYS_OFFSET + SZ_64M - 1) + return 0; + +@@ -304,8 +299,7 @@ int pci_set_dma_mask(struct pci_dev *dev, u64 mask) + int + pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) + { +- printk(KERN_DEBUG "%s: %s %llx\n", +- __FUNCTION__, dev->dev.bus_id, mask); ++ dev_dbg(&dev->dev, "%s: %llx\n", __FUNCTION__, mask); + if (mask >= PHYS_OFFSET + SZ_64M - 1) + return 0; + +diff --git a/arch/arm/mach-pxa/cm-x270-pci.c b/arch/arm/mach-pxa/cm-x270-pci.c +index 878d3b9..15c4e0d 100644 +--- a/arch/arm/mach-pxa/cm-x270-pci.c ++++ b/arch/arm/mach-pxa/cm-x270-pci.c +@@ -40,7 +40,7 @@ void __init cmx270_pci_adjust_zones(int node, unsigned long *zone_size, + { + unsigned int sz = SZ_64M >> PAGE_SHIFT; + +- printk(KERN_INFO "Adjusting zones for CM-x270\n"); ++ pr_info("Adjusting zones for CM-x270\n"); + + /* + * Only adjust if > 64M on current system +@@ -104,8 +104,7 @@ static int __init cmx270_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) + { + int irq; + +- printk(KERN_DEBUG "===> %s: %s slot=%x, pin=%x\n", __FUNCTION__, +- pci_name(dev), slot, pin); ++ dev_dbg(&dev->dev, "%s: slot=%x, pin=%x\n", __FUNCTION__, slot, pin); + + irq = it8152_pci_map_irq(dev, slot, pin); + if (irq) +@@ -141,14 +140,13 @@ static int __init cmx270_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) + return(0); + } + +-static struct pci_bus * __init +-cmx270_pci_scan_bus(int nr, struct pci_sys_data *sys) ++static void cmx270_pci_preinit(void) + { +- printk(KERN_INFO "Initializing CM-X270 PCI subsystem\n"); ++ pr_info("Initializing CM-X270 PCI subsystem\n"); + + __raw_writel(0x800, IT8152_PCI_CFG_ADDR); + if (__raw_readl(IT8152_PCI_CFG_DATA) == 0x81521283) { +- printk(KERN_INFO "PCI Bridge found.\n"); ++ pr_info("PCI Bridge found.\n"); + + /* set PCI I/O base at 0 */ + writel(0x848, IT8152_PCI_CFG_ADDR); +@@ -163,7 +161,7 @@ cmx270_pci_scan_bus(int nr, stru |