aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorin Sarbu <florin.sarbu@windriver.com>2013-10-01 15:25:16 +0300
committerFlorin Sarbu <florin.sarbu@windriver.com>2013-10-01 15:29:33 +0300
commita9c1c58ed30a28d19faaf9eed617898b47b011a5 (patch)
tree9f16c25b7b3e800a405e14343b1b93eac2b7ab6a
parent1bb1a3b75367222ac3771cda9244a2fda2e555ad (diff)
downloadmeta-ivi-a9c1c58ed30a28d19faaf9eed617898b47b011a5.tar.gz
meta-ivi-a9c1c58ed30a28d19faaf9eed617898b47b011a5.tar.bz2
meta-ivi-a9c1c58ed30a28d19faaf9eed617898b47b011a5.zip
vexpressa9: Use kernel version 3.10
Change the kernel image type to zImage instead of uImage. Add proper LOADADDR for the vexpressa9 kernel. Rework the runqemu script used for vexpressa9 machine to pick up the kernel and .sdimg from the new location. Signed-off-by: Florin Sarbu <florin.sarbu@windriver.com>
-rw-r--r--conf/distro/poky-ivi-systemd.conf2
-rw-r--r--meta-ivi-bsp/conf/machine/vexpressa9.conf3
-rwxr-xr-xscripts/runqemu8
3 files changed, 7 insertions, 6 deletions
diff --git a/conf/distro/poky-ivi-systemd.conf b/conf/distro/poky-ivi-systemd.conf
index 465678e..0e1dd92 100644
--- a/conf/distro/poky-ivi-systemd.conf
+++ b/conf/distro/poky-ivi-systemd.conf
@@ -21,7 +21,7 @@ PREFERRED_VERSION_linux-yocto ?= "3.10%"
PREFERRED_VERSION_linux-yocto_qemux86 ?= "3.10%"
PREFERRED_VERSION_linux-yocto_qemux86-64 ?= "3.10%"
PREFERRED_VERSION_linux-yocto_qemuarm ?= "3.10%"
-PREFERRED_VERSION_linux-yocto_vexpressa9 ?= "3.4%"
+PREFERRED_VERSION_linux-yocto_vexpressa9 ?= "3.10%"
PREFERRED_PROVIDER_jpeg = "jpeg"
PREFERRED_PROVIDER_jpeg-native = "jpeg-native"
diff --git a/meta-ivi-bsp/conf/machine/vexpressa9.conf b/meta-ivi-bsp/conf/machine/vexpressa9.conf
index 0e937bd..2ecba16 100644
--- a/meta-ivi-bsp/conf/machine/vexpressa9.conf
+++ b/meta-ivi-bsp/conf/machine/vexpressa9.conf
@@ -27,10 +27,11 @@ SERIAL_CONSOLE = "115200 ttyO2"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-KERNEL_IMAGETYPE = "uImage"
+KERNEL_IMAGETYPE = "zImage"
UBOOT_MACHINE = "ca9x4_ct_vxp_config"
UBOOT_ENTRYPOINT = "0x80008000"
UBOOT_LOADADDRESS = "0x80008000"
+KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat alsa"
diff --git a/scripts/runqemu b/scripts/runqemu
index 111ebe1..20ae6fc 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -262,7 +262,7 @@ QEMUARM_DEFAULT_FSTYPE=ext3
BEAGLEBOARD_DEFAULT_KERNEL=uImage-beagleboard.bin
BEAGLEBOARD_DEFAULT_FSTYPE=tar.bz2
-VEXPRESSA9_DEFAULT_KERNEL=uImage-vexpressa9.bin
+VEXPRESSA9_DEFAULT_KERNEL=zImage-vexpressa9.bin
VEXPRESSA9_DEFAULT_FSTYPE=tar.bz2
QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin
@@ -353,7 +353,7 @@ fi
if [ -z "$KERNEL" ]; then
setup_tmpdir
eval kernel_file=\$${machine2}_DEFAULT_KERNEL
- KERNEL=$TMPDIR/deploy/images/$kernel_file
+ KERNEL=$TMPDIR/deploy/images/$MACHINE/$kernel_file
if [ -z "$KERNEL" ]; then
echo "Error: Unable to determine default kernel for MACHINE [$MACHINE]"
@@ -383,8 +383,8 @@ fi
if [ "$LAZY_ROOTFS" = "true" ]; then
setup_tmpdir
echo "Assuming $ROOTFS really means $TMPDIR/deploy/images/$ROOTFS-$MACHINE.$FSTYPE"
- IMGNAME=$TMPDIR/deploy/images/$ROOTFS-$MACHINE.vexpressa9-sdimg
- ROOTFS=$TMPDIR/deploy/images/$ROOTFS-$MACHINE.$FSTYPE
+ IMGNAME=$TMPDIR/deploy/images/$MACHINE/$ROOTFS-$MACHINE.vexpressa9-sdimg
+ ROOTFS=$TMPDIR/deploy/images/$MACHINE/$ROOTFS-$MACHINE.$FSTYPE
MLO=$TMPDIR/deploy/images/MLO-$MACHINE
UBOOT=$TMPDIR/deploy/images/u-boot-$MACHINE.bin
fi