sdm845: Combine BB with QC-Sec for ROM boot

TEST=build & run

Change-Id: I222a56f1c9b74856a1e1ff8132bab5e041672c5d
Signed-off-by: T Michael Turney <mturney@codeaurora.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/25207
Reviewed-by: Julius Werner <jwerner@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

src/soc/qualcomm/ipq40xx/Kconfig

@@ -47,7 +47,7 @@ config SBL_ELF
 config SBL_UTIL_PATH
 	depends on USE_BLOBS
 	string "Path for utils to combine SBL_ELF and bootblock"
-	default "util/ipqheader"
+	default "util/qualcomm"
 	help
 	  Path for utils to combine SBL_ELF and bootblock
 

src/soc/qualcomm/ipq40xx/mbn_header.h

@@ -18,7 +18,7 @@
 
 #include <types.h>
 
-/* QCA firmware blob header gleaned from util/ipqheader/ipqheader.py */
+/* QCA firmware blob header gleaned from util/qualcomm/ipqheader.py */
 
 struct mbn_header {
 	u32	mbn_type;

src/soc/qualcomm/ipq806x/Makefile.inc

@@ -62,14 +62,14 @@ ifeq ($(CONFIG_USE_BLOBS),y)
 # Add MBN header to allow SBL3 to start coreboot bootblock
 $(objcbfs)/bootblock.mbn: $(objcbfs)/bootblock.raw.bin
 	@printf "    ADD MBN    $(subst $(obj)/,,$(@))\n"
-	./util/ipqheader/ipqheader.py $(call loadaddr,bootblock) $< $@.tmp
+	./util/qualcomm/ipqheader.py $(call loadaddr,bootblock) $< $@.tmp
 	@mv $@.tmp $@
 
 # Create a complete bootblock which will start up the system
 $(objcbfs)/bootblock.bin: $(call strip_quotes,$(CONFIG_SBL_BLOB)) \
 			   $(objcbfs)/bootblock.mbn
 	@printf "    MBNCAT     $(subst $(obj)/,,$(@))\n"
-	@util/ipqheader/mbncat.py -o $@.tmp $^
+	@util/qualcomm/mbncat.py -o $@.tmp $^
 	@mv $@.tmp $@
 
 endif

src/soc/qualcomm/ipq806x/mbn_header.h

@@ -18,7 +18,7 @@
 
 #include <types.h>
 
-/* Qualcomm firmware blob header gleaned from util/ipqheader/ipqheader.py */
+/* Qualcomm firmware blob header gleaned from util/qualcomm/ipqheader.py */
 
 struct mbn_header {
 	u32	mbn_type;