From ffd0ca6f361adb6c2f3af2fbb40eec5f9341d948 Mon Sep 17 00:00:00 2001
From: Nick Sanders <nsanders@chromium.org>
Date: Sat, 25 Jun 2011 01:20:24 -0700
Subject: [PATCH] Use %U on dm-verity boots on arm

BUG=chrome-os-partner:4662,chrome-os-partner:3198
TEST=run recovery

Change-Id: I54372737dc75ed19d4361e8d58a50511c34336b1
Reviewed-on: http://gerrit.chromium.org/gerrit/3226
Tested-by: Nick Sanders <nsanders@chromium.org>
Reviewed-by: Che-Liang Chiou <clchiou@chromium.org>
Reviewed-by: Will Drewry <wad@chromium.org>
---
 build_kernel_image.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/build_kernel_image.sh b/build_kernel_image.sh
index dc6ab07abc..64299d68f6 100755
--- a/build_kernel_image.sh
+++ b/build_kernel_image.sh
@@ -112,11 +112,7 @@ if [[ -n "${FLAGS_rootfs_image}" && -n "${FLAGS_rootfs_hash}" ]]; then
   # the verified boot device.  Doing so will claim /dev/sdDP out from
   # under the system.
   if [[ ${FLAGS_root} = "/dev/dm-0" ]]; then
-    if [[ "${FLAGS_arch}" = "x86" ]]; then
-      base_root='%U+1'  # kern_guid + 1
-    elif [[ "${FLAGS_arch}" = "arm" ]]; then
-      base_root='/dev/${devname}${rootpart}'
-    fi
+    base_root='%U+1'  # kern_guid + 1
     table=${table//HASH_DEV/${base_root}}
     table=${table//ROOT_DEV/${base_root}}
   fi