From 9e4f77a3b777f1025671204a46b1279130e1c8cc Mon Sep 17 00:00:00 2001 From: gdisirio Date: Wed, 28 Nov 2012 10:14:50 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4841 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- boards/GENERIC_SPC560B/board.c | 70 ---------------------------------------- boards/GENERIC_SPC560B/board.h | 66 ------------------------------------- boards/GENERIC_SPC560B/board.mk | 5 --- boards/GENERIC_SPC560BC/board.c | 70 ++++++++++++++++++++++++++++++++++++++++ boards/GENERIC_SPC560BC/board.h | 66 +++++++++++++++++++++++++++++++++++++ boards/GENERIC_SPC560BC/board.mk | 5 +++ demos/PPC-SPC560B-GCC/Makefile | 2 +- 7 files changed, 142 insertions(+), 142 deletions(-) delete mode 100644 boards/GENERIC_SPC560B/board.c delete mode 100644 boards/GENERIC_SPC560B/board.h delete mode 100644 boards/GENERIC_SPC560B/board.mk create mode 100644 boards/GENERIC_SPC560BC/board.c create mode 100644 boards/GENERIC_SPC560BC/board.h create mode 100644 boards/GENERIC_SPC560BC/board.mk diff --git a/boards/GENERIC_SPC560B/board.c b/boards/GENERIC_SPC560B/board.c deleted file mode 100644 index 0830128b3..000000000 --- a/boards/GENERIC_SPC560B/board.c +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Licensed under ST Liberty SW License Agreement V2, (the "License"); - * You may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.st.com/software_license_agreement_liberty_v2 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "ch.h" -#include "hal.h" - -#if HAL_USE_PAL || defined(__DOXYGEN__) -/* Initial setup of all defined pads, the list is terminated by a {0, 0}.*/ -static const spc_siu_init_t spc_siu_init[] = { - {PCR(PB, PB_LIN0_TDX), PAL_HIGH, PAL_MODE_OUTPUT_ALTERNATE(1)}, - {PCR(PB, PB_LIN0_RDX), PAL_HIGH, PAL_MODE_INPUT}, - {PCR(PE, PE_BUTTON1), PAL_LOW, PAL_MODE_INPUT}, - {PCR(PE, PE_BUTTON2), PAL_LOW, PAL_MODE_INPUT}, - {PCR(PE, PE_BUTTON3), PAL_LOW, PAL_MODE_INPUT}, - {PCR(PE, PE_BUTTON4), PAL_LOW, PAL_MODE_INPUT}, - {PCR(PE, PE_LED1), PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL}, - {PCR(PE, PE_LED2), PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL}, - {PCR(PE, PE_LED3), PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL}, - {PCR(PE, PE_LED4), PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL}, - {0, 0, 0} -}; - -/* Initialization array for the PSMI registers.*/ -static const uint8_t spc_padsels_init[SPC5_SIU_NUM_PADSELS] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -}; - -/** - * @brief PAL setup. - */ -const PALConfig pal_default_config = { - PAL_MODE_UNCONNECTED, /* Default mode for all undefined pads. */ - spc_siu_init, - spc_padsels_init -}; -#endif - -/* - * Early initialization code. - * This initialization must be performed just after stack setup and before - * any other initialization. - */ -void __early_init(void) { - - spc_clock_init(); - - /* SWT disabled.*/ - SWT.SR.R = 0xC520; - SWT.SR.R = 0xD928; - SWT.CR.R = 0xFF00000A; -} - -/* - * Board-specific initialization code. - */ -void boardInit(void) { - -} diff --git a/boards/GENERIC_SPC560B/board.h b/boards/GENERIC_SPC560B/board.h deleted file mode 100644 index 3fd7bc8c0..000000000 --- a/boards/GENERIC_SPC560B/board.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Licensed under ST Liberty SW License Agreement V2, (the "License"); - * You may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.st.com/software_license_agreement_liberty_v2 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef _BOARD_H_ -#define _BOARD_H_ - -/* - * Setup for a generic SPC560B/Cxx proto board. - */ - -/* - * Board identifiers. - */ -#define BOARD_GENERIC_SPC560BC -#define BOARD_NAME "Generic SPC560B/C" - -/* - * Board frequencies. - */ -#if !defined(SPC5_XOSC_CLK) -#define SPC5_XOSC_CLK 8000000 -#endif - -/* - * I/O definitions. - */ -#define PB_LIN0_TDX 2 -#define PB_LIN0_RDX 3 - -#define PE_BUTTON1 0 -#define PE_BUTTON2 1 -#define PE_BUTTON3 2 -#define PE_BUTTON4 3 - -#define PE_LED1 4 -#define PE_LED2 5 -#define PE_LED3 6 -#define PE_LED4 7 - -/* - * Support macros. - */ -#define PCR(port, pin) (((port) * 16) + (pin)) - -#if !defined(_FROM_ASM_) -#ifdef __cplusplus -extern "C" { -#endif - void boardInit(void); -#ifdef __cplusplus -} -#endif -#endif /* _FROM_ASM_ */ - -#endif /* _BOARD_H_ */ diff --git a/boards/GENERIC_SPC560B/board.mk b/boards/GENERIC_SPC560B/board.mk deleted file mode 100644 index 26a9dc606..000000000 --- a/boards/GENERIC_SPC560B/board.mk +++ /dev/null @@ -1,5 +0,0 @@ -# List of all the board related files. -BOARDSRC = ${CHIBIOS}/boards/GENERIC_SPC560B/board.c - -# Required include directories -BOARDINC = ${CHIBIOS}/boards/GENERIC_SPC560B diff --git a/boards/GENERIC_SPC560BC/board.c b/boards/GENERIC_SPC560BC/board.c new file mode 100644 index 000000000..0830128b3 --- /dev/null +++ b/boards/GENERIC_SPC560BC/board.c @@ -0,0 +1,70 @@ +/* + * Licensed under ST Liberty SW License Agreement V2, (the "License"); + * You may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.st.com/software_license_agreement_liberty_v2 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "ch.h" +#include "hal.h" + +#if HAL_USE_PAL || defined(__DOXYGEN__) +/* Initial setup of all defined pads, the list is terminated by a {0, 0}.*/ +static const spc_siu_init_t spc_siu_init[] = { + {PCR(PB, PB_LIN0_TDX), PAL_HIGH, PAL_MODE_OUTPUT_ALTERNATE(1)}, + {PCR(PB, PB_LIN0_RDX), PAL_HIGH, PAL_MODE_INPUT}, + {PCR(PE, PE_BUTTON1), PAL_LOW, PAL_MODE_INPUT}, + {PCR(PE, PE_BUTTON2), PAL_LOW, PAL_MODE_INPUT}, + {PCR(PE, PE_BUTTON3), PAL_LOW, PAL_MODE_INPUT}, + {PCR(PE, PE_BUTTON4), PAL_LOW, PAL_MODE_INPUT}, + {PCR(PE, PE_LED1), PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL}, + {PCR(PE, PE_LED2), PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL}, + {PCR(PE, PE_LED3), PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL}, + {PCR(PE, PE_LED4), PAL_HIGH, PAL_MODE_OUTPUT_PUSHPULL}, + {0, 0, 0} +}; + +/* Initialization array for the PSMI registers.*/ +static const uint8_t spc_padsels_init[SPC5_SIU_NUM_PADSELS] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +}; + +/** + * @brief PAL setup. + */ +const PALConfig pal_default_config = { + PAL_MODE_UNCONNECTED, /* Default mode for all undefined pads. */ + spc_siu_init, + spc_padsels_init +}; +#endif + +/* + * Early initialization code. + * This initialization must be performed just after stack setup and before + * any other initialization. + */ +void __early_init(void) { + + spc_clock_init(); + + /* SWT disabled.*/ + SWT.SR.R = 0xC520; + SWT.SR.R = 0xD928; + SWT.CR.R = 0xFF00000A; +} + +/* + * Board-specific initialization code. + */ +void boardInit(void) { + +} diff --git a/boards/GENERIC_SPC560BC/board.h b/boards/GENERIC_SPC560BC/board.h new file mode 100644 index 000000000..3fd7bc8c0 --- /dev/null +++ b/boards/GENERIC_SPC560BC/board.h @@ -0,0 +1,66 @@ +/* + * Licensed under ST Liberty SW License Agreement V2, (the "License"); + * You may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.st.com/software_license_agreement_liberty_v2 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef _BOARD_H_ +#define _BOARD_H_ + +/* + * Setup for a generic SPC560B/Cxx proto board. + */ + +/* + * Board identifiers. + */ +#define BOARD_GENERIC_SPC560BC +#define BOARD_NAME "Generic SPC560B/C" + +/* + * Board frequencies. + */ +#if !defined(SPC5_XOSC_CLK) +#define SPC5_XOSC_CLK 8000000 +#endif + +/* + * I/O definitions. + */ +#define PB_LIN0_TDX 2 +#define PB_LIN0_RDX 3 + +#define PE_BUTTON1 0 +#define PE_BUTTON2 1 +#define PE_BUTTON3 2 +#define PE_BUTTON4 3 + +#define PE_LED1 4 +#define PE_LED2 5 +#define PE_LED3 6 +#define PE_LED4 7 + +/* + * Support macros. + */ +#define PCR(port, pin) (((port) * 16) + (pin)) + +#if !defined(_FROM_ASM_) +#ifdef __cplusplus +extern "C" { +#endif + void boardInit(void); +#ifdef __cplusplus +} +#endif +#endif /* _FROM_ASM_ */ + +#endif /* _BOARD_H_ */ diff --git a/boards/GENERIC_SPC560BC/board.mk b/boards/GENERIC_SPC560BC/board.mk new file mode 100644 index 000000000..26a9dc606 --- /dev/null +++ b/boards/GENERIC_SPC560BC/board.mk @@ -0,0 +1,5 @@ +# List of all the board related files. +BOARDSRC = ${CHIBIOS}/boards/GENERIC_SPC560B/board.c + +# Required include directories +BOARDINC = ${CHIBIOS}/boards/GENERIC_SPC560B diff --git a/demos/PPC-SPC560B-GCC/Makefile b/demos/PPC-SPC560B-GCC/Makefile index 8e942f03e..ae63962f4 100644 --- a/demos/PPC-SPC560B-GCC/Makefile +++ b/demos/PPC-SPC560B-GCC/Makefile @@ -46,7 +46,7 @@ PROJECT = ch # Imported source files CHIBIOS = ../.. -include $(CHIBIOS)/boards/GENERIC_SPC560B/board.mk +include $(CHIBIOS)/boards/GENERIC_SPC560BC/board.mk include $(CHIBIOS)/os/hal/platforms/SPC560BCxx/platform.mk include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/ports/GCC/PPC/SPC560BCxx/port.mk -- cgit v1.2.3