From a4395b5b1c2a91ce31502f09fc71469edaada522 Mon Sep 17 00:00:00 2001 From: Tom Wai-Hong Tam Date: Thu, 12 May 2011 23:07:52 +0800 Subject: [PATCH] Revert "ARM: enable kernel signing by default" This reverts commit 9c5d88573f1c92a089c89dd60838c26ae15e6422. Change-Id: Ica876e1be20dc9ab60666af476294e093fd59498 Reviewed-on: http://gerrit.chromium.org/gerrit/762 Reviewed-by: Simon Glass Tested-by: Benson Leung Reviewed-by: Benson Leung --- bin/cros_make_image_bootable | 2 +- build_image | 2 +- build_kernel_image.sh | 2 +- mod_image_for_recovery.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/cros_make_image_bootable b/bin/cros_make_image_bootable index ef58dba8c8..d4eb9c81db 100755 --- a/bin/cros_make_image_bootable +++ b/bin/cros_make_image_bootable @@ -116,7 +116,7 @@ DEFINE_boolean use_dev_keys ${FLAGS_FALSE} \ "Use developer keys for signing. (Default: false)" # TODO(clchiou): Remove this flag after arm verified boot is stable -DEFINE_boolean crosbug12352_arm_kernel_signing ${FLAGS_TRUE} \ +DEFINE_boolean crosbug12352_arm_kernel_signing ${FLAGS_FALSE} \ "Sign kernel partition for ARM images (temporary hack)." # TODO(sosa): Remove once known images no longer use this in their config. diff --git a/build_image b/build_image index dfe9d29995..9faf25d109 100755 --- a/build_image +++ b/build_image @@ -91,7 +91,7 @@ DEFINE_string usb_disk /dev/sdb3 \ "Path syslinux should use to do a usb boot. Default: /dev/sdb3" # TODO(clchiou): Remove this flag after arm verified boot is stable -DEFINE_boolean crosbug12352_arm_kernel_signing ${FLAGS_TRUE} \ +DEFINE_boolean crosbug12352_arm_kernel_signing ${FLAGS_FALSE} \ "Sign kernel partition for ARM images (temporary hack)." DEFINE_boolean enable_rootfs_verification ${FLAGS_TRUE} \ diff --git a/build_kernel_image.sh b/build_kernel_image.sh index 691906dce8..736d72a8b6 100755 --- a/build_kernel_image.sh +++ b/build_kernel_image.sh @@ -70,7 +70,7 @@ DEFINE_string verity_hash_alg "sha1" \ "Cryptographic hash algorithm used for dm-verity. (Default: sha1)" # TODO(clchiou): Remove this flag after arm verified boot is stable -DEFINE_boolean crosbug12352_arm_kernel_signing ${FLAGS_TRUE} \ +DEFINE_boolean crosbug12352_arm_kernel_signing ${FLAGS_FALSE} \ "Sign kernel partition for ARM images (temporary hack)." # Parse flags diff --git a/mod_image_for_recovery.sh b/mod_image_for_recovery.sh index d3f5d35be2..1f05010dd5 100755 --- a/mod_image_for_recovery.sh +++ b/mod_image_for_recovery.sh @@ -82,7 +82,7 @@ DEFINE_string keys_dir "/usr/share/vboot/devkeys" \ "Directory containing the signing keys." # TODO(clchiou): Remove this flag after arm verified boot is stable -DEFINE_boolean crosbug12352_arm_kernel_signing ${FLAGS_TRUE} \ +DEFINE_boolean crosbug12352_arm_kernel_signing ${FLAGS_FALSE} \ "Sign kernel partition for ARM images (temporary hack)." # Parse command line