switch iks to new hwpack format

1 files changed, 78 insertions, 26 deletions

diff --git a/hwpacks/linaro-vexpress-iks b/hwpacks/linaro-vexpress-iks
index 2a8b198..9308b50 100644
--- a/hwpacks/linaro-vexpress-iks
+++ b/hwpacks/linaro-vexpress-iks
@@ -1,27 +1,79 @@
-[hwpack]
-format=2.0
-name=linaro-vexpress-iks
-architectures=armhf
-origin=Linaro
-maintainer=Linaro Platform <linaro-dev@lists.linaro.org>
-support=supported
-packages=linux-image-3.7-0-linaro-lt-vexpressdt-rtsm memtester iozone3 stressapptest libjpeg-turbo-test libturbojpeg core-tests sched-tests trace-cmd
-assume-installed=linaro-headless
+name: linaro-vexpress-iks
+origin: Linaro
+format: '3.0'
+boot_script: boot.scr
+kernel_addr: '0x60000000'
+kernel_file: boot/vmlinuz-*-linaro-lt-vexpressdt-rtsm
+initrd_addr: '0x62000000'
+initrd_file: boot/initrd.img-*-linaro-lt-vexpressdt-rtsm
+load_addr: '0x60008000'
+maintainer: Linaro Platform <linaro-dev@lists.linaro.org>
+serial_tty: ttyAMA0
+support: supported
+partition_layout: bootfs16_rootfs
+mmc_id: '0:1'
+architectures:
+- armhf
+assume_installed:
+- linaro-headless
+extra_serial_options:
+- console=ttyAMA0,38400n8
+packages:
+- linux-image-3.7-2-linaro-lt-vexpressdt-rtsm
+- linux-headers-3.7-2-linaro-lt-vexpressdt-rtsm
+- ubuntu-vexpress-extras-config
+- memtester
+- iozone3
+- stressapptest
+- libjpeg-turbo-test
+- libturbojpeg
+- core-tests
+- sched-tests
+- trace-cmd
+- sysbench
 
-mmc_id=0:1
-partition_layout=bootfs_rootfs
-u_boot_in_boot_part=no
-kernel_file=boot/vmlinuz-*-linaro-lt-vexpressdt-rtsm
-initrd_file=boot/initrd.img-*-linaro-lt-vexpressdt-rtsm
-dtb_file=boot/dt-*-linaro-lt-vexpressdt-rtsm/rtsm_ve-v2p-ca15x4-ca7x4.dtb
-
-wired_interfaces=eth0
-
-[ubuntu]
-sources-entry=http://ports.ubuntu.com/ubuntu-ports quantal main universe multiverse
-
-[linaro]
-sources-entry=http://ppa.launchpad.net/linaro-maintainers/overlay/ubuntu quantal main
-
-# see https://launchpad.net/~USERNAME/+archivesubscriptions for big.LITTLE Private PPA access deb url
-[linaro-private]
+wired_interfaces:
+- eth0
+sources:
+  linaro: http://ppa.launchpad.net/linaro-maintainers/overlay/ubuntu quantal main
+  ubuntu: http://ports.ubuntu.com/ubuntu-ports quantal main universe multiverse
+  linaro-private: PRIVATE-REPO
+bootloaders:
+  u_boot:
+    extra_boot_options:
+    - mem=1024M
+    - ip=dhcp
+    - clcd=xvga
+    - mmci.fmax=4000000
+    package: u-boot-linaro-vexpress-ca9x4
+    file: usr/lib/u-boot/vexpress_ca9x4/u-boot.bin
+    in_boot_part: true
+  uefi:
+    extra_boot_options:
+    - mem=1024M
+    - ip=dhcp
+    - clcd=xvga
+    - mmci.fmax=4000000
+    package: uefi-image-vexpress
+    file: usr/lib/uefi/vexpress/uefi_v2p-ca9.bin
+    in_boot_part: true
+#    copy_files:
+#      - usr/lib/uefi/vexpress/uefi_v2p-ca5s.bin
+#      - usr/lib/uefi/vexpress/uefi_v2p-ca15-tc1.bin
+#      - usr/lib/uefi/vexpress/uefi_v2p-ca15-tc2.bin
+dtb_files:
+- v2p-ca5s.dtb : lib/firmware/*-linaro-lt-vexpress/device-tree/vexpress-v2p-ca5s.dtb
+- v2p-ca9.dtb : lib/firmware/*-linaro-lt-vexpress/device-tree/vexpress-v2p-ca9.dtb
+- v2p-ca15-tc1.dtb : lib/firmware/*-linaro-lt-vexpress/device-tree/vexpress-v2p-ca15-tc1.dtb
+- v2p-ca15-tc2.dtb : lib/firmware/*-linaro-lt-vexpress/device-tree/vexpress-v2p-ca15-tc2.dtb
+- rtsm/rtsm_ve-ca9x2.dtb : lib/firmware/*-linaro-lt-vexpress/device-tree/rtsm_ve-cortex_a9x2.dtb
+- rtsm/rtsm_ve-ca9x4.dtb : lib/firmware/*-linaro-lt-vexpress/device-tree/rtsm_ve-cortex_a9x4.dtb
+- rtsm/rtsm_ve-ca15x1.dtb : lib/firmware/*-linaro-lt-vexpress/device-tree/rtsm_ve-cortex_a15x1.dtb
+- rtsm/rtsm_ve-ca15x2.dtb : lib/firmware/*-linaro-lt-vexpress/device-tree/rtsm_ve-cortex_a15x2.dtb
+- rtsm/rtsm_ve-ca15x4.dtb : lib/firmware/*-linaro-lt-vexpress/device-tree/rtsm_ve-cortex_a15x4.dtb
+- rtsm/rtsm_ve-ca15x1-ca7x1.dtb : lib/firmware/*-linaro-lt-vexpress/device-tree/rtsm_ve-v2p-ca15x1-ca7x1.dtb
+- rtsm/rtsm_ve-ca15x4-ca7x4.dtb : lib/firmware/*-linaro-lt-vexpress/device-tree/rtsm_ve-v2p-ca15x4-ca7x4.dtb
+- uefi_v2p-ca5s.bin : usr/lib/uefi/vexpress/uefi_v2p-ca5s.bin
+- uefi_v2p-ca15-tc1.bin : usr/lib/uefi/vexpress/uefi_v2p-ca15-tc1.bin
+- uefi_v2p-ca15-tc2.bin : usr/lib/uefi/vexpress/uefi_v2p-ca15-tc2.bin
+- rtsm/linux-system-semi.axf : boot/img.axf