arch/arm/src/lpc2378/Kconfig: Create Kconfig for the platform; Adjust configuration names for compatibility, configs/olimex-lpc2378/nsh: Convert to use the kconfig-frontends tools

This commit is contained in:
Gregory Nutt 2014-03-02 11:08:23 -06:00
parent 740a3ce1b9
commit 74414b9762
6 changed files with 247 additions and 66 deletions

View File

@ -37,7 +37,7 @@ config DEFAULT_MODE
endchoice
config CODE_BASE
hex "Execuation Base Address"
hex "Execution Base Address"
default 0x00000000
---help---
This must match the expected address for the selected "Memory
@ -45,7 +45,7 @@ config CODE_BASE
EXTMEM_MODE: 0x8000:0000
RAM_MODE: 0x4000:0000
DEFAULT)MODE: 0x0000:0000
DEFAULT_MODE: 0x0000:0000
config PLL_SETUP
bool "Configure the PLL"

View File

@ -4,3 +4,163 @@
#
comment "LPC2378 Configuration Options"
choice
prompt "Memory Execution Mode"
default LPC2378_DEFAULT_MODE
config LPC2378_EXTMEM_MODE
bool "External Memory Mode"
depends on EXPERIMENTAL # Not used
---help---
Code executes from external memory starting at address 0x8000:0000.
config LPC2378_RAM_MODE
bool "RAM Memory Mode"
depends on EXPERIMENTAL # Not used
---help---
Code executes from on-chip RAM at address 0x4000:0000.
config LPC2378_DEFAULT_MODE
bool "Default Memory Mode"
---help---
Executes from 0x0000:0000. In non-default modes, the MEMAP register
is set override the settings of the CPU configuration pins.
endchoice
config LPC2378_CODE_BASE
hex "Execution Base Address"
default 0x00000000
---help---
This must match the expected address for the selected "Memory
Execution Address":
LPC2378_EXTMEM_MODE: 0x8000:0000
LPC2378_RAM_MODE: 0x4000:0000
LPC2378_DEFAULT_MODE: 0x0000:0000
config LPC2378_PLL_SETUP
bool "Configure the PLL"
default y
config LPC2378_PLL_CLKSRC
int "PLL clock source"
default 1
range 0 2
depends on LPC2378_PLL_SETUP
---help---
PLL clock source
config LPC2378_MAM_SETUP
bool "Configure the Memory Accelerator Module (MAM)"
default y
config LPC2378_LPC2378_MAMCR_VALUE
int "Memory accelerator mode"
default 1
range 0 2
---help---
Memory accelerator mode:
OFF 0
PART 1
FULL 2
config LPC2378_LPC2378_MAMTIM_VALUE
int "Memory accelerator timing value"
default 3
---help---
Memory accelerator timing value
config LPC2378_APBDIV_SETUP
bool "Configure the APB Divider"
default y
depends on EXPERIMENTAL # Not used
config LPC2378_APBDIV_VALUE
int "APB Divisor"
default 1
depends on EXPERIMENTAL # Not used
config LPC2378_EMC_SETUP
bool "Configure EMC"
default n
depends on EXPERIMENTAL # Not used
config LPC2378_BCFG0_SETUP
bool "Configure BCFG0"
default n
depends on EXPERIMENTAL # Not used
config LPC2378_BCFG1_SETUP
bool "Configure BCFG1"
default n
depends on EXPERIMENTAL # Not used
config LPC2378_BCFG2_SETUP
bool "Configure BCFG2"
default n
depends on EXPERIMENTAL # Not used
config BCFG3_SETUP
bool "Configure BCFG3"
default n
depends on EXPERIMENTAL # Not used
config LPC2378_ADC_SETUP
bool "Configure ADC"
default y
depends on EXPERIMENTAL # Not used
menu "LPC2378 Peripheral Support"
config LPC2378_UART0
bool "UART0"
default y
select ARCH_HAVE_UART0
config LPC2378_UART1
bool "UART1"
default y
select ARCH_HAVE_UART1
config LPC2378_UART2
bool "UART2"
default y
select ARCH_HAVE_UART2
config LPC2378_USBDEV
bool "USB Device"
default y
depends on USBDEV
endmenu
if LPC2378_USBDEV
menu "LPC2378 USB Device Configuration"
config LPC2378_USBDEV_DMA
bool "USB Device DMA Support"
default n
config LPC2378_USBDEV_NDMADESCRIPTORS
int "Number of USB DMA Descriptors"
default 8
depends on LPC2378_USBDEV_DMA
config LPC2378_USBDEV_EPFAST_INTERRUPT
bool "USB Device Fast Endpoint Interrupts"
default n
config LPC2378_USBDEV_FRAME_INTERRUPT
bool "USB Device Frame Interrupts"
default n
config LPC2378_USBDEV_REGDEBUG
bool "USB Device Register-Level Debug Output"
default n
depends on DEBUG
endmenu
endif

View File

@ -6,7 +6,7 @@
*
* This file is part of the NuttX RTOS and based on the lpc2148 port:
*
* Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved.
* Copyright (C) 2010, 2012, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -59,6 +59,7 @@
/* Print a character on the UART to show boot status. This macro will
* modify r0, r1, r2 and r14
*/
#ifdef CONFIG_DEBUG
.macro showprogress, code
mov r0, #\code
@ -80,7 +81,7 @@
*
* Description:
* Interrrupt vector table. This must be located at the beginning
* of the memory space (at CONFIG_CODE_BASE). The first entry in
* of the memory space (at CONFIG_LPC2378_CODE_BASE). The first entry in
* the vector table is the reset vector and this is the code that
* will execute whn the processor is reset.
*
@ -136,6 +137,7 @@ _vector_table:
__start:
/* Call lowlevel init C-function */
.extern ConfigurePLL
ldr r0, =ConfigurePLL
mov lr, pc
@ -153,7 +155,6 @@ __start:
showprogress 'A'
/* Setup system stack (and get the BSS range) */
adr r0, LC0
@ -231,4 +232,3 @@ g_idle_topstack:
.size g_idle_topstack, .-g_idle_topstack
.end

View File

@ -6,7 +6,7 @@
*
* This file is part of the NuttX RTOS:
*
* Copyright (C) 2010 Gregory Nutt. All rights reserved.
* Copyright (C) 2010, 2014 Gregory Nutt. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -46,13 +46,13 @@
* MEMAP register is set override the settings of the CPU configuration
* pins.
*
* CONFIG_EXTMEM_MODE: Code executes from external memory starting at
* CONFIG_LPC2378_EXTMEM_MODE: Code executes from external memory starting at
* address 0x8000:0000.
*
* CONFIG_RAM_MODE: Code executes from on-chip RAM at address
* CONFIG_LPC2378_RAM_MODE: Code executes from on-chip RAM at address
* 0x4000:0000.
*
* Starupt Code must be linked to run at the correct address
* Start-up Code must be linked to run at the correct address
* corresponding to the selected mode.
*/
@ -70,10 +70,10 @@
#include "lpc23xx_pinsel.h"
#include "lpc23xx_scb.h"
extern void IO_Init(void);
void IO_Init(void);
/***********************************************************************
* Definitions
* Pre-processor Definitions
**********************************************************************/
#if ((FOSC < 32000) || (FOSC > 50000000))
@ -105,8 +105,8 @@ extern void IO_Init(void);
* RTC 2
*/
#ifdef CONFIG_PLL_CLKSRC
# if ( (CONFIG_PLL_CLKSRC < 0) || (CONFIG_PLL_CLKSRC > 2) )
#ifdef CONFIG_LPC2378_PLL_CLKSRC
# if ( (CONFIG_LPC2378_PLL_CLKSRC < 0) || (CONFIG_LPC2378_PLL_CLKSRC > 2) )
# error "PLL clock source not valid, check configuration "
# endif
#else
@ -138,13 +138,13 @@ extern void IO_Init(void);
/* LPC2378 Rev. '-' errata MAM may not work if fully enabled */
#ifdef CONFIG_MAM_SETUP
# ifndef CONFIG_MAMCR_VALUE /* Can be selected from config file */
# define CONFIG_MAMCR_VALUE (MAMCR_PART)
#ifdef CONFIG_LPC2378_MAM_SETUP
# ifndef CONFIG_LPC2378_MAMCR_VALUE /* Can be selected from config file */
# define CONFIG_LPC2378_MAMCR_VALUE (MAMCR_PART)
# endif
# ifndef CONFIG_MAMTIM_VALUE /* Can be selected from config file */
# define CONFIG_MAMTIM_VALUE (0x00000003)
# ifndef CONFIG_LPC2378_MAMTIM_VALUE /* Can be selected from config file */
# define CONFIG_LPC2378_MAMTIM_VALUE (0x00000003)
# endif
#endif
@ -171,12 +171,15 @@ void ConfigurePLL(void)
uint32_t MSel, NSel;
/* LPC2378 Rev.'-' errata Enable the Ethernet block to enable 16k EnetRAM */
SCB_PCONP |= PCENET;
/* Vectors are remapped to Flash */
SCB_MEMMAP = MEMMAP2FLASH;
/* Enable PLL, disconnected */
if (SCB_PLLSTAT & (1 << 25))
{
SCB_PLLCON = 0x01;
@ -184,37 +187,48 @@ void ConfigurePLL(void)
}
/* Disable PLL, disconnected */
SCB_PLLCON = 0;
up_scbpllfeed();
/* Enable main OSC */
SCB_SCS |= 0x20;
/* Wait until main OSC is usable */
while (!(SCB_SCS & 0x40));
/* select main OSC, 12MHz, as the PLL clock source */
SCB_CLKSRCSEL = CONFIG_PLL_CLKSRC;
SCB_CLKSRCSEL = CONFIG_LPC2378_PLL_CLKSRC;
/* Reconfigure PLL */
SCB_PLLCFG = PLL;
up_scbpllfeed();
/* Enable PLL */
SCB_PLLCON = 0x01;
up_scbpllfeed();
/* Set clock divider */
SCB_CCLKCFG = CCLK_DIV;
#ifdef CONFIG_USBDEV
/* usbclk = 288 MHz/6 = 48 MHz */
SCB_USBCLKCFG = USBCLK_DIV;
/* Turn On USB PCLK */
SCB_PCONP |= PCUSB;
#endif
/* Wait for PLL to lock */
while ((SCB_PLLSTAT & (1 << 26)) == 0);
MSel = SCB_PLLSTAT & 0x00007FFF;
@ -222,18 +236,22 @@ void ConfigurePLL(void)
while ((MSel != PLL_M) && (NSel != PLL_N));
/* Enable and connect */
SCB_PLLCON = 0x03;
up_scbpllfeed();
/* Check connect bit status */
while ((SCB_PLLSTAT & (1 << 25)) == 0);
/* Set memory accelerater module */
SCB_MAMCR = 0;
SCB_MAMTIM = CONFIG_MAMTIM_VALUE;
SCB_MAMCR = CONFIG_MAMCR_VALUE;
SCB_MAMTIM = CONFIG_LPC2378_MAMTIM_VALUE;
SCB_MAMCR = CONFIG_LPC2378_MAMCR_VALUE;
/* Enable FastIO on P0:P1 */
SCB_SCS |= 0x01;
IO_Init();

View File

@ -6,7 +6,7 @@
*
* This file is part of the NuttX RTOS and based on the lpc2148 port:
*
* Copyright (C) 2010 Gregory Nutt. All rights reserved.
* Copyright (C) 2010, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -49,17 +49,20 @@
#include "lpc23xx_vic.h"
/****************************************************************************************************
* Definitions
* Pre-processor Definitions
****************************************************************************************************/
#define scb_getreg(o) getreg32(LPC23XX_SCB_BASE + (o))
#define scb_putreg(v,o) putreg32((v),LPC23XX_SCB_BASE + (o))
/* Memory Accelerator Mode */
#define MAMCR_OFF 0
#define MAMCR_PART 1
#define MAMCR_FULL 2
/* Memory Mapping */
#define MEMMAP2BBLK 0 /* Interrupt Vectors in Boot Block */
#define MEMMAP2FLASH 1 /* Interrupt Vectors in FLASH */
#define MEMMAP2SRAM 2 /* Interrupt Vectors in RAM */
@ -68,58 +71,58 @@
/* PLL Control Register Bit Settings */
#define PLLCON_PLLE (1 << 0) /* PLL Enable */
#define PLLCON_PLLC (1 << 1) /* PLL Connect */
#define PLLCON_PLLE (1 << 0) /* PLL Enable */
#define PLLCON_PLLC (1 << 1) /* PLL Connect */
/* PLL Configuration Register Bit Settings */
#define PLLCFG_MSEL (0x0000FFFF << 0) /* PLL Multiplier (minus 1) */
#define PLLCFG_NSEL (0x000000FF << 16) /* PLL Divider */
#define PLLCFG_MSEL (0x0000ffff << 0) /* PLL Multiplier (minus 1) */
#define PLLCFG_NSEL (0x000000ff << 16) /* PLL Divider */
/* PLL Status Register Bit Settings */
#define PLLSTAT_MSEL (0x7FFF << 0) /* PLL Multiplier Readback */
#define PLLSTAT_NSEL (0xFF << 16) /* PLL Divider Readback */
#define PLLSTAT_PLLE (1 << 24) /* PLL Enable Readback */
#define PLLSTAT_PLLC (1 << 25) /* PLL Connect Readback */
#define PLLSTAT_PLOCK (1 << 26) /* PLL Lock Status */
#define PLLSTAT_MSEL (0x7fff << 0) /* PLL Multiplier Readback */
#define PLLSTAT_NSEL (0xff << 16) /* PLL Divider Readback */
#define PLLSTAT_PLLE (1 << 24) /* PLL Enable Readback */
#define PLLSTAT_PLLC (1 << 25) /* PLL Connect Readback */
#define PLLSTAT_PLOCK (1 << 26) /* PLL Lock Status */
/* PLL Feed Register values */
#define PLLFEED1 0xaa
#define PLLFEED2 0x55
#define PLLFEED1 0xaa
#define PLLFEED2 0x55
/* Peripheral Power Control (PCONP) Register 0xE01FC0C4 */
#define PCTIM0 (1 << 1) /* Timer/Counter 0 */
#define PCTIM1 (1 << 2) /* Timer/Counter 1 */
#define PCUART0 (1 << 3) /* UART0 power/clock */
#define PCUART1 (1 << 4) /* UART1 power/clock */
#define PCPWM1 (1 << 5) /* Unused, always 0 */
#define PWM1 (1 << 6) /* Pulse Width Modulation 1 */
#define PCI2C0 (1 << 7) /* I2C0 interface */
#define PCSPI (1 << 8) /* SPI */
#define PCRTC (1 << 9) /* Real Time Clock*/
#define PCSSP1 (1 << 10) /* SSP1 */
#define PCEMC (1 << 11) /* External Memory Controller */
#define PCAD (1 << 12) /* A/D converter (ADC) Note: Clear the PDN bit in the AD0CR before
clearing this bit, and set this bit before setting PDN */
#define PCAN1 (1 << 13) /* CAN Controller 1 */
#define PCAN2 (1 << 14) /* CAN Controller 2 */
#define PCI2C1 (1 << 19) /* The I2C1 interface power/clock control bit */
#define PCSSP0 (1 << 21) /* The SSP0 interface power/clock control bit */
#define PCTIM2 (1 << 22) /* Timer 2 */
#define PCTIM3 (1 << 23) /* Timer 3 */
#define PCUART2 (1 << 24) /* UART 2 */
#define PCUART3 (1 << 25) /* UART 3 */
#define PCI2C2 (1 << 26) /* I2C interface 2 */
#define PCI2S (1 << 27) /* I2S interface */
#define PCSDC (1 << 28) /* SD card interface */
#define PCGPDMA (1 << 29) /* GP DMA function */
#define PCENET (1 << 30) /* Ethernet block */
#define PCUSB (1 << 31) /* USB interface */
#define PCTIM0 (1 << 1) /* Timer/Counter 0 */
#define PCTIM1 (1 << 2) /* Timer/Counter 1 */
#define PCUART0 (1 << 3) /* UART0 power/clock */
#define PCUART1 (1 << 4) /* UART1 power/clock */
#define PCPWM1 (1 << 5) /* Unused, always 0 */
#define PWM1 (1 << 6) /* Pulse Width Modulation 1 */
#define PCI2C0 (1 << 7) /* I2C0 interface */
#define PCSPI (1 << 8) /* SPI */
#define PCRTC (1 << 9) /* Real Time Clock*/
#define PCSSP1 (1 << 10) /* SSP1 */
#define PCEMC (1 << 11) /* External Memory Controller */
#define PCAD (1 << 12) /* A/D converter (ADC) Note: Clear the PDN
* bit in the AD0CR before clearing this bit,
* and set this bit before setting PDN */
#define PCAN1 (1 << 13) /* CAN Controller 1 */
#define PCAN2 (1 << 14) /* CAN Controller 2 */
#define PCI2C1 (1 << 19) /* The I2C1 interface power/clock control bit */
#define PCSSP0 (1 << 21) /* The SSP0 interface power/clock control bit */
#define PCTIM2 (1 << 22) /* Timer 2 */
#define PCTIM3 (1 << 23) /* Timer 3 */
#define PCUART2 (1 << 24) /* UART 2 */
#define PCUART3 (1 << 25) /* UART 3 */
#define PCI2C2 (1 << 26) /* I2C interface 2 */
#define PCI2S (1 << 27) /* I2S interface */
#define PCSDC (1 << 28) /* SD card interface */
#define PCGPDMA (1 << 29) /* GP DMA function */
#define PCENET (1 << 30) /* Ethernet block */
#define PCUSB (1 << 31) /* USB interface */
/****************************************************************************************************
* Inline Functions
****************************************************************************************************/

View File

@ -136,7 +136,7 @@ static char g_uart2txbuffer[CONFIG_UART2_TXBUFSIZE];
/* This describes the state of the LPC214X uart0 port. */
#ifdef CONFIG_UART0
#ifdef CONFIG_LPC2378_UART0
static struct up_dev_s g_uart0priv =
{
.uartbase = UART0_BASE_ADDR,
@ -164,7 +164,7 @@ static uart_dev_t g_uart0port =
};
#endif
#ifdef CONFIG_UART2
#ifdef CONFIG_LPC2378_UART2
/* This describes the state of the LPC23XX uart2 port. */