From 962e0fac18302d0a26dcdd664d9ef3043b0728d2 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 2 May 2013 11:18:09 +0200 Subject: bsps/arm: Add and use bsp_translation_table_base --- c/src/lib/libbsp/arm/lpc32xx/startup/bspstarthooks.c | 4 +--- c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx | 2 +- c/src/lib/libbsp/arm/shared/include/linker-symbols.h | 15 +++++++++------ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/c/src/lib/libbsp/arm/lpc32xx/startup/bspstarthooks.c b/c/src/lib/libbsp/arm/lpc32xx/startup/bspstarthooks.c index acc24e9cc5..e828d8899c 100644 --- a/c/src/lib/libbsp/arm/lpc32xx/startup/bspstarthooks.c +++ b/c/src/lib/libbsp/arm/lpc32xx/startup/bspstarthooks.c @@ -41,8 +41,6 @@ #define LPC32XX_MMU_CODE LPC32XX_MMU_READ_ONLY_CACHED #endif -LINKER_SYMBOL(lpc32xx_translation_table_base); - static BSP_START_TEXT_SECTION void clear_bss(void) { const int *end = (const int *) bsp_section_bss_end; @@ -155,7 +153,7 @@ static BSP_START_TEXT_SECTION void clear_bss(void) { uint32_t const dac = ARM_CP15_DAC_DOMAIN(LPC32XX_MMU_CLIENT_DOMAIN, ARM_CP15_DAC_CLIENT); - uint32_t *const ttb = (uint32_t *) lpc32xx_translation_table_base; + uint32_t *const ttb = (uint32_t *) bsp_translation_table_base; size_t const config_entry_count = sizeof(lpc32xx_mmu_config_table) / sizeof(lpc32xx_mmu_config_table [0]); size_t i = 0; diff --git a/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx b/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx index 4989ae3c9a..200e7f3e04 100644 --- a/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx +++ b/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx @@ -6,7 +6,7 @@ * @brief Linker support. */ -lpc32xx_translation_table_base = ORIGIN (RAM_MMU); +bsp_translation_table_base = ORIGIN (RAM_MMU); lpc32xx = 0x20020000; diff --git a/c/src/lib/libbsp/arm/shared/include/linker-symbols.h b/c/src/lib/libbsp/arm/shared/include/linker-symbols.h index 3048175e7c..cb83522695 100644 --- a/c/src/lib/libbsp/arm/shared/include/linker-symbols.h +++ b/c/src/lib/libbsp/arm/shared/include/linker-symbols.h @@ -7,12 +7,13 @@ */ /* - * Copyright (c) 2008, 2009 - * embedded brains GmbH - * Obere Lagerstr. 30 - * D-82178 Puchheim - * Germany - * + * Copyright (c) 2008-2013 embedded brains GmbH. All rights reserved. + * + * embedded brains GmbH + * Dornierstr. 4 + * 82178 Puchheim + * Germany + * * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at @@ -120,6 +121,8 @@ LINKER_SYMBOL(bsp_start_vector_table_begin) LINKER_SYMBOL(bsp_start_vector_table_end) LINKER_SYMBOL(bsp_start_vector_table_size) +LINKER_SYMBOL(bsp_translation_table_base) + #define BSP_FAST_TEXT_SECTION __attribute__((section(".bsp_fast_text"))) #define BSP_FAST_DATA_SECTION __attribute__((section(".bsp_fast_data"))) -- cgit v1.2.3