diff options
| author | Le Chi Thu le.chi.thu@linaro.org <le.chi.thu@linaro.org> | 2011-12-06 21:54:58 +0100 |
|---|---|---|
| committer | Le Chi Thu le.chi.thu@linaro.org <le.chi.thu@linaro.org> | 2011-12-06 21:54:58 +0100 |
| commit | cf7140f15d500feb9d7fd08b00f7c4b76c6194f6 (patch) | |
| tree | 45abd3810f378bc011c8e94c04b6cb9a0dc371d1 | |
| parent | 2959ff5caae7646d5f27cfe2ff6a329f95ff9222 (diff) | |
Added support for snowball V5 and later.
| -rw-r--r-- | lava_dispatcher/connection.py | 9 | ||||
| -rw-r--r-- | lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/lava_dispatcher/connection.py b/lava_dispatcher/connection.py index 8d2936ffb..0f6a8f713 100644 --- a/lava_dispatcher/connection.py +++ b/lava_dispatcher/connection.py @@ -90,14 +90,7 @@ class LavaConmuxConnection(LavaConnection): logging.info("Perform hard reset on the system") self.proc.send("~$") self.proc.sendline("hardreset") - # XXX Workaround for snowball - if self.device_option('device_type') == "snowball_sd": - time.sleep(10) - self.in_master_shell(300) - # Intentionally avoid self.soft_reboot() to prevent looping - self.proc.sendline("reboot") - self.enter_uboot() - + def _boot(self, boot_cmds): self.soft_reboot() try: diff --git a/lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf b/lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf index c8911b311..789ba4e14 100644 --- a/lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf +++ b/lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf @@ -9,5 +9,11 @@ boot_cmds = mmc init, hwmem=48M@302M mem=152M@360M'", boot -#boot_cmds_android = TBD +boot_cmds_android = mmc init, + mmc rescan 1, + setenv initrd_high "'0xffffffff'", + setenv fdt_high "'0xffffffff'", + setenv bootcmd "'fat load mmc 1:3 0x00100000 /uImage; fat load mmc 1:3 0x05000000 /uInitrd; bootm 0x00100000 0x05000000'", + setenv bootargs "'console=ttyAMA2,115200n8 root=/dev/mmcblk1p5 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=256M init=/init androidboot.console=ttyAMA2 omapdss.def_disp=hdmi consoleblank=0'", + boot bootloader_prompt = $ |