diff --git a/configs/eagle100/README.txt b/configs/eagle100/README.txt index a79ac2b2d70..3f9da652b47 100644 --- a/configs/eagle100/README.txt +++ b/configs/eagle100/README.txt @@ -273,7 +273,7 @@ Eagle100-specific Configuration Options CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory - CONFIG_ARCH_CHIP=lm3s + CONFIG_ARCH_CHIP=lm CONFIG_ARCH_CHIP_name - For use in C code to identify the exact chip: @@ -371,7 +371,7 @@ Eagle100-specific Configuration Options to build the LM3S Ethernet driver CONFIG_LM3S_ETHLEDS - Enable to use Ethernet LEDs on the board. CONFIG_LM3S_BOARDMAC - If the board-specific logic can provide - a MAC address (via lm3s_ethernetmac()), then this should be selected. + a MAC address (via lm_ethernetmac()), then this should be selected. CONFIG_LM3S_ETHHDUPLEX - Set to force half duplex operation CONFIG_LM3S_ETHNOAUTOCRC - Set to suppress auto-CRC generation CONFIG_LM3S_ETHNOPAD - Set to suppress Tx padding diff --git a/configs/eagle100/httpd/defconfig b/configs/eagle100/httpd/defconfig index c2ea86bed87..cf4f979304c 100644 --- a/configs/eagle100/httpd/defconfig +++ b/configs/eagle100/httpd/defconfig @@ -38,7 +38,8 @@ CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP="lm3s" +CONFIG_ARCH_CHIP="lm" +CONFIG_ARCH_CHIP_LM=y CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM3S6918=y CONFIG_ARCH_BOARD="eagle100" diff --git a/configs/eagle100/nettest/defconfig b/configs/eagle100/nettest/defconfig index 2dab94846f5..a3b50ead6b0 100644 --- a/configs/eagle100/nettest/defconfig +++ b/configs/eagle100/nettest/defconfig @@ -38,7 +38,8 @@ CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP="lm3s" +CONFIG_ARCH_CHIP="lm" +CONFIG_ARCH_CHIP_LM=y CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM3S6918=y CONFIG_ARCH_BOARD="eagle100" diff --git a/configs/eagle100/nsh/defconfig b/configs/eagle100/nsh/defconfig index fd141bc80de..342023d6a0f 100644 --- a/configs/eagle100/nsh/defconfig +++ b/configs/eagle100/nsh/defconfig @@ -38,7 +38,8 @@ CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP="lm3s" +CONFIG_ARCH_CHIP="lm" +CONFIG_ARCH_CHIP_LM=y CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM3S6918=y CONFIG_ARCH_BOARD="eagle100" diff --git a/configs/eagle100/nxflat/defconfig b/configs/eagle100/nxflat/defconfig index 20cd50432c5..fe02ab4b928 100644 --- a/configs/eagle100/nxflat/defconfig +++ b/configs/eagle100/nxflat/defconfig @@ -38,7 +38,8 @@ CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP="lm3s" +CONFIG_ARCH_CHIP="lm" +CONFIG_ARCH_CHIP_LM=y CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM3S6918=y CONFIG_ARCH_BOARD="eagle100" diff --git a/configs/eagle100/ostest/defconfig b/configs/eagle100/ostest/defconfig index 01f3be334ff..52496c4a32e 100644 --- a/configs/eagle100/ostest/defconfig +++ b/configs/eagle100/ostest/defconfig @@ -38,7 +38,8 @@ CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP="lm3s" +CONFIG_ARCH_CHIP="lm" +CONFIG_ARCH_CHIP_LM=y CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM3S6918=y CONFIG_ARCH_BOARD="eagle100" diff --git a/configs/eagle100/thttpd/defconfig b/configs/eagle100/thttpd/defconfig index 460bd64b332..7efbbed11a9 100644 --- a/configs/eagle100/thttpd/defconfig +++ b/configs/eagle100/thttpd/defconfig @@ -38,7 +38,8 @@ CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP="lm3s" +CONFIG_ARCH_CHIP="lm" +CONFIG_ARCH_CHIP_LM=y CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM3S6918=y CONFIG_ARCH_BOARD="eagle100" diff --git a/configs/ekk-lm3s9b96/README.txt b/configs/ekk-lm3s9b96/README.txt index d331c1cd563..f7896118e7f 100644 --- a/configs/ekk-lm3s9b96/README.txt +++ b/configs/ekk-lm3s9b96/README.txt @@ -173,13 +173,13 @@ IDEs 2) Start the NuttX build at least one time from the Cygwin command line before trying to create your project. This is necessary to create certain auto-generated files and directories that will be needed. - 3) Set up include pathes: You will need include/, arch/arm/src/lm3s, + 3) Set up include pathes: You will need include/, arch/arm/src/lm, arch/arm/src/common, arch/arm/src/armv7-m, and sched/. 4) All assembly files need to have the definition option -D __ASSEMBLY__ on the command line. Startup files will probably cause you some headaches. The NuttX startup file - is arch/arm/src/lm3s/lm3s_vectors.S. + is arch/arm/src/lm/lm_vectors.S. NuttX EABI "buildroot" Toolchain ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -294,7 +294,7 @@ Stellaris EKK-LM3S9B96 Evaluation Kit Configuration Options CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory - CONFIG_ARCH_CHIP=lm3s + CONFIG_ARCH_CHIP=lm CONFIG_ARCH_CHIP_name - For use in C code to identify the exact chip: @@ -389,7 +389,7 @@ Stellaris EKK-LM3S9B96 Evaluation Kit Configuration Options to build the LM3S Ethernet driver CONFIG_LM3S_ETHLEDS - Enable to use Ethernet LEDs on the board. CONFIG_LM3S_BOARDMAC - If the board-specific logic can provide - a MAC address (via lm3s_ethernetmac()), then this should be selected. + a MAC address (via lm_ethernetmac()), then this should be selected. CONFIG_LM3S_ETHHDUPLEX - Set to force half duplex operation CONFIG_LM3S_ETHNOAUTOCRC - Set to suppress auto-CRC generation CONFIG_LM3S_ETHNOPAD - Set to suppress Tx padding diff --git a/configs/ekk-lm3s9b96/nsh/defconfig b/configs/ekk-lm3s9b96/nsh/defconfig index d8ae63cfffd..b614c031643 100644 --- a/configs/ekk-lm3s9b96/nsh/defconfig +++ b/configs/ekk-lm3s9b96/nsh/defconfig @@ -39,7 +39,8 @@ CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP="lm3s" +CONFIG_ARCH_CHIP="lm" +CONFIG_ARCH_CHIP_LM=y CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM3S9B96=y CONFIG_ARCH_BOARD="ekk-lm3s9b96" diff --git a/configs/ekk-lm3s9b96/ostest/defconfig b/configs/ekk-lm3s9b96/ostest/defconfig index 62a092d1f2f..df562236067 100644 --- a/configs/ekk-lm3s9b96/ostest/defconfig +++ b/configs/ekk-lm3s9b96/ostest/defconfig @@ -39,7 +39,8 @@ CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP="lm3s" +CONFIG_ARCH_CHIP="lm" +CONFIG_ARCH_CHIP_LM=y CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM3S9B96=y CONFIG_ARCH_BOARD="ekk-lm3s9b96" diff --git a/configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h b/configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h index bb3315f5b26..17b0d0e2790 100644 --- a/configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h +++ b/configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h @@ -1,6 +1,6 @@ /************************************************************************************ * configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h - * arch/arm/src/board/lm3s6965ek_internal.n + * arch/arm/src/board/lm3s6965ek_internal.h * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt diff --git a/configs/lm3s6432-s2e/README.txt b/configs/lm3s6432-s2e/README.txt index 296a10f0543..669708c1682 100644 --- a/configs/lm3s6432-s2e/README.txt +++ b/configs/lm3s6432-s2e/README.txt @@ -163,13 +163,13 @@ IDEs 2) Start the NuttX build at least one time from the Cygwin command line before trying to create your project. This is necessary to create certain auto-generated files and directories that will be needed. - 3) Set up include pathes: You will need include/, arch/arm/src/lm3s, + 3) Set up include pathes: You will need include/, arch/arm/src/lm, arch/arm/src/common, arch/arm/src/armv7-m, and sched/. 4) All assembly files need to have the definition option -D __ASSEMBLY__ on the command line. Startup files will probably cause you some headaches. The NuttX startup file - is arch/arm/src/lm3s/lm3s_vectors.S. + is arch/arm/src/lm/lm_vectors.S. NuttX EABI "buildroot" Toolchain ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -288,7 +288,7 @@ Stellaris MDL-S2E Reference Design Configuration Options CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory - CONFIG_ARCH_CHIP=lm3s + CONFIG_ARCH_CHIP=lm CONFIG_ARCH_CHIP_name - For use in C code to identify the exact chip: diff --git a/configs/lm3s6432-s2e/nsh/defconfig b/configs/lm3s6432-s2e/nsh/defconfig index 7d1657cda5c..edd61eaccbe 100644 --- a/configs/lm3s6432-s2e/nsh/defconfig +++ b/configs/lm3s6432-s2e/nsh/defconfig @@ -38,7 +38,8 @@ CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP="lm3s" +CONFIG_ARCH_CHIP="lm" +CONFIG_ARCH_CHIP_LM=y CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM3S6432=y CONFIG_ARCH_BOARD="lm3s6432-s2e" diff --git a/configs/lm3s6432-s2e/ostest/defconfig b/configs/lm3s6432-s2e/ostest/defconfig index 90357ce7f5d..2d32db81c67 100644 --- a/configs/lm3s6432-s2e/ostest/defconfig +++ b/configs/lm3s6432-s2e/ostest/defconfig @@ -38,7 +38,8 @@ CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP="lm3s" +CONFIG_ARCH_CHIP="lm" +CONFIG_ARCH_CHIP_LM=y CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM3S6432=y CONFIG_ARCH_BOARD="lm3s6432-s2e" diff --git a/configs/lm3s6965-ek/README.txt b/configs/lm3s6965-ek/README.txt index 09a07ec6853..5a9cdbf4e73 100644 --- a/configs/lm3s6965-ek/README.txt +++ b/configs/lm3s6965-ek/README.txt @@ -197,13 +197,13 @@ IDEs 2) Start the NuttX build at least one time from the Cygwin command line before trying to create your project. This is necessary to create certain auto-generated files and directories that will be needed. - 3) Set up include pathes: You will need include/, arch/arm/src/lm3s, + 3) Set up include pathes: You will need include/, arch/arm/src/lm, arch/arm/src/common, arch/arm/src/armv7-m, and sched/. 4) All assembly files need to have the definition option -D __ASSEMBLY__ on the command line. Startup files will probably cause you some headaches. The NuttX startup file - is arch/arm/src/lm3s/lm3s_vectors.S. + is arch/arm/src/lm/lm_vectors.S. NuttX EABI "buildroot" Toolchain ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -357,7 +357,7 @@ Stellaris LM3S6965 Evaluation Kit Configuration Options CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory - CONFIG_ARCH_CHIP=lm3s + CONFIG_ARCH_CHIP=lm CONFIG_ARCH_CHIP_name - For use in C code to identify the exact chip: @@ -452,7 +452,7 @@ Stellaris LM3S6965 Evaluation Kit Configuration Options to build the LM3S Ethernet driver CONFIG_LM3S_ETHLEDS - Enable to use Ethernet LEDs on the board. CONFIG_LM3S_BOARDMAC - If the board-specific logic can provide - a MAC address (via lm3s_ethernetmac()), then this should be selected. + a MAC address (via lm_ethernetmac()), then this should be selected. CONFIG_LM3S_ETHHDUPLEX - Set to force half duplex operation CONFIG_LM3S_ETHNOAUTOCRC - Set to suppress auto-CRC generation CONFIG_LM3S_ETHNOPAD - Set to suppress Tx padding diff --git a/configs/lm3s6965-ek/nsh/defconfig b/configs/lm3s6965-ek/nsh/defconfig index 64f4397cb54..c1827920b9e 100755 --- a/configs/lm3s6965-ek/nsh/defconfig +++ b/configs/lm3s6965-ek/nsh/defconfig @@ -65,6 +65,7 @@ CONFIG_ARCH="arm" # CONFIG_ARCH_CHIP_DM320 is not set # CONFIG_ARCH_CHIP_IMX is not set # CONFIG_ARCH_CHIP_KINETIS is not set +CONFIG_ARCH_CHIP_LM=y CONFIG_ARCH_CHIP_LM3S=y # CONFIG_ARCH_CHIP_LPC17XX is not set # CONFIG_ARCH_CHIP_LPC214X is not set @@ -76,7 +77,7 @@ CONFIG_ARCH_CHIP_LM3S=y # CONFIG_ARCH_CHIP_STR71X is not set CONFIG_ARCH_CORTEXM3=y CONFIG_ARCH_FAMILY="armv7-m" -CONFIG_ARCH_CHIP="lm3s" +CONFIG_ARCH_CHIP="lm" CONFIG_ARCH_HAVE_MPU=y # CONFIG_ARMV7M_MPU is not set CONFIG_BOARD_LOOPSPERMSEC=4531 diff --git a/configs/lm3s6965-ek/nx/defconfig b/configs/lm3s6965-ek/nx/defconfig index be75c287559..e3cac8dd753 100755 --- a/configs/lm3s6965-ek/nx/defconfig +++ b/configs/lm3s6965-ek/nx/defconfig @@ -65,6 +65,7 @@ CONFIG_ARCH="arm" # CONFIG_ARCH_CHIP_DM320 is not set # CONFIG_ARCH_CHIP_IMX is not set # CONFIG_ARCH_CHIP_KINETIS is not set +CONFIG_ARCH_CHIP_LM=y CONFIG_ARCH_CHIP_LM3S=y # CONFIG_ARCH_CHIP_LPC17XX is not set # CONFIG_ARCH_CHIP_LPC214X is not set @@ -76,7 +77,7 @@ CONFIG_ARCH_CHIP_LM3S=y # CONFIG_ARCH_CHIP_STR71X is not set CONFIG_ARCH_CORTEXM3=y CONFIG_ARCH_FAMILY="armv7-m" -CONFIG_ARCH_CHIP="lm3s" +CONFIG_ARCH_CHIP="lm" CONFIG_ARCH_HAVE_MPU=y # CONFIG_ARMV7M_MPU is not set CONFIG_BOARD_LOOPSPERMSEC=4531 diff --git a/configs/lm3s6965-ek/ostest/defconfig b/configs/lm3s6965-ek/ostest/defconfig index 83e89a6ae77..81247c795d7 100755 --- a/configs/lm3s6965-ek/ostest/defconfig +++ b/configs/lm3s6965-ek/ostest/defconfig @@ -65,6 +65,7 @@ CONFIG_ARCH="arm" # CONFIG_ARCH_CHIP_DM320 is not set # CONFIG_ARCH_CHIP_IMX is not set # CONFIG_ARCH_CHIP_KINETIS is not set +CONFIG_ARCH_CHIP_LM=y CONFIG_ARCH_CHIP_LM3S=y # CONFIG_ARCH_CHIP_LPC17XX is not set # CONFIG_ARCH_CHIP_LPC214X is not set @@ -76,7 +77,7 @@ CONFIG_ARCH_CHIP_LM3S=y # CONFIG_ARCH_CHIP_STR71X is not set CONFIG_ARCH_CORTEXM3=y CONFIG_ARCH_FAMILY="armv7-m" -CONFIG_ARCH_CHIP="lm3s" +CONFIG_ARCH_CHIP="lm" CONFIG_ARCH_HAVE_MPU=y # CONFIG_ARMV7M_MPU is not set CONFIG_BOARD_LOOPSPERMSEC=4531 diff --git a/configs/lm3s6965-ek/src/lm3s6965ek_internal.h b/configs/lm3s6965-ek/src/lm3s6965ek_internal.h index 8ebd4cf65a0..4cd2eddc76a 100644 --- a/configs/lm3s6965-ek/src/lm3s6965ek_internal.h +++ b/configs/lm3s6965-ek/src/lm3s6965ek_internal.h @@ -1,6 +1,6 @@ /************************************************************************************ * configs/lm3s6965-ek/src/lm3s6965ek_internal.h - * arch/arm/src/board/lm3s6965ek_internal.n + * arch/arm/src/board/lm3s6965ek_internal.h * * Copyright (C) 2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/lm3s8962-ek/README.txt b/configs/lm3s8962-ek/README.txt index fdb78346603..0f796e38dc7 100644 --- a/configs/lm3s8962-ek/README.txt +++ b/configs/lm3s8962-ek/README.txt @@ -181,13 +181,13 @@ IDEs 2) Start the NuttX build at least one time from the Cygwin command line before trying to create your project. This is necessary to create certain auto-generated files and directories that will be needed. - 3) Set up include pathes: You will need include/, arch/arm/src/lm3s, + 3) Set up include pathes: You will need include/, arch/arm/src/lm, arch/arm/src/common, arch/arm/src/armv7-m, and sched/. 4) All assembly files need to have the definition option -D __ASSEMBLY__ on the command line. Startup files will probably cause you some headaches. The NuttX startup file - is arch/arm/src/lm3s/lm3s_vectors.S. + is arch/arm/src/lm/lm_vectors.S. NuttX EABI "buildroot" Toolchain ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -341,7 +341,7 @@ Stellaris LM3S8962 Evaluation Kit Configuration Options CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory - CONFIG_ARCH_CHIP=lm3s + CONFIG_ARCH_CHIP=lm CONFIG_ARCH_CHIP_name - For use in C code to identify the exact chip: @@ -436,7 +436,7 @@ Stellaris LM3S8962 Evaluation Kit Configuration Options to build the LM3S Ethernet driver CONFIG_LM3S_ETHLEDS - Enable to use Ethernet LEDs on the board. CONFIG_LM3S_BOARDMAC - If the board-specific logic can provide - a MAC address (via lm3s_ethernetmac()), then this should be selected. + a MAC address (via lm_ethernetmac()), then this should be selected. CONFIG_LM3S_ETHHDUPLEX - Set to force half duplex operation CONFIG_LM3S_ETHNOAUTOCRC - Set to suppress auto-CRC generation CONFIG_LM3S_ETHNOPAD - Set to suppress Tx padding diff --git a/configs/lm3s8962-ek/nsh/defconfig b/configs/lm3s8962-ek/nsh/defconfig index 79f90d5f9b6..1d3df2fa795 100755 --- a/configs/lm3s8962-ek/nsh/defconfig +++ b/configs/lm3s8962-ek/nsh/defconfig @@ -38,7 +38,8 @@ CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP="lm3s" +CONFIG_ARCH_CHIP="lm" +CONFIG_ARCH_CHIP_LM=y CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM3S8962=y CONFIG_ARCH_BOARD="lm3s8962-ek" diff --git a/configs/lm3s8962-ek/nx/defconfig b/configs/lm3s8962-ek/nx/defconfig index 8424b6623de..37fc8903ddb 100755 --- a/configs/lm3s8962-ek/nx/defconfig +++ b/configs/lm3s8962-ek/nx/defconfig @@ -38,7 +38,8 @@ CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP="lm3s" +CONFIG_ARCH_CHIP="lm" +CONFIG_ARCH_CHIP_LM=y CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM3S8962=y CONFIG_ARCH_BOARD="lm3s8962-ek" diff --git a/configs/lm3s8962-ek/ostest/defconfig b/configs/lm3s8962-ek/ostest/defconfig index 73fbff29fbd..731003fd0e1 100755 --- a/configs/lm3s8962-ek/ostest/defconfig +++ b/configs/lm3s8962-ek/ostest/defconfig @@ -38,7 +38,8 @@ CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP="lm3s" +CONFIG_ARCH_CHIP="lm" +CONFIG_ARCH_CHIP_LM=y CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM3S8962=y CONFIG_ARCH_BOARD="lm3s8962-ek"