fix: remove fvp_romlib_runtime
It is no longer relevant - the build passes with and without it. Keeping
it causes problems as it builds tf-a twice with different expected
outcomes. So remove it.
Signed-off-by: Boyan Karatotev <boyan.karatotev@arm.com>
Change-Id: Iae4fd384d459d9b8700459c18eccaf28430656ea
diff --git a/fvp_utils.sh b/fvp_utils.sh
index c860a9d..d082cd2 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -200,25 +200,6 @@
popd
}
-fvp_romlib_runtime() {
- local tmpdir="$(mktempdir)"
-
- # Save BL1 and romlib binaries from original build
- mv "${tf_build_root:?}/${plat:?}/${mode:?}/romlib/romlib.bin" "$tmpdir/romlib.bin"
- mv "${tf_build_root:?}/${plat:?}/${mode:?}/bl1.bin" "$tmpdir/bl1.bin"
-
- # Patch index file
- apply_tf_patch "fvp_romlib_runtime/jmptbl_i_patch.patch"
-
- # Rebuild with patched file
- echo "Building patched romlib:"
- build_tf
-
- # Retrieve original BL1 and romlib binaries
- mv "$tmpdir/romlib.bin" "${tf_build_root:?}/${plat:?}/${mode:?}/romlib/romlib.bin"
- mv "$tmpdir/bl1.bin" "${tf_build_root:?}/${plat:?}/${mode:?}/bl1.bin"
-}
-
# Generates the final YAML-based LAVA job definition from a template file.
#
# The job definition template is expanded with visibility of all variables that
diff --git a/patch/fvp_romlib_runtime/jmptbl_i_patch.patch b/patch/fvp_romlib_runtime/jmptbl_i_patch.patch
deleted file mode 100644
index ba58e50..0000000
--- a/patch/fvp_romlib_runtime/jmptbl_i_patch.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git i/plat/arm/board/fvp/jmptbl.i w/plat/arm/board/fvp/jmptbl.i
-index a23de733d..dfd1dda83 100644
---- i/plat/arm/board/fvp/jmptbl.i
-+++ w/plat/arm/board/fvp/jmptbl.i
-@@ -12,30 +12,30 @@
- # lib function [patch]
- # Example:
- # rom rom_lib_init
--# fdt fdt_getprop_namelen patch
-+# fdt fdt_getprop_namelen patch patch
-
- rom rom_lib_init
--fdt fdt_getprop
--fdt fdt_get_property
--fdt fdt_getprop_namelen
--fdt fdt_setprop_inplace
--fdt fdt_check_header
--fdt fdt_node_offset_by_compatible
--fdt fdt_node_offset_by_prop_value
--fdt fdt_setprop_inplace_namelen_partial
--fdt fdt_first_subnode
--fdt fdt_next_subnode
--fdt fdt_path_offset
--fdt fdt_path_offset_namelen
--fdt fdt_subnode_offset
--fdt fdt_address_cells
--fdt fdt_size_cells
--fdt fdt_parent_offset
--fdt fdt_stringlist_search
--fdt fdt_get_alias_namelen
--fdt fdt_get_name
--fdt fdt_get_alias
--fdt fdt_node_offset_by_phandle
--fdt fdt_add_subnode
-+fdt fdt_getprop patch
-+fdt fdt_get_property patch
-+fdt fdt_getprop_namelen patch
-+fdt fdt_setprop_inplace patch
-+fdt fdt_check_header patch
-+fdt fdt_node_offset_by_compatible patch
-+fdt fdt_node_offset_by_prop_value patch
-+fdt fdt_setprop_inplace_namelen_partial patch
-+fdt fdt_first_subnode patch
-+fdt fdt_next_subnode patch
-+fdt fdt_path_offset patch
-+fdt fdt_path_offset_namelen patch
-+fdt fdt_subnode_offset patch
-+fdt fdt_address_cells patch
-+fdt fdt_size_cells patch
-+fdt fdt_parent_offset patch
-+fdt fdt_stringlist_search patch
-+fdt fdt_get_alias_namelen patch
-+fdt fdt_get_name patch
-+fdt fdt_get_alias patch
-+fdt fdt_node_offset_by_phandle patch
-+fdt fdt_add_subnode patch
- c exit
- c atexit
diff --git a/run_config/fvp-romlib b/run_config/fvp-romlib
index b58a512..10b6fe1 100644
--- a/run_config/fvp-romlib
+++ b/run_config/fvp-romlib
@@ -6,5 +6,4 @@
#
post_tf_build() {
- fvp_romlib_runtime
}
diff --git a/run_config/fvp-spm+romlib b/run_config/fvp-spm+romlib
index 4fa3f7a..a783beb 100644
--- a/run_config/fvp-spm+romlib
+++ b/run_config/fvp-spm+romlib
@@ -6,7 +6,6 @@
#
post_tf_build() {
- fvp_romlib_runtime
build_fip BL33="$archive/tftf.bin" BL32="$archive/secure_hafnium.bin"
}
diff --git a/run_config/fvp-spm+romlib.bmcov b/run_config/fvp-spm+romlib.bmcov
index 6500905..04be165 100644
--- a/run_config/fvp-spm+romlib.bmcov
+++ b/run_config/fvp-spm+romlib.bmcov
@@ -6,7 +6,6 @@
#
post_tf_build() {
- fvp_romlib_runtime
build_fip BL33="$archive/tftf.bin" BL32="$archive/secure_hafnium.bin"
}