From bb756eebdac6fd24e8919e2c43f7d2c8c4091f59 Mon Sep 17 00:00:00 2001 From: RajithaY Date: Tue, 25 Apr 2017 03:31:15 -0700 Subject: Adding qemu as a submodule of KVMFORNFV This Patch includes the changes to add qemu as a submodule to kvmfornfv repo and make use of the updated latest qemu for the execution of all testcase Change-Id: I1280af507a857675c7f81d30c95255635667bdd7 Signed-off-by:RajithaY --- qemu/roms/u-boot/board/keymile/scripts/README | 31 ---------------------- .../u-boot/board/keymile/scripts/develop-arm.txt | 1 - .../board/keymile/scripts/develop-common.txt | 10 ------- .../board/keymile/scripts/develop-ppc_82xx.txt | 1 - .../board/keymile/scripts/develop-ppc_8xx.txt | 1 - .../u-boot/board/keymile/scripts/ramfs-arm.txt | 1 - .../u-boot/board/keymile/scripts/ramfs-common.txt | 13 --------- .../board/keymile/scripts/ramfs-ppc_82xx.txt | 1 - .../u-boot/board/keymile/scripts/ramfs-ppc_8xx.txt | 1 - 9 files changed, 60 deletions(-) delete mode 100644 qemu/roms/u-boot/board/keymile/scripts/README delete mode 100644 qemu/roms/u-boot/board/keymile/scripts/develop-arm.txt delete mode 100644 qemu/roms/u-boot/board/keymile/scripts/develop-common.txt delete mode 100644 qemu/roms/u-boot/board/keymile/scripts/develop-ppc_82xx.txt delete mode 100644 qemu/roms/u-boot/board/keymile/scripts/develop-ppc_8xx.txt delete mode 100644 qemu/roms/u-boot/board/keymile/scripts/ramfs-arm.txt delete mode 100644 qemu/roms/u-boot/board/keymile/scripts/ramfs-common.txt delete mode 100644 qemu/roms/u-boot/board/keymile/scripts/ramfs-ppc_82xx.txt delete mode 100644 qemu/roms/u-boot/board/keymile/scripts/ramfs-ppc_8xx.txt (limited to 'qemu/roms/u-boot/board/keymile/scripts') diff --git a/qemu/roms/u-boot/board/keymile/scripts/README b/qemu/roms/u-boot/board/keymile/scripts/README deleted file mode 100644 index dd935b2c6..000000000 --- a/qemu/roms/u-boot/board/keymile/scripts/README +++ /dev/null @@ -1,31 +0,0 @@ -These scripts are needed for our development usecases. Copy this directory -into your tftp root directory to be able to use this scripts. -cp -r /board/keymile/scripts / - -To load and configure these usecase, two environment variables in the u-boot -default environment must be parsed: -run develop : setup environment to configure for rootfs via nfs -run ramfs : setup environment to configure for rootfs in ram - -Last change: 24.11.2011 - -develop-common.txt -============================ -This file defines variables for working with rootfs via nfs for powerpc and -arm. - -develop-.txt -============================ -This file defines architecture specific variables for working with rootfs via -nfs arm. - - -ramfs-common.txt -============================ -This file defines variables for working with rootfs inside the ram for powerpc -and arm. - -ramfs-.txt -============================ -This file defines architecture specific variables for working with rootfs inside -ram. diff --git a/qemu/roms/u-boot/board/keymile/scripts/develop-arm.txt b/qemu/roms/u-boot/board/keymile/scripts/develop-arm.txt deleted file mode 100644 index d3c974f1f..000000000 --- a/qemu/roms/u-boot/board/keymile/scripts/develop-arm.txt +++ /dev/null @@ -1 +0,0 @@ -setup_debug_env=tftpboot 0x200000 scripts/develop-common.txt && env import -t 0x200000 ${filesize} && run configure diff --git a/qemu/roms/u-boot/board/keymile/scripts/develop-common.txt b/qemu/roms/u-boot/board/keymile/scripts/develop-common.txt deleted file mode 100644 index a80812a5d..000000000 --- a/qemu/roms/u-boot/board/keymile/scripts/develop-common.txt +++ /dev/null @@ -1,10 +0,0 @@ -altbootcmd=run ${subbootcmds} -bootcmd=run ${subbootcmds} -configure=run set_uimage; km_setboardid && saveenv && reset -subbootcmds=tftpfdt tftpkernel nfsargs add_default boot -nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${toolchain}/${arch} -tftpfdt=if run set_fdthigh || test ${arch} != arm; then tftpboot ${fdt_addr_r} ${hostname}/${hostname}.dtb; else true; fi -tftpkernel=tftpboot ${load_addr_r} ${hostname}/${uimage} -toolchain=/opt/eldk -rootfssize=0 -set_uimage=printenv uimage || setenv uimage uImage diff --git a/qemu/roms/u-boot/board/keymile/scripts/develop-ppc_82xx.txt b/qemu/roms/u-boot/board/keymile/scripts/develop-ppc_82xx.txt deleted file mode 100644 index d3c974f1f..000000000 --- a/qemu/roms/u-boot/board/keymile/scripts/develop-ppc_82xx.txt +++ /dev/null @@ -1 +0,0 @@ -setup_debug_env=tftpboot 0x200000 scripts/develop-common.txt && env import -t 0x200000 ${filesize} && run configure diff --git a/qemu/roms/u-boot/board/keymile/scripts/develop-ppc_8xx.txt b/qemu/roms/u-boot/board/keymile/scripts/develop-ppc_8xx.txt deleted file mode 100644 index d3c974f1f..000000000 --- a/qemu/roms/u-boot/board/keymile/scripts/develop-ppc_8xx.txt +++ /dev/null @@ -1 +0,0 @@ -setup_debug_env=tftpboot 0x200000 scripts/develop-common.txt && env import -t 0x200000 ${filesize} && run configure diff --git a/qemu/roms/u-boot/board/keymile/scripts/ramfs-arm.txt b/qemu/roms/u-boot/board/keymile/scripts/ramfs-arm.txt deleted file mode 100644 index 87e984e17..000000000 --- a/qemu/roms/u-boot/board/keymile/scripts/ramfs-arm.txt +++ /dev/null @@ -1 +0,0 @@ -setup_debug_env=tftpboot 0x200000 scripts/ramfs-common.txt && env import -t 0x200000 ${filesize} && run configure diff --git a/qemu/roms/u-boot/board/keymile/scripts/ramfs-common.txt b/qemu/roms/u-boot/board/keymile/scripts/ramfs-common.txt deleted file mode 100644 index d79ad2e21..000000000 --- a/qemu/roms/u-boot/board/keymile/scripts/ramfs-common.txt +++ /dev/null @@ -1,13 +0,0 @@ -addramfs=setenv bootargs "${bootargs} phram.phram=rootfs${boot_bank},${rootfsaddr},${rootfssize}" -boot_bank=-1 -altbootcmd=run ${subbootcmds} -bootcmd=run ${subbootcmds} -subbootcmds=tftpfdt tftpkernel setrootfsaddr tftpramfs flashargs add_default addpanic addramfs boot -nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} -configure=run set_uimage; km_setboardid && saveenv && reset -rootfsfile=${hostname}/rootfsImage -setrootfsaddr=setexpr value ${pnvramaddr} - ${rootfssize} && setenv rootfsaddr 0x${value} -tftpfdt=if run set_fdthigh || test ${arch} != arm; then tftpboot ${fdt_addr_r} ${hostname}/${hostname}.dtb; else true; fi -tftpkernel=tftpboot ${load_addr_r} ${hostname}/${uimage} -tftpramfs=tftpboot ${rootfsaddr} ${hostname}/rootfsImage -set_uimage=printenv uimage || setenv uimage uImage diff --git a/qemu/roms/u-boot/board/keymile/scripts/ramfs-ppc_82xx.txt b/qemu/roms/u-boot/board/keymile/scripts/ramfs-ppc_82xx.txt deleted file mode 100644 index 87e984e17..000000000 --- a/qemu/roms/u-boot/board/keymile/scripts/ramfs-ppc_82xx.txt +++ /dev/null @@ -1 +0,0 @@ -setup_debug_env=tftpboot 0x200000 scripts/ramfs-common.txt && env import -t 0x200000 ${filesize} && run configure diff --git a/qemu/roms/u-boot/board/keymile/scripts/ramfs-ppc_8xx.txt b/qemu/roms/u-boot/board/keymile/scripts/ramfs-ppc_8xx.txt deleted file mode 100644 index 87e984e17..000000000 --- a/qemu/roms/u-boot/board/keymile/scripts/ramfs-ppc_8xx.txt +++ /dev/null @@ -1 +0,0 @@ -setup_debug_env=tftpboot 0x200000 scripts/ramfs-common.txt && env import -t 0x200000 ${filesize} && run configure -- cgit