Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-21 04:52:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

onfigs/mx1ads/ostest: Configuration converted to use the kconfig-frontends tools

Browse Source
This commit is contained in:
Gregory Nutt
2014-03-06 09:48:25 -06:00
parent d5fbc4eeac
commit ca916b1060
9 changed files with 675 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+2
View File
@@ -6906,3 +6906,5 @@
kconfig-frontends tools (2014-3-6)
* configs/us7032evb1/nsh: Configuration converted to use the
kconfig-frontends tools (2014-3-6)
* configs/mx1ads/ostest: Configuration converted to use the
kconfig-frontends tools (2014-3-6)
arch/arm/src/imx/Kconfig
+32 -6
View File
@@ -5,19 +5,45 @@
if ARCH_CHIP_IMX
config IMX_UART0
bool "UART0"
select ARCH_HAVE_UART0
default n
# choice "iMX Chip Selection"
config ARCH_CHIP_IMX1
bool
default y
menu "iMX Peripheral Selection"
config IMX_UART1
bool "UART1"
select ARCH_HAVE_UART1
default n
select ARCH_HAVE_UART1
config IMX_UART2
bool "UART2"
select ARCH_HAVE_UART2
default n
select ARCH_HAVE_UART2
config IMX_UART3
bool "UART2"
default n
select ARCH_HAVE_UART3
config IMX_SPI1
bool "SPI1"
default n
select SPI
config IMX_SPI2
bool "SPI2"
default n
select SPI
endmenu # iMX Peripheral Selection
config RAM_NUTTXENTRY
hex "NuttX entry point"
default 0x01004000
---help---
The virtual address of the NuttX entry point
endif
arch/arm/src/imx/imx_allocateheap.c
+2 -2
View File
@@ -107,9 +107,9 @@ void up_addregion(void)
*/
#if !defined(CONFIG_BOOT_RUNFROMFLASH) && !defined(CONFIG_BOOT_COPYTORAM)
# if (CONFIG_DRAM_NUTTXENTRY & 0xffff0000) != CONFIG_RAM_VSTART
# if (CONFIG_RAM_NUTTXENTRY & 0xffff0000) != CONFIG_RAM_VSTART
uint32_t start = CONFIG_RAM_VSTART + 0x1000;
uint32_t end = (CONFIG_DRAM_NUTTXENTRY & 0xffff0000);
uint32_t end = (CONFIG_RAM_NUTTXENTRY & 0xffff0000);
kmm_addregion((FAR void*)start, end - start);
# endif
#endif
arch/arm/src/imx/imx_memorymap.h
+3 -3
View File
@@ -216,11 +216,11 @@
* This offset reserves space for the MMU page cache.
*/
#define NUTTX_START_VADDR ((CONFIG_DRAM_NUTTXENTRY & 0xfff00000) | PGTABLE_SIZE)
#define NUTTX_START_VADDR ((CONFIG_RAM_NUTTXENTRY & 0xfff00000) | PGTABLE_SIZE)
#define NUTTX_START_PADDR (IMX_SDRAM0_PSECTION | PGTABLE_SIZE)
#if NUTTX_START_VADDR != CONFIG_DRAM_NUTTXENTRY
# error "CONFIG_DRAM_NUTTXENTRY does not have correct offset for page table"
#if NUTTX_START_VADDR != CONFIG_RAM_NUTTXENTRY
# error "CONFIG_RAM_NUTTXENTRY does not have correct offset for page table"
#endif
/* Section MMU Flags */
arch/arm/src/imx/imx_spi.c
+11 -11
View File
@@ -63,16 +63,16 @@
/* The i.MX1/L supports 2 SPI interfaces. Which have been enabled? */
#ifndef CONFIG_SPI1_DISABLE
#ifdef CONFIG_IMX_SPI1
# define SPI1_NDX 0 /* Index to SPI1 in g_spidev[] */
# ifndef CONFIG_SPI2_DISABLE
# ifdef CONFIG_IMX_SPI2
# define SPI2_NDX 1 /* Index to SPI2 in g_spidev[] */
# define NSPIS 2 /* Two SPI interfaces: SPI1 & SPI2 */
# else
# define NSPIS 1 /* One SPI interface: SPI1 */
# endif
#else
# ifndef CONFIG_SPI2_DISABLE
# ifdef CONFIG_IMX_SPI2
# define SPI2_NDX 0 /* Index to SPI2 in g_spidev[] */
# define NSPIS 1 /* One SPI interface: SPI2 */
# else
@@ -213,7 +213,7 @@ static const struct spi_ops_s g_spiops =
static struct imx_spidev_s g_spidev[] =
{
#ifndef CONFIG_SPI1_DISABLE
#ifdef CONFIG_IMX_SPI1
{
.ops = &g_spiops,
.base = IMX_CSPI1_VBASE,
@@ -222,7 +222,7 @@ static struct imx_spidev_s g_spidev[] =
#endif
},
#endif
#ifndef CONFIG_SPI2_DISABLE
#ifdef CONFIG_IMX_SPI2
{
.ops = &g_spiops,
.base = IMX_CSPI2_VBASE,
@@ -614,11 +614,11 @@ static inline struct imx_spidev_s *spi_mapirq(int irq)
{
switch (irq)
{
#ifndef CONFIG_SPI1_DISABLE
#ifdef CONFIG_IMX_SPI1
case IMX_IRQ_CSPI1:
return &g_spidev[SPI1_NDX];
#endif
#ifndef CONFIG_SPI2_DISABLE
#ifdef CONFIG_IMX_SPI2
case IMX_IRQ_CSPI2:
return &g_spidev[SPI2_NDX];
#endif
@@ -1020,7 +1020,7 @@ FAR struct spi_dev_s *up_spiinitialize(int port)
switch (port)
{
#ifndef CONFIG_SPI1_DISABLE
#ifdef CONFIG_IMX_SPI1
case 1:
/* Select SPI1 */
@@ -1035,9 +1035,9 @@ FAR struct spi_dev_s *up_spiinitialize(int port)
imxgpio_configpfinput(GPIOC, 16); /* Port C, pin 16: MISO */
imxgpio_configpfoutput(GPIOC, 17); /* Port C, pin 17: MOSI */
break;
#endif /* CONFIG_SPI1_DISABLE */
#endif /* CONFIG_IMX_SPI1 */
#ifndef CONFIG_SPI2_DISABLE
#ifdef CONFIG_IMX_SPI2
case 2:
/* Select SPI2 */
@@ -1087,7 +1087,7 @@ FAR struct spi_dev_s *up_spiinitialize(int port)
imxgpio_configoutput(GPIOD, 10);
#endif
break;
#endif /* CONFIG_SPI2_DISABLE */
#endif /* CONFIG_IMX_SPI2 */
default:
return NULL;
configs/mx1ads/README.txt
+33 -10
View File
@@ -121,18 +121,41 @@ ARM/i.MX1-specific Configuration Options
Configurations
^^^^^^^^^^^^^^
Each MX1ADS configuration is maintained in a sub-directory and
can be selected as follow:
Common Configuration Notes
--------------------------
cd tools
./configure.sh imxads/<subdir>
cd -
. ./setenv.sh
1. Each MX1ADS configuration is maintained in a sub-directory and
can be selected as follow:
cd tools
./configure.sh imxads/<subdir>
cd -
. ./setenv.sh
Where <subdir> is one of the configuration sub-directories described in
the following paragraph.
2. These configurations use the mconf-based configuration tool. To
change a configurations using that tool, you should:
a. Build and install the kconfig-mconf tool. See nuttx/README.txt
and misc/tools/
b. Execute 'make menuconfig' in nuttx/ in order to start the
reconfiguration process.
3. By default, all configurations assume that you are building under
Linux (should work under Windows with Cygwin as well). This is
is easily reconfigured:
CONFIG_HOST_LINUX=y
Configuration Sub-Directories
-----------------------------
Where <subdir> is one of the following:
ostest
^^^^^^
ostest
This configuration directory, performs a simple OS test using
examples/ostest.
This configuration directory, performs a simple OS test using
examples/ostest.
configs/mx1ads/ostest/appconfig
-39
View File
@@ -1,39 +0,0 @@
############################################################################
# configs/mx1ads/ostest/appconfig
#
# Copyright (C) 2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in
# the documentation and/or other materials provided with the
# distribution.
# 3. Neither the name NuttX nor the names of its contributors may be
# used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
############################################################################
# Path to example in apps/examples containing the user_start entry point
CONFIGURED_APPS += examples/ostest
configs/mx1ads/ostest/defconfig
+590 -267
View File
File diff suppressed because it is too large Load Diff
configs/us7032evb1/README.txt
+2 -3
View File
@@ -78,12 +78,11 @@ Common Configuration Notes
b. Execute 'make menuconfig' in nuttx/ in order to start the
reconfiguration process.
3. By default, all configurations assume the NuttX Buildroot toolchain
under Linux (should work under Windows with Cygwin as well). This
3. By default, all configurations assume that you are building under
Linux (should work under Windows with Cygwin as well). This is
is easily reconfigured:
CONFIG_HOST_LINUX=y
CONFIG_ARM_TOOLCHAIN_BUILDROOT=y
Configuration Sub-Directories
-----------------------------