diff options
author | Mark Hatle <mark.hatle@xilinx.com> | 2021-12-19 15:11:50 -0800 |
---|---|---|
committer | Mark Hatle <mark.hatle@xilinx.com> | 2022-01-14 15:37:05 -0800 |
commit | f46b6e44c61a97b48a4cdc4fef3f067645814b1b (patch) | |
tree | e8c6e8955f196f1c61c65e5b4195cdfe76347ab3 /meta-xilinx-core/conf | |
parent | 58205ff04948596d6fdd8e815699baffb83510b7 (diff) | |
download | meta-xilinx-f46b6e44c61a97b48a4cdc4fef3f067645814b1b.tar.gz |
zynq-generic: Remove hardcoded -initrd and use runqemu instead
Change rootfs to cpio.gz, and runqemu will automatically load it as an initrd
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
Diffstat (limited to 'meta-xilinx-core/conf')
-rw-r--r-- | meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc | 2 | ||||
-rw-r--r-- | meta-xilinx-core/conf/machine/zynq-generic.conf | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc index d169c513..dd02ab1f 100644 --- a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc +++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc | |||
@@ -5,7 +5,7 @@ INHERIT += "xilinx-deprecated" | |||
5 | MACHINE_FEATURES_BACKFILL_CONSIDERED += "rtc" | 5 | MACHINE_FEATURES_BACKFILL_CONSIDERED += "rtc" |
6 | 6 | ||
7 | # File System Configuration | 7 | # File System Configuration |
8 | IMAGE_FSTYPES ?= "tar.gz cpio cpio.gz.u-boot" | 8 | IMAGE_FSTYPES ?= "tar.gz cpio cpio.gz cpio.gz.u-boot" |
9 | 9 | ||
10 | # Kernel Configuration | 10 | # Kernel Configuration |
11 | PREFERRED_PROVIDER_virtual/kernel ??= "linux-xlnx" | 11 | PREFERRED_PROVIDER_virtual/kernel ??= "linux-xlnx" |
diff --git a/meta-xilinx-core/conf/machine/zynq-generic.conf b/meta-xilinx-core/conf/machine/zynq-generic.conf index 3271051d..59fc3976 100644 --- a/meta-xilinx-core/conf/machine/zynq-generic.conf +++ b/meta-xilinx-core/conf/machine/zynq-generic.conf | |||
@@ -32,14 +32,13 @@ QB_NETWORK_DEVICE = "-net nic,netdev=eth0 -netdev user,id=eth0,tftp=/tftpboot -n | |||
32 | QB_DEFAULT_KERNEL:qemuboot-xilinx = "zImage" | 32 | QB_DEFAULT_KERNEL:qemuboot-xilinx = "zImage" |
33 | 33 | ||
34 | QB_SYSTEM_NAME ?= "${@qemu_target_binary(d)}" | 34 | QB_SYSTEM_NAME ?= "${@qemu_target_binary(d)}" |
35 | QB_DEFAULT_FSTYPE = "cpio.gz.u-boot" | 35 | QB_DEFAULT_FSTYPE = "cpio.gz" |
36 | QB_DTB = "system.dtb" | 36 | QB_DTB = "system.dtb" |
37 | QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw" | 37 | QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw" |
38 | 38 | ||
39 | # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW) | 39 | # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW) |
40 | QB_OPT_APPEND = " \ | 40 | QB_OPT_APPEND = " \ |
41 | -nographic -serial null -serial mon:stdio \ | 41 | -nographic -serial null -serial mon:stdio \ |
42 | -initrd ${DEPLOY_DIR_IMAGE}/@ROOTFS@ \ | ||
43 | -gdb tcp::9000 \ | 42 | -gdb tcp::9000 \ |
44 | -device loader,addr=0xf8000008,data=0xDF0D,data-len=4 \ | 43 | -device loader,addr=0xf8000008,data=0xDF0D,data-len=4 \ |
45 | -device loader,addr=0xf8000140,data=0x00500801,data-len=4 \ | 44 | -device loader,addr=0xf8000140,data=0x00500801,data-len=4 \ |