summaryrefslogtreecommitdiffstats
path: root/configs/platform-v7a/run
diff options
context:
space:
mode:
authorRouven Czerwinski <r.czerwinski@pengutronix.de>2017-06-30 19:58:23 +0200
committerRobert Schwebel <r.schwebel@pengutronix.de>2017-07-04 09:25:24 +0200
commit1db33216735daf91728acce6adcb0dfb518c9c60 (patch)
tree012511b2d9a65464a841f3d4789beb03e473d348 /configs/platform-v7a/run
parentf164e4370adca281c107131a46b378896c86a7a5 (diff)
downloadDistroKit-1db33216735daf91728acce6adcb0dfb518c9c60.tar.gz
DistroKit-1db33216735daf91728acce6adcb0dfb518c9c60.tar.xz
platform-v7a: vexpress: adapt run script, generic dtb name
The run script is adapted to the new image names for the vexpress hardware. The devicetree is used by qemu to pass it to barebox. To make the devicetree independend of the actual barebox-version, it is copied to the image directory. Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de> [split from riotboard, improve patch description] Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> [generic dtb name] Signed-off-by: Chris Fiege <c.fiege@pengutronix.de>
Diffstat (limited to 'configs/platform-v7a/run')
-rwxr-xr-xconfigs/platform-v7a/run16
1 files changed, 8 insertions, 8 deletions
diff --git a/configs/platform-v7a/run b/configs/platform-v7a/run
index 4237009..63a10b6 100755
--- a/configs/platform-v7a/run
+++ b/configs/platform-v7a/run
@@ -97,18 +97,18 @@ if [ -e "${PTXDIST_PLATFORMDIR}/images/usbstick.img" ]; then
fi
QEMU_LINUX_ARGS=( -kernel ${PTXDIST_PLATFORMDIR}/images/linuximage -dtb ${PTXDIST_PLATFORMDIR}/images/vexpress-v2p-ca9.dtb )
# the barebox device tree has a state node for bootchooser
-QEMU_BAREBOX_ARGS=( -dtb ${PTXDIST_PLATFORMDIR}/build-target/barebox-${PTXCONF_BAREBOX_VERSION}/arch/arm/dts/vexpress-v2p-ca9.dtb )
+QEMU_BAREBOX_ARGS=( -dtb ${PTXDIST_PLATFORMDIR}/images/vexpress-v2p-ca9.dtb )
check_hd() {
- if [ ! -e "${PTXDIST_PLATFORMDIR}/images/hd.img" ]; then
- echo "error: hd.img is missing. Run 'ptxdist images' first"
+ if [ ! -e "${PTXDIST_PLATFORMDIR}/images/vexpress.hdimg" ]; then
+ echo "error: vexpress.hdimg is missing. Run 'ptxdist images' first"
exit 1
fi
}
check_flash() {
- if [ ! -e "${PTXDIST_PLATFORMDIR}/images/flash.img" ]; then
- echo "error: flash.img is missing. Run 'ptxdist images' first"
+ if [ ! -e "${PTXDIST_PLATFORMDIR}/images/vexpress.norimg" ]; then
+ echo "error: vexpress.norimg is missing. Run 'ptxdist images' first"
exit 1
fi
}
@@ -151,7 +151,7 @@ run_qemu_mmc() {
check_hd
exec ${QEMU_EXEC} \
"${QEMU_ARGS[@]}" \
- -drive if=sd,format=raw,file=${PTXDIST_PLATFORMDIR}/images/hd.img,id=mmc0 \
+ -drive if=sd,format=raw,file=${PTXDIST_PLATFORMDIR}/images/vexpress.hdimg,id=mmc0 \
"${QEMU_EXTRA_ARGS[@]}" \
"${QEMU_LINUX_ARGS[@]}" \
-append "root=/dev/mmcblk0p1 rootfstype=ext4 rootwait ${BASE_CMDLINE}"
@@ -164,8 +164,8 @@ run_qemu_barebox() {
"${QEMU_ARGS[@]}" \
-fsdev local,id=rootfs,path=${PTXDIST_PLATFORMDIR}/root,security_model=none \
-device virtio-9p-device,fsdev=rootfs,mount_tag=/dev/root \
- -drive if=sd,format=raw,file=${PTXDIST_PLATFORMDIR}/images/hd.img,id=mmc0 \
- -drive if=pflash,format=raw,file=${PTXDIST_PLATFORMDIR}/images/flash.img,id=nor0 \
+ -drive if=sd,format=raw,file=${PTXDIST_PLATFORMDIR}/images/vexpress.hdimg,id=mmc0 \
+ -drive if=pflash,format=raw,file=${PTXDIST_PLATFORMDIR}/images/vexpress.norimg,id=nor0 \
"${QEMU_EXTRA_ARGS[@]}" \
"${QEMU_BAREBOX_ARGS[@]}"
}