diff options
-rw-r--r-- | c/src/lib/libbsp/powerpc/gen5200/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/gen5200/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/gen5200/startup/bspidle.c | 38 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/gen83xx/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/gen83xx/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/gen83xx/startup/bspidle.c | 48 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspidle.c | 41 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am | 7 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/tqm8xx/startup/bspidle.c | 51 |
12 files changed, 31 insertions, 184 deletions
diff --git a/c/src/lib/libbsp/powerpc/gen5200/ChangeLog b/c/src/lib/libbsp/powerpc/gen5200/ChangeLog index bf0d8b6cc3..5c5971e505 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/ChangeLog +++ b/c/src/lib/libbsp/powerpc/gen5200/ChangeLog @@ -1,3 +1,9 @@ +2009-09-09 Joel Sherrill <joel.sherrill@oarcorp.com> + + PR 1435/bsps + * Makefile.am: Use shared implementation of bsp_idle_thread(). + * startup/bspidle.c: Removed. + 2009-08-26 Joel Sherrill <joel.sherrill@oarcorp.com> * Makefile.am, startup/bspstart.c: Rename BSP specific idle thread to diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am index ef777ef624..6619c9d9da 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am @@ -116,7 +116,7 @@ libbsp_a_SOURCES += ../../shared/bootcard.c \ ../../shared/bspclean.c \ startup/bspreset.c \ ../../shared/bspgetworkarea.c \ - startup/bspidle.c \ + ../shared/startup/bspidle.c \ startup/bspstart.c \ startup/cpuinit.c \ startup/uboot_support.c diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/bspidle.c b/c/src/lib/libbsp/powerpc/gen5200/startup/bspidle.c deleted file mode 100644 index ad83c94d2e..0000000000 --- a/c/src/lib/libbsp/powerpc/gen5200/startup/bspidle.c +++ /dev/null @@ -1,38 +0,0 @@ -/*===============================================================*\ -| Project: RTEMS generic MPC5200 BSP | -+-----------------------------------------------------------------+ -| Partially based on the code references which are named below. | -| Adaptions, modifications, enhancements and any recent parts of | -| the code are: | -| Copyright (c) 2005 | -| Embedded Brains GmbH | -| Obere Lagerstr. 30 | -| D-82178 Puchheim | -| Germany | -| rtems@embedded-brains.de | -+-----------------------------------------------------------------+ -| The license and distribution terms for this file may be | -| found in the file LICENSE in this distribution or at | -| | -| http://www.rtems.com/license/LICENSE. | -| | -+-----------------------------------------------------------------+ -| this file contains the BSP initialization code | -\*===============================================================*/ - -#include <rtems.h> -/* - * bsp_idle_thread - * - * The MSR[POW] bit is set to put the CPU into the low power mode - * defined in HID0. HID0 is set during starup in start.S. - */ -void *bsp_idle_thread( uintptr_t ignored ) -{ - for(;;) { - asm volatile( - "mfmsr 3; oris 3,3,4; sync; mtmsr 3; isync; ori 3,3,0; ori 3,3,0" - ); - } - return 0; -} diff --git a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog index 7caff43450..8a72cc15b5 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog +++ b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog @@ -1,3 +1,9 @@ +2009-09-09 Joel Sherrill <joel.sherrill@oarcorp.com> + + PR 1435/bsps + * Makefile.am: Use shared implementation of bsp_idle_thread(). + * startup/bspidle.c: Removed. + 2009-08-26 Joel Sherrill <joel.sherrill@oarcorp.com> * Makefile.am, startup/bspstart.c: Rename BSP specific idle thread to diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am index e78fae24b9..c307d70604 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am @@ -52,7 +52,7 @@ libbsp_a_SOURCES += ../../shared/bsplibc.c \ ../../shared/gnatinstallhandler.c \ ../shared/src/tictac.c \ startup/cpuinit.c \ - startup/bspidle.c \ + ../shared/startup/bspidle.c \ startup/bspstart.c \ ../../shared/bspclean.c \ startup/bspreset.c \ diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/bspidle.c b/c/src/lib/libbsp/powerpc/gen83xx/startup/bspidle.c deleted file mode 100644 index 541fa6cae5..0000000000 --- a/c/src/lib/libbsp/powerpc/gen83xx/startup/bspidle.c +++ /dev/null @@ -1,48 +0,0 @@ -/** - * @file - * - * @ingroup mpc83xx - * - * @brief Source for BSP Idle Thread - */ - -/* - * Copyright (c) 2008 - * Embedded Brains GmbH - * Obere Lagerstr. 30 - * D-82178 Puchheim - * Germany - * rtems@embedded-brains.de - * - * The license and distribution terms for this file may be found in the file - * LICENSE in this distribution or at http://www.rtems.com/license/LICENSE. - * - * $Id$ - */ - -#include <bsp.h> - -/** - * @brief Idle thread body. - * - * Replaces the one in c/src/exec/score/src/threadidlebody.c - * The MSR[POW] bit is set to put the CPU into the low power mode - * defined in HID0. HID0 is set during starup in start.S. - */ -void *bsp_idle_thread( uintptr_t ignored ) -{ - - while (1) { - asm volatile ( - "mfmsr 3;" - "oris 3, 3, 4;" - "sync;" - "mtmsr 3;" - "isync;" - "ori 3, 3, 0;" - "ori 3, 3, 0" - ); - } - - return NULL; -} diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog b/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog index c52953ae1f..75f051bec2 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog @@ -1,3 +1,9 @@ +2009-09-09 Joel Sherrill <joel.sherrill@oarcorp.com> + + PR 1435/bsps + * Makefile.am: Use shared implementation of bsp_idle_thread(). + * startup/bspidle.c: Removed. + 2009-08-26 Joel Sherrill <joel.sherrill@oarcorp.com> * Makefile.am, startup/bspstart.c: Rename BSP specific idle thread to diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am index e777aadb4f..ea9fad3b8b 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am @@ -45,7 +45,7 @@ include_bsp_HEADERS = include/mpc55xxevb.h \ # startup libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../shared/bootcard.c ../shared/src/tictac.c ../../shared/bspclean.c \ - startup/bspidle.c startup/bspstart.c startup/bspgetworkarea.c \ + ../shared/startup/bspidle.c startup/bspstart.c startup/bspgetworkarea.c \ ../../shared/bsppretaskinghook.c # clock diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspidle.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspidle.c deleted file mode 100644 index 70dce97b67..0000000000 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspidle.c +++ /dev/null @@ -1,41 +0,0 @@ -/** - * @file - * - * @ingroup mpc55xx - * - * @brief BSP Idle Thread Code - */ - -/* - * Copyright (c) 2008 - * Embedded Brains GmbH - * Obere Lagerstr. 30 - * D-82178 Puchheim - * Germany - * rtems@embedded-brains.de - * - * The license and distribution terms for this file may be found in the file - * LICENSE in this distribution or at http://www.rtems.com/license/LICENSE. - */ - -#include <bsp.h> - -/** - * @brief Idle thread body. - */ -void *bsp_idle_thread( uintptr_t ignored ) -{ - - while (1) { - asm volatile( - "mfmsr 3;" - "oris 3,3,4;" - "sync;" - "mtmsr 3;" - "isync;" - "ori 3,3,0;" - "ori 3,3,0" - ); - } - return 0; -} diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog b/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog index 97449c9a32..82e881a677 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog +++ b/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog @@ -1,3 +1,9 @@ +2009-09-09 Joel Sherrill <joel.sherrill@oarcorp.com> + + PR 1435/bsps + * Makefile.am: Use shared implementation of bsp_idle_thread(). + * startup/bspidle.c: Removed. + 2009-08-26 Joel Sherrill <joel.sherrill@oarcorp.com> * Makefile.am, startup/bspstart.c: Rename BSP specific idle thread to diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am index ead7ee2d51..8246d0ae62 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am +++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am @@ -58,9 +58,10 @@ libbsp_a_SOURCES += timer/timer.c # startup libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c ../../shared/bsppredriverhook.c \ - ../../shared/bsppretaskinghook.c startup/bspidle.c startup/bspstart.c \ - startup/bspgetworkarea.c ../../shared/bootcard.c startup/mmutlbtab.c \ - startup/cpuinit.c ../../shared/sbrk.c ../../shared/gnatinstallhandler.c + ../../shared/bsppretaskinghook.c ../shared/startup/bspidle.c \ + startup/bspstart.c startup/bspgetworkarea.c ../../shared/bootcard.c \ + startup/mmutlbtab.c startup/cpuinit.c ../../shared/sbrk.c \ + ../../shared/gnatinstallhandler.c if HAS_NETWORKING network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/startup/bspidle.c b/c/src/lib/libbsp/powerpc/tqm8xx/startup/bspidle.c deleted file mode 100644 index 29a2f0a8d8..0000000000 --- a/c/src/lib/libbsp/powerpc/tqm8xx/startup/bspidle.c +++ /dev/null @@ -1,51 +0,0 @@ -/** - * @file - * - * @ingroup tqm8xx - * - * @brief Source for BSP Idle Thread - */ - -/* - * Copyright (c) 2008 - * Embedded Brains GmbH - * Obere Lagerstr. 30 - * D-82178 Puchheim - * Germany - * rtems@embedded-brains.de - * - * The license and distribution terms for this file may be found in the file - * LICENSE in this distribution or at http://www.rtems.com/license/LICENSE. - * - * $Id$ - */ - -#include <rtems.h> -#include <libcpu/powerpc-utility.h> - -#include <bsp.h> - -/** - * @brief BSP Idle thread body. - * - * Replaces the one in c/src/exec/score/src/threadidlebody.c - * The MSR[POW] bit is set to put the CPU into the low power mode - * defined in HID0. HID0 is set during starup in start.S. - */ -void *bsp_idle_thread( uintptr_t ignored ) -{ - - while (1) { - asm volatile ( - "mfmsr 3;" - "oris 3, 3, 4;" - "sync;" - "mtmsr 3;" - "isync;" - "ori 3, 3, 0;" - "ori 3, 3, 0" - ); - } - - return NULL; -} |