smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dumpimage: add 'T' option to explicitly set the image type

Browse Source 
Some image types, like "KeyStone GP", do not have magic numbers to
distinguish them from other image types. Thus, the automatic image
type discovery does not work correctly.

This patch also fix some integer type mismatches.

Signed-off-by: Guilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
This commit is contained in:
Guilherme Maciel Ferreira
2015-01-15 02:54:40 -02:00
committed by Tom Rini
parent a93648d197
commit f41f5b7c05
5 changed files with 66 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
test/image/test-imagetools.sh
View File

@@ -13,9 +13,9 @@
# ./test/image/test-imagetools.sh
BASEDIR=sandbox
SRCDIR=sandbox/boot
SRCDIR=${BASEDIR}/boot
IMAGE_NAME="v1.0-test"
IMAGE=linux.img
IMAGE_MULTI=linux.img
DATAFILE0=vmlinuz
DATAFILE1=initrd.img
DATAFILE2=System.map
@@ -34,14 +34,14 @@ cleanup()
for file in ${DATAFILES}; do
rm -f ${file} ${SRCDIR}/${file}
done
rm -f ${IMAGE} ${DUMPIMAGE_LIST} ${MKIMAGE_LIST} ${TEST_OUT}
rm -f ${IMAGE_MULTI} ${DUMPIMAGE_LIST} ${MKIMAGE_LIST} ${TEST_OUT}
rmdir ${SRCDIR}
}
# Check that two files are the same
assert_equal()
{
if ! diff $1 $2; then
if ! diff -u $1 $2; then
echo "Failed."
cleanup
exit 1
@@ -82,35 +82,39 @@ do_cmd_redir()
${cmd} >${redir}
}
# Write files into an image
create_image()
# Write files into an multi-file image
create_multi_image()
{
local files="${SRCDIR}/${DATAFILE0}:${SRCDIR}/${DATAFILE1}"
files+=":${SRCDIR}/${DATAFILE2}"
echo -e "\nBuilding image..."
echo -e "\nBuilding multi-file image..."
do_cmd ${MKIMAGE} -A x86 -O linux -T multi -n \"${IMAGE_NAME}\" \
-d ${files} ${IMAGE}
-d ${files} ${IMAGE_MULTI}
echo "done."
}
# Extract files from an image
extract_image()
# Extract files from an multi-file image
extract_multi_image()
{
echo -e "\nExtracting image contents..."
do_cmd ${DUMPIMAGE} -i ${IMAGE} -p 0 ${DATAFILE0}
do_cmd ${DUMPIMAGE} -i ${IMAGE} -p 1 ${DATAFILE1}
do_cmd ${DUMPIMAGE} -i ${IMAGE} -p 2 ${DATAFILE2}
do_cmd ${DUMPIMAGE} -i ${IMAGE} -p 2 ${DATAFILE2} -o ${TEST_OUT}
echo -e "\nExtracting multi-file image contents..."
do_cmd ${DUMPIMAGE} -T multi -i ${IMAGE_MULTI} -p 0 ${DATAFILE0}
do_cmd ${DUMPIMAGE} -T multi -i ${IMAGE_MULTI} -p 1 ${DATAFILE1}
do_cmd ${DUMPIMAGE} -T multi -i ${IMAGE_MULTI} -p 2 ${DATAFILE2}
do_cmd ${DUMPIMAGE} -T multi -i ${IMAGE_MULTI} -p 2 ${DATAFILE2} -o ${TEST_OUT}
echo "done."
}
# List the contents of a file
# Args:
# image filename
list_image()
{
local image="$1"
echo -e "\nListing image contents..."
do_cmd_redir ${MKIMAGE_LIST} ${MKIMAGE} -l ${IMAGE}
do_cmd_redir ${DUMPIMAGE_LIST} ${DUMPIMAGE} -l ${IMAGE}
do_cmd_redir ${MKIMAGE_LIST} ${MKIMAGE} -l ${image}
do_cmd_redir ${DUMPIMAGE_LIST} ${DUMPIMAGE} -l ${image}
echo "done."
}
@@ -120,16 +124,16 @@ main()
create_files
# Compress and extract multifile images, compare the result
create_image
extract_image
# Compress and extract multi-file images, compare the result
create_multi_image
extract_multi_image
for file in ${DATAFILES}; do
assert_equal ${file} ${SRCDIR}/${file}
done
assert_equal ${TEST_OUT} ${DATAFILE2}
# List contents and compares output fro tools
list_image
# List contents of multi-file image and compares output from tools
list_image ${IMAGE_MULTI}
assert_equal ${DUMPIMAGE_LIST} ${MKIMAGE_LIST}
# Remove files created