diff options
| author | Pratik Prajapati <pratikkumar.v.prajapati@intel.com> | 2016-02-22 16:50:31 -0800 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2016-05-10 22:59:36 +0200 |
| commit | de62e0f079dc9e7803587d4e587f8f8cd2a1c9aa (patch) | |
| tree | c403f2d96feb780fb7ebfe01b4ac3e56780e5bc0 /util/mma | |
| parent | 0175fb1b4ffaa126df516a0086e5adb51cfc94e2 (diff) | |
util/mma: changing BOOT_STUB to COREBOOT region and few more things
(1) Added following new function.
cbfs_locate_file_in_region - to locate (and mmap) a file in a flash
region
This function is used to look for MMA blobs in "COREBOOT" cbfs region
(2) mma_setup_test.sh would write to "COREBOOT" region.
(3) changes in mma_automated_test.sh. Few MMA tests need system to
be COLD rebooted before test can start. mma_automated_test.sh would
do COLD reboot after each test, and so i would sync the filesystem
before doing COLD reboot.
BRANCH=none
BUG=chrome-os-partner:43731
TEST=Build and Boot kunimitsu (FAB4). Able to locate MMA files in CBFS
Not tested on Glados.
Change-Id: I8338a46d8591d16183e51917782f052fa78c4167
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 1e418dfffd8a7fe590f9db771d2f0b01a44afbb4
Original-Change-Id: I402f84f5c46720710704dfd32b9319c73c412e47
Original-Signed-off-by: Pratik Prajapati <pratikkumar.v.prajapati@intel.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/331682
Original-Commit-Ready: Pratikkumar V Prajapati <pratikkumar.v.prajapati@intel.com>
Original-Tested-by: Pratikkumar V Prajapati <pratikkumar.v.prajapati@intel.com>
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Original-Reviewed-by: Pratikkumar V Prajapati <pratikkumar.v.prajapati@intel.com>
Reviewed-on: https://review.coreboot.org/14125
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'util/mma')
| -rwxr-xr-x | util/mma/mma_automated_test.sh | 14 | ||||
| -rwxr-xr-x | util/mma/mma_setup_test.sh | 4 |
2 files changed, 15 insertions, 3 deletions
diff --git a/util/mma/mma_automated_test.sh b/util/mma/mma_automated_test.sh index 0e9596245d..b43325ba14 100755 --- a/util/mma/mma_automated_test.sh +++ b/util/mma/mma_automated_test.sh @@ -64,6 +64,10 @@ get_mma_autotest_params() { } main() { + # sleep 30 sec, before we start. This would give some time if we want + # to stop automation. + sleep 30s + mkdir -p "${MMA_LOCAL_DATA_STORAGE}" # Exit if there are no tests [ -e "${MMA_AUTOMATED_TEST_CONFIG}" ] || exit 0 @@ -87,7 +91,15 @@ main() { get_mma_autotest_params ${MMA_SETUP_TEST_TOOL} set ${MMA_TEST_NAME} ${MMA_TEST_PARAM} - reboot + # sync the filesystem, hoping this would minimize + # the chances of fs corruption + sync + sleep 2s + sync + sleep 2s + sync + sleep 2s + ectool reboot_ec } main "$@" diff --git a/util/mma/mma_setup_test.sh b/util/mma/mma_setup_test.sh index ecbedf85a5..7eb3c7c225 100755 --- a/util/mma/mma_setup_test.sh +++ b/util/mma/mma_setup_test.sh @@ -90,7 +90,7 @@ show_usage() { write_flash() { printf "Writing back flash contents "${flashrom_temp_image}"\n" - flashrom -p host -w "${flashrom_temp_image}" -i BOOT_STUB --fast-verify || \ + flashrom -p host -w "${flashrom_temp_image}" --fast-verify || \ { printf "failed to read flash\n" ; exit -1; @@ -180,7 +180,7 @@ main() { remove_file_if_exists "${flashrom_temp_image}" printf "Reading flash contents to "${flashrom_temp_image}"\n" - flashrom -p host -r "${flashrom_temp_image}" -i BOOT_STUB || \ + flashrom -p host -r "${flashrom_temp_image}" || \ { printf "failed to read flash\n" ; exit -1; |