From a3724d8825cf4126ffccebd6e38ab67b2796c31f Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Mon, 4 Apr 2016 17:57:56 +0000 Subject: [PATCH] QEMU ARM simulation environment updates. --- .../r0/src/lib/arm-qemu-armv7a-r0.yml | 4 ++++ .../r0/src/lib/boot/arm-qemu-armv7a-r0 | 13 +++++-------- .../__init__.py | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 packages/platforms/qemu/arm/arm-qemu-armv7a/platform-config/r0/src/lib/arm-qemu-armv7a-r0.yml rename packages/platforms/qemu/arm/arm-qemu-armv7a/platform-config/r0/src/python/{arm_qemu_armv7a => arm_qemu_armv7a_r0}/__init__.py (89%) diff --git a/packages/platforms/qemu/arm/arm-qemu-armv7a/platform-config/r0/src/lib/arm-qemu-armv7a-r0.yml b/packages/platforms/qemu/arm/arm-qemu-armv7a/platform-config/r0/src/lib/arm-qemu-armv7a-r0.yml new file mode 100644 index 00000000..ce884b4a --- /dev/null +++ b/packages/platforms/qemu/arm/arm-qemu-armv7a/platform-config/r0/src/lib/arm-qemu-armv7a-r0.yml @@ -0,0 +1,4 @@ +arm-qemu-armv7a-r0: + flat_image_tree: + kernel: onl-kernel-3.2-deb7-arm-iproc-all:armel, kernel-3.2-deb7-arm-iproc-all.bin.gz + dtb: onl-kernel-3.2-deb7-arm-iproc-all:armel, accton_as4610_54.dtb diff --git a/packages/platforms/qemu/arm/arm-qemu-armv7a/platform-config/r0/src/lib/boot/arm-qemu-armv7a-r0 b/packages/platforms/qemu/arm/arm-qemu-armv7a/platform-config/r0/src/lib/boot/arm-qemu-armv7a-r0 index ae44e205..a0ef10f3 100644 --- a/packages/platforms/qemu/arm/arm-qemu-armv7a/platform-config/r0/src/lib/boot/arm-qemu-armv7a-r0 +++ b/packages/platforms/qemu/arm/arm-qemu-armv7a/platform-config/r0/src/lib/boot/arm-qemu-armv7a-r0 @@ -1,11 +1,8 @@ -echo "pci0000:00/0000:00:03.0 ma1" >/etc/onl/net +ip link set dev eth0 name ma1 cp /dev/null /etc/onl/mounts -echo "block/sda sda flash" >> /etc/onl/mounts -echo "block/vda vda flash" >> /etc/onl/mounts -echo "LABEL=FLASH * flash" >> /etc/onl/mounts - -echo "block/sdb sdb flash2" >> /etc/onl/mounts -echo "block/vdb vdb flash2" >> /etc/onl/mounts -echo "LABEL=FLASH2 * flash2" >> /etc/onl/mounts +echo "block/mmcblk0 mmcblk0p2 flash" > /etc/onl/mounts +echo "block/mmcblk0 mmcblk0p3 flash2" >> /etc/onl/mounts +echo "# MTD device name Device offset Env. size Flash sector size" > /etc/fw_env.config +echo "/dev/mtd1 0x00000000 0x00002000 0x00040000" >> /etc/fw_env.config diff --git a/packages/platforms/qemu/arm/arm-qemu-armv7a/platform-config/r0/src/python/arm_qemu_armv7a/__init__.py b/packages/platforms/qemu/arm/arm-qemu-armv7a/platform-config/r0/src/python/arm_qemu_armv7a_r0/__init__.py similarity index 89% rename from packages/platforms/qemu/arm/arm-qemu-armv7a/platform-config/r0/src/python/arm_qemu_armv7a/__init__.py rename to packages/platforms/qemu/arm/arm-qemu-armv7a/platform-config/r0/src/python/arm_qemu_armv7a_r0/__init__.py index a2f30e78..91cf4771 100644 --- a/packages/platforms/qemu/arm/arm-qemu-armv7a/platform-config/r0/src/python/arm_qemu_armv7a/__init__.py +++ b/packages/platforms/qemu/arm/arm-qemu-armv7a/platform-config/r0/src/python/arm_qemu_armv7a_r0/__init__.py @@ -7,7 +7,7 @@ class OnlPlatform_arm_qemu_armv7a_r0(OnlPlatformQEMU): return "QEMU ARMv7a" def platform(self): - return "arm-qemu-armv7a" + return "arm-qemu-armv7a-r0" def sys_oid_platform(self): return ".2"