summaryrefslogtreecommitdiff
path: root/src/soc/qualcomm
diff options
context:
space:
mode:
authorT Michael Turney <mturney@codeaurora.org>2018-05-01 15:59:37 -0700
committerJulius Werner <jwerner@chromium.org>2019-05-03 21:59:05 +0000
commit101098c41a047184e3eceabca2c1baa11141f36e (patch)
treeb6fcf8f46131e4e8fc28554e0c79eda984bb7fca /src/soc/qualcomm
parent61309e39b3c4545f47c9107a0e0ddaedef854505 (diff)
downloadcoreboot-101098c41a047184e3eceabca2c1baa11141f36e.tar.xz
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>
Diffstat (limited to 'src/soc/qualcomm')
-rw-r--r--src/soc/qualcomm/ipq40xx/Kconfig2
-rw-r--r--src/soc/qualcomm/ipq40xx/mbn_header.h2
-rw-r--r--src/soc/qualcomm/ipq806x/Makefile.inc4
-rw-r--r--src/soc/qualcomm/ipq806x/mbn_header.h2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/soc/qualcomm/ipq40xx/Kconfig b/src/soc/qualcomm/ipq40xx/Kconfig
index 72e05faf22..90744d5285 100644
--- a/src/soc/qualcomm/ipq40xx/Kconfig
+++ b/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
diff --git a/src/soc/qualcomm/ipq40xx/mbn_header.h b/src/soc/qualcomm/ipq40xx/mbn_header.h
index cedcf12584..a48de1c883 100644
--- a/src/soc/qualcomm/ipq40xx/mbn_header.h
+++ b/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;
diff --git a/src/soc/qualcomm/ipq806x/Makefile.inc b/src/soc/qualcomm/ipq806x/Makefile.inc
index 8a428b2f0d..1fd134a7b3 100644
--- a/src/soc/qualcomm/ipq806x/Makefile.inc
+++ b/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
diff --git a/src/soc/qualcomm/ipq806x/mbn_header.h b/src/soc/qualcomm/ipq806x/mbn_header.h
index 1e6a32f732..c7b38d3a81 100644
--- a/src/soc/qualcomm/ipq806x/mbn_header.h
+++ b/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;