[rtems commit] bsp/mpc55xx: Use BSP_START_DATA_SECTION
Sebastian Huber
sebh at rtems.org
Mon Dec 3 12:14:53 UTC 2012
Module: rtems
Branch: master
Commit: 2d561b9cdf98d13e923dfae8531229ce4b20554a
Changeset: http://git.rtems.org/rtems/commit/?id=2d561b9cdf98d13e923dfae8531229ce4b20554a
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Tue Nov 13 14:39:19 2012 +0100
bsp/mpc55xx: Use BSP_START_DATA_SECTION
---
.../powerpc/mpc55xxevb/include/mpc55xx-config.h | 35 +++++++++++++-------
.../mpc55xxevb/startup/start-config-clock.c | 5 +--
.../mpc55xxevb/startup/start-config-ebi-cs-cal.c | 9 ++---
.../mpc55xxevb/startup/start-config-ebi-cs.c | 9 ++---
.../mpc55xxevb/startup/start-config-mmu-early.c | 6 +--
.../powerpc/mpc55xxevb/startup/start-config-mmu.c | 7 +---
.../mpc55xxevb/startup/start-config-siu-pcr.c | 7 +---
.../powerpc/mpc55xxevb/startup/start-early.c | 2 -
8 files changed, 37 insertions(+), 43 deletions(-)
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/mpc55xx-config.h b/c/src/lib/libbsp/powerpc/mpc55xxevb/include/mpc55xx-config.h
index a564861..e95997a 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/mpc55xx-config.h
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/include/mpc55xx-config.h
@@ -7,7 +7,7 @@
*/
/*
- * Copyright (c) 2008-2011 embedded brains GmbH. All rights reserved.
+ * Copyright (c) 2008-2012 embedded brains GmbH. All rights reserved.
*
* embedded brains GmbH
* Obere Lagerstr. 30
@@ -43,17 +43,23 @@ typedef struct {
union SIU_PCR_tag pcr;
} mpc55xx_siu_pcr_config;
-extern const mpc55xx_siu_pcr_config mpc55xx_start_config_siu_pcr [];
+extern BSP_START_DATA_SECTION const mpc55xx_siu_pcr_config
+ mpc55xx_start_config_siu_pcr [];
-extern const size_t mpc55xx_start_config_siu_pcr_count [];
+extern BSP_START_DATA_SECTION const size_t
+ mpc55xx_start_config_siu_pcr_count [];
-extern const struct MMU_tag mpc55xx_start_config_mmu_early [];
+extern BSP_START_DATA_SECTION const struct
+ MMU_tag mpc55xx_start_config_mmu_early [];
-extern const size_t mpc55xx_start_config_mmu_early_count [];
+extern BSP_START_DATA_SECTION const size_t
+ mpc55xx_start_config_mmu_early_count [];
-extern const struct MMU_tag mpc55xx_start_config_mmu [];
+extern BSP_START_DATA_SECTION const struct
+ MMU_tag mpc55xx_start_config_mmu [];
-extern const size_t mpc55xx_start_config_mmu_count [];
+extern BSP_START_DATA_SECTION const size_t
+ mpc55xx_start_config_mmu_count [];
#ifdef MPC55XX_HAS_FMPLL
typedef struct {
@@ -83,16 +89,21 @@ extern const size_t mpc55xx_start_config_mmu_count [];
} mpc55xx_clock_config;
#endif
-extern const mpc55xx_clock_config mpc55xx_start_config_clock [];
+extern BSP_START_DATA_SECTION const mpc55xx_clock_config
+ mpc55xx_start_config_clock [];
#ifdef MPC55XX_HAS_EBI
- extern const struct EBI_CS_tag mpc55xx_start_config_ebi_cs [];
+ extern BSP_START_DATA_SECTION const struct
+ EBI_CS_tag mpc55xx_start_config_ebi_cs [];
- extern const size_t mpc55xx_start_config_ebi_cs_count [];
+ extern BSP_START_DATA_SECTION const size_t
+ mpc55xx_start_config_ebi_cs_count [];
- extern const struct EBI_CAL_CS_tag mpc55xx_start_config_ebi_cal_cs [];
+ extern BSP_START_DATA_SECTION const struct EBI_CAL_CS_tag
+ mpc55xx_start_config_ebi_cal_cs [];
- extern const size_t mpc55xx_start_config_ebi_cal_cs_count [];
+ extern BSP_START_DATA_SECTION const size_t
+ mpc55xx_start_config_ebi_cal_cs_count [];
#endif
void mpc55xx_start_early(void);
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 e434c09..366e590 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
@@ -7,7 +7,7 @@
*/
/*
- * Copyright (c) 2008-2011 embedded brains GmbH. All rights reserved.
+ * Copyright (c) 2008-2012 embedded brains GmbH. All rights reserved.
*
* embedded brains GmbH
* Obere Lagerstr. 30
@@ -22,8 +22,7 @@
#include <bsp/mpc55xx-config.h>
-BSP_START_TEXT_SECTION const mpc55xx_clock_config
- mpc55xx_start_config_clock [1] = { {
+const mpc55xx_clock_config mpc55xx_start_config_clock [1] = { {
#ifdef MPC55XX_HAS_FMPLL
.syncr_tmp = {
.B = {
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-ebi-cs-cal.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-ebi-cs-cal.c
index f9b4f6c..0a18222 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-ebi-cs-cal.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-ebi-cs-cal.c
@@ -7,7 +7,7 @@
*/
/*
- * Copyright (c) 2008-2011 embedded brains GmbH. All rights reserved.
+ * Copyright (c) 2008-2012 embedded brains GmbH. All rights reserved.
*
* embedded brains GmbH
* Obere Lagerstr. 30
@@ -21,13 +21,10 @@
*/
#include <bsp/mpc55xx-config.h>
-#include <bsp/start.h>
-#include <bsp.h>
#ifdef MPC55XX_HAS_EBI
-BSP_START_TEXT_SECTION const struct EBI_CAL_CS_tag
- mpc55xx_start_config_ebi_cal_cs [] = {
+const struct EBI_CAL_CS_tag mpc55xx_start_config_ebi_cal_cs [] = {
#if defined(MPC55XX_BOARD_MPC5674FEVB)
/* External SRAM */
{
@@ -175,7 +172,7 @@ BSP_START_TEXT_SECTION const struct EBI_CAL_CS_tag
#endif
};
-BSP_START_TEXT_SECTION const size_t mpc55xx_start_config_ebi_cal_cs_count [] = {
+const size_t mpc55xx_start_config_ebi_cal_cs_count [] = {
sizeof(mpc55xx_start_config_ebi_cal_cs) / sizeof(mpc55xx_start_config_ebi_cal_cs [0])
};
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-ebi-cs.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-ebi-cs.c
index 819c21e..74ed7d6 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-ebi-cs.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-ebi-cs.c
@@ -7,7 +7,7 @@
*/
/*
- * Copyright (c) 2008-2011 embedded brains GmbH. All rights reserved.
+ * Copyright (c) 2008-2012 embedded brains GmbH. All rights reserved.
*
* embedded brains GmbH
* Obere Lagerstr. 30
@@ -21,13 +21,10 @@
*/
#include <bsp/mpc55xx-config.h>
-#include <bsp/start.h>
-#include <bsp.h>
#ifdef MPC55XX_HAS_EBI
-BSP_START_TEXT_SECTION const struct EBI_CS_tag
- mpc55xx_start_config_ebi_cs [] = {
+const struct EBI_CS_tag mpc55xx_start_config_ebi_cs [] = {
#if defined(MPC55XX_BOARD_GWLCFM)
/* CS0: External SRAM (16 bit, 1 wait states, 512kB, no burst) */
{
@@ -160,7 +157,7 @@ BSP_START_TEXT_SECTION const struct EBI_CS_tag
#endif
};
-BSP_START_TEXT_SECTION const size_t mpc55xx_start_config_ebi_cs_count [] = {
+const size_t mpc55xx_start_config_ebi_cs_count [] = {
sizeof(mpc55xx_start_config_ebi_cs) / sizeof(mpc55xx_start_config_ebi_cs [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 d84a008..42508a7 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
@@ -20,11 +20,9 @@
* http://www.rtems.com/license/LICENSE.
*/
-#include <bsp/start.h>
#include <bsp/mpc55xx-config.h>
-BSP_START_TEXT_SECTION const struct MMU_tag
- mpc55xx_start_config_mmu_early [] = {
+const struct MMU_tag mpc55xx_start_config_mmu_early [] = {
#if defined(MPC55XX_BOARD_MPC5674F_ECU508) \
&& !defined(MPC55XX_NEEDS_LOW_LEVEL_INIT)
/* Used as cache-inhibited area later (ADC, DSPI queues) */
@@ -51,7 +49,7 @@ BSP_START_TEXT_SECTION const struct MMU_tag
#endif
};
-BSP_START_TEXT_SECTION const size_t mpc55xx_start_config_mmu_early_count [] = {
+const size_t mpc55xx_start_config_mmu_early_count [] = {
sizeof(mpc55xx_start_config_mmu_early)
/ sizeof(mpc55xx_start_config_mmu_early [0])
};
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 6895820..4093c7d 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
@@ -20,12 +20,9 @@
* http://www.rtems.com/license/LICENSE.
*/
-#include <bsp.h>
-#include <bsp/start.h>
#include <bsp/mpc55xx-config.h>
-BSP_START_TEXT_SECTION const struct MMU_tag
- mpc55xx_start_config_mmu [] = {
+const struct MMU_tag mpc55xx_start_config_mmu [] = {
#if defined(MPC55XX_BOARD_GWLCFM)
/* External Ethernet Controller 64k */
MPC55XX_MMU_TAG_INITIALIZER(5, 0x3fff8000, MPC55XX_MMU_64K, 0, 1, 1, 1)
@@ -120,6 +117,6 @@ BSP_START_TEXT_SECTION const struct MMU_tag
#endif
};
-BSP_START_TEXT_SECTION const size_t mpc55xx_start_config_mmu_count [] = {
+const size_t mpc55xx_start_config_mmu_count [] = {
sizeof(mpc55xx_start_config_mmu) / sizeof(mpc55xx_start_config_mmu [0])
};
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-siu-pcr.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-siu-pcr.c
index c9d363f..692dba2 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-siu-pcr.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-siu-pcr.c
@@ -21,11 +21,8 @@
*/
#include <bsp/mpc55xx-config.h>
-#include <bsp/start.h>
-#include <bsp.h>
-BSP_START_TEXT_SECTION const mpc55xx_siu_pcr_config
- mpc55xx_start_config_siu_pcr [] = {
+const mpc55xx_siu_pcr_config mpc55xx_start_config_siu_pcr [] = {
#if defined(MPC55XX_BOARD_GWLCFM)
{ 0,16, 0, {.B.PA = 1, .B.WPE = 0}}, /* PA[ 0..15] analog input */
{ 16, 4, 0, {.B.PA = 0,.B.OBE = 1,.B.WPE = 0}}, /* PB[ 0.. 4] LED/CAN_STBN out */
@@ -133,6 +130,6 @@ BSP_START_TEXT_SECTION const mpc55xx_siu_pcr_config
#endif
};
-BSP_START_TEXT_SECTION const size_t mpc55xx_start_config_siu_pcr_count [] = {
+const size_t mpc55xx_start_config_siu_pcr_count [] = {
sizeof(mpc55xx_start_config_siu_pcr) / sizeof(mpc55xx_start_config_siu_pcr [0])
};
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-early.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-early.c
index cab0efe..c1b4a80 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-early.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-early.c
@@ -20,8 +20,6 @@
* http://www.rtems.com/license/LICENSE.
*/
-#include <bsp.h>
-#include <bsp/start.h>
#include <bsp/mpc55xx-config.h>
#include <bsp/linker-symbols.h>
More information about the vc
mailing list