configs/stm3240g-eval/nxconsole: Configuration converted to use the kconfig-frontends tools
This commit is contained in:
Gregory Nutt
parent
4f067ce765
commit
433f5f6227
@ -15,14 +15,14 @@ config STM3240G_LCD
|
||||
|
||||
if STM3240G_LCD
|
||||
|
||||
config LCD_RDSHIFT
|
||||
config STM3240G_LCD_RDSHIFT
|
||||
int "LCD data shift"
|
||||
default 5
|
||||
---help---
|
||||
When reading 16-bit gram data, there appears to be a shift in the returned
|
||||
data. This value fixes the offset. Default 5.
|
||||
|
||||
config STM32_ILI9320_DISABLE
|
||||
config STM3240G_ILI9320_DISABLE
|
||||
bool "Disable LCD_ILI9320 (and LCD_ILI9321) support"
|
||||
default n
|
||||
---help---
|
||||
@ -30,7 +30,7 @@ config STM32_ILI9320_DISABLE
|
||||
ID value. However, code size can be reduced by suppressing support for
|
||||
individual LCDs using this option.
|
||||
|
||||
config STM32_ILI9325_DISABLE
|
||||
config STM3240G_ILI9325_DISABLE
|
||||
bool "Disable LCD_ILI9325 support"
|
||||
default n
|
||||
---help---
|
||||
|
||||
@ -54,13 +54,13 @@ GNU Toolchain Options
|
||||
add one of the following configuration options to your .config (or defconfig)
|
||||
file:
|
||||
|
||||
CONFIG_STM32_CODESOURCERYW=y : CodeSourcery under Windows
|
||||
CONFIG_STM32_CODESOURCERYL=y : CodeSourcery under Linux
|
||||
CONFIG_STM32_ATOLLIC_LITE=y : The free, "Lite" version of Atollic toolchain under Windows
|
||||
CONFIG_STM32_ATOLLIC_PRO=y : The paid, "Pro" version of Atollic toolchain under Windows
|
||||
CONFIG_STM32_DEVKITARM=y : devkitARM under Windows
|
||||
CONFIG_STM32_RAISONANCE=y : Raisonance RIDE7 under Windows
|
||||
CONFIG_STM32_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default)
|
||||
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : CodeSourcery under Windows
|
||||
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y : CodeSourcery under Linux
|
||||
CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC_LITE=y : The free, "Lite" version of Atollic toolchain under Windows
|
||||
CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC_PRO=y : The paid, "Pro" version of Atollic toolchain under Windows
|
||||
CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM=y : devkitARM under Windows
|
||||
CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE=y : Raisonance RIDE7 under Windows
|
||||
CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default)
|
||||
|
||||
If you change the default toolchain, then you may also have to modify the PATH in
|
||||
the setenv.h file if your make cannot find the tools.
|
||||
@ -466,8 +466,8 @@ in order to successfully build NuttX using the Atollic toolchain WITH FPU suppor
|
||||
-CONFIG_ARCH_FPU=n : Enable FPU support
|
||||
+CONFIG_ARCH_FPU=y
|
||||
|
||||
-CONFIG_STM32_CODESOURCERYW=y : Disable the CodeSourcery toolchain
|
||||
+CONFIG_STM32_CODESOURCERYW=n
|
||||
-CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : Disable the CodeSourcery toolchain
|
||||
+CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=n
|
||||
|
||||
-CONFIG_STM32_ATOLLIC_LITE=n : Enable *one* the Atollic toolchains
|
||||
CONFIG_STM32_ATOLLIC_PRO=n
|
||||
@ -873,7 +873,7 @@ STM3240G-EVAL-specific Configuration Options
|
||||
In this orientation, the top of the display is to the right
|
||||
of the buttons (if the board is held so that the buttons are at the
|
||||
botton of the board).
|
||||
CONFIG_LCD_RDSHIFT - When reading 16-bit gram data, there appears
|
||||
CONFIG_STM3240G_LCD_RDSHIFT - When reading 16-bit gram data, there appears
|
||||
to be a shift in the returned data. This value fixes the offset.
|
||||
Default 5.
|
||||
|
||||
@ -881,8 +881,8 @@ STM3240G-EVAL-specific Configuration Options
|
||||
ID value. However, code size can be reduced by suppressing support for
|
||||
individual LCDs using:
|
||||
|
||||
CONFIG_STM32_ILI9320_DISABLE (includes ILI9321)
|
||||
CONFIG_STM32_ILI9325_DISABLE
|
||||
CONFIG_STM3240G_ILI9320_DISABLE (includes ILI9321)
|
||||
CONFIG_STM3240G_ILI9325_DISABLE
|
||||
|
||||
STM32 USB OTG FS Host Driver Support
|
||||
|
||||
@ -962,10 +962,10 @@ Where <subdir> is one of the following:
|
||||
Configuration settings that you may need to change for your
|
||||
environment:
|
||||
|
||||
CONFIG_STM32_CODESOURCERYL=y - CodeSourcery for Linux
|
||||
CONFIG_EXAMPLES_DISCOVER_DHCPC=y - DHCP Client
|
||||
CONFIG_EXAMPLES_DISCOVER_IPADDR - (not defined)
|
||||
CONFIG_EXAMPLES_DISCOVER_DRIPADDR - Router IP address
|
||||
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y - CodeSourcery for Linux
|
||||
CONFIG_EXAMPLES_DISCOVER_DHCPC=y - DHCP Client
|
||||
CONFIG_EXAMPLES_DISCOVER_IPADDR - (not defined)
|
||||
CONFIG_EXAMPLES_DISCOVER_DRIPADDR - Router IP address
|
||||
|
||||
NOTE: This configuration uses to the kconfig-mconf configuration tool to
|
||||
control the configuration. See the section entitled "NuttX Configuration
|
||||
@ -1096,7 +1096,7 @@ Where <subdir> is one of the following:
|
||||
using the STM32's Ethernet controller. It uses apps/examples/nettest to exercise the
|
||||
TCP/IP network.
|
||||
|
||||
CONFIG_STM32_CODESOURCERYW=y : CodeSourcery under Windows
|
||||
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : CodeSourcery under Windows
|
||||
CONFIG_EXAMPLES_NETTEST_SERVER=n : Target is configured as the client
|
||||
CONFIG_EXAMPLES_NETTEST_PERFORMANCE=y : Only network performance is verified.
|
||||
CONFIG_EXAMPLES_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) : Target side is IP: 10.0.0.2
|
||||
@ -1119,7 +1119,7 @@ Where <subdir> is one of the following:
|
||||
Configures the NuttShell (nsh) located at apps/examples/nsh. The
|
||||
Configuration enables both the serial and telnet NSH interfaces.
|
||||
|
||||
CONFIG_STM32_CODESOURCERYW=y : CodeSourcery under Windows
|
||||
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : CodeSourcery under Windows
|
||||
CONFIG_NSH_DHCPC=n : DHCP is disabled
|
||||
CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) : Target IP address 10.0.0.2
|
||||
CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) : Host IP address 10.0.0.1
|
||||
@ -1424,27 +1424,43 @@ Where <subdir> is one of the following:
|
||||
from the others, however, in that it uses the NxConsole driver to host
|
||||
the NSH shell.
|
||||
|
||||
Some of the differences in this configuration and the normal nsh configuration
|
||||
include these settings in the defconfig file:
|
||||
NOTES:
|
||||
|
||||
These select NX Multi-User mode:
|
||||
1. This configuration uses the mconf-based configuration tool. To
|
||||
change this configurations using that tool, you should:
|
||||
|
||||
CONFG_NX_MULTIUSER=y
|
||||
CONFIG_DISABLE_MQUEUE=n
|
||||
a. Build and install the kconfig-mconf tool. See nuttx/README.txt
|
||||
and misc/tools/
|
||||
|
||||
The following definition in the defconfig file to enables the NxConsole
|
||||
driver:
|
||||
b. Execute 'make menuconfig' in nuttx/ in order to start the
|
||||
reconfiguration process.
|
||||
|
||||
CONFIG_NXCONSOLE=y
|
||||
2. Some of the differences in this configuration and the normal nsh
|
||||
configuration include these settings in the defconfig file:
|
||||
|
||||
The appconfig file selects examples/nxconsole instead of examples/nsh:
|
||||
These select NX Multi-User mode:
|
||||
|
||||
CONFIGURED_APPS += examples/nxconsole
|
||||
CONFG_NX_MULTIUSER=y
|
||||
CONFIG_DISABLE_MQUEUE=n
|
||||
|
||||
Other configuration settings:
|
||||
The following definition in the defconfig file to enables the NxConsole
|
||||
driver:
|
||||
|
||||
CONFIG_STM32_CODESOURCERYW=y : CodeSourcery under Windows
|
||||
CONFIG_LCD_LANDSCAPE=y : 320x240 landscape
|
||||
CONFIG_NXCONSOLE=y
|
||||
|
||||
And this selects examples/nxconsole instead of examples/nsh:
|
||||
|
||||
CONFIG_EXAMPLES_NXCONSOLE=y
|
||||
|
||||
LCD Orientation:
|
||||
|
||||
CONFIG_LCD_LANDSCAPE=y : 320x240 landscape
|
||||
|
||||
3. Default build environment (also easily reconfigured):
|
||||
|
||||
CONFIG_HOST_WINDOWS=y : Windows
|
||||
CONFIG_WINDOWS_CYGWIN=y : With Cygwin
|
||||
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : CodeSourcery under Windows
|
||||
|
||||
nxwm
|
||||
----
|
||||
|
||||
@ -378,9 +378,9 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
|
||||
#
|
||||
# Board-Specific Options
|
||||
#
|
||||
# CONFIG_STM32_ILI9320_DISABLE is not set
|
||||
# CONFIG_STM32_ILI9325_DISABLE is not set
|
||||
CONFIG_LCD_RDSHIFT=5
|
||||
# CONFIG_STM3240G_ILI9320_DISABLE is not set
|
||||
# CONFIG_STM3240G_ILI9325_DISABLE is not set
|
||||
CONFIG_STM3240G_LCD_RDSHIFT=5
|
||||
CONFIG_STM3240G_LCD=y
|
||||
CONFIG_STM3240G_BOARDINIT_PRIO=196
|
||||
CONFIG_STM3240G_BOARDINIT_STACK=2048
|
||||
@ -618,7 +618,7 @@ CONFIG_FAT_MAXFNAME=32
|
||||
CONFIG_NX=y
|
||||
CONFIG_NX_LCDDRIVER=y
|
||||
CONFIG_NX_NPLANES=1
|
||||
CONFIG_NX_WRITEONLY=y
|
||||
# CONFIG_NX_WRITEONLY is not set
|
||||
|
||||
#
|
||||
# Supported Pixel Depths
|
||||
|
||||
@ -1,99 +0,0 @@
|
||||
############################################################################
|
||||
# configs/stm3240g-eval/nxconsole/appconfig
|
||||
#
|
||||
# Copyright (C) 2012 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/nxconsole
|
||||
|
||||
# The NSH application library
|
||||
|
||||
CONFIGURED_APPS += system/readline
|
||||
CONFIGURED_APPS += nshlib
|
||||
|
||||
# Networking libraries.
|
||||
# Uncomment netutils/ftpc to include an FTP client library
|
||||
# Uncomment netutils/ftpd to include an FTP server library
|
||||
|
||||
ifeq ($(CONFIG_NET),y)
|
||||
CONFIGURED_APPS += netutils/uiplib
|
||||
CONFIGURED_APPS += netutils/resolv
|
||||
CONFIGURED_APPS += netutils/webclient
|
||||
CONFIGURED_APPS += netutils/tftpc
|
||||
#CONFIGURED_APPS += netutils/ftpc
|
||||
#CONFIGURED_APPS += netutils/ftpd
|
||||
ifeq ($(CONFIG_NSH_TELNET),y)
|
||||
CONFIGURED_APPS += netutils/telnetd
|
||||
endif
|
||||
endif
|
||||
|
||||
# Applications configured as an NX built-in commands
|
||||
|
||||
ifeq ($(CONFIG_ADC),y)
|
||||
CONFIGURED_APPS += examples/adc
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_PWM),y)
|
||||
CONFIGURED_APPS += examples/pwm
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_CAN),y)
|
||||
CONFIGURED_APPS += examples/can
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_I2C),y)
|
||||
CONFIGURED_APPS += system/i2c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_WATCHDOG),y)
|
||||
CONFIGURED_APPS += examples/watchdog
|
||||
endif
|
||||
|
||||
# Uncomment examples/ftpc to include the FTP client example
|
||||
# Uncomment examples/ftpd to include the FTP daemon example
|
||||
|
||||
ifeq ($(CONFIG_NET),y)
|
||||
#CONFIGURED_APPS += examples/ftpc
|
||||
#CONFIGURED_APPS += examples/ftpd
|
||||
endif
|
||||
|
||||
# Uncomment to select a graphics examples
|
||||
|
||||
ifeq ($(CONFIG_NX),y)
|
||||
#CONFIGURED_APPS += examples/nx
|
||||
#CONFIGURED_APPS += examples/nxhello
|
||||
#CONFIGURED_APPS += examples/nximage
|
||||
#CONFIGURED_APPS += examples/nxlines
|
||||
endif
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -391,9 +391,9 @@ CONFIG_NSH_MMCSDMINOR=0
|
||||
#
|
||||
# Board-Specific Options
|
||||
#
|
||||
# CONFIG_STM32_ILI9320_DISABLE is not set
|
||||
# CONFIG_STM32_ILI9325_DISABLE is not set
|
||||
CONFIG_LCD_RDSHIFT=5
|
||||
# CONFIG_STM3240G_ILI9320_DISABLE is not set
|
||||
# CONFIG_STM3240G_ILI9325_DISABLE is not set
|
||||
CONFIG_STM3240G_LCD_RDSHIFT=5
|
||||
CONFIG_STM3240G_LCD=y
|
||||
|
||||
#
|
||||
@ -692,7 +692,7 @@ CONFIG_FAT_MAXFNAME=32
|
||||
CONFIG_NX=y
|
||||
CONFIG_NX_LCDDRIVER=y
|
||||
CONFIG_NX_NPLANES=1
|
||||
CONFIG_NX_WRITEONLY=y
|
||||
# CONFIG_NX_WRITEONLY is not set
|
||||
|
||||
#
|
||||
# Supported Pixel Depths
|
||||
|
||||
@ -63,15 +63,15 @@
|
||||
#include "stm32.h"
|
||||
#include "stm3240g-internal.h"
|
||||
|
||||
#if !defined(CONFIG_STM32_ILI9320_DISABLE) || !defined(CONFIG_STM32_ILI9325_DISABLE)
|
||||
#if !defined(CONFIG_STM3240G_ILI9320_DISABLE) || !defined(CONFIG_STM3240G_ILI9325_DISABLE)
|
||||
|
||||
/**************************************************************************************
|
||||
* Pre-processor Definitions
|
||||
**************************************************************************************/
|
||||
/* Configuration **********************************************************************/
|
||||
/* CONFIG_STM32_ILI9320_DISABLE may be defined to disabled the AM-240320L8TNQW00H
|
||||
/* CONFIG_STM3240G_ILI9320_DISABLE may be defined to disabled the AM-240320L8TNQW00H
|
||||
* (LCD_ILI9320 or LCD_ILI9321)
|
||||
* CONFIG_STM32_ILI9325_DISABLE may be defined to disabled the AM-240320D5TOQW01H
|
||||
* CONFIG_STM3240G_ILI9325_DISABLE may be defined to disabled the AM-240320D5TOQW01H
|
||||
* (LCD_ILI9325)
|
||||
*/
|
||||
|
||||
@ -908,7 +908,7 @@ static int stm3240g_setpower(struct lcd_dev_s *dev, int power)
|
||||
{
|
||||
/* Then turn the display on */
|
||||
|
||||
#if !defined(CONFIG_STM32_ILI9320_DISABLE) || !defined(CONFIG_STM32_ILI9325_DISABLE)
|
||||
#if !defined(CONFIG_STM3240G_ILI9320_DISABLE) || !defined(CONFIG_STM3240G_ILI9325_DISABLE)
|
||||
stm3240g_writereg(LCD_REG_7, 0x0173);
|
||||
#endif
|
||||
g_lcddev.power = power;
|
||||
@ -970,18 +970,18 @@ static inline void stm3240g_lcdinitialize(void)
|
||||
|
||||
/* Check if the ID is for the STM32_ILI9320 (or ILI9321) or STM32_ILI9325 */
|
||||
|
||||
#if !defined(CONFIG_STM32_ILI9320_DISABLE) && !defined(CONFIG_STM32_ILI9325_DISABLE)
|
||||
#if !defined(CONFIG_STM3240G_ILI9320_DISABLE) && !defined(CONFIG_STM3240G_ILI9325_DISABLE)
|
||||
if (id == ILI9320_ID || id == ILI9321_ID || id == ILI9325_ID)
|
||||
#elif !defined(CONFIG_STM32_ILI9320_DISABLE) && defined(CONFIG_STM32_ILI9325_DISABLE)
|
||||
#elif !defined(CONFIG_STM3240G_ILI9320_DISABLE) && defined(CONFIG_STM3240G_ILI9325_DISABLE)
|
||||
if (id == ILI9320_ID || id == ILI9321_ID)
|
||||
#else /* if defined(CONFIG_STM32_ILI9320_DISABLE) && !defined(CONFIG_STM32_ILI9325_DISABLE)) */
|
||||
#else /* if defined(CONFIG_STM3240G_ILI9320_DISABLE) && !defined(CONFIG_STM3240G_ILI9325_DISABLE)) */
|
||||
if (id == ILI9325_ID)
|
||||
#endif
|
||||
{
|
||||
/* Save the LCD type (not actually used at for anything important) */
|
||||
|
||||
#if !defined(CONFIG_STM32_ILI9320_DISABLE)
|
||||
# if !defined(CONFIG_STM32_ILI9325_DISABLE)
|
||||
#if !defined(CONFIG_STM3240G_ILI9320_DISABLE)
|
||||
# if !defined(CONFIG_STM3240G_ILI9325_DISABLE)
|
||||
if (id == ILI9325_ID)
|
||||
{
|
||||
g_lcddev.type = LCD_TYPE_ILI9325;
|
||||
@ -992,7 +992,7 @@ static inline void stm3240g_lcdinitialize(void)
|
||||
g_lcddev.type = LCD_TYPE_ILI9320;
|
||||
stm3240g_writereg(LCD_REG_229, 0x8000); /* Set the internal vcore voltage */
|
||||
}
|
||||
#else /* if !defined(CONFIG_STM32_ILI9325_DISABLE) */
|
||||
#else /* if !defined(CONFIG_STM3240G_ILI9325_DISABLE) */
|
||||
g_lcddev.type = LCD_TYPE_ILI9325;
|
||||
#endif
|
||||
lcddbg("LCD type: %d\n", g_lcddev.type);
|
||||
@ -1036,8 +1036,8 @@ static inline void stm3240g_lcdinitialize(void)
|
||||
|
||||
/* Adjust the Gamma Curve (ILI9320/1) */
|
||||
|
||||
#if !defined(CONFIG_STM32_ILI9320_DISABLE)
|
||||
# if !defined(CONFIG_STM32_ILI9325_DISABLE)
|
||||
#if !defined(CONFIG_STM3240G_ILI9320_DISABLE)
|
||||
# if !defined(CONFIG_STM3240G_ILI9325_DISABLE)
|
||||
if (g_lcddev.type == LCD_TYPE_ILI9320)
|
||||
# endif
|
||||
{
|
||||
@ -1055,8 +1055,8 @@ static inline void stm3240g_lcdinitialize(void)
|
||||
#endif
|
||||
/* Adjust the Gamma Curve (ILI9325) */
|
||||
|
||||
#if !defined(CONFIG_STM32_ILI9325_DISABLE)
|
||||
# if !defined(CONFIG_STM32_ILI9320_DISABLE)
|
||||
#if !defined(CONFIG_STM3240G_ILI9325_DISABLE)
|
||||
# if !defined(CONFIG_STM3240G_ILI9320_DISABLE)
|
||||
else
|
||||
# endif
|
||||
{
|
||||
@ -1206,4 +1206,4 @@ void stm3240g_lcdclear(uint16_t color)
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* !CONFIG_STM32_ILI9320_DISABLE || !CONFIG_STM32_ILI9325_DISABLE */
|
||||
#endif /* !CONFIG_STM3240G_ILI9320_DISABLE || !CONFIG_STM3240G_ILI9325_DISABLE */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user