fix(build): use common name for ivy partitions

Trusted firmware sp_gen.mk expects the package name to be ivy.pkg
for all ivy packages (both with and without the shim). However
the packages are named according to the partition name in
sp_layout.json. Make ivy partitions use the ivy name in
sp_layout.json to prevent this name mismatch.

Signed-off-by: Daniel Boulby <daniel.boulby@arm.com>
Change-Id: If4702667b13be26feee809d10b21c46110ff6848
diff --git a/tools/generate_json/generate_json.sh b/tools/generate_json/generate_json.sh
index 81ab756..9ac13ec 100755
--- a/tools/generate_json/generate_json.sh
+++ b/tools/generate_json/generate_json.sh
@@ -83,7 +83,7 @@
 	if [ $PARTITION_ALREADY_PRESENT == "true" ]; then
 		echo -ne ",\n\n" >> $GENERATED_JSON
 	fi
-	echo -ne "\t\"ivy_shim\" : {\n \
+	echo -ne "\t\"ivy\" : {\n \
 	\t\"image\": \"ivy.bin\",\n \
 	\t\"pm\": \"ivy-sel1.dts\",\n \
 	\t\"owner\": \"Plat\"\n\t}" >> "$GENERATED_JSON"