fip_create: Remove fip_create compatibility script
A compatibility script has been provided for about 2 years. Users should
have migrated to fiptool by now so remove the compat script.
Change-Id: I643e0c40a9e3fb428bad3be04a82cb431aad74dc
Signed-off-by: dp-arm <dimitris.papastamos@arm.com>
diff --git a/.gitignore b/.gitignore
index 78da669..b4359c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@
# Ignore build products from tools
tools/**/*.o
-tools/fip_create/
tools/fiptool/fiptool
tools/fiptool/fiptool.exe
tools/cert_create/src/*.o
diff --git a/docs/user-guide.rst b/docs/user-guide.rst
index bffc062..39f6449 100644
--- a/docs/user-guide.rst
+++ b/docs/user-guide.rst
@@ -1085,18 +1085,6 @@
More information about FIP can be found in the `Firmware Design`_ document.
-Migrating from fip\_create to fiptool
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The previous version of fiptool was called fip\_create. A compatibility script
-that emulates the basic functionality of the previous fip\_create is provided.
-However, users are strongly encouraged to migrate to fiptool.
-
-- To create a new FIP file, replace "fip\_create" with "fiptool create".
-- To update a FIP file, replace "fip\_create" with "fiptool update".
-- To dump the contents of a FIP file, replace "fip\_create --dump"
- with "fiptool info".
-
Building FIP images with support for Trusted Board Boot
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/tools/fiptool/Makefile b/tools/fiptool/Makefile
index e0e3923..9bdafe0 100644
--- a/tools/fiptool/Makefile
+++ b/tools/fiptool/Makefile
@@ -33,7 +33,7 @@
.PHONY: all clean distclean
-all: ${PROJECT} fip_create
+all: ${PROJECT}
${PROJECT}: ${OBJECTS} Makefile
@echo " LD $@"
@@ -42,13 +42,9 @@
@echo "Built $@ successfully"
@${ECHO_BLANK_LINE}
-fip_create: fip_create.sh
- ${Q}mkdir -p ../fip_create
- ${Q}install -m 755 fip_create.sh ../fip_create/fip_create
-
%.o: %.c %.h Makefile
@echo " CC $<"
${Q}${HOSTCC} -c ${CPPFLAGS} ${CFLAGS} ${INCLUDE_PATHS} $< -o $@
clean:
- $(call SHELL_DELETE_ALL, ${PROJECT} ${OBJECTS} fip_create)
+ $(call SHELL_DELETE_ALL, ${PROJECT} ${OBJECTS})
diff --git a/tools/fiptool/fip_create.sh b/tools/fiptool/fip_create.sh
deleted file mode 100644
index 0e80199..0000000
--- a/tools/fiptool/fip_create.sh
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/bin/sh
-#
-# This script implements the old fip_create tool on top of
-# the new fiptool.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-usage() {
- cat << EOF
-This tool is used to create a Firmware Image Package.
-
-Usage:
- fip_create [options] FIP_FILENAME
-
-Options:
- -h,--help: Print this help message and exit
- -d,--dump: Print contents of FIP after update
- -u,--unpack: Unpack images from an existing FIP
- -f,--force: Overwrite existing files when unpacking images
-
-Components that can be added/updated:
- --scp-fwu-cfg FILENAME SCP Firmware Updater Configuration FWU SCP_BL2U
- --ap-fwu-cfg FILENAME AP Firmware Updater Configuration BL2U
- --fwu FILENAME Firmware Updater NS_BL2U
- --fwu-cert FILENAME Non-Trusted Firmware Updater certificate
- --tb-fw FILENAME Trusted Boot Firmware BL2
- --scp-fw FILENAME SCP Firmware SCP_BL2
- --soc-fw FILENAME EL3 Runtime Firmware BL31
- --tos-fw FILENAME Secure Payload BL32 (Trusted OS)
- --tos-fw-extra1 FILENAME Secure Payload BL32 Extra1 (Trusted OS Extra1)
- --tos-fw-extra2 FILENAME Secure Payload BL32 Extra2 (Trusted OS Extra2)
- --nt-fw FILENAME Non-Trusted Firmware BL33
- --rot-cert FILENAME Root Of Trust key certificate
- --trusted-key-cert FILENAME Trusted key certificate
- --scp-fw-key-cert FILENAME SCP Firmware key certificate
- --soc-fw-key-cert FILENAME SoC Firmware key certificate
- --tos-fw-key-cert FILENAME Trusted OS Firmware key certificate
- --nt-fw-key-cert FILENAME Non-Trusted Firmware key certificate
- --tb-fw-cert FILENAME Trusted Boot Firmware BL2 certificate
- --scp-fw-cert FILENAME SCP Firmware content certificate
- --soc-fw-cert FILENAME SoC Firmware content certificate
- --tos-fw-cert FILENAME Trusted OS Firmware content certificate
- --nt-fw-cert FILENAME Non-Trusted Firmware content certificate
-EOF
- exit
-}
-
-echo "!! The fip_create tool is deprecated. Use the new fiptool. !!"
-basedir="$(dirname $0)/../fiptool"
-fiptool_args=
-while :; do
- case "$1" in
- -h | --help )
- usage
- break ;;
- -d | --dump )
- fiptool_args="info $fiptool_args"
- shift ;;
- -u | --unpack )
- fiptool_args="unpack $fiptool_args"
- shift ;;
- -f | --force )
- fiptool_args="$fiptool_args --force"
- shift ;;
- --scp-fwu-cfg | \
- --ap-fwu-cfg | \
- --fwu | \
- --fwu-cert | \
- --tb-fw | \
- --scp-fw | \
- --soc-fw | \
- --tos-fw | \
- --tos-fw-extra1 | \
- --tos-fw-extra2 | \
- --nt-fw | \
- --rot-cert | \
- --trusted-key-cert | \
- --scp-fw-key-cert | \
- --soc-fw-key-cert | \
- --tos-fw-key-cert | \
- --nt-fw-key-cert | \
- --tb-fw-cert | \
- --scp-fw-cert | \
- --soc-fw-cert | \
- --tos-fw-cert | \
- --nt-fw-cert )
- fiptool_args="$fiptool_args $1"
- shift
- if test -z $1; then
- usage
- fi
- fiptool_args="$fiptool_args $1"
- shift ;;
- * )
- break ;;
- esac
-done
-
-# expect a FIP filename
-if test -z $1; then
- usage
-fi
-
-is_pack_cmd=1
-for arg in $fiptool_args; do
- case "$arg" in
- unpack )
- is_pack_cmd=0
- break ;;
- info )
- is_pack_cmd=0
- break ;;
- * )
- esac
-done
-
-# if --unpack and --dump were not specified
-# the default action is to pack
-if test "$is_pack_cmd" -eq 1; then
- fiptool_args="update $fiptool_args"
-fi
-
-# append FIP filename
-fiptool_args="$fiptool_args $1"
-echo "Invoking fiptool with args: $fiptool_args"
-"$basedir/fiptool" $fiptool_args