Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(317)

Issue 1613008: move mkimage (Closed)

Created:
10 years, 8 months ago by jiesun
Modified:
9 years, 7 months ago
Reviewers:
piman
CC:
chromium-os-reviews_chromium.org
Visibility:
Public.

Description

current mkimage are build in u-boot package and copied to sys-root ( a x86 binary). move mkimage to hard-host-depends and remove dependency from u-boot to kernel. this will make use of mkimage on target possible in the future.

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+2 lines, -9 lines) Patch
M src/scripts/build_gpt.sh View 3 chunks +1 line, -7 lines 0 comments Download
M src/scripts/build_image View 1 chunk +1 line, -2 lines 0 comments Download

Messages

Total messages: 3 (0 generated)
jiesun
strip mkimage
10 years, 8 months ago (2010-04-09 17:51:05 UTC) #1
piman
LGTM
10 years, 8 months ago (2010-04-09 17:54:21 UTC) #2
tedbo
10 years, 8 months ago (2010-04-09 17:57:06 UTC) #3
FYI

Can you please have more descriptive comments for your changes? I
think we have a pretty good culture of people being willing to take a
quick look at code reviews as they go by even if they aren't the
primary reviewer. It is very hard to do this if the description
doesn't explain a bit more about the reasoning behind the change.

ted

On Fri, Apr 9, 2010 at 10:50 AM,  <jiesun@chromium.org> wrote:
> Reviewers: piman,
>
> Message:
> strip mkimage
>
> Description:
> move mkimage
>
> Please review this at http://codereview.chromium.org/1613008/show
>
> Affected files:
>  M src/scripts/build_gpt.sh
>  M src/scripts/build_image
>
>
> Index: src/scripts/build_gpt.sh
> diff --git a/src/scripts/build_gpt.sh b/src/scripts/build_gpt.sh
> index
>
96e66e431722719cf1c74945cd9f8c06e3ab95e8..0201ca516e14632fb5cf3b4b09f7373fe26320ab
> 100755
> --- a/src/scripts/build_gpt.sh
> +++ b/src/scripts/build_gpt.sh
> @@ -21,8 +21,6 @@ DEFINE_string arch "" \
>   "The target architecture (\"arm\" or \"x86\")."
>  DEFINE_string board "$DEFAULT_BOARD" \
>   "The board to build an image for."
> -DEFINE_string board_root "" \
> -  "The build directory, needed to find tools for ARM."
>
>  # Usage.
>  FLAGS_HELP=$(cat <<EOF
> @@ -70,10 +68,6 @@ else
>   esac
>  fi
>
> -if [[ -z "$FLAGS_board_root" ]]; then
> -  FLAGS_board_root="/build/${FLAGS_board}"
> -fi
> -
>  # Only now can we die on error.  shflags functions leak non-zero error
> codes,
>  # so will die prematurely if 'set -e' is specified before now.
>  set -e
> @@ -130,7 +124,7 @@ if [[ "$ARCH" = "arm" ]]; then
>           "setenv bootargs ${BOOTARGS}\n" \
>           "mmc read 1 C0008000 $KERNEL_OFFSET $KERNEL_SECS_HEX\n" \
>           "bootm C0008000" > ${MBR_SCRIPT}
> -  MKIMAGE="${FLAGS_board_root}/u-boot/mkimage"
> +  MKIMAGE="/usr/bin/mkimage"
>   if [[ -f "$MKIMAGE".gz ]]; then
>     sudo gunzip "$MKIMAGE".gz
>   fi
> Index: src/scripts/build_image
> diff --git a/src/scripts/build_image b/src/scripts/build_image
> index
>
11548f74c3d9e46ab0804ca106908e8fa749c664..722a8ef62b9ca0f604bb8b62f403e47984917011
> 100755
> --- a/src/scripts/build_image
> +++ b/src/scripts/build_image
> @@ -422,8 +422,7 @@ cleanup
>
>  # Create the GPT-formatted image
>  ${SCRIPTS_DIR}/build_gpt.sh \
> -   --arch=${ARCH} --board=${FLAGS_board} --board_root=${BOARD_ROOT} \
> -   "${OUTPUT_DIR}" "${OUTPUT_IMG}"
> +   --arch=${ARCH} --board=${FLAGS_board} "${OUTPUT_DIR}" "${OUTPUT_IMG}"
>
>  # Clean up temporary files.
>  rm -f "${ROOT_FS_IMG}" "${STATEFUL_IMG}" "${OUTPUT_DIR}/vmlinuz.image" \
>
>
>

Powered by Google App Engine
This is Rietveld 408576698