diff options
Diffstat (limited to 'bsps/arm/beagle')
-rw-r--r-- | bsps/arm/beagle/clock/clock.c | 2 | ||||
-rw-r--r-- | bsps/arm/beagle/include/bsp.h | 10 | ||||
-rw-r--r-- | bsps/arm/beagle/irq/irq.c | 2 | ||||
-rw-r--r-- | bsps/arm/beagle/pwmss/pwmss.c | 10 | ||||
-rw-r--r-- | bsps/arm/beagle/start/bspstart.c | 4 | ||||
-rw-r--r-- | bsps/arm/beagle/start/bspstarthooks.c | 6 | ||||
-rw-r--r-- | bsps/arm/beagle/start/bspstartmmu.c | 2 |
7 files changed, 14 insertions, 22 deletions
diff --git a/bsps/arm/beagle/clock/clock.c b/bsps/arm/beagle/clock/clock.c index d42b051c98..a32dde86bf 100644 --- a/bsps/arm/beagle/clock/clock.c +++ b/bsps/arm/beagle/clock/clock.c @@ -290,7 +290,7 @@ static void beagle_clock_handler_install(rtems_interrupt_handler isr) clock_isr = isr; } -#define Clock_driver_support_at_tick() beagle_clock_at_tick() +#define Clock_driver_support_at_tick(arg) beagle_clock_at_tick() #define Clock_driver_support_initialize_hardware() beagle_clock_initialize() #define Clock_driver_support_install_isr(isr) \ beagle_clock_handler_install(isr) diff --git a/bsps/arm/beagle/include/bsp.h b/bsps/arm/beagle/include/bsp.h index 58c7a8850a..a5c9bc0459 100644 --- a/bsps/arm/beagle/include/bsp.h +++ b/bsps/arm/beagle/include/bsp.h @@ -350,16 +350,6 @@ static inline void write_ttbr0(uint32_t bar) refresh_tlb(); } -/* Behaviour on fatal error; default: test-friendly. - * set breakpoint to bsp_fatal_extension. - */ -/* Enabling BSP_PRESS_KEY_FOR_RESET prevents noninteractive testing */ -/*#define BSP_PRESS_KEY_FOR_RESET 1 */ -#define BSP_PRINT_EXCEPTION_CONTEXT 1 - /* human-readable exception info */ -#define BSP_RESET_BOARD_AT_EXIT 1 - /* causes qemu to exit, signaling end of test */ - /** * @brief Beagleboard specific set up of the MMU. * diff --git a/bsps/arm/beagle/irq/irq.c b/bsps/arm/beagle/irq/irq.c index 29a4e391e8..0ae82aa95e 100644 --- a/bsps/arm/beagle/irq/irq.c +++ b/bsps/arm/beagle/irq/irq.c @@ -1,7 +1,7 @@ /** * @file * - * @ingroup bsp_interrupt + * @ingroup RTEMSImplClassicIntr * @ingroup arm_beagle * * @brief Interrupt support. diff --git a/bsps/arm/beagle/pwmss/pwmss.c b/bsps/arm/beagle/pwmss/pwmss.c index 0fde3db5a9..f3aaf8fc3f 100644 --- a/bsps/arm/beagle/pwmss/pwmss.c +++ b/bsps/arm/beagle/pwmss/pwmss.c @@ -38,7 +38,7 @@ #include <bsp.h> #include <bsp/pwmss.h> #include <bsp/beagleboneblack.h> - +#include <rtems/error.h> /** * @brief This function configures the L3 and L4_PER system clocks. @@ -56,7 +56,10 @@ */ rtems_status_code pwmss_module_clk_config(BBB_PWMSS pwmss_id) { - uint32_t clkctrl; + /* we initialize clkctrl here to nonsentical value as this is going + * to be assigned later anyway. Here assigning 0 is just to kill + * warning emitted by the C compiler. */ + uint32_t clkctrl = 0; /* calculate the address of the clock control register for the PWMSS * module we are configuring */ @@ -66,6 +69,9 @@ rtems_status_code pwmss_module_clk_config(BBB_PWMSS pwmss_id) clkctrl = AM335X_CM_PER_ADDR + AM335X_CM_PER_EPWMSS1_CLKCTRL; } else if(pwmss_id == BBB_PWMSS2) { clkctrl = AM335X_CM_PER_ADDR + AM335X_CM_PER_EPWMSS2_CLKCTRL; + } else { + /* wrong clock configuration, let's panic here. */ + rtems_error(RTEMS_ERROR_PANIC, "beagle: unsupported pwmss module clock configuration value!"); } /* when the module is functional the IDLEST bits (16 -17) of the diff --git a/bsps/arm/beagle/start/bspstart.c b/bsps/arm/beagle/start/bspstart.c index 83138f29dd..9dba40daee 100644 --- a/bsps/arm/beagle/start/bspstart.c +++ b/bsps/arm/beagle/start/bspstart.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-2-Clause */ /* - * Copyright (c) 2013 embedded brains GmbH. All rights reserved. + * Copyright (c) 2013 embedded brains GmbH & Co. KG * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -121,7 +121,7 @@ int beagle_get_node_unit(phandle_t node) if (strstr(prop_val, name) != NULL) { for (i = strlen(prop) - 1; i >= 0; i--) { - if (!isdigit(prop[i])) + if (!isdigit((int)prop[i])) break; } diff --git a/bsps/arm/beagle/start/bspstarthooks.c b/bsps/arm/beagle/start/bspstarthooks.c index 3291c698b7..69d5256f52 100644 --- a/bsps/arm/beagle/start/bspstarthooks.c +++ b/bsps/arm/beagle/start/bspstarthooks.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-2-Clause */ /* - * Copyright (c) 2013 embedded brains GmbH. All rights reserved. + * Copyright (c) 2013 embedded brains GmbH & Co. KG * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -29,10 +29,6 @@ #include <bsp/start.h> #include <bsp/arm-cp15-start.h> -BSP_START_TEXT_SECTION void bsp_start_hook_0(void) -{ -} - BSP_START_TEXT_SECTION void bsp_start_hook_1(void) { bsp_start_copy_sections(); diff --git a/bsps/arm/beagle/start/bspstartmmu.c b/bsps/arm/beagle/start/bspstartmmu.c index 478eb8c26b..6a7c9366ca 100644 --- a/bsps/arm/beagle/start/bspstartmmu.c +++ b/bsps/arm/beagle/start/bspstartmmu.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 embedded brains GmbH. All rights reserved. + * Copyright (c) 2013 embedded brains GmbH & Co. KG * * Copyright (c) 2014 Chris Johns. All rights reserved. * |