[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 647: More device-type cleanup

Message ID 20130814224331.26480.41495.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Tyler Baker Aug. 14, 2013, 10:43 p.m.
------------------------------------------------------------
revno: 647
committer: Tyler Baker <tyler.baker@linaro.org>
branch nick: lava-dispatcher
timestamp: Wed 2013-08-14 15:42:41 -0700
message:
  More device-type cleanup
modified:
  lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf
  lava_dispatcher/default-config/lava-dispatcher/device-types/beagle-xm.conf
  lava_dispatcher/default-config/lava-dispatcher/device-types/beaglebone-black.conf
  lava_dispatcher/default-config/lava-dispatcher/device-types/beaglebone.conf
  lava_dispatcher/default-config/lava-dispatcher/device-types/origen.conf
  lava_dispatcher/default-config/lava-dispatcher/device-types/panda.conf
  lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf


--
lp:lava-dispatcher
https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk

You are subscribed to branch lp:lava-dispatcher.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription

Patch

=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf'
--- lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf	2013-05-23 17:51:36 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf	2013-08-14 22:42:41 +0000
@@ -94,7 +94,7 @@ 
 interrupt_boot_command = ""
 
 # The string to look for to know that the boot process has begun
-image_boot_msg = Uncompressing Linux
+image_boot_msg = Booting Linux
 
 # The character the boot loader uses as a prompt on this board.
 bootloader_prompt = #

=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/beagle-xm.conf'
--- lava_dispatcher/default-config/lava-dispatcher/device-types/beagle-xm.conf	2013-08-14 21:48:44 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/device-types/beagle-xm.conf	2013-08-14 22:42:41 +0000
@@ -22,6 +22,7 @@ 
 
 qemu_machine_type = beaglexm
 lmc_dev_arg = beagle
+bootloader_prompt = OMAP3 beagleboard.org
 
 boot_options =
     boot_cmds

=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/beaglebone-black.conf'
--- lava_dispatcher/default-config/lava-dispatcher/device-types/beaglebone-black.conf	2013-08-14 19:54:58 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/device-types/beaglebone-black.conf	2013-08-14 22:42:41 +0000
@@ -32,6 +32,8 @@ 
 
 lmc_dev_arg = beaglebone
 
+bootloader_prompt = U-Boot
+
 boot_options =
     boot_cmds
 

=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/beaglebone.conf'
--- lava_dispatcher/default-config/lava-dispatcher/device-types/beaglebone.conf	2013-08-14 19:54:58 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/device-types/beaglebone.conf	2013-08-14 22:42:41 +0000
@@ -31,6 +31,8 @@ 
 
 lmc_dev_arg = beaglebone
 
+bootloader_prompt = U-Boot
+
 boot_options =
     boot_cmds
 

=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/origen.conf'
--- lava_dispatcher/default-config/lava-dispatcher/device-types/origen.conf	2013-08-14 21:48:44 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/device-types/origen.conf	2013-08-14 22:42:41 +0000
@@ -1,6 +1,7 @@ 
 client_type = bootloader
 boot_part = 2
 root_part = 3
+testboot_offset = 3
 boot_cmds = mmc init,
     mmc part 0,
     setenv bootcmd "'fatload mmc 0:5 0x40007000 uImage; fatload mmc 0:5 0x42000000 uInitrd; fatload mmc 0:5 0x41f00000 board.dtb; bootm 0x40007000 0x42000000 0x41f00000'",
@@ -25,7 +26,7 @@ 
     setenv bootargs "'console=ttySAC2,115200n8 rootwait ro init=/init androidboot.console=ttySAC2'",
     boot
 
-bootloader_prompt = #
+bootloader_prompt = ORIGEN
 
 lmc_dev_arg = origen
 

=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/panda.conf'
--- lava_dispatcher/default-config/lava-dispatcher/device-types/panda.conf	2013-08-14 21:48:44 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/device-types/panda.conf	2013-08-14 22:42:41 +0000
@@ -60,6 +60,8 @@ 
 # changed to /mnt/sdcard in  http://review.android.git.linaro.org/#change,3213
 sdcard_mountpoint_path = /mnt/sdcard
 
+bootloader_prompt = Panda
+
 boot_options =
     boot_cmds
 

=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf'
--- lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf	2013-08-14 21:48:44 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf	2013-08-14 22:42:41 +0000
@@ -1,18 +1,26 @@ 
 client_type = bootloader
-boot_cmds = mmc rescan 0,
-    setenv bootcmd "'fatload mmc 0:3 0x00100000 /uImage;
+
+boot_device = 1
+
+boot_cmds = mmc rescan 1,
+    setenv bootcmd "'fatload mmc 1:3 0x00100000 /uImage;
     bootm 0x00100000'",
-    setenv bootargs "'console=ttyAMA2,115200n8 ip=dhcp vmalloc=300M 
-    root=/dev/mmcblk0p5 rootwait mem=128M@0 mali.mali_mem=32M@128M 
+    setenv bootargs "'console=ttyAMA2,115200n8 ip=dhcp vmalloc=300M
+    root=/dev/mmcblk1p5 rootwait mem=128M@0 mali.mali_mem=32M@128M
     hwmem=168M@160M mem=48M@328M mem_issw=1M@383M mem=640M@384M'",
     boot
 
-boot_cmds_android = mmc rescan 0,
-    setenv bootcmd "'fatload mmc 0:3 0x00100000 /uImage; fat load mmc 0:3 0x05000000 /uInitrd; bootm 0x00100000 0x05000000'",
+boot_cmds_android = mmc rescan 1,
+    setenv bootcmd "'fatload mmc 1:3 0x00100000 /uImage'",
     setenv bootargs "'console=ttyAMA2,115200n8 rootwait ro earlyprintk mem=128M@0 mali.mali_mem=32M@128M hwmem=168M@160M mem=48M@328M mem_issw=1M@383M mem=640M@384M vmalloc=500M init=/init androidboot.console=ttyAMA2 omapdss.def_disp=hdmi consoleblank=0'",
     boot
+
+boot_cmds_fdt = mmc rescan 1,
+    setenv bootcmd "'fatload mmc 1:3 0x00100000 /uImage; fatload mmc 1:3 0x01000000 /uInitrd; fatload mmc 1:3 0x00f00000 /board.dtb; bootm 0x00100000 0x01000000 0x00f00000'"
+    setenv bootargs "'console=ttyAMA2,115200n8 root=/dev/mmcblk1p5 rootwait ro fixrtc nocompcache vmalloc=300M mem=128M@0 mali.mali_mem=32M@128M hwmem=168M@160M mem=48M@328M mem_issw=1M@383M mem=640M@384M'",
+    boot
     
-bootloader_prompt = $
+bootloader_prompt = U8500
 
 lmc_dev_arg = snowball_sd
 
@@ -23,8 +31,8 @@ 
     echo 0x01 > /sys/kernel/debug/ab8500/register-address 
     echo 0x11 > /sys/kernel/debug/ab8500/register-value
 
-android_orig_block_device = mmcblk0
-android_lava_block_device = mmcblk0
+android_orig_block_device = mmcblk1
+android_lava_block_device = mmcblk1
 
 boot_options =
     boot_cmds