meta-ti: pull request

The following changes since commit 29851840a1d2b10d8759d1a44c59460afd367f8f:

  meta-ti: x-load: add config header support for BeagleBoard (2011-09-26 05:39:08 +0200)

are available in the git repository at:
  http://github.com/jadonk/meta-texasinstruments.git for-koen

Jason Kridner (2):
      HACK: meta-ti: linux: beagleboard: disable preemption
      classes: sdcardimage: move to 4GiB image

classes/sdcard_image.bbclass | 4 ++--
.../linux/linux-3.0/beagleboard/defconfig | 2 +-
recipes-kernel/linux/linux_3.0.bb | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/classes/sdcard_image.bbclass b/classes/sdcard_image.bbclass
index b3885df..640c6a4 100644
--- a/classes/sdcard_image.bbclass
+++ b/classes/sdcard_image.bbclass
@@ -10,12 +10,12 @@ IMAGE_CMD_sdimg () {
     losetup -d $loop_dev || true
   done

- dd if=/dev/zero of=${SDIMG} bs=4k seek=$(echo '256 * 1024' | bc) count=1
+ dd if=/dev/zero of=${SDIMG} bs=$(echo '255 * 63 * 512' | bc) count=444
   losetup -f ${SDIMG}
   LOOPDEV=$(losetup -j ${SDIMG} -o 0 | cut -d ":" -f 1)

   # Create partition table
- dd if=/dev/zero of=${LOOPDEV} bs=1024 count=1024
+ #dd if=/dev/zero of=${LOOPDEV} bs=1024 count=1024
   SIZE=`fdisk -l ${LOOPDEV} | grep Disk | grep bytes | awk '{print $5}'`
   CYLINDERS=`echo $SIZE/255/63/512 | bc`
   {
diff --git a/recipes-kernel/linux/linux-3.0/beagleboard/defconfig b/recipes-kernel/linux/linux-3.0/beagleboard/defconfig
index 148519d..b558190 100644
--- a/recipes-kernel/linux/linux-3.0/beagleboard/defconfig
+++ b/recipes-kernel/linux/linux-3.0/beagleboard/defconfig
@@ -404,7 +404,7 @@ CONFIG_VMSPLIT_3G=y
# CONFIG_VMSPLIT_1G is not set
CONFIG_PAGE_OFFSET=0xC0000000
# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set
CONFIG_HZ=128
# CONFIG_THUMB2_KERNEL is not set
diff --git a/recipes-kernel/linux/linux_3.0.bb b/recipes-kernel/linux/linux_3.0.bb
index 7de9d93..2248db2 100644
--- a/recipes-kernel/linux/linux_3.0.bb
+++ b/recipes-kernel/linux/linux_3.0.bb
@@ -10,7 +10,7 @@ PV = "3.0.4"
SRCREV_pn-${PN} = "04aa37b5f943920017ad094e776cd5514b1a9246"

# The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc
-MACHINE_KERNEL_PR_append = "f"
+MACHINE_KERNEL_PR_append = "g"

FILESPATH =. "${FILE_DIRNAME}/linux-3.0:${FILE_DIRNAME}/linux-3.0/${MACHINE}:"