diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-10-12 16:56:19 +0200 |
|---|---|---|
| committer | Andy Gross <agross@codeaurora.org> | 2015-10-14 14:51:22 -0500 |
| commit | 33e38b4f1c54f9c2d3b2034c18ef937a3c09bc66 (patch) | |
| tree | 5816341e9c69698b00a1702e5fe36d7c61252e97 /drivers/firmware | |
| parent | ea4683e0b6c38ed54e5a66160c99d65f5022ecb2 (diff) | |
| download | linux-stable-33e38b4f1c54f9c2d3b2034c18ef937a3c09bc66.tar.gz linux-stable-33e38b4f1c54f9c2d3b2034c18ef937a3c09bc66.tar.bz2 linux-stable-33e38b4f1c54f9c2d3b2034c18ef937a3c09bc66.zip | |
firmware: qcom-scm: build for correct architecture level
The ".arch_extension sec" directive is only available on ARMv6 or higher,
so if we enable the SCM driver while building a kernel for an older CPU,
we get a build error:
/tmp/ccUyhMOY.s:130: Error: selected processor does not support ARM mode `smc #0'
/tmp/ccUyhMOY.s:216: Error: selected processor does not support ARM mode `smc #0'
/tmp/ccUyhMOY.s:373: Error: selected processor does not support ARM mode `smc #0'
make[4]: *** [drivers/firmware/qcom_scm-32.o] Error 1
This changes the Makefile so we pass the ARMv7 architecture level both
for the check and for the actual compilation of the scm driver.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andy Gross <agross@codeaurora.org>
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile index 2ee83474a3c1..f0066373b170 100644 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile @@ -15,7 +15,7 @@ obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o obj-$(CONFIG_QCOM_SCM) += qcom_scm.o obj-$(CONFIG_QCOM_SCM_64) += qcom_scm-64.o obj-$(CONFIG_QCOM_SCM_32) += qcom_scm-32.o -CFLAGS_qcom_scm-32.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) +CFLAGS_qcom_scm-32.o :=$(call as-instr,.arch armv7-a\n.arch_extension sec,-DREQUIRES_SEC=1) -march=armv7-a obj-y += broadcom/ obj-$(CONFIG_GOOGLE_FIRMWARE) += google/ |