diff options
| author | Pavel Pisa <ppisa@pikron.com> | 2016-05-21 23:50:31 +0200 |
|---|---|---|
| committer | Pavel Pisa <ppisa@pikron.com> | 2016-05-31 10:33:42 +0200 |
| commit | de378ad40d452024590c357c11b69077ea492b1b (patch) | |
| tree | 32c55fb845ea0d434aaa90ff0101e4b7ce1183e1 /c | |
| parent | arm/raspberrypi: cmdline enhancement and early access workaround. (diff) | |
| download | rtems-de378ad40d452024590c357c11b69077ea492b1b.tar.bz2 | |
arm/raspberrypi: ensure that correct RPI_PERIPHERAL_BASE is provided by raspberrypi.h
If the raspberrypi.h has been included without preceding inclussion
of bsp.h then BSP_IS_RPI2 has not been set for Raspberry Pi 2
BSP variant and bad things happen later.
The patch includes bspopts.h by raspberrypi.h and even includes
bsp.h in critical peripherals support.
Diffstat (limited to 'c')
4 files changed, 4 insertions, 0 deletions
diff --git a/c/src/lib/libbsp/arm/raspberrypi/gpio/rpi-gpio.c b/c/src/lib/libbsp/arm/raspberrypi/gpio/rpi-gpio.c index 2788d36237..6c01d62404 100644 --- a/c/src/lib/libbsp/arm/raspberrypi/gpio/rpi-gpio.c +++ b/c/src/lib/libbsp/arm/raspberrypi/gpio/rpi-gpio.c @@ -14,6 +14,7 @@ * http://www.rtems.org/license/LICENSE. */ +#include <bsp.h> #include <bsp/raspberrypi.h> #include <bsp/irq-generic.h> #include <bsp/gpio.h> diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/raspberrypi.h b/c/src/lib/libbsp/arm/raspberrypi/include/raspberrypi.h index d6f00e8bd0..60645b9baa 100644 --- a/c/src/lib/libbsp/arm/raspberrypi/include/raspberrypi.h +++ b/c/src/lib/libbsp/arm/raspberrypi/include/raspberrypi.h @@ -21,6 +21,7 @@ #ifndef LIBBSP_ARM_RASPBERRYPI_RASPBERRYPI_H #define LIBBSP_ARM_RASPBERRYPI_RASPBERRYPI_H +#include <bspopts.h> #include <stdint.h> #include <bsp/utility.h> diff --git a/c/src/lib/libbsp/arm/raspberrypi/misc/mailbox.c b/c/src/lib/libbsp/arm/raspberrypi/misc/mailbox.c index 9d70c72545..37890ddbc0 100644 --- a/c/src/lib/libbsp/arm/raspberrypi/misc/mailbox.c +++ b/c/src/lib/libbsp/arm/raspberrypi/misc/mailbox.c @@ -17,6 +17,7 @@ #include <stdint.h> #include <stdbool.h> +#include <bsp.h> #include <bsp/raspberrypi.h> #include <bsp/mailbox.h> diff --git a/c/src/lib/libbsp/arm/raspberrypi/misc/timer.c b/c/src/lib/libbsp/arm/raspberrypi/misc/timer.c index e90af08290..1047b3e417 100644 --- a/c/src/lib/libbsp/arm/raspberrypi/misc/timer.c +++ b/c/src/lib/libbsp/arm/raspberrypi/misc/timer.c @@ -16,6 +16,7 @@ * */ +#include <bsp.h> #include <rtems.h> #include <rtems/btimer.h> #include <bsp/raspberrypi.h> |