diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c index 3f500b6d33..239960f961 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c @@ -2195,10 +2195,11 @@ static int lpc17_40_eth_ioctl(struct net_driver_s *dev, int cmd, default: nerr("ERROR: Unrecognized IOCTL command: %d\n", command); - return -ENOTTY; /* Special return value for this case */ + ret = -ENOTTY; /* Special return value for this case */ + break; } - return OK; + return ret; } #endif diff --git a/configs/lpc4088-devkit/README.txt b/configs/lpc4088-devkit/README.txt index e578570d49..06381f95f0 100644 --- a/configs/lpc4088-devkit/README.txt +++ b/configs/lpc4088-devkit/README.txt @@ -381,22 +381,3 @@ Configuration Directories Configuration enables both the serial NSH interface as well as the telnet interface over ethernet, with an IP address assigned via DHCP. - nxlines - ------- - Configures the graphics example located at examples/nsh. This - configuration enables SDRAM to hold the LCD framebuffer and enables - the LPC178x LCD driver in order to support the external LCD panel. - - NOTES: - - 1. Uses the older, OABI, buildroot toolchain. But that is easily - reconfigured: - - CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y : Buildroot toolchain - CONFIG_ARMV7M_OABI_TOOLCHAIN=y : Older, OABI toolchain - - 2. In this configuration, the SDRAM is not added to heap but is - dedicated to supporting an LCD frame buffer at address 0xa0010000. - - STATUS: - 2019-04-23: Untested with LPC4088. diff --git a/configs/lpc4088-devkit/nxlines/defconfig b/configs/lpc4088-devkit/nxlines/defconfig deleted file mode 100644 index 9939a774da..0000000000 --- a/configs/lpc4088-devkit/nxlines/defconfig +++ /dev/null @@ -1,65 +0,0 @@ -# -# This file is autogenerated: PLEASE DO NOT EDIT IT. -# -# You can use "make menuconfig" to make any modifications to the installed .config file. -# You can then do "make savedefconfig" to generate a new defconfig file that includes your -# modifications. -# -# CONFIG_NX_DISABLE_32BPP is not set -CONFIG_ARCH="arm" -CONFIG_ARCH_BOARD="lpc4088-devkit" -CONFIG_ARCH_BOARD_LPC4088_DEVKIT=y -CONFIG_ARCH_CHIP_LPC17XX_40XX=y -CONFIG_ARCH_CHIP_LPC4088=y -CONFIG_ARCH_STACKDUMP=y -CONFIG_ARMV7M_OABI_TOOLCHAIN=y -CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y -CONFIG_BCH=y -CONFIG_BOARD_LOOPSPERMSEC=11934 -CONFIG_BUILTIN=y -CONFIG_DEV_LOOP=y -CONFIG_EXAMPLES_NXLINES=y -CONFIG_EXAMPLES_NXLINES_BPP=32 -CONFIG_FAT_LCNAMES=y -CONFIG_FAT_LFN=y -CONFIG_FS_FAT=y -CONFIG_FS_ROMFS=y -CONFIG_INTELHEX_BINARY=y -CONFIG_LPC17_40_EXTDRAM=y -CONFIG_LPC17_40_EXTDRAMSIZE=67108864 -CONFIG_LPC17_40_GPDMA=y -CONFIG_LPC17_40_LCD=y -CONFIG_LPC17_40_SDCARD=y -CONFIG_LPC17_40_UART0=y -CONFIG_MAX_TASKS=16 -CONFIG_MAX_WDOGPARMS=2 -CONFIG_MMCSD=y -CONFIG_MMCSD_SDIO=y -CONFIG_MM_REGIONS=2 -CONFIG_MQ_MAXMSGSIZE=64 -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NFILE_STREAMS=8 -CONFIG_NX=y -CONFIG_NXFONT_SANS23X27=y -CONFIG_NXFONT_SANS28X37B=y -CONFIG_NX_ANTIALIASING=y -CONFIG_NX_BLOCKING=y -CONFIG_PIPES=y -CONFIG_PREALLOC_MQ_MSGS=4 -CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 -CONFIG_RAM_SIZE=65536 -CONFIG_RAM_START=0x10000000 -CONFIG_RR_INTERVAL=200 -CONFIG_SCHED_HPWORK=y -CONFIG_SCHED_HPWORKPRIORITY=192 -CONFIG_SCHED_WAITPID=y -CONFIG_START_DAY=4 -CONFIG_START_MONTH=3 -CONFIG_START_YEAR=2013 -CONFIG_SYMTAB_ORDEREDBYNAME=y -CONFIG_SYSTEM_READLINE=y -CONFIG_TASK_NAME_SIZE=0 -CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nxlines_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/lpc4088-devkit/src/lpc17_40_sdraminitialize.c b/configs/lpc4088-devkit/src/lpc17_40_sdraminitialize.c index 6e932de9cb..c9d8014a51 100644 --- a/configs/lpc4088-devkit/src/lpc17_40_sdraminitialize.c +++ b/configs/lpc4088-devkit/src/lpc17_40_sdraminitialize.c @@ -47,7 +47,7 @@ #include "up_arch.h" #include "up_internal.h" -#include "chip/lpc17_40_syscon.h" +#include "hardware/lpc17_40_syscon.h" #include "lpc17_40_emc.h" #include "lpc4088-devkit.h" diff --git a/configs/lpc4088-quickstart/README.txt b/configs/lpc4088-quickstart/README.txt index af7aaa9438..0f6a88fa44 100644 --- a/configs/lpc4088-quickstart/README.txt +++ b/configs/lpc4088-quickstart/README.txt @@ -260,22 +260,6 @@ Information Common to All Configurations Configuration Directories ------------------------- - fb - -- - - A simple configuration used for some basic (non-graphic) debug of the - framebuffer character drivers using apps/examples/fb. This - configuration enables SDRAM to hold the LCD framebuffer and enables - the LPC178x LCD driver in order to support the external LCD panel. - - NOTES: - - 1. In this configuration, the SDRAM is not added to heap but is - dedicated to supporting an LCD frame buffer at address 0xa0010000. - - STATUS: - 2019-04-23: Untested with LPC4088. - knsh ---- This is identical to the nsh configuration below except that NuttX @@ -366,21 +350,6 @@ Configuration Directories STATUS: 2019-04-23: Untested with LPC4088. - knxterm - ------- - - This is another protected mode build. This configuration was used to - verify that NxTerms can be used in protected mode. See the knsh - configuration notes for instructions on building and loading this - configuration. - - This is a very minimal configuration intended only for low level testing. - To be useful, the font sizes, windows sizes, and line widths would need - to be optimized to make a friendlier display. - - STATUS: - 2019-04-23: Untested with LPC4088. - nsh --- Configures the NuttShell (nsh) located at examples/nsh. The @@ -485,63 +454,3 @@ Configuration Directories CONFIG_DEBUG_INFO=y CONFIG_DEBUG_INPUT=y - nxlines - ------- - Configures the graphics example located at examples/nsh. This - configuration enables SDRAM to hold the LCD framebuffer and enables - the LPC178x LCD driver in order to support the external LCD panel. - - NOTES: - - 1. Uses the older, OABI, buildroot toolchain. But that is easily - reconfigured: - - CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y : Buildroot toolchain - CONFIG_ARMV7M_OABI_TOOLCHAIN=y : Older, OABI toolchain - - 2. In this configuration, the SDRAM is not added to heap but is - dedicated to supporting an LCD frame buffer at address 0xa0010000. - - STATUS: - 2019-04-23: Untested with LPC4088. - - pdcurses - ------- - - A simple NSH configuration used for some basic (non-graphic) debug of - the pdcurses library on top of a framebuffer character drivers. This - configuration provides the test programs from: - - - apps/examples/pdcurses, - - apps/examples/fb, and - - apps/examples/djoystick - - as NSH built-in applications. - - This configuration enables SDRAM to hold the LCD framebuffer and - enables the LPC178x LCD driver in order to support the external LCD panel. - In this configuration, the SDRAM is not added to heap - but is dedicated to supporting an LCD frame buffer at address - 0xa0010000. - - STATUS: - 2019-04-23: Untested with LPC4088. - - pwfb: - ----- - - This configuration uses the test at apps/examples/pwfb to verify the - operation of the per-window framebuffers. That example shows three - windows containing text moving around, crossing each other from - "above" and from "below". The example application is NOT updating the - windows any anyway! The application is only changing the window - position. The windows are being updated from the per-winidow - framebuffers automatically. - - This example is reminescent of Pong: Each window travels in straight - line until it hits an edge, then it bounces off. The window is also - raised when it hits the edge (gets "focus"). This tests all - combinations of overap. - - STATUS: - 2019-04-23: Untested with LPC4088. diff --git a/configs/lpc4088-quickstart/fb/defconfig b/configs/lpc4088-quickstart/fb/defconfig deleted file mode 100644 index 4e31ee6e84..0000000000 --- a/configs/lpc4088-quickstart/fb/defconfig +++ /dev/null @@ -1,57 +0,0 @@ -# -# This file is autogenerated: PLEASE DO NOT EDIT IT. -# -# You can use "make menuconfig" to make any modifications to the installed .config file. -# You can then do "make savedefconfig" to generate a new defconfig file that includes your -# modifications. -# -# CONFIG_LPC17_40_LCD_BACKLIGHT is not set -# CONFIG_NX_DISABLE_32BPP is not set -CONFIG_ARCH="arm" -CONFIG_ARCH_BOARD="lpc4088-quickstart" -CONFIG_ARCH_BOARD_LPC4088_QUICKSTART=y -CONFIG_ARCH_CHIP_LPC17XX_40XX=y -CONFIG_ARCH_CHIP_LPC4088=y -CONFIG_ARCH_STACKDUMP=y -CONFIG_BCH=y -CONFIG_BOARD_LATE_INITIALIZE=y -CONFIG_BOARD_LOOPSPERMSEC=11934 -CONFIG_BUILTIN=y -CONFIG_DEV_LOOP=y -CONFIG_DRIVERS_VIDEO=y -CONFIG_EXAMPLES_FB=y -CONFIG_HOST_WINDOWS=y -CONFIG_LPC17_40_EXTDRAM=y -CONFIG_LPC17_40_EXTDRAMSIZE=67108864 -CONFIG_LPC17_40_GPDMA=y -CONFIG_LPC17_40_LCD=y -CONFIG_LPC17_40_SDCARD=y -CONFIG_LPC17_40_UART0=y -CONFIG_MAX_TASKS=16 -CONFIG_MAX_WDOGPARMS=2 -CONFIG_MMCSD=y -CONFIG_MMCSD_SDIO=y -CONFIG_MM_REGIONS=2 -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NFILE_STREAMS=8 -CONFIG_NX=y -CONFIG_NXFONT_SANS23X27=y -CONFIG_NXFONT_SANS28X37B=y -CONFIG_PREALLOC_MQ_MSGS=4 -CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 -CONFIG_RAM_SIZE=65536 -CONFIG_RAM_START=0x10000000 -CONFIG_RR_INTERVAL=200 -CONFIG_SCHED_HPWORK=y -CONFIG_SCHED_HPWORKPRIORITY=192 -CONFIG_SCHED_WAITPID=y -CONFIG_START_DAY=16 -CONFIG_START_MONTH=9 -CONFIG_SYMTAB_ORDEREDBYNAME=y -CONFIG_SYSTEM_READLINE=y -CONFIG_TASK_NAME_SIZE=0 -CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="fb_main" -CONFIG_VIDEO_FB=y -CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/lpc4088-quickstart/knxterm/Make.defs b/configs/lpc4088-quickstart/knxterm/Make.defs deleted file mode 100644 index f95e49a858..0000000000 --- a/configs/lpc4088-quickstart/knxterm/Make.defs +++ /dev/null @@ -1,114 +0,0 @@ -############################################################################ -# configs/lpc4088-quickstart/knxterm/Make.defs -# -# Copyright (C) 2019 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt -# -# 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. -# -############################################################################ - -include ${TOPDIR}/.config -include ${TOPDIR}/tools/Config.mk -include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs - -ifeq ($(WINTOOL),y) - # Windows-native toolchains - DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh - DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh - MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkwindeps.sh - ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" - ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld}" -else - # Linux/Cygwin-native toolchain - MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkdeps$(HOSTEXEEXT) - ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include - ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx - ARCHSCRIPT = -T$(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - ARCHSCRIPT += -T$(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld -endif - -CC = $(CROSSDEV)gcc -CXX = $(CROSSDEV)g++ -CPP = $(CROSSDEV)gcc -E -LD = $(CROSSDEV)ld -STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)ar rcs -NM = $(CROSSDEV)nm -OBJCOPY = $(CROSSDEV)objcopy -OBJDUMP = $(CROSSDEV)objdump - -ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'} -ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1} - -ifeq ($(CONFIG_DEBUG_SYMBOLS),y) - ARCHOPTIMIZATION = -g -endif - -ifneq ($(CONFIG_DEBUG_NOOPT),y) - ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer -endif - -ARCHCFLAGS = -fno-builtin -ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fcheck-new -ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -ARCHWARNINGSXX = -Wall -Wshadow -Wundef -ARCHDEFINES = -ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10 - -CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS) -CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS) -CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -AFLAGS = $(CFLAGS) -D__ASSEMBLY__ - -NXFLATLDFLAGS1 = -r -d -warn-common -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)$(DELIM)binfmt$(DELIM)libnxflat$(DELIM)gnu-nxflat-pcrel.ld -no-check-sections -LDNXFLATFLAGS = -e main -s 2048 - -ASMEXT = .S -OBJEXT = .o -LIBEXT = .a -EXEEXT = - -ifneq ($(CROSSDEV),arm-nuttx-elf-) - LDFLAGS += -nostartfiles -nodefaultlibs -endif -ifeq ($(CONFIG_DEBUG_SYMBOLS),y) - LDFLAGS += -g -endif - - -HOSTCC = gcc -HOSTINCLUDES = -I. -HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe -HOSTLDFLAGS = - diff --git a/configs/lpc4088-quickstart/knxterm/defconfig b/configs/lpc4088-quickstart/knxterm/defconfig deleted file mode 100644 index e36ce3d9c6..0000000000 --- a/configs/lpc4088-quickstart/knxterm/defconfig +++ /dev/null @@ -1,79 +0,0 @@ -# -# This file is autogenerated: PLEASE DO NOT EDIT IT. -# -# You can use "make menuconfig" to make any modifications to the installed .config file. -# You can then do "make savedefconfig" to generate a new defconfig file that includes your -# modifications. -# -# CONFIG_LPC17_40_LCD_BACKLIGHT is not set -# CONFIG_NXFONTS_DISABLE_16BPP is not set -# CONFIG_NX_DISABLE_16BPP is not set -CONFIG_ARCH="arm" -CONFIG_ARCH_BOARD="lpc4088-quickstart" -CONFIG_ARCH_BOARD_LPC4088_QUICKSTART=y -CONFIG_ARCH_CHIP_LPC17XX_40XX=y -CONFIG_ARCH_CHIP_LPC4088=y -CONFIG_ARCH_STACKDUMP=y -CONFIG_ARM_MPU=y -CONFIG_BCH=y -CONFIG_BOARD_LATE_INITIALIZE=y -CONFIG_BOARD_LOOPSPERMSEC=11934 -CONFIG_BUILD_PROTECTED=y -CONFIG_DEV_LOOP=y -CONFIG_EXAMPLES_NXTERM=y -CONFIG_EXAMPLES_NXTERM_FONTID=1 -CONFIG_FAT_LCNAMES=y -CONFIG_FAT_LFN=y -CONFIG_FS_FAT=y -CONFIG_FS_PROCFS=y -CONFIG_FS_ROMFS=y -CONFIG_INTELHEX_BINARY=y -CONFIG_LPC17_40_EXTDRAM=y -CONFIG_LPC17_40_EXTDRAMSIZE=67108864 -CONFIG_LPC17_40_GPDMA=y -CONFIG_LPC17_40_LCD=y -CONFIG_LPC17_40_LCD_BPP16=y -CONFIG_LPC17_40_SDCARD=y -CONFIG_LPC17_40_UART0=y -CONFIG_MAX_TASKS=16 -CONFIG_MAX_WDOGPARMS=2 -CONFIG_MMCSD=y -CONFIG_MMCSD_SDIO=y -CONFIG_MM_REGIONS=2 -CONFIG_MQ_MAXMSGSIZE=64 -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NFILE_STREAMS=8 -CONFIG_NSH_DISABLE_IFCONFIG=y -CONFIG_NSH_DISABLE_IFUPDOWN=y -CONFIG_NSH_DISABLE_PS=y -CONFIG_NSH_FILEIOSIZE=512 -CONFIG_NSH_LIBRARY=y -CONFIG_NSH_READLINE=y -CONFIG_NUTTX_USERSPACE=0x00040000 -CONFIG_NX=y -CONFIG_NXFONT_SANS23X27=y -CONFIG_NXTERM=y -CONFIG_NXTERM_CURSORCHAR=95 -CONFIG_NXTERM_MXCHARS=512 -CONFIG_NXTERM_NOWRAP=y -CONFIG_NX_BLOCKING=y -CONFIG_PASS1_BUILDIR="configs/lpc4088-quickstart/kernel" -CONFIG_PIPES=y -CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 -CONFIG_RAM_SIZE=65536 -CONFIG_RAM_START=0x10000000 -CONFIG_RR_INTERVAL=200 -CONFIG_SCHED_HPWORK=y -CONFIG_SCHED_HPWORKPRIORITY=192 -CONFIG_SCHED_WAITPID=y -CONFIG_START_DAY=2 -CONFIG_START_MONTH=3 -CONFIG_START_YEAR=2019 -CONFIG_SYMTAB_ORDEREDBYNAME=y -CONFIG_SYSTEM_CLE=y -CONFIG_SYS_RESERVED=8 -CONFIG_TASK_NAME_SIZE=0 -CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nxterm_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/lpc4088-quickstart/nxlines/defconfig b/configs/lpc4088-quickstart/nxlines/defconfig deleted file mode 100644 index 6e5a5349ca..0000000000 --- a/configs/lpc4088-quickstart/nxlines/defconfig +++ /dev/null @@ -1,66 +0,0 @@ -# -# This file is autogenerated: PLEASE DO NOT EDIT IT. -# -# You can use "make menuconfig" to make any modifications to the installed .config file. -# You can then do "make savedefconfig" to generate a new defconfig file that includes your -# modifications. -# -# CONFIG_LPC17_40_LCD_BACKLIGHT is not set -# CONFIG_NX_DISABLE_32BPP is not set -CONFIG_ARCH="arm" -CONFIG_ARCH_BOARD="lpc4088-quickstart" -CONFIG_ARCH_BOARD_LPC4088_QUICKSTART=y -CONFIG_ARCH_CHIP_LPC17XX_40XX=y -CONFIG_ARCH_CHIP_LPC4088=y -CONFIG_ARCH_STACKDUMP=y -CONFIG_ARMV7M_OABI_TOOLCHAIN=y -CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y -CONFIG_BCH=y -CONFIG_BOARD_LOOPSPERMSEC=11934 -CONFIG_BUILTIN=y -CONFIG_DEV_LOOP=y -CONFIG_EXAMPLES_NXLINES=y -CONFIG_EXAMPLES_NXLINES_BPP=32 -CONFIG_FAT_LCNAMES=y -CONFIG_FAT_LFN=y -CONFIG_FS_FAT=y -CONFIG_FS_ROMFS=y -CONFIG_INTELHEX_BINARY=y -CONFIG_LPC17_40_EXTDRAM=y -CONFIG_LPC17_40_EXTDRAMSIZE=67108864 -CONFIG_LPC17_40_GPDMA=y -CONFIG_LPC17_40_LCD=y -CONFIG_LPC17_40_SDCARD=y -CONFIG_LPC17_40_UART0=y -CONFIG_MAX_TASKS=16 -CONFIG_MAX_WDOGPARMS=2 -CONFIG_MMCSD=y -CONFIG_MMCSD_SDIO=y -CONFIG_MM_REGIONS=2 -CONFIG_MQ_MAXMSGSIZE=64 -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NFILE_STREAMS=8 -CONFIG_NX=y -CONFIG_NXFONT_SANS23X27=y -CONFIG_NXFONT_SANS28X37B=y -CONFIG_NX_ANTIALIASING=y -CONFIG_NX_BLOCKING=y -CONFIG_PIPES=y -CONFIG_PREALLOC_MQ_MSGS=4 -CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 -CONFIG_RAM_SIZE=65536 -CONFIG_RAM_START=0x10000000 -CONFIG_RR_INTERVAL=200 -CONFIG_SCHED_HPWORK=y -CONFIG_SCHED_HPWORKPRIORITY=192 -CONFIG_SCHED_WAITPID=y -CONFIG_START_DAY=4 -CONFIG_START_MONTH=3 -CONFIG_START_YEAR=2013 -CONFIG_SYMTAB_ORDEREDBYNAME=y -CONFIG_SYSTEM_READLINE=y -CONFIG_TASK_NAME_SIZE=0 -CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nxlines_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/lpc4088-quickstart/pdcurses/defconfig b/configs/lpc4088-quickstart/pdcurses/defconfig deleted file mode 100644 index b6a58b5e33..0000000000 --- a/configs/lpc4088-quickstart/pdcurses/defconfig +++ /dev/null @@ -1,79 +0,0 @@ -# -# This file is autogenerated: PLEASE DO NOT EDIT IT. -# -# You can use "make menuconfig" to make any modifications to the installed .config file. -# You can then do "make savedefconfig" to generate a new defconfig file that includes your -# modifications. -# -# CONFIG_LPC17_40_LCD_BACKLIGHT is not set -# CONFIG_NSH_DISABLE_IFCONFIG is not set -# CONFIG_NSH_DISABLE_PS is not set -CONFIG_ARCH="arm" -CONFIG_ARCH_BOARD="lpc4088-quickstart" -CONFIG_ARCH_BOARD_LPC4088_QUICKSTART=y -CONFIG_ARCH_CHIP_LPC17XX_40XX=y -CONFIG_ARCH_CHIP_LPC4088=y -CONFIG_ARCH_STACKDUMP=y -CONFIG_BCH=y -CONFIG_BOARD_LOOPSPERMSEC=11934 -CONFIG_BUILTIN=y -CONFIG_DEV_LOOP=y -CONFIG_DJOYSTICK=y -CONFIG_DRIVERS_VIDEO=y -CONFIG_EXAMPLES_DJOYSTICK=y -CONFIG_EXAMPLES_FB=y -CONFIG_EXAMPLES_PDCURSES=y -CONFIG_FAT_LCNAMES=y -CONFIG_FAT_LFN=y -CONFIG_FS_FAT=y -CONFIG_FS_ROMFS=y -CONFIG_GRAPHICS_PDCURSES=y -CONFIG_HOST_WINDOWS=y -CONFIG_INPUT=y -CONFIG_INTELHEX_BINARY=y -CONFIG_LPC17_40_EXTDRAM=y -CONFIG_LPC17_40_EXTDRAMSIZE=67108864 -CONFIG_LPC17_40_GPDMA=y -CONFIG_LPC17_40_GPIOIRQ=y -CONFIG_LPC17_40_LCD=y -CONFIG_LPC17_40_SDCARD=y -CONFIG_LPC17_40_UART0=y -CONFIG_MAX_TASKS=16 -CONFIG_MAX_WDOGPARMS=2 -CONFIG_MMCSD=y -CONFIG_MMCSD_SDIO=y -CONFIG_MM_REGIONS=2 -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NFILE_STREAMS=8 -CONFIG_NSH_ARCHINIT=y -CONFIG_NSH_BUILTIN_APPS=y -CONFIG_NSH_FILEIOSIZE=512 -CONFIG_NSH_READLINE=y -CONFIG_NXFONTS_DISABLE_16BPP=y -CONFIG_NXFONTS_DISABLE_1BPP=y -CONFIG_NXFONTS_DISABLE_24BPP=y -CONFIG_NXFONTS_DISABLE_2BPP=y -CONFIG_NXFONTS_DISABLE_4BPP=y -CONFIG_NXFONTS_DISABLE_8BPP=y -CONFIG_PDCURSES_COLORFMT_RGB888=y -CONFIG_PDCURSES_DJOYSTICK=y -CONFIG_PDCURSES_FONT_6X9=y -CONFIG_PIPES=y -CONFIG_PREALLOC_MQ_MSGS=4 -CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 -CONFIG_RAM_SIZE=65536 -CONFIG_RAM_START=0x10000000 -CONFIG_RR_INTERVAL=200 -CONFIG_SCHED_HPWORK=y -CONFIG_SCHED_HPWORKPRIORITY=192 -CONFIG_SCHED_WAITPID=y -CONFIG_START_DAY=19 -CONFIG_START_MONTH=11 -CONFIG_SYMTAB_ORDEREDBYNAME=y -CONFIG_SYSTEM_NSH=y -CONFIG_TASK_NAME_SIZE=0 -CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_VIDEO_FB=y -CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/lpc4088-quickstart/pwfb/defconfig b/configs/lpc4088-quickstart/pwfb/defconfig deleted file mode 100644 index 7829d8121a..0000000000 --- a/configs/lpc4088-quickstart/pwfb/defconfig +++ /dev/null @@ -1,71 +0,0 @@ -# -# This file is autogenerated: PLEASE DO NOT EDIT IT. -# -# You can use "make menuconfig" to make any modifications to the installed .config file. -# You can then do "make savedefconfig" to generate a new defconfig file that includes your -# modifications. -# -# CONFIG_EXAMPLES_PWFB_DEFAULT_COLORS is not set -# CONFIG_EXAMPLES_PWFB_DEFAULT_FONT is not set -# CONFIG_LPC17_40_LCD_BACKLIGHT is not set -# CONFIG_NXFONTS_DISABLE_16BPP is not set -# CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set -# CONFIG_NX_DISABLE_16BPP is not set -CONFIG_ARCH="arm" -CONFIG_ARCH_BOARD="lpc4088-quickstart" -CONFIG_ARCH_BOARD_LPC4088_QUICKSTART=y -CONFIG_ARCH_CHIP_LPC17XX_40XX=y -CONFIG_ARCH_CHIP_LPC4088=y -CONFIG_ARCH_STACKDUMP=y -CONFIG_ARM_MPU=y -CONFIG_BOARD_LATE_INITIALIZE=y -CONFIG_BOARD_LOOPSPERMSEC=11934 -CONFIG_EXAMPLES_PWFB=y -CONFIG_EXAMPLES_PWFB_BGCOLOR=0x7b5d -CONFIG_EXAMPLES_PWFB_BPP=16 -CONFIG_EXAMPLES_PWFB_COLOR1=0xe73f -CONFIG_EXAMPLES_PWFB_COLOR2=0xdefb -CONFIG_EXAMPLES_PWFB_COLOR3=0xff76 -CONFIG_EXAMPLES_PWFB_FONTCOLOR=0x0000 -CONFIG_EXAMPLES_PWFB_FONTID=1 -CONFIG_EXAMPLES_PWFB_TBCOLOR=0xad55 -CONFIG_INTELHEX_BINARY=y -CONFIG_LPC17_40_EXTDRAM=y -CONFIG_LPC17_40_EXTDRAMHEAP_OFFSET=393216 -CONFIG_LPC17_40_EXTDRAMSIZE=67108864 -CONFIG_LPC17_40_GPDMA=y -CONFIG_LPC17_40_LCD=y -CONFIG_LPC17_40_LCD_BPP16=y -CONFIG_LPC17_40_UART0=y -CONFIG_MAX_TASKS=16 -CONFIG_MAX_WDOGPARMS=2 -CONFIG_MMCSD=y -CONFIG_MM_REGIONS=3 -CONFIG_MQ_MAXMSGSIZE=64 -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NFILE_STREAMS=8 -CONFIG_NSH_FILEIOSIZE=512 -CONFIG_NSH_LIBRARY=y -CONFIG_NSH_READLINE=y -CONFIG_NX=y -CONFIG_NXFONT_SANS23X27=y -CONFIG_NXTK_BORDERCOLOR1=0xad55 -CONFIG_NXTK_BORDERCOLOR2=0x6b4d -CONFIG_NXTK_BORDERCOLOR3=0xdedb -CONFIG_NX_BLOCKING=y -CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 -CONFIG_RAM_SIZE=65536 -CONFIG_RAM_START=0x10000000 -CONFIG_RR_INTERVAL=200 -CONFIG_SCHED_HPWORK=y -CONFIG_SCHED_HPWORKPRIORITY=192 -CONFIG_SCHED_WAITPID=y -CONFIG_START_DAY=16 -CONFIG_START_MONTH=3 -CONFIG_START_YEAR=2019 -CONFIG_SYMTAB_ORDEREDBYNAME=y -CONFIG_TASK_NAME_SIZE=0 -CONFIG_UART0_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="pwfb_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/lpc4088-quickstart/src/lpc17_40_sdraminitialize.c b/configs/lpc4088-quickstart/src/lpc17_40_sdraminitialize.c index 2c6e14e7c4..05ecda8770 100644 --- a/configs/lpc4088-quickstart/src/lpc17_40_sdraminitialize.c +++ b/configs/lpc4088-quickstart/src/lpc17_40_sdraminitialize.c @@ -1,6 +1,5 @@ /************************************************************************************ * configs/lpc4088-quickstart/src/lpc17_40_sdraminitialize.c - * arch/arm/src/board/lpc17_40_sdraminitialize.c * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -47,7 +46,7 @@ #include "up_arch.h" #include "up_internal.h" -#include "chip/lpc17_40_syscon.h" +#include "hardware/lpc17_40_syscon.h" #include "lpc17_40_emc.h" #include "lpc4088-quickstart.h"