From 495605c4e28fe4a5cf973d6dbb935cb996fcf5d7 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Tue, 5 Feb 2013 11:19:19 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5114 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/ports/GCC/PPC/SPC56ELxx/hwconf.s | 210 +++++++++++++++++++++++++++++++++++ os/ports/GCC/PPC/SPC56ELxx/mmuconf.s | 210 ----------------------------------- os/ports/GCC/PPC/SPC56ELxx/port.mk | 2 +- 3 files changed, 211 insertions(+), 211 deletions(-) create mode 100644 os/ports/GCC/PPC/SPC56ELxx/hwconf.s delete mode 100644 os/ports/GCC/PPC/SPC56ELxx/mmuconf.s diff --git a/os/ports/GCC/PPC/SPC56ELxx/hwconf.s b/os/ports/GCC/PPC/SPC56ELxx/hwconf.s new file mode 100644 index 000000000..3d903e15e --- /dev/null +++ b/os/ports/GCC/PPC/SPC56ELxx/hwconf.s @@ -0,0 +1,210 @@ +/* + ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010, + 2011,2012,2013 Giovanni Di Sirio. + + This file is part of ChibiOS/RT. + + ChibiOS/RT is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + ChibiOS/RT is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +/** + * @file SPC56ELxx/mmuconf.s + * @brief SPC56ELxx MMU initial configuration. + * + * @addtogroup PPC_CORE + * @{ + */ + +/** + * @name MASx registers definitions. + * @{ + */ +#define MAS0_TBLMAS_TBL 0x10000000 +#define MAS0_ESEL_MASK 0x000F0000 +#define MAS0_ESEL(n) ((n) << 16) + +#define MAS1_VALID 0x80000000 +#define MAS1_IPROT 0x40000000 +#define MAS1_TID_MASK 0x00FF0000 +#define MAS1_TS 0x00001000 +#define MAS1_TSISE_MASK 0x00000F80 +#define MAS1_TSISE_1K 0x00000000 +#define MAS1_TSISE_2K 0x00000080 +#define MAS1_TSISE_4K 0x00000100 +#define MAS1_TSISE_8K 0x00000180 +#define MAS1_TSISE_16K 0x00000200 +#define MAS1_TSISE_32K 0x00000280 +#define MAS1_TSISE_64K 0x00000300 +#define MAS1_TSISE_128K 0x00000380 +#define MAS1_TSISE_256K 0x00000400 +#define MAS1_TSISE_512K 0x00000480 +#define MAS1_TSISE_1M 0x00000500 +#define MAS1_TSISE_2M 0x00000580 +#define MAS1_TSISE_4M 0x00000600 +#define MAS1_TSISE_8M 0x00000680 +#define MAS1_TSISE_16M 0x00000700 +#define MAS1_TSISE_32M 0x00000780 +#define MAS1_TSISE_64M 0x00000800 +#define MAS1_TSISE_128M 0x00000880 +#define MAS1_TSISE_256M 0x00000900 +#define MAS1_TSISE_512M 0x00000980 +#define MAS1_TSISE_1G 0x00000A00 +#define MAS1_TSISE_2G 0x00000A80 +#define MAS1_TSISE_4G 0x00000B00 + +#define MAS2_EPN_MASK 0xFFFFFC00 +#define MAS2_EPN(n) ((n) & MAS2_EPN_MASK) +#define MAS2_EBOOK 0x00000000 +#define MAS2_VLE 0x00000020 +#define MAS2_W 0x00000010 +#define MAS2_I 0x00000008 +#define MAS2_M 0x00000004 +#define MAS2_G 0x00000002 +#define MAS2_E 0x00000001 + +#define MAS3_RPN_MASK 0xFFFFFC00 +#define MAS3_RPN(n) ((n) & MAS3_RPN_MASK) +#define MAS3_U0 0x00000200 +#define MAS3_U1 0x00000100 +#define MAS3_U2 0x00000080 +#define MAS3_U3 0x00000040 +#define MAS3_UX 0x00000020 +#define MAS3_SX 0x00000010 +#define MAS3_UW 0x00000008 +#define MAS3_SW 0x00000004 +#define MAS3_UR 0x00000002 +#define MAS3_SR 0x00000001 +/** @} */ + +/** + * @name TLB default settings + * @{ + */ +#define TLB0_MAS0 (MAS0_TBLMAS_TBL | MAS0_ESEL(0)) +#define TLB0_MAS1 (MAS1_VALID | MAS1_IPROT | MAS1_TSISE_2M) +#define TLB0_MAS2 (MAS2_EPN(0x00000000) | MAS2_VLE) +#define TLB0_MAS3 (MAS3_RPN(0x00000000) | \ + MAS3_UX | MAS3_SX | MAS3_UW | MAS3_SW | \ + MAS3_UR | MAS3_SR) + +#define TLB1_MAS0 (MAS0_TBLMAS_TBL | MAS0_ESEL(1)) +#define TLB1_MAS1 (MAS1_VALID | MAS1_IPROT | MAS1_TSISE_16M) +#define TLB1_MAS2 (MAS2_EPN(0x20000000) | MAS2_VLE) +#define TLB1_MAS3 (MAS3_RPN(0x20000000) | \ + MAS3_UX | MAS3_SX | MAS3_UW | MAS3_SW | \ + MAS3_UR | MAS3_SR) + +#define TLB2_MAS0 (MAS0_TBLMAS_TBL | MAS0_ESEL(2)) +#define TLB2_MAS1 (MAS1_VALID | MAS1_IPROT | MAS1_TSISE_128K) +#define TLB2_MAS2 (MAS2_EPN(0x40000000) | MAS2_VLE | MAS2_I) +#define TLB2_MAS3 (MAS3_RPN(0x40000000) | \ + MAS3_UX | MAS3_SX | MAS3_UW | MAS3_SW | \ + MAS3_UR | MAS3_SR) + +#define TLB3_MAS0 (MAS0_TBLMAS_TBL | MAS0_ESEL(3)) +#define TLB3_MAS1 (MAS1_VALID | MAS1_IPROT | MAS1_TSISE_1M) +#define TLB3_MAS2 (MAS2_EPN(0xC3F00000) | MAS2_I) +#define TLB3_MAS3 (MAS3_RPN(0xC3F00000) | \ + MAS3_UW | MAS3_SW | MAS3_UR | MAS3_SR) + +#define TLB4_MAS0 (MAS0_TBLMAS_TBL | MAS0_ESEL(4)) +#define TLB4_MAS1 (MAS1_VALID | MAS1_IPROT | MAS1_TSISE_2M) +#define TLB4_MAS2 (MAS2_EPN(0xFFE00000) | MAS2_I) +#define TLB4_MAS3 (MAS3_RPN(0xFFE00000) | \ + MAS3_UW | MAS3_SW | MAS3_UR | MAS3_SR) +/** @} */ + +#if !defined(__DOXYGEN__) + + .section .hwinit, "ax" + + .align 2 + .globl _mmuconf + .type _mmuconf, @function +_mmuconf: + /* TLB0 allocated to flash.*/ + e_lis r3, TLB0_MAS0@h + mtspr 624, r3 /* MAS0 */ + e_lis r3, TLB0_MAS1@h + e_or2i r3, TLB0_MAS1@l + mtspr 625, r3 /* MAS1 */ + e_lis r3, TLB0_MAS2@h + e_or2i r3, TLB0_MAS2@l + mtspr 626, r3 /* MAS2 */ + e_lis r3, TLB0_MAS3@h + e_or2i r3, TLB0_MAS3@l + mtspr 627, r3 /* MAS3 */ + tlbwe + + /* TLB1 allocated to external RAM, if any.*/ + e_lis r3, TLB1_MAS0@h + mtspr 624, r3 /* MAS0 */ + e_lis r3, TLB1_MAS1@h + e_or2i r3, TLB1_MAS1@l + mtspr 625, r3 /* MAS1 */ + e_lis r3, TLB1_MAS2@h + e_or2i r3, TLB1_MAS2@l + mtspr 626, r3 /* MAS2 */ + e_lis r3, TLB1_MAS3@h + e_or2i r3, TLB1_MAS3@l + mtspr 627, r3 /* MAS3 */ + tlbwe + + /* TLB2 allocated to internal RAM.*/ + e_lis r3, TLB2_MAS0@h + mtspr 624, r3 /* MAS0 */ + e_lis r3, TLB2_MAS1@h + e_or2i r3, TLB2_MAS1@l + mtspr 625, r3 /* MAS1 */ + e_lis r3, TLB2_MAS2@h + e_or2i r3, TLB2_MAS2@l + mtspr 626, r3 /* MAS2 */ + e_lis r3, TLB2_MAS3@h + e_or2i r3, TLB2_MAS3@l + mtspr 627, r3 /* MAS3 */ + tlbwe + + /* TLB3 allocated to internal Peripherals Bridge A.*/ + e_lis r3, TLB3_MAS0@h + mtspr 624, r3 /* MAS0 */ + e_lis r3, TLB3_MAS1@h + e_or2i r3, TLB3_MAS1@l + mtspr 625, r3 /* MAS1 */ + e_lis r3, TLB3_MAS2@h + e_or2i r3, TLB3_MAS2@l + mtspr 626, r3 /* MAS2 */ + e_lis r3, TLB3_MAS3@h + e_or2i r3, TLB3_MAS3@l + mtspr 627, r3 /* MAS3 */ + tlbwe + + /* TLB4 allocated to internal Peripherals Bridge B.*/ + e_lis r3, TLB4_MAS0@h + mtspr 624, r3 /* MAS0 */ + e_lis r3, TLB4_MAS1@h + e_or2i r3, TLB4_MAS1@l + mtspr 625, r3 /* MAS1 */ + e_lis r3, TLB4_MAS2@h + e_or2i r3, TLB4_MAS2@l + mtspr 626, r3 /* MAS2 */ + e_lis r3, TLB4_MAS3@h + e_or2i r3, TLB4_MAS3@l + mtspr 627, r3 /* MAS3 */ + tlbwe + + blr + +#endif /* !defined(__DOXYGEN__) */ + +/** @} */ diff --git a/os/ports/GCC/PPC/SPC56ELxx/mmuconf.s b/os/ports/GCC/PPC/SPC56ELxx/mmuconf.s deleted file mode 100644 index 3d903e15e..000000000 --- a/os/ports/GCC/PPC/SPC56ELxx/mmuconf.s +++ /dev/null @@ -1,210 +0,0 @@ -/* - ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010, - 2011,2012,2013 Giovanni Di Sirio. - - This file is part of ChibiOS/RT. - - ChibiOS/RT is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - ChibiOS/RT is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -/** - * @file SPC56ELxx/mmuconf.s - * @brief SPC56ELxx MMU initial configuration. - * - * @addtogroup PPC_CORE - * @{ - */ - -/** - * @name MASx registers definitions. - * @{ - */ -#define MAS0_TBLMAS_TBL 0x10000000 -#define MAS0_ESEL_MASK 0x000F0000 -#define MAS0_ESEL(n) ((n) << 16) - -#define MAS1_VALID 0x80000000 -#define MAS1_IPROT 0x40000000 -#define MAS1_TID_MASK 0x00FF0000 -#define MAS1_TS 0x00001000 -#define MAS1_TSISE_MASK 0x00000F80 -#define MAS1_TSISE_1K 0x00000000 -#define MAS1_TSISE_2K 0x00000080 -#define MAS1_TSISE_4K 0x00000100 -#define MAS1_TSISE_8K 0x00000180 -#define MAS1_TSISE_16K 0x00000200 -#define MAS1_TSISE_32K 0x00000280 -#define MAS1_TSISE_64K 0x00000300 -#define MAS1_TSISE_128K 0x00000380 -#define MAS1_TSISE_256K 0x00000400 -#define MAS1_TSISE_512K 0x00000480 -#define MAS1_TSISE_1M 0x00000500 -#define MAS1_TSISE_2M 0x00000580 -#define MAS1_TSISE_4M 0x00000600 -#define MAS1_TSISE_8M 0x00000680 -#define MAS1_TSISE_16M 0x00000700 -#define MAS1_TSISE_32M 0x00000780 -#define MAS1_TSISE_64M 0x00000800 -#define MAS1_TSISE_128M 0x00000880 -#define MAS1_TSISE_256M 0x00000900 -#define MAS1_TSISE_512M 0x00000980 -#define MAS1_TSISE_1G 0x00000A00 -#define MAS1_TSISE_2G 0x00000A80 -#define MAS1_TSISE_4G 0x00000B00 - -#define MAS2_EPN_MASK 0xFFFFFC00 -#define MAS2_EPN(n) ((n) & MAS2_EPN_MASK) -#define MAS2_EBOOK 0x00000000 -#define MAS2_VLE 0x00000020 -#define MAS2_W 0x00000010 -#define MAS2_I 0x00000008 -#define MAS2_M 0x00000004 -#define MAS2_G 0x00000002 -#define MAS2_E 0x00000001 - -#define MAS3_RPN_MASK 0xFFFFFC00 -#define MAS3_RPN(n) ((n) & MAS3_RPN_MASK) -#define MAS3_U0 0x00000200 -#define MAS3_U1 0x00000100 -#define MAS3_U2 0x00000080 -#define MAS3_U3 0x00000040 -#define MAS3_UX 0x00000020 -#define MAS3_SX 0x00000010 -#define MAS3_UW 0x00000008 -#define MAS3_SW 0x00000004 -#define MAS3_UR 0x00000002 -#define MAS3_SR 0x00000001 -/** @} */ - -/** - * @name TLB default settings - * @{ - */ -#define TLB0_MAS0 (MAS0_TBLMAS_TBL | MAS0_ESEL(0)) -#define TLB0_MAS1 (MAS1_VALID | MAS1_IPROT | MAS1_TSISE_2M) -#define TLB0_MAS2 (MAS2_EPN(0x00000000) | MAS2_VLE) -#define TLB0_MAS3 (MAS3_RPN(0x00000000) | \ - MAS3_UX | MAS3_SX | MAS3_UW | MAS3_SW | \ - MAS3_UR | MAS3_SR) - -#define TLB1_MAS0 (MAS0_TBLMAS_TBL | MAS0_ESEL(1)) -#define TLB1_MAS1 (MAS1_VALID | MAS1_IPROT | MAS1_TSISE_16M) -#define TLB1_MAS2 (MAS2_EPN(0x20000000) | MAS2_VLE) -#define TLB1_MAS3 (MAS3_RPN(0x20000000) | \ - MAS3_UX | MAS3_SX | MAS3_UW | MAS3_SW | \ - MAS3_UR | MAS3_SR) - -#define TLB2_MAS0 (MAS0_TBLMAS_TBL | MAS0_ESEL(2)) -#define TLB2_MAS1 (MAS1_VALID | MAS1_IPROT | MAS1_TSISE_128K) -#define TLB2_MAS2 (MAS2_EPN(0x40000000) | MAS2_VLE | MAS2_I) -#define TLB2_MAS3 (MAS3_RPN(0x40000000) | \ - MAS3_UX | MAS3_SX | MAS3_UW | MAS3_SW | \ - MAS3_UR | MAS3_SR) - -#define TLB3_MAS0 (MAS0_TBLMAS_TBL | MAS0_ESEL(3)) -#define TLB3_MAS1 (MAS1_VALID | MAS1_IPROT | MAS1_TSISE_1M) -#define TLB3_MAS2 (MAS2_EPN(0xC3F00000) | MAS2_I) -#define TLB3_MAS3 (MAS3_RPN(0xC3F00000) | \ - MAS3_UW | MAS3_SW | MAS3_UR | MAS3_SR) - -#define TLB4_MAS0 (MAS0_TBLMAS_TBL | MAS0_ESEL(4)) -#define TLB4_MAS1 (MAS1_VALID | MAS1_IPROT | MAS1_TSISE_2M) -#define TLB4_MAS2 (MAS2_EPN(0xFFE00000) | MAS2_I) -#define TLB4_MAS3 (MAS3_RPN(0xFFE00000) | \ - MAS3_UW | MAS3_SW | MAS3_UR | MAS3_SR) -/** @} */ - -#if !defined(__DOXYGEN__) - - .section .hwinit, "ax" - - .align 2 - .globl _mmuconf - .type _mmuconf, @function -_mmuconf: - /* TLB0 allocated to flash.*/ - e_lis r3, TLB0_MAS0@h - mtspr 624, r3 /* MAS0 */ - e_lis r3, TLB0_MAS1@h - e_or2i r3, TLB0_MAS1@l - mtspr 625, r3 /* MAS1 */ - e_lis r3, TLB0_MAS2@h - e_or2i r3, TLB0_MAS2@l - mtspr 626, r3 /* MAS2 */ - e_lis r3, TLB0_MAS3@h - e_or2i r3, TLB0_MAS3@l - mtspr 627, r3 /* MAS3 */ - tlbwe - - /* TLB1 allocated to external RAM, if any.*/ - e_lis r3, TLB1_MAS0@h - mtspr 624, r3 /* MAS0 */ - e_lis r3, TLB1_MAS1@h - e_or2i r3, TLB1_MAS1@l - mtspr 625, r3 /* MAS1 */ - e_lis r3, TLB1_MAS2@h - e_or2i r3, TLB1_MAS2@l - mtspr 626, r3 /* MAS2 */ - e_lis r3, TLB1_MAS3@h - e_or2i r3, TLB1_MAS3@l - mtspr 627, r3 /* MAS3 */ - tlbwe - - /* TLB2 allocated to internal RAM.*/ - e_lis r3, TLB2_MAS0@h - mtspr 624, r3 /* MAS0 */ - e_lis r3, TLB2_MAS1@h - e_or2i r3, TLB2_MAS1@l - mtspr 625, r3 /* MAS1 */ - e_lis r3, TLB2_MAS2@h - e_or2i r3, TLB2_MAS2@l - mtspr 626, r3 /* MAS2 */ - e_lis r3, TLB2_MAS3@h - e_or2i r3, TLB2_MAS3@l - mtspr 627, r3 /* MAS3 */ - tlbwe - - /* TLB3 allocated to internal Peripherals Bridge A.*/ - e_lis r3, TLB3_MAS0@h - mtspr 624, r3 /* MAS0 */ - e_lis r3, TLB3_MAS1@h - e_or2i r3, TLB3_MAS1@l - mtspr 625, r3 /* MAS1 */ - e_lis r3, TLB3_MAS2@h - e_or2i r3, TLB3_MAS2@l - mtspr 626, r3 /* MAS2 */ - e_lis r3, TLB3_MAS3@h - e_or2i r3, TLB3_MAS3@l - mtspr 627, r3 /* MAS3 */ - tlbwe - - /* TLB4 allocated to internal Peripherals Bridge B.*/ - e_lis r3, TLB4_MAS0@h - mtspr 624, r3 /* MAS0 */ - e_lis r3, TLB4_MAS1@h - e_or2i r3, TLB4_MAS1@l - mtspr 625, r3 /* MAS1 */ - e_lis r3, TLB4_MAS2@h - e_or2i r3, TLB4_MAS2@l - mtspr 626, r3 /* MAS2 */ - e_lis r3, TLB4_MAS3@h - e_or2i r3, TLB4_MAS3@l - mtspr 627, r3 /* MAS3 */ - tlbwe - - blr - -#endif /* !defined(__DOXYGEN__) */ - -/** @} */ diff --git a/os/ports/GCC/PPC/SPC56ELxx/port.mk b/os/ports/GCC/PPC/SPC56ELxx/port.mk index 75c816de3..8bd94f574 100644 --- a/os/ports/GCC/PPC/SPC56ELxx/port.mk +++ b/os/ports/GCC/PPC/SPC56ELxx/port.mk @@ -2,7 +2,7 @@ PORTSRC = ${CHIBIOS}/os/ports/GCC/PPC/chcore.c PORTASM = ${CHIBIOS}/os/ports/GCC/PPC/SPC56ELxx/bam.s \ - ${CHIBIOS}/os/ports/GCC/PPC/SPC56ELxx/mmuconf.s \ + ${CHIBIOS}/os/ports/GCC/PPC/SPC56ELxx/hwconf.s \ ${CHIBIOS}/os/ports/GCC/PPC/crt0.s \ ${CHIBIOS}/os/ports/GCC/PPC/SPC56ELxx/ivor.s \ ${CHIBIOS}/os/ports/GCC/PPC/SPC56ELxx/vectors.s -- cgit v1.2.3