Changeset 598a4505 in rtems


Ignore:
Timestamp:
Dec 3, 2010, 9:29:08 AM (10 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.11, 5, master
Children:
dd853a3
Parents:
a3579d3
Message:

2010-12-03 Sebastian Huber <sebastian.huber@…>

  • include/lpc32xx.h: Added I2S module.
  • Makefile.am, bsp_specs, preinstall.am, startup/bspstarthooks.c, startup/linkcmds.lpc32xx, startup/linkcmds.lpc32xx_mzx, startup/linkcmds.lpc32xx_mzx_stage_1, startup/linkcmds.lpc32xx_mzx_stage_2, startup/linkcmds.lpc32xx_phycore: Update due to linker command file changes.
Location:
c/src/lib/libbsp/arm/lpc32xx
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/arm/lpc32xx/ChangeLog

    ra3579d3 r598a4505  
     12010-12-03      Sebastian Huber <sebastian.huber@embedded-brains.de>
     2
     3        * include/lpc32xx.h: Added I2S module.
     4        * Makefile.am, bsp_specs, preinstall.am, startup/bspstarthooks.c,
     5        startup/linkcmds.lpc32xx, startup/linkcmds.lpc32xx_mzx,
     6        startup/linkcmds.lpc32xx_mzx_stage_1,
     7        startup/linkcmds.lpc32xx_mzx_stage_2,
     8        startup/linkcmds.lpc32xx_phycore: Update due to linker command file
     9        changes.
     10
    1112010-11-12      Sebastian Huber <sebastian.huber@embedded-brains.de>
    212
  • c/src/lib/libbsp/arm/lpc32xx/Makefile.am

    ra3579d3 r598a4505  
    3636include_bsp_HEADERS += ../../shared/include/uart-output-char.h
    3737include_bsp_HEADERS += ../../shared/tod.h
    38 include_bsp_HEADERS += ../shared/include/linker-symbols.h
    3938include_bsp_HEADERS += ../shared/include/start.h
    4039include_bsp_HEADERS += ../shared/lpc/include/lpc-timer.h
    4140include_bsp_HEADERS += ../shared/lpc/include/lpc-dma.h
     41include_bsp_HEADERS += ../shared/lpc/include/lpc-i2s.h
    4242include_bsp_HEADERS += include/irq.h
    4343include_bsp_HEADERS += include/mmu.h
     
    6565project_lib_DATA += startup/linkcmds
    6666project_lib_DATA += startup/linkcmds.lpc32xx
    67 project_lib_DATA += ../shared/startup/linkcmds.base
    6867
    6968EXTRA_DIST = startup/linkcmds.lpc32xx_phycore \
  • c/src/lib/libbsp/arm/lpc32xx/bsp_specs

    ra3579d3 r598a4505  
    55*startfile:
    66%{!qrtems: %(old_startfile)} \
    7 %{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e start}}
     7%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e _start}}
    88
    99*link:
  • c/src/lib/libbsp/arm/lpc32xx/include/lpc32xx.h

    ra3579d3 r598a4505  
    2828#include <bsp/lpc-timer.h>
    2929#include <bsp/lpc-dma.h>
     30#include <bsp/lpc-i2s.h>
    3031
    3132/**
     
    233234
    234235typedef struct {
    235 } lpc32xx_i2s;
    236 
    237 typedef struct {
    238236} lpc32xx_sd_card;
    239237
     
    502500  lpc32xx_spi spi_2;
    503501  uint32_t reserved_4 [LPC32XX_RESERVED(0x20090000, 0x20094000, lpc32xx_spi)];
    504   lpc32xx_i2s i2s_0;
    505   uint32_t reserved_5 [LPC32XX_RESERVED(0x20094000, 0x20098000, lpc32xx_i2s)];
     502  lpc_i2s i2s_0;
     503  uint32_t reserved_5 [LPC32XX_RESERVED(0x20094000, 0x20098000, lpc_i2s)];
    506504  lpc32xx_sd_card sd_card;
    507505  uint32_t reserved_6 [LPC32XX_RESERVED(0x20098000, 0x2009c000, lpc32xx_sd_card)];
    508   lpc32xx_i2s i2s_1;
    509   uint32_t reserved_7 [LPC32XX_RESERVED(0x2009c000, 0x200a8000, lpc32xx_i2s)];
     506  lpc_i2s i2s_1;
     507  uint32_t reserved_7 [LPC32XX_RESERVED(0x2009c000, 0x200a8000, lpc_i2s)];
    510508  lpc32xx_nand_mlc nand_mlc;
    511509  uint32_t reserved_8 [LPC32XX_RESERVED(0x200a8000, 0x31000000, lpc32xx_nand_mlc)];
  • c/src/lib/libbsp/arm/lpc32xx/preinstall.am

    ra3579d3 r598a4505  
    8787PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tod.h
    8888
    89 $(PROJECT_INCLUDE)/bsp/linker-symbols.h: ../shared/include/linker-symbols.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
    90         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/linker-symbols.h
    91 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/linker-symbols.h
    92 
    9389$(PROJECT_INCLUDE)/bsp/start.h: ../shared/include/start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
    9490        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/start.h
     
    10298        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-dma.h
    10399PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-dma.h
     100
     101$(PROJECT_INCLUDE)/bsp/lpc-i2s.h: ../shared/lpc/include/lpc-i2s.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
     102        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-i2s.h
     103PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-i2s.h
    104104
    105105$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
     
    159159TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc32xx
    160160
    161 $(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
    162         $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
    163 TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
    164 
  • c/src/lib/libbsp/arm/lpc32xx/startup/bspstarthooks.c

    ra3579d3 r598a4505  
    4545LINKER_SYMBOL(lpc32xx_translation_table_base);
    4646
    47 static void BSP_START_SECTION clear_bss(void)
     47static void BSP_START_TEXT_SECTION clear_bss(void)
    4848{
    4949  const int *end = (const int *) bsp_section_bss_end;
     
    6767    lpc32xx_mmu_config_table [] = {
    6868    {
     69      .begin = (uint32_t) bsp_section_fast_text_begin,
     70      .end = (uint32_t) bsp_section_fast_text_end,
     71      .flags = LPC32XX_MMU_CODE
     72    }, {
     73      .begin = (uint32_t) bsp_section_fast_data_begin,
     74      .end = (uint32_t) bsp_section_fast_data_end,
     75      .flags = LPC32XX_MMU_READ_WRITE_DATA
     76    }, {
    6977      .begin = (uint32_t) bsp_section_start_begin,
    7078      .end = (uint32_t) bsp_section_start_end,
     
    8795      .flags = LPC32XX_MMU_READ_WRITE_DATA
    8896    }, {
    89       .begin = (uint32_t) bsp_section_fast_begin,
    90       .end = (uint32_t) bsp_section_fast_end,
    91       .flags = LPC32XX_MMU_CODE
    92     }, {
    9397      .begin = (uint32_t) bsp_section_bss_begin,
    9498      .end = (uint32_t) bsp_section_bss_end,
     
    125129  };
    126130
    127   static void BSP_START_SECTION set_translation_table_entries(
     131  static void BSP_START_TEXT_SECTION set_translation_table_entries(
    128132    uint32_t *ttb,
    129133    const lpc32xx_mmu_config *config
     
    142146  }
    143147
    144   static void BSP_START_SECTION
     148  static void BSP_START_TEXT_SECTION
    145149    setup_translation_table_and_enable_mmu(uint32_t ctrl)
    146150  {
     
    170174#endif
    171175
    172 static void BSP_START_SECTION setup_mmu_and_cache(void)
     176static void BSP_START_TEXT_SECTION setup_mmu_and_cache(void)
    173177{
    174178  uint32_t ctrl = 0;
     
    193197#endif
    194198
    195 static void BSP_START_SECTION setup_pll(void)
     199static void BSP_START_TEXT_SECTION setup_pll(void)
    196200{
    197201  uint32_t pwr_ctrl = LPC32XX_PWR_CTRL;
     
    212216}
    213217
    214 void BSP_START_SECTION bsp_start_hook_0(void)
     218void BSP_START_TEXT_SECTION bsp_start_hook_0(void)
    215219{
    216220  setup_pll();
     
    218222}
    219223
    220 static void BSP_START_SECTION stop_dma_activities(void)
     224static void BSP_START_TEXT_SECTION stop_dma_activities(void)
    221225{
    222226  #ifdef LPC32XX_STOP_GPDMA
     
    252256}
    253257
    254 static void BSP_START_SECTION setup_uarts(void)
     258static void BSP_START_TEXT_SECTION setup_uarts(void)
    255259{
    256260  uint32_t uartclk_ctrl = 0;
     
    287291}
    288292
    289 static void BSP_START_SECTION setup_timer(void)
     293static void BSP_START_TEXT_SECTION setup_timer(void)
    290294{
    291295  volatile lpc_timer *timer = LPC32XX_STANDARD_TIMER;
     
    302306}
    303307
    304 void BSP_START_SECTION bsp_start_hook_1(void)
     308void BSP_START_TEXT_SECTION bsp_start_hook_1(void)
    305309{
    306310  stop_dma_activities();
     
    332336  );
    333337
    334   /* Copy .fast section */
    335   arm_cp15_instruction_cache_invalidate();
    336   bsp_start_memcpy(
    337     (int *) bsp_section_fast_begin,
    338     (const int *) bsp_section_fast_load_begin,
    339     (size_t) bsp_section_fast_size
     338  /* Copy .fast_text section */
     339  arm_cp15_instruction_cache_invalidate();
     340  bsp_start_memcpy(
     341    (int *) bsp_section_fast_text_begin,
     342    (const int *) bsp_section_fast_text_load_begin,
     343    (size_t) bsp_section_fast_text_size
     344  );
     345
     346  /* Copy .fast_data section */
     347  arm_cp15_instruction_cache_invalidate();
     348  bsp_start_memcpy(
     349    (int *) bsp_section_fast_data_begin,
     350    (const int *) bsp_section_fast_data_load_begin,
     351    (size_t) bsp_section_fast_data_size
    340352  );
    341353
  • c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx

    ra3579d3 r598a4505  
    1515lpc32xx_magic_zero_size = lpc32xx_magic_zero_end - lpc32xx_magic_zero_end;
    1616
    17 INCLUDE linkcmds.base
     17INCLUDE linkcmds.armv4
  • c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_mzx

    ra3579d3 r598a4505  
    3636
    3737MEMORY {
    38         RAM_INT (AIW) : ORIGIN = 0x08000000, LENGTH = 256k
    39         RAM_MMU (AIW) : ORIGIN = 0x80000000, LENGTH = 16k /* SDRAM on DYCS0 */
    40         RAM_EXT (AIW) : ORIGIN = 0x80004000, LENGTH = 32M - 16k /* SDRAM on DYCS0 */
    41         NIRVANA : ORIGIN = 0, LENGTH = 0
     38        RAM_INT : ORIGIN = 0x08000000, LENGTH = 256k
     39        RAM_MMU : ORIGIN = 0x80000000, LENGTH = 16k /* SDRAM on DYCS0 */
     40        RAM_EXT : ORIGIN = 0x80004000, LENGTH = 32M - 16k /* SDRAM on DYCS0 */
     41        NIRVANA : ORIGIN = 0, LENGTH = 0
    4242}
    4343
  • c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_mzx_stage_1

    ra3579d3 r598a4505  
    3636
    3737MEMORY {
    38         RAM_INT (AIW) : ORIGIN = 0x08000000, LENGTH = 232k
    39         RAM_VEC (AIW) : ORIGIN = 0x0803a000, LENGTH = 8k
    40         RAM_MMU (AIW) : ORIGIN = 0x0803c000, LENGTH = 16k
    41         NIRVANA : ORIGIN = 0, LENGTH = 0
     38        RAM_INT : ORIGIN = 0x08000000, LENGTH = 232k
     39        RAM_VEC : ORIGIN = 0x0803a000, LENGTH = 8k
     40        RAM_MMU : ORIGIN = 0x0803c000, LENGTH = 16k
     41        NIRVANA : ORIGIN = 0, LENGTH = 0
    4242}
    4343
  • c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_mzx_stage_2

    ra3579d3 r598a4505  
    3636
    3737MEMORY {
    38         RAM_INT (AIW) : ORIGIN = 0x08000000, LENGTH = 256k
    39         RAM_MMU (AIW) : ORIGIN = 0x81c00000, LENGTH = 16k /* SDRAM on DYCS0 */
    40         RAM_EXT (AIW) : ORIGIN = 0x81c04000, LENGTH = 4M - 16k /* SDRAM on DYCS0 */
    41         NIRVANA : ORIGIN = 0, LENGTH = 0
     38        RAM_INT : ORIGIN = 0x08000000, LENGTH = 256k
     39        RAM_MMU : ORIGIN = 0x81c00000, LENGTH = 16k /* SDRAM on DYCS0 */
     40        RAM_EXT : ORIGIN = 0x81c04000, LENGTH = 4M - 16k /* SDRAM on DYCS0 */
     41        NIRVANA : ORIGIN = 0, LENGTH = 0
    4242}
    4343
  • c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_phycore

    ra3579d3 r598a4505  
    3737
    3838MEMORY {
    39         RAM_INT (AIW) : ORIGIN = 0x08000000, LENGTH = 256k
    40         RAM_MMU (AIW) : ORIGIN = 0x80000000, LENGTH = 16k /* SDRAM on DYCS0 */
    41         RAM_EXT (AIW) : ORIGIN = 0x80004000, LENGTH = 64M - 16k /* SDRAM on DYCS0 */
    42         ROM_EXT (RX) : ORIGIN = 0xe0000000, LENGTH = 2M /* NOR flash on CS0 */
    43         NIRVANA : ORIGIN = 0, LENGTH = 0
     39        RAM_INT : ORIGIN = 0x08000000, LENGTH = 256k
     40        RAM_MMU : ORIGIN = 0x80000000, LENGTH = 16k /* SDRAM on DYCS0 */
     41        RAM_EXT : ORIGIN = 0x80004000, LENGTH = 64M - 16k /* SDRAM on DYCS0 */
     42        ROM_EXT : ORIGIN = 0xe0000000, LENGTH = 2M /* NOR flash on CS0 */
     43        NIRVANA : ORIGIN = 0, LENGTH = 0
    4444}
    4545
Note: See TracChangeset for help on using the changeset viewer.