diff options
| -rwxr-xr-x | arch/arm/mach-ux500/Makefile | 4 | ||||
| -rw-r--r-- | drivers/tee/Makefile | 3 | ||||
| -rw-r--r-- | drivers/tee/tee_service_svp.c | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile index cb341b1e75b..f9fb079213a 100755 --- a/arch/arm/mach-ux500/Makefile +++ b/arch/arm/mach-ux500/Makefile @@ -36,4 +36,6 @@ else obj-$(CONFIG_MFD_STE_CONN) += ste_conn_devices.o endif -obj-$(CONFIG_TEE_SUPPORT) += tee_ux500.o +ifndef CONFIG_MACH_U5500_SIMULATOR + obj-$(CONFIG_TEE_SUPPORT) += tee_ux500.o +endif diff --git a/drivers/tee/Makefile b/drivers/tee/Makefile index 8203426fd79..7fac2911a8a 100644 --- a/drivers/tee/Makefile +++ b/drivers/tee/Makefile @@ -8,9 +8,8 @@ EXTRA_CFLAGS = -O0 ifdef CONFIG_MACH_U5500_SIMULATOR obj-$(CONFIG_TEE_SUPPORT) += tee_service_svp.o -else - obj-$(CONFIG_TEE_SUPPORT) += tee_service.o endif +obj-$(CONFIG_TEE_SUPPORT) += tee_service.o obj-$(CONFIG_TEE_SUPPORT) += tee_driver.o obj-$(CONFIG_TEE_SUPPORT) += ta/ diff --git a/drivers/tee/tee_service_svp.c b/drivers/tee/tee_service_svp.c index a5bd3254f30..2f3caa80732 100644 --- a/drivers/tee/tee_service_svp.c +++ b/drivers/tee/tee_service_svp.c @@ -9,7 +9,7 @@ #include <linux/kernel.h> #include <linux/string.h> #include <linux/tee.h> - +#include <linux/err.h> #include "ta/tee_ta_start_modem.h" static int cmp_uuid_start_modem(struct tee_uuid *uuid) @@ -47,7 +47,7 @@ int call_sec_world(struct tee_session *ts) switch (ts->cmd) { case COMMAND_ID_START_MODEM: ret = tee_ta_start_modem((struct tee_ta_start_modem *) - ts->its); + ts->idata); if (ret) { ts->err = TEED_ERROR_GENERIC; ts->origin = TEED_ORIGIN_TEE_APPLICATION; |