summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2012-10-01 15:02:57 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2012-10-02 15:27:33 +0200
commit94102775e0103e82bd1279e1415e93a17d5cb0d4 (patch)
tree8fce6be63e0b0b2aebff4dd3bdeb2ce422802776 /c/src/lib/libbsp
parentfsrfsbitmap01/test.c: Remove tabs (diff)
downloadrtems-94102775e0103e82bd1279e1415e93a17d5cb0d4.tar.bz2
bsp/mpc55xx: Add and use MPC55XX_CHIP_FAMILY
Diffstat (limited to 'c/src/lib/libbsp')
-rw-r--r--c/src/lib/libbsp/powerpc/mpc55xxevb/clock/clock-config.c2
-rw-r--r--c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac4
-rw-r--r--c/src/lib/libbsp/powerpc/mpc55xxevb/i2c/i2c_init.c2
-rw-r--r--c/src/lib/libbsp/powerpc/mpc55xxevb/network/smsc9218i.c6
-rw-r--r--c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c2
-rw-r--r--c/src/lib/libbsp/powerpc/mpc55xxevb/startup/reset.c2
-rw-r--r--c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-cache.S2
-rw-r--r--c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-clock.c2
-rw-r--r--c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-clock.c2
-rw-r--r--c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-mmu-early.c8
-rw-r--r--c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-mmu.c2
-rw-r--r--c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-flash.S2
-rw-r--r--c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start.S4
13 files changed, 22 insertions, 18 deletions
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/clock/clock-config.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/clock/clock-config.c
index d8a6594ad2..f2489448b7 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/clock/clock-config.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/clock/clock-config.c
@@ -98,7 +98,7 @@ static void mpc55xx_clock_initialize(void)
regs->CADR.R = (uint32_t) interval - 1;
/* Set control register */
- #if MPC55XX_CHIP_TYPE / 10 == 551
+ #if MPC55XX_CHIP_FAMILY == 551
ccr.B.MODE = MPC55XX_EMIOS_MODE_MCB_UP_INT_CLK;
#else
ccr.B.MODE = MPC55XX_EMIOS_MODE_MC_UP_INT_CLK;
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac b/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac
index 1cd019f164..a7b3f94e62 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac
@@ -143,6 +143,10 @@ RTEMS_BSPOPTS_SET([MPC55XX_CHIP_TYPE],[*],[5554])
RTEMS_BSPOPTS_HELP([MPC55XX_CHIP_TYPE],
[specifies the chip type in use (e.g. 5554 for MPC5554)])
+RTEMS_BSPOPTS_SET([MPC55XX_CHIP_FAMILY],[*],[(MPC55XX_CHIP_TYPE / 10)])
+RTEMS_BSPOPTS_HELP([MPC55XX_CHIP_FAMILY],
+[specifies the chip family in use (e.g. 555 for MPC5554)])
+
RTEMS_BSPOPTS_SET([MPC55XX_EARLY_STACK_SIZE],[*],[1024])
RTEMS_BSPOPTS_HELP([MPC55XX_EARLY_STACK_SIZE],
[size of the early initialization stack in bytes])
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/i2c/i2c_init.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/i2c/i2c_init.c
index 802d02a9d9..3103531b33 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/i2c/i2c_init.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/i2c/i2c_init.c
@@ -23,7 +23,7 @@
#include <bsp/irq.h>
#include <bsp/mpc83xx_i2cdrv.h>
-#if MPC55XX_CHIP_TYPE / 10 == 551
+#if MPC55XX_CHIP_FAMILY == 551
static mpc83xx_i2c_desc_t mpc55xx_i2c_bus = {
.bus_desc = {
.ops = &mpc83xx_i2c_ops,
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/network/smsc9218i.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/network/smsc9218i.c
index 3ed1ae896d..460ffce8ff 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/network/smsc9218i.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/network/smsc9218i.c
@@ -1610,7 +1610,7 @@ static void smsc9218i_interrupt_init(
pcr.B.PA = 2;
pcr.B.OBE = 0;
pcr.B.IBE = 1;
-#if MPC55XX_CHIP_TYPE / 10 != 551
+#if MPC55XX_CHIP_FAMILY != 551
pcr.B.DSC = 0;
#endif
pcr.B.ODE = 0;
@@ -1623,7 +1623,7 @@ static void smsc9218i_interrupt_init(
/* DMA/Interrupt Request Select */
rtems_interrupt_disable(level);
dirsr.R = SIU.DIRSR.R;
-#if MPC55XX_CHIP_TYPE / 10 != 551
+#if MPC55XX_CHIP_FAMILY != 551
dirsr.B.DIRS0 = 0;
#endif
SIU.DIRSR.R = dirsr.R;
@@ -1698,7 +1698,7 @@ static void smsc9218i_reset_signal_init(void)
pcr.B.PA = 0;
pcr.B.OBE = 1;
pcr.B.IBE = 0;
-#if MPC55XX_CHIP_TYPE / 10 != 551
+#if MPC55XX_CHIP_FAMILY != 551
pcr.B.DSC = 0;
#endif
pcr.B.ODE = 0;
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c
index dc1d63239d..9bffd453dc 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c
@@ -145,7 +145,7 @@ void bsp_start(void)
void bsp_pretasking_hook(void)
{
- #if MPC55XX_CHIP_TYPE / 10 == 564
+ #if MPC55XX_CHIP_FAMILY == 564
_Heap_Extend(
RTEMS_Malloc_Heap,
bsp_section_rwextra_end,
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/reset.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/reset.c
index a0a1350962..386ddb0613 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/reset.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/reset.c
@@ -29,7 +29,7 @@
void bsp_reset(void)
{
while (true) {
- #if MPC55XX_CHIP_TYPE / 10 == 564
+ #if MPC55XX_CHIP_FAMILY == 564
/* TODO */
#else
SIU.SRCR.R = 1U << (31 - 0);
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-cache.S b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-cache.S
index ae2bb00995..e254092a24 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-cache.S
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-cache.S
@@ -96,7 +96,7 @@ get_data_cache_invalidation_status:
bne get_data_cache_invalidation_status
/* Save data cache settings */
-#if MPC55XX_CHIP_TYPE / 10 != 567
+#if MPC55XX_CHIP_FAMILY != 567
/* FIXME: CORG??? 0x00180011 */
LWI r6, 0x00100001
#else
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-clock.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-clock.c
index 90d392e4bd..e3d4405769 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-clock.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-clock.c
@@ -74,7 +74,7 @@ BSP_START_TEXT_SECTION void mpc55xx_start_clock(void)
fmpll->ESYNCR2.R;
fmpll_wait_for_lock();
- #if MPC55XX_CHIP_TYPE / 10 == 551
+ #if MPC55XX_CHIP_FAMILY == 551
/* System clock supplied by PLL */
SIU.SYSCLK.B.SYSCLKSEL = 2;
#endif
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-clock.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-clock.c
index af243191b7..e434c0976a 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-clock.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-clock.c
@@ -71,7 +71,7 @@ BSP_START_TEXT_SECTION const mpc55xx_clock_config
.LOLIRQ = 0,
.LOCIRQ = 0,
.ERATE = 0,
- #if MPC55XX_CHIP_TYPE / 10 == 567
+ #if MPC55XX_CHIP_FAMILY == 567
.CLKCFG_DIS = 1,
#endif
.EDEPTH = 0,
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-mmu-early.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-mmu-early.c
index 406b33b68f..10483a4a71 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-mmu-early.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-mmu-early.c
@@ -25,14 +25,14 @@
BSP_START_TEXT_SECTION const struct MMU_tag
mpc55xx_start_config_mmu_early [] = {
-#if MPC55XX_CHIP_TYPE / 10 == 555
+#if MPC55XX_CHIP_FAMILY == 555
/* Internal SRAM 96k */
MPC55XX_MMU_TAG_INITIALIZER(3, 0x40000000, MPC55XX_MMU_256K, 1, 1, 1, 0),
-#elif MPC55XX_CHIP_TYPE / 10 == 556
+#elif MPC55XX_CHIP_FAMILY == 556
/* Internal SRAM 128k */
MPC55XX_MMU_TAG_INITIALIZER(3, 0x40000000, MPC55XX_MMU_64K, 1, 1, 1, 0),
MPC55XX_MMU_TAG_INITIALIZER(5, 0x40010000, MPC55XX_MMU_64K, 0, 1, 1, 0),
-#elif MPC55XX_CHIP_TYPE / 10 == 564
+#elif MPC55XX_CHIP_FAMILY == 564
/* Internal flash 1M */
MPC55XX_MMU_TAG_INITIALIZER(0, 0x00000000, MPC55XX_MMU_1M, 1, 0, 1, 1),
/* IO */
@@ -41,7 +41,7 @@ BSP_START_TEXT_SECTION const struct MMU_tag
/* Internal SRAM 64k + 64k */
MPC55XX_MMU_TAG_INITIALIZER(3, 0x40000000, MPC55XX_MMU_64K, 1, 1, 1, 0),
MPC55XX_MMU_TAG_INITIALIZER(4, 0x50000000, MPC55XX_MMU_64K, 0, 1, 1, 0)
-#elif MPC55XX_CHIP_TYPE / 10 == 567
+#elif MPC55XX_CHIP_FAMILY == 567
/* Internal SRAM 256k */
MPC55XX_MMU_TAG_INITIALIZER(3, 0x40000000, MPC55XX_MMU_256K, 1, 1, 1, 0)
#endif
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-mmu.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-mmu.c
index cc735770f4..389a948da4 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-mmu.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-mmu.c
@@ -147,7 +147,7 @@ BSP_START_TEXT_SECTION const struct MMU_tag
MPC55XX_MMU_TAG_INITIALIZER(17, 0x3ffc0000, MPC55XX_MMU_1K, 0, 1, 1, 1)
/* Peripheral Bridge A-Registers on MMU-table pos 4 */
/* Peripheral Bridge B-Registers on MMU-table pos 0 */
-#elif MPC55XX_CHIP_TYPE / 10 == 564
+#elif MPC55XX_CHIP_FAMILY == 564
/* Internal flash 1M */
MPC55XX_MMU_TAG_INITIALIZER(0, 0x00000000, MPC55XX_MMU_1M, 1, 0, 1, 0),
/* IO */
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-flash.S b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-flash.S
index 61df507b13..974102c90c 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-flash.S
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-flash.S
@@ -38,7 +38,7 @@
* @warning Code will be copied and executed on the stack.
*/
GLOBAL_FUNCTION mpc55xx_start_flash
-#if !defined(MPC55XX_NEEDS_LOW_LEVEL_INIT) || MPC55XX_CHIP_TYPE / 10 == 564
+#if !defined(MPC55XX_NEEDS_LOW_LEVEL_INIT) || MPC55XX_CHIP_FAMILY == 564
blr
#else
.equ stack_size, 20
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start.S b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start.S
index b5e31463e0..565da0f858 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start.S
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start.S
@@ -24,11 +24,11 @@
#include <bsp/linker-symbols.h>
#include <libcpu/powerpc-utility.h>
-#if MPC55XX_CHIP_TYPE / 10 != 551
+#if MPC55XX_CHIP_FAMILY != 551
#define HAS_SPE
#endif
-#if MPC55XX_CHIP_TYPE / 10 == 564
+#if MPC55XX_CHIP_FAMILY == 564
#define INIT_REGISTERS_FOR_LSM
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 12:17:32 +0000