From 69faa267cd29c5ce8224e12cbfd7409fd0c99db0 Mon Sep 17 00:00:00 2001 From: Che-Liang Chiou Date: Wed, 1 Jun 2011 11:52:21 +0800 Subject: [PATCH] Remove obsolete u-boot script in kernel partition BUG=chromium-os:14572 TEST=./build_kernel_image.sh \ --arch=arm --vmlinuz=/build/tegra2_seaboard/boot/vmlinuz --keys_dir=/usr/share/vboot/devkeys --use_dev_keys Change-Id: I85e8b96ef0b79bf17976e718bcfb59040a557c1f Reviewed-on: http://gerrit.chromium.org/gerrit/1876 Tested-by: Che-Liang Chiou Reviewed-by: Tom Wai-Hong Tam --- build_kernel_image.sh | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/build_kernel_image.sh b/build_kernel_image.sh index ce90aadcc1..5305e47084 100755 --- a/build_kernel_image.sh +++ b/build_kernel_image.sh @@ -182,19 +182,11 @@ kern_guid=%U EOF WORK="${WORK} ${FLAGS_working_dir}/config.txt" - kernel_script="${FLAGS_working_dir}/kernel.scr" - kernel_script_img="${FLAGS_working_dir}/kernel.scr.uimg" + # arm does not need/have a bootloader in kernel partition + dd if="/dev/zero" of="${FLAGS_working_dir}/bootloader.bin" bs=512 count=1 + WORK="${WORK} ${FLAGS_working_dir}/bootloader.bin" - echo -n 'setenv bootargs ${bootargs} ' > "${kernel_script}" - tr '\n' ' ' < "${FLAGS_working_dir}/boot.config" >> "${kernel_script}" - echo >> "${kernel_script}" - - mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ - -n kernel_script -d "${kernel_script}" "${kernel_script_img}" - - WORK="${WORK} ${kernel_script} ${kernel_script_img}" - - bootloader_path="${kernel_script_img}" + bootloader_path="${FLAGS_working_dir}/bootloader.bin" kernel_image="${FLAGS_vmlinuz/vmlinuz/vmlinux.uimg}" sign_the_kernel=${FLAGS_crosbug12352_arm_kernel_signing}