diff options
Diffstat (limited to 'services')
| -rw-r--r-- | services/spd/trusty/trusty.c | 2 | ||||
| -rw-r--r-- | services/spd/tspd/tspd.mk | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/services/spd/trusty/trusty.c b/services/spd/trusty/trusty.c index cc808e2b0..333583622 100644 --- a/services/spd/trusty/trusty.c +++ b/services/spd/trusty/trusty.c @@ -322,7 +322,7 @@ static int32_t trusty_init(void) fpregs_context_restore(get_fpregs_ctx(cm_get_context(NON_SECURE))); cm_set_next_eret_context(NON_SECURE); - return 0; + return 1; } static void trusty_cpu_suspend(uint32_t off) diff --git a/services/spd/tspd/tspd.mk b/services/spd/tspd/tspd.mk index 0747e15f6..1457360a5 100644 --- a/services/spd/tspd/tspd.mk +++ b/services/spd/tspd/tspd.mk @@ -33,16 +33,6 @@ NEED_BL32 := yes # generated while the code is executing in S-EL1/0. TSP_NS_INTR_ASYNC_PREEMPT := 0 -# If TSPD_ROUTE_IRQ_TO_EL3 build flag is defined, use it to define value for -# TSP_NS_INTR_ASYNC_PREEMPT for backward compatibility. -ifdef TSPD_ROUTE_IRQ_TO_EL3 -ifeq (${ERROR_DEPRECATED},1) -$(error "TSPD_ROUTE_IRQ_TO_EL3 is deprecated. Please use the new build flag TSP_NS_INTR_ASYNC_PREEMPT") -endif -$(warning "TSPD_ROUTE_IRQ_TO_EL3 is deprecated. Please use the new build flag TSP_NS_INTR_ASYNC_PREEMPT") -TSP_NS_INTR_ASYNC_PREEMPT := ${TSPD_ROUTE_IRQ_TO_EL3} -endif - ifeq ($(EL3_EXCEPTION_HANDLING),1) ifeq ($(TSP_NS_INTR_ASYNC_PREEMPT),0) $(error When EL3_EXCEPTION_HANDLING=1, TSP_NS_INTR_ASYNC_PREEMPT must also be 1) |