From 404f659c83bf051513fe7b2bd0a2bccdd14c2fd5 Mon Sep 17 00:00:00 2001 From: Pavel Pisa Date: Sat, 2 Jul 2016 13:15:02 +0200 Subject: arm/raspberrypi: Enable HYP to SVC switch for this BSP. This support is required when newer firmware is used on Raspberry Pi 2 boards. Updates #2783 --- c/src/lib/libbsp/arm/raspberrypi/Makefile.am | 3 +++ c/src/lib/libbsp/arm/raspberrypi/configure.ac | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am index bf3c3f297b..6689d643fc 100644 --- a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am +++ b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am @@ -87,6 +87,9 @@ libbsp_a_SOURCES += ../../shared/sbrk.c libbsp_a_SOURCES += ../../shared/src/stackalloc.c libbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S libbsp_a_SOURCES += ../shared/arm-cp15-set-ttb-entries.c +if BSP_START_IN_HYP_SUPPORT +libbsp_a_SOURCES += ../shared/startup/bsp-start-in-hyp-support.S +endif # Startup libbsp_a_SOURCES += ../../shared/bspreset_loop.c diff --git a/c/src/lib/libbsp/arm/raspberrypi/configure.ac b/c/src/lib/libbsp/arm/raspberrypi/configure.ac index 27abe6c09f..2a6285b731 100644 --- a/c/src/lib/libbsp/arm/raspberrypi/configure.ac +++ b/c/src/lib/libbsp/arm/raspberrypi/configure.ac @@ -24,6 +24,10 @@ AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") RTEMS_BSPOPTS_SET([BSP_START_RESET_VECTOR],[*],[]) RTEMS_BSPOPTS_HELP([BSP_START_RESET_VECTOR],[reset vector address for BSP start]) +RTEMS_BSPOPTS_SET([BSP_START_IN_HYP_SUPPORT],[*],[1]) +RTEMS_BSPOPTS_HELP([BSP_START_IN_HYP_SUPPORT], [Support start of BSP in ARM HYP mode]) +AM_CONDITIONAL(BSP_START_IN_HYP_SUPPORT,test "$BSP_START_IN_HYP_SUPPORT" = "1") + # Is this a Raspberry Pi 2? RTEMS_BSPOPTS_SET([BSP_IS_RPI2],[raspberrypi2],[1]) RTEMS_BSPOPTS_SET([BSP_IS_RPI2],[*],[0]) -- cgit v1.2.3