diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-09-13 07:00:57 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-09-22 14:32:37 +0200 |
| commit | 05f9858ffde4cb7e8593fd609bb4e7c5dbf3b8bc (patch) | |
| tree | 388feeeaa15cdfbb12d3c70cd4ed9d4018b9f44f /c/src/lib/libbsp/arm/imx | |
| parent | bsp/imx: Add SMP support (diff) | |
| download | rtems-05f9858ffde4cb7e8593fd609bb4e7c5dbf3b8bc.tar.bz2 | |
bsps: Generalize bsp_fdt_map_intr()
Pass all interrupt cells to bsp_fdt_map_intr() since some platforms use
an array to describe an interrupt.
Update #3090.
Diffstat (limited to 'c/src/lib/libbsp/arm/imx')
| -rw-r--r-- | c/src/lib/libbsp/arm/imx/console/console-config.c | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/imx/startup/bspstart.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/c/src/lib/libbsp/arm/imx/console/console-config.c b/c/src/lib/libbsp/arm/imx/console/console-config.c index a5b3682dd7..c9654685ab 100644 --- a/c/src/lib/libbsp/arm/imx/console/console-config.c +++ b/c/src/lib/libbsp/arm/imx/console/console-config.c @@ -86,7 +86,9 @@ static void imx_uart_init_context( #ifdef CONSOLE_USE_INTERRUPTS val = fdt_getprop(fdt, node, "interrupts", &len); if (val != NULL && len >= 8) { - ctx->irq = bsp_fdt_map_intr(fdt32_to_cpu(val[1])); + uint32_t cpu_val[2]; + cpu_val[1] = fdt32_to_cpu(val[1]); + ctx->irq = bsp_fdt_map_intr(cpu_val, 2); } #endif } diff --git a/c/src/lib/libbsp/arm/imx/startup/bspstart.c b/c/src/lib/libbsp/arm/imx/startup/bspstart.c index eb2ba29a3e..e28fe2bc48 100644 --- a/c/src/lib/libbsp/arm/imx/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/imx/startup/bspstart.c @@ -20,9 +20,9 @@ #include <libfdt.h> -uint32_t bsp_fdt_map_intr(uint32_t intr) +uint32_t bsp_fdt_map_intr(const uint32_t *intr, size_t icells) { - return intr + 32; + return intr[1] + 32; } void arm_generic_timer_get_config( |