diff options
| author | Jan Luebbe <jlu@pengutronix.de> | 2017-08-15 17:08:13 +0200 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2017-08-18 11:25:04 +0200 |
| commit | 202ca712489bb278eb952a112f8dff383b2eaaf4 (patch) | |
| tree | 776553aa5c64a67c5bd14de9fa05ae66f68f6bd4 /configs | |
| parent | d1a5e0898ce4cbd65af0e14a7e4de5da6c6fe030 (diff) | |
| download | DistroKit-202ca712489bb278eb952a112f8dff383b2eaaf4.tar.gz DistroKit-202ca712489bb278eb952a112f8dff383b2eaaf4.tar.xz | |
platform-v7a: barebox: use a separate file name for the barebox DTB
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/platform-v7a/rules/barebox-vexpress.make | 2 | ||||
| -rwxr-xr-x | configs/platform-v7a/run | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/configs/platform-v7a/rules/barebox-vexpress.make b/configs/platform-v7a/rules/barebox-vexpress.make index 6610080..56e594c 100644 --- a/configs/platform-v7a/rules/barebox-vexpress.make +++ b/configs/platform-v7a/rules/barebox-vexpress.make @@ -71,7 +71,7 @@ $(STATEDIR)/barebox-vexpress.install: install -m 644 \ $(image) $(IMAGEDIR)/$(notdir $(image))-vexpress;) @install -D -m644 $(BAREBOX_VEXPRESS_DIR)/defaultenv/barebox_zero_env $(IMAGEDIR)/barebox-zero-env-vexpress - @install -D -m644 $(BAREBOX_VEXPRESS_DIR)/arch/arm/dts/vexpress-v2p-ca9.dtb $(IMAGEDIR)/vexpress-v2p-ca9.dtb + @install -D -m644 $(BAREBOX_VEXPRESS_DIR)/arch/arm/dts/vexpress-v2p-ca9.dtb $(IMAGEDIR)/bb-vexpress-v2p-ca9.dtb @$(call touch) # ---------------------------------------------------------------------------- diff --git a/configs/platform-v7a/run b/configs/platform-v7a/run index 63a10b6..cad54e7 100755 --- a/configs/platform-v7a/run +++ b/configs/platform-v7a/run @@ -97,7 +97,7 @@ 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}/images/vexpress-v2p-ca9.dtb ) +QEMU_BAREBOX_ARGS=( -dtb ${PTXDIST_PLATFORMDIR}/images/bb-vexpress-v2p-ca9.dtb ) check_hd() { if [ ! -e "${PTXDIST_PLATFORMDIR}/images/vexpress.hdimg" ]; then @@ -164,6 +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 \ + -fsdev local,id=images,path=${PTXDIST_PLATFORMDIR}/images,security_model=none \ + -device virtio-9p-device,fsdev=images,mount_tag=/dev/images \ -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[@]}" \ |