Changeset 76134c5 in rtems


Ignore:
Timestamp:
May 19, 2011, 12:11:36 PM (9 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.11, 5, master
Children:
d74ed4a
Parents:
f6083f0
Message:

2011-05-19 Sebastian Huber <sebastian.huber@…>

  • Makefile.am, preinstall.am: Install new header files.
  • include/bsp.h, include/emc.h, include/lpc32xx.h, misc/emc.c: Update for API changes.
Location:
c/src/lib/libbsp/arm/lpc32xx
Files:
7 edited

Legend:

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

    rf6083f0 r76134c5  
     12011-05-19      Sebastian Huber <sebastian.huber@embedded-brains.de>
     2
     3        * Makefile.am, preinstall.am: Install new header files.
     4        * include/bsp.h, include/emc.h, include/lpc32xx.h, misc/emc.c: Update
     5        for API changes.
     6
    172011-03-29      Sebastian Huber <sebastian.huber@embedded-brains.de>
    28
  • c/src/lib/libbsp/arm/lpc32xx/Makefile.am

    rf6083f0 r76134c5  
    4040include_bsp_HEADERS += ../shared/lpc/include/lpc-dma.h
    4141include_bsp_HEADERS += ../shared/lpc/include/lpc-i2s.h
     42include_bsp_HEADERS += ../shared/lpc/include/lpc-emc.h
     43include_bsp_HEADERS += ../shared/lpc/include/lpc-lcd.h
    4244include_bsp_HEADERS += include/irq.h
    4345include_bsp_HEADERS += include/mmu.h
  • c/src/lib/libbsp/arm/lpc32xx/include/bsp.h

    rf6083f0 r76134c5  
    148148  do { \
    149149    if ((LPC32XX_DMACLK_CTRL & 0x1) != 0) { \
    150       if ((lpc32xx.dma.cfg & LPC_DMA_CFG_EN) != 0) { \
     150      if ((lpc32xx.dma.cfg & DMA_CFG_E) != 0) { \
    151151        int i = 0; \
    152152        for (i = 0; i < 8; ++i) { \
    153153          lpc32xx.dma.channels [i].cfg = 0; \
    154154        } \
    155         lpc32xx.dma.cfg &= ~LPC_DMA_CFG_EN; \
     155        lpc32xx.dma.cfg &= ~DMA_CFG_E; \
    156156      } \
    157157      LPC32XX_DMACLK_CTRL = 0; \
  • c/src/lib/libbsp/arm/lpc32xx/include/emc.h

    rf6083f0 r76134c5  
    88
    99/*
    10  * Copyright (c) 2010
    11  * embedded brains GmbH
    12  * Obere Lagerstr. 30
    13  * D-82178 Puchheim
    14  * Germany
    15  * <rtems@embedded-brains.de>
     10 * Copyright (c) 2010-2011 embedded brains GmbH.  All rights reserved.
     11 *
     12 *  embedded brains GmbH
     13 *  Obere Lagerstr. 30
     14 *  82178 Puchheim
     15 *  Germany
     16 *  <rtems@embedded-brains.de>
    1617 *
    1718 * The license and distribution terms for this file may be
     
    2526#include <rtems.h>
    2627
    27 #include <bsp/lpc32xx.h>
     28#include <bsp/lpc-emc.h>
    2829
    2930#ifdef __cplusplus
     
    3233
    3334/**
    34  * @defgroup lpc32xx_emc EMC Support
    35  *
    36  * @ingroup lpc32xx
     35 * @addtogroup lpc_emc
    3736 *
    3837 * @brief EMC Support
     
    4039 * @{
    4140 */
    42 
    4341
    4442/**
     
    6159#define SDRAMCLK_PIN_2_FAST BSP_BIT32(21)
    6260#define SDRAMCLK_PIN_3_FAST BSP_BIT32(22)
    63 
    64 /** @} */
    65 
    66 /**
    67  * @name EMC Control Register (EMCControl)
    68  *
    69  * @{
    70  */
    71 
    72 #define EMC_CTRL_EN BSP_BIT32(0)
    73 #define EMC_CTRL_LOW_POWER BSP_BIT32(2)
    74 
    75 /** @} */
    76 
    77 /**
    78  * @name EMC Dynamic Memory Control Register (EMCDynamicControl)
    79  *
    80  * @{
    81  */
    82 
    83 #define EMC_DYN_CTRL_CE BSP_BIT32(0)
    84 #define EMC_DYN_CTRL_CS BSP_BIT32(1)
    85 #define EMC_DYN_CTRL_SR BSP_BIT32(2)
    86 #define EMC_DYN_CTRL_SRMCC BSP_BIT32(3)
    87 #define EMC_DYN_CTRL_IMCC BSP_BIT32(4)
    88 #define EMC_DYN_CTRL_MCC BSP_BIT32(5)
    89 #define EMC_DYN_CTRL_I_MASK BSP_MSK32(7, 8)
    90 #define EMC_DYN_CTRL_I_NORMAL BSP_FLD32(0x0, 7, 8)
    91 #define EMC_DYN_CTRL_I_MODE BSP_FLD32(0x1, 7, 8)
    92 #define EMC_DYN_CTRL_I_PALL BSP_FLD32(0x2, 7, 8)
    93 #define EMC_DYN_CTRL_I_NOP BSP_FLD32(0x3, 7, 8)
    94 #define EMC_DYN_CTRL_DP BSP_BIT32(9)
    95 
    96 /** @} */
    97 
    98 /**
    99  * @name EMC Dynamic Memory Read Configuration Register (EMCDynamicReadConfig)
    100  *
    101  * @{
    102  */
    103 
    104 #define EMC_DYN_READ_CONFIG_SDR_STRAT(val) BSP_FLD32(val, 0, 1)
    105 #define EMC_DYN_READ_CONFIG_SDR_POL_POS BSP_BIT32(4)
    106 #define EMC_DYN_READ_CONFIG_DDR_STRAT(val) BSP_FLD32(val, 8, 9)
    107 #define EMC_DYN_READ_CONFIG_DDR_POL_POS BSP_BIT32(12)
    108 
    109 /** @} */
    110 
    111 /**
    112  * @name EMC Dynamic Memory Configuration N Register (EMCDynamicConfigN)
    113  *
    114  * @{
    115  */
    116 
    117 #define EMC_DYN_CFG_MD(val) BSP_FLD32(val, 0, 2)
    118 #define EMC_DYN_CFG_AM(val) BSP_FLD32(val, 7, 14)
    119 #define EMC_DYN_CFG_P(val) BSP_BIT32(20)
    120 
    121 /** @} */
    122 
    123 /**
    124  * @name EMC Dynamic Memory RAS and CAS Delay N Register (EMCDynamicRasCasN)
    125  *
    126  * @{
    127  */
    128 
    129 #define EMC_DYN_RAS(val) BSP_FLD32(val, 0, 3)
    130 #define EMC_DYN_CAS(val) BSP_FLD32(val, 7, 10)
    13161
    13262/** @} */
  • c/src/lib/libbsp/arm/lpc32xx/include/lpc32xx.h

    rf6083f0 r76134c5  
    2929#include <bsp/lpc-dma.h>
    3030#include <bsp/lpc-i2s.h>
     31#include <bsp/lpc-emc.h>
    3132
    3233/**
     
    233234/** @} */
    234235
    235 #define LPC32XX_RESERVED(a, b, s) (((b) - (a) - sizeof(s)) / 4)
     236#define LPC32XX_FILL(a, b, s) uint8_t reserved_ ## b [b - a - sizeof(s)]
     237#define LPC32XX_RESERVE(a, b) uint8_t reserved_ ## b [b - a]
    236238
    237239typedef struct {
     
    432434  uint32_t p2_outp_set;
    433435  uint32_t p2_outp_clr;
    434   uint32_t reserved_0 [6];
     436  uint32_t p2_mux_set;
     437  uint32_t p2_mux_clr;
     438  uint32_t p2_mux_state;
     439  LPC32XX_RESERVE(0x034, 0x040);
    435440  uint32_t p0_inp_state;
    436441  uint32_t p0_outp_set;
     
    440445  uint32_t p0_dir_clr;
    441446  uint32_t p0_dir_state;
    442   uint32_t reserved_1 [1];
     447  LPC32XX_RESERVE(0x05c, 0x060);
    443448  uint32_t p1_inp_state;
    444449  uint32_t p1_outp_set;
     
    448453  uint32_t p1_dir_clr;
    449454  uint32_t p1_dir_state;
     455  LPC32XX_RESERVE(0x07c, 0x110);
     456  uint32_t p3_mux_set;
     457  uint32_t p3_mux_clr;
     458  uint32_t p3_mux_state;
     459  uint32_t p0_mux_set;
     460  uint32_t p0_mux_clr;
     461  uint32_t p0_mux_state;
     462  uint32_t p1_mux_set;
     463  uint32_t p1_mux_clr;
     464  uint32_t p1_mux_state;
    450465} lpc32xx_gpio;
    451466
     
    476491} lpc32xx_rtc;
    477492
    478 #define EMC_DYN_CHIP_COUNT 2
    479 
    480 #define EMC_STATIC_CHIP_COUNT 4
    481 
    482 typedef struct {
    483   uint32_t config;
    484   uint32_t rascas;
    485   uint32_t reserved_0 [6];
    486 } lpc32xx_emc_dynamic;
    487 
    488 typedef struct {
    489   uint32_t config;
    490   uint32_t waitwen;
    491   uint32_t waitoen;
    492   uint32_t waitrd;
    493   uint32_t waitpage;
    494   uint32_t waitwr;
    495   uint32_t waitturn;
    496   uint32_t reserved_0 [1];
    497 } lpc32xx_emc_static;
    498 
    499493typedef struct {
    500494  uint32_t control;
     
    503497  uint32_t reserved_0 [5];
    504498} lpc32xx_emc_ahb;
    505 
    506 typedef struct {
    507   uint32_t control;
    508   uint32_t status;
    509   uint32_t config;
    510   uint32_t reserved_0 [5];
    511   uint32_t dynamiccontrol;
    512   uint32_t dynamicrefresh;
    513   uint32_t dynamicreadconfig;
    514   uint32_t reserved_1;
    515   uint32_t dynamictrp;
    516   uint32_t dynamictras;
    517   uint32_t dynamictsrex;
    518   uint32_t reserved_2 [2];
    519   uint32_t dynamictwr;
    520   uint32_t dynamictrc;
    521   uint32_t dynamictrfc;
    522   uint32_t dynamictxsr;
    523   uint32_t dynamictrrd;
    524   uint32_t dynamictmrd;
    525   uint32_t dynamictcdlr;
    526   uint32_t reserved_3 [8];
    527   uint32_t staticextendedwait;
    528   uint32_t reserved_4 [31];
    529   lpc32xx_emc_dynamic dynamic [EMC_DYN_CHIP_COUNT];
    530   uint32_t reserved_5 [48];
    531   lpc32xx_emc_static emcstatic [EMC_STATIC_CHIP_COUNT];
    532   uint32_t reserved_6 [96];
    533   lpc32xx_emc_ahb ahb [5];
    534 } lpc32xx_emc;
    535499
    536500typedef struct {
     
    570534typedef struct {
    571535  lpc32xx_nand_slc nand_slc;
    572   uint32_t reserved_0 [LPC32XX_RESERVED(0x20020000, 0x20084000, lpc32xx_nand_slc)];
     536  LPC32XX_FILL(0x20020000, 0x20084000, lpc32xx_nand_slc);
    573537  lpc32xx_ssp ssp_0;
    574   uint32_t reserved_1 [LPC32XX_RESERVED(0x20084000, 0x20088000, lpc32xx_ssp)];
     538  LPC32XX_FILL(0x20084000, 0x20088000, lpc32xx_ssp);
    575539  lpc32xx_spi spi_1;
    576   uint32_t reserved_2 [LPC32XX_RESERVED(0x20088000, 0x2008c000, lpc32xx_spi)];
     540  LPC32XX_FILL(0x20088000, 0x2008c000, lpc32xx_spi);
    577541  lpc32xx_ssp ssp_1;
    578   uint32_t reserved_3 [LPC32XX_RESERVED(0x2008c000, 0x20090000, lpc32xx_ssp)];
     542  LPC32XX_FILL(0x2008c000, 0x20090000, lpc32xx_ssp);
    579543  lpc32xx_spi spi_2;
    580   uint32_t reserved_4 [LPC32XX_RESERVED(0x20090000, 0x20094000, lpc32xx_spi)];
     544  LPC32XX_FILL(0x20090000, 0x20094000, lpc32xx_spi);
    581545  lpc_i2s i2s_0;
    582   uint32_t reserved_5 [LPC32XX_RESERVED(0x20094000, 0x20098000, lpc_i2s)];
     546  LPC32XX_FILL(0x20094000, 0x20098000, lpc_i2s);
    583547  lpc32xx_sd_card sd_card;
    584   uint32_t reserved_6 [LPC32XX_RESERVED(0x20098000, 0x2009c000, lpc32xx_sd_card)];
     548  LPC32XX_FILL(0x20098000, 0x2009c000, lpc32xx_sd_card);
    585549  lpc_i2s i2s_1;
    586   uint32_t reserved_7 [LPC32XX_RESERVED(0x2009c000, 0x200a8000, lpc_i2s)];
     550  LPC32XX_FILL(0x2009c000, 0x200a8000, lpc_i2s);
    587551  lpc32xx_nand_mlc nand_mlc;
    588   uint32_t reserved_8 [LPC32XX_RESERVED(0x200a8000, 0x31000000, lpc32xx_nand_mlc)];
     552  LPC32XX_FILL(0x200a8000, 0x31000000, lpc32xx_nand_mlc);
    589553  lpc_dma dma;
    590   uint32_t reserved_9 [LPC32XX_RESERVED(0x31000000, 0x31020000, lpc_dma)];
     554  LPC32XX_FILL(0x31000000, 0x31020000, lpc_dma);
    591555  lpc32xx_usb usb;
    592   uint32_t reserved_10 [LPC32XX_RESERVED(0x31020000, 0x31040000, lpc32xx_usb)];
     556  LPC32XX_FILL(0x31020000, 0x31040000, lpc32xx_usb);
    593557  lpc32xx_lcd lcd;
    594   uint32_t reserved_11 [LPC32XX_RESERVED(0x31040000, 0x31060000, lpc32xx_lcd)];
     558  LPC32XX_FILL(0x31040000, 0x31060000, lpc32xx_lcd);
    595559  lpc32xx_eth eth;
    596   uint32_t reserved_12 [LPC32XX_RESERVED(0x31060000, 0x31080000, lpc32xx_eth)];
    597   lpc32xx_emc emc;
    598   uint32_t reserved_13 [LPC32XX_RESERVED(0x31080000, 0x310c0000, lpc32xx_emc)];
     560  LPC32XX_FILL(0x31060000, 0x31080000, lpc32xx_eth);
     561  lpc_emc emc;
     562  LPC32XX_FILL(0x31080000, 0x31080400, lpc_emc);
     563  lpc32xx_emc_ahb emc_ahb [5];
     564  LPC32XX_FILL(0x31080400, 0x310c0000, lpc32xx_emc_ahb [5]);
    599565  lpc32xx_etb etb;
    600   uint32_t reserved_14 [LPC32XX_RESERVED(0x310c0000, 0x40004000, lpc32xx_etb)];
     566  LPC32XX_FILL(0x310c0000, 0x40004000, lpc32xx_etb);
    601567  lpc32xx_syscon syscon;
    602   uint32_t reserved_15 [LPC32XX_RESERVED(0x40004000, 0x40008000, lpc32xx_syscon)];
     568  LPC32XX_FILL(0x40004000, 0x40008000, lpc32xx_syscon);
    603569  lpc32xx_irq mic;
    604   uint32_t reserved_16 [LPC32XX_RESERVED(0x40008000, 0x4000c000, lpc32xx_irq)];
     570  LPC32XX_FILL(0x40008000, 0x4000c000, lpc32xx_irq);
    605571  lpc32xx_irq sic_1;
    606   uint32_t reserved_17 [LPC32XX_RESERVED(0x4000c000, 0x40010000, lpc32xx_irq)];
     572  LPC32XX_FILL(0x4000c000, 0x40010000, lpc32xx_irq);
    607573  lpc32xx_irq sic_2;
    608   uint32_t reserved_18 [LPC32XX_RESERVED(0x40010000, 0x40014000, lpc32xx_irq)];
     574  LPC32XX_FILL(0x40010000, 0x40014000, lpc32xx_irq);
    609575  lpc32xx_uart uart_1;
    610   uint32_t reserved_19 [LPC32XX_RESERVED(0x40014000, 0x40018000, lpc32xx_uart)];
     576  LPC32XX_FILL(0x40014000, 0x40018000, lpc32xx_uart);
    611577  lpc32xx_uart uart_2;
    612   uint32_t reserved_20 [LPC32XX_RESERVED(0x40018000, 0x4001c000, lpc32xx_uart)];
     578  LPC32XX_FILL(0x40018000, 0x4001c000, lpc32xx_uart);
    613579  lpc32xx_uart uart_7;
    614   uint32_t reserved_21 [LPC32XX_RESERVED(0x4001c000, 0x40024000, lpc32xx_uart)];
     580  LPC32XX_FILL(0x4001c000, 0x40024000, lpc32xx_uart);
    615581  lpc32xx_rtc rtc;
    616   uint32_t reserved_22 [LPC32XX_RESERVED(0x40024000, 0x40028000, lpc32xx_rtc)];
     582  LPC32XX_FILL(0x40024000, 0x40028000, lpc32xx_rtc);
    617583  lpc32xx_gpio gpio;
    618   uint32_t reserved_23 [LPC32XX_RESERVED(0x40028000, 0x4002c000, lpc32xx_gpio)];
     584  LPC32XX_FILL(0x40028000, 0x4002c000, lpc32xx_gpio);
    619585  lpc_timer timer_4;
    620   uint32_t reserved_24 [LPC32XX_RESERVED(0x4002c000, 0x40030000, lpc_timer)];
     586  LPC32XX_FILL(0x4002c000, 0x40030000, lpc_timer);
    621587  lpc_timer timer_5;
    622   uint32_t reserved_25 [LPC32XX_RESERVED(0x40030000, 0x40034000, lpc_timer)];
     588  LPC32XX_FILL(0x40030000, 0x40034000, lpc_timer);
    623589  lpc32xx_ms_timer ms_timer;
    624   uint32_t reserved_26 [LPC32XX_RESERVED(0x40034000, 0x40038000, lpc32xx_ms_timer)];
     590  LPC32XX_FILL(0x40034000, 0x40038000, lpc32xx_ms_timer);
    625591  lpc32xx_hs_timer hs_timer;
    626   uint32_t reserved_27 [LPC32XX_RESERVED(0x40038000, 0x4003c000, lpc32xx_hs_timer)];
     592  LPC32XX_FILL(0x40038000, 0x4003c000, lpc32xx_hs_timer);
    627593  lpc32xx_wdt wdt;
    628   uint32_t reserved_28 [LPC32XX_RESERVED(0x4003c000, 0x40040000, lpc32xx_wdt)];
     594  LPC32XX_FILL(0x4003c000, 0x40040000, lpc32xx_wdt);
    629595  lpc32xx_debug debug;
    630   uint32_t reserved_29 [LPC32XX_RESERVED(0x40040000, 0x40044000, lpc32xx_debug)];
     596  LPC32XX_FILL(0x40040000, 0x40044000, lpc32xx_debug);
    631597  lpc_timer timer_0;
    632   uint32_t reserved_30 [LPC32XX_RESERVED(0x40044000, 0x40048000, lpc_timer)];
     598  LPC32XX_FILL(0x40044000, 0x40048000, lpc_timer);
    633599  lpc32xx_adc adc;
    634   uint32_t reserved_31 [LPC32XX_RESERVED(0x40048000, 0x4004c000, lpc32xx_adc)];
     600  LPC32XX_FILL(0x40048000, 0x4004c000, lpc32xx_adc);
    635601  lpc_timer timer_1;
    636   uint32_t reserved_32 [LPC32XX_RESERVED(0x4004c000, 0x40050000, lpc_timer)];
     602  LPC32XX_FILL(0x4004c000, 0x40050000, lpc_timer);
    637603  lpc32xx_keyscan keyscan;
    638   uint32_t reserved_33 [LPC32XX_RESERVED(0x40050000, 0x40054000, lpc32xx_keyscan)];
     604  LPC32XX_FILL(0x40050000, 0x40054000, lpc32xx_keyscan);
    639605  lpc32xx_uart_ctrl uart_ctrl;
    640   uint32_t reserved_34 [LPC32XX_RESERVED(0x40054000, 0x40058000, lpc32xx_uart_ctrl)];
     606  LPC32XX_FILL(0x40054000, 0x40058000, lpc32xx_uart_ctrl);
    641607  lpc_timer timer_2;
    642   uint32_t reserved_35 [LPC32XX_RESERVED(0x40058000, 0x4005c000, lpc_timer)];
     608  LPC32XX_FILL(0x40058000, 0x4005c000, lpc_timer);
    643609  lpc32xx_pwm pwm_1_and_pwm_2;
    644   uint32_t reserved_36 [LPC32XX_RESERVED(0x4005c000, 0x40060000, lpc32xx_pwm)];
     610  LPC32XX_FILL(0x4005c000, 0x40060000, lpc32xx_pwm);
    645611  lpc_timer timer3;
    646   uint32_t reserved_37 [LPC32XX_RESERVED(0x40060000, 0x40080000, lpc_timer)];
     612  LPC32XX_FILL(0x40060000, 0x40080000, lpc_timer);
    647613  lpc32xx_uart uart_3;
    648   uint32_t reserved_38 [LPC32XX_RESERVED(0x40080000, 0x40088000, lpc32xx_uart)];
     614  LPC32XX_FILL(0x40080000, 0x40088000, lpc32xx_uart);
    649615  lpc32xx_uart uart_4;
    650   uint32_t reserved_39 [LPC32XX_RESERVED(0x40088000, 0x40090000, lpc32xx_uart)];
     616  LPC32XX_FILL(0x40088000, 0x40090000, lpc32xx_uart);
    651617  lpc32xx_uart uart_5;
    652   uint32_t reserved_40 [LPC32XX_RESERVED(0x40090000, 0x40098000, lpc32xx_uart)];
     618  LPC32XX_FILL(0x40090000, 0x40098000, lpc32xx_uart);
    653619  lpc32xx_uart uart_6;
    654   uint32_t reserved_41 [LPC32XX_RESERVED(0x40098000, 0x400a0000, lpc32xx_uart)];
     620  LPC32XX_FILL(0x40098000, 0x400a0000, lpc32xx_uart);
    655621  lpc32xx_i2c i2c_1;
    656   uint32_t reserved_42 [LPC32XX_RESERVED(0x400a0000, 0x400a8000, lpc32xx_i2c)];
     622  LPC32XX_FILL(0x400a0000, 0x400a8000, lpc32xx_i2c);
    657623  lpc32xx_i2c i2c_2;
    658   uint32_t reserved_43 [LPC32XX_RESERVED(0x400a8000, 0x400e8000, lpc32xx_i2c)];
     624  LPC32XX_FILL(0x400a8000, 0x400e8000, lpc32xx_i2c);
    659625  lpc32xx_mcpwm mcpwm;
    660626} lpc32xx_registers;
  • c/src/lib/libbsp/arm/lpc32xx/misc/emc.c

    rf6083f0 r76134c5  
    2525#include <bsp/mmu.h>
    2626
    27 static volatile lpc32xx_emc *const emc = &lpc32xx.emc;
     27static volatile lpc_emc *const emc = &lpc32xx.emc;
     28
     29static volatile lpc32xx_emc_ahb *const emc_ahb = &lpc32xx.emc_ahb [0];
    2830
    2931static void dynamic_init(const lpc32xx_emc_dynamic_config *cfg)
     
    9698
    9799  /* Enable buffers in AHB ports */
    98   emc->ahb [0].control = EMC_AHB_PORT_BUFF_EN;
    99   emc->ahb [3].control = EMC_AHB_PORT_BUFF_EN;
    100   emc->ahb [4].control = EMC_AHB_PORT_BUFF_EN;
     100  emc_ahb [0].control = EMC_AHB_PORT_BUFF_EN;
     101  emc_ahb [3].control = EMC_AHB_PORT_BUFF_EN;
     102  emc_ahb [4].control = EMC_AHB_PORT_BUFF_EN;
    101103
    102104  /* Set AHB port timeouts */
    103   emc->ahb [0].timeout = EMC_AHB_TIMEOUT(32);
    104   emc->ahb [3].timeout = EMC_AHB_TIMEOUT(32);
    105   emc->ahb [4].timeout = EMC_AHB_TIMEOUT(32);
     105  emc_ahb [0].timeout = EMC_AHB_TIMEOUT(32);
     106  emc_ahb [3].timeout = EMC_AHB_TIMEOUT(32);
     107  emc_ahb [4].timeout = EMC_AHB_TIMEOUT(32);
    106108
    107109  /* Enable EMC */
    108   emc->control = EMC_CTRL_EN,
     110  emc->control = EMC_CTRL_E,
    109111  emc->config = 0;
    110112
  • c/src/lib/libbsp/arm/lpc32xx/preinstall.am

    rf6083f0 r76134c5  
    103103PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-i2s.h
    104104
     105$(PROJECT_INCLUDE)/bsp/lpc-emc.h: ../shared/lpc/include/lpc-emc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
     106        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-emc.h
     107PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-emc.h
     108
     109$(PROJECT_INCLUDE)/bsp/lpc-lcd.h: ../shared/lpc/include/lpc-lcd.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
     110        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-lcd.h
     111PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-lcd.h
     112
    105113$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
    106114        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
Note: See TracChangeset for help on using the changeset viewer.