diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2015-02-22 12:14:20 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2015-02-22 12:14:20 -0600 |
commit | 2f19e3752d6876a41987d9aef7369831f325e2ce (patch) | |
tree | 267da6ddd38de7f1645daf9856064a76bb967e66 | |
parent | 8d978e686b36daf37b31449546d25a3cf7f5c0db (diff) | |
download | nuttx-2f19e3752d6876a41987d9aef7369831f325e2ce.tar.gz nuttx-2f19e3752d6876a41987d9aef7369831f325e2ce.tar.bz2 nuttx-2f19e3752d6876a41987d9aef7369831f325e2ce.zip |
Remove support for obsolete PIC32 toolchain configuration names
-rw-r--r-- | nuttx/arch/mips/src/mips32/Toolchain.defs | 16 | ||||
-rw-r--r-- | nuttx/configs/pcblogic-pic32mx/README.txt | 12 | ||||
-rw-r--r-- | nuttx/configs/pic32mx-starterkit/README.txt | 12 | ||||
-rw-r--r-- | nuttx/configs/pic32mx7mmb/README.txt | 12 | ||||
-rw-r--r-- | nuttx/configs/sure-pic32mx/README.txt | 12 | ||||
-rw-r--r-- | nuttx/configs/ubw32/README.txt | 12 |
6 files changed, 48 insertions, 28 deletions
diff --git a/nuttx/arch/mips/src/mips32/Toolchain.defs b/nuttx/arch/mips/src/mips32/Toolchain.defs index 8509b5dee..365784680 100644 --- a/nuttx/arch/mips/src/mips32/Toolchain.defs +++ b/nuttx/arch/mips/src/mips32/Toolchain.defs @@ -1,7 +1,7 @@ ############################################################################ # arch/mips/src/mips32/Toolchain.defs # -# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013, 2015 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -41,45 +41,45 @@ # toolchain and allow the selected toolchain to be overridden by a # command-line selection. # + ifeq ($(filter y, \ - $(CONFIG_PIC32MX_PINGUINOL) \ $(CONFIG_MIPS32_TOOLCHAIN_PINGUINOL) \ $(CONFIG_MIPS32_TOOLCHAIN_GNU_ELF) \ ),y) CONFIG_MIPS32_TOOLCHAIN ?= GNU_ELF endif + ifeq ($(filter y, \ - $(CONFIG_PIC32MX_MICROCHIPL) \ $(CONFIG_MIPS32_TOOLCHAIN_MICROCHIPL) \ ),y) CONFIG_MIPS32_TOOLCHAIN ?= MICROCHIPL endif + ifeq ($(filter y, \ - $(CONFIG_PIC32MX_MICROCHIPL_LITE) \ $(CONFIG_MIPS32_TOOLCHAIN_MICROCHIPL_LITE) \ ),y) CONFIG_MIPS32_TOOLCHAIN ?= MICROCHIPL_LITE endif + ifeq ($(filter y, \ - $(CONFIG_PIC32MX_MICROCHIPW) \ $(CONFIG_MIPS32_TOOLCHAIN_MICROCHIPW) \ ),y) CONFIG_MIPS32_TOOLCHAIN ?= MICROCHIPW endif + ifeq ($(filter y, \ - $(CONFIG_PIC32MX_MICROCHIPW_LITE) \ $(CONFIG_MIPS32_TOOLCHAIN_MICROCHIPW_LITE) \ ),y) CONFIG_MIPS32_TOOLCHAIN ?= MICROCHIPW_LITE endif + ifeq ($(filter y, \ - $(CONFIG_PIC32MX_MICROCHIPOPENL) \ $(CONFIG_MIPS32_TOOLCHAIN_MICROCHIPOPENL) \ ),y) CONFIG_MIPS32_TOOLCHAIN ?= MICROCHIPOPENL endif + ifeq ($(filter y, \ - $(CONFIG_PIC32MX_PINGUINOW) \ $(CONFIG_MIPS32_TOOLCHAIN_PINGUINOW) \ ),y) CONFIG_MIPS32_TOOLCHAIN ?= PINGUINOW diff --git a/nuttx/configs/pcblogic-pic32mx/README.txt b/nuttx/configs/pcblogic-pic32mx/README.txt index 5d329b672..5bcf29119 100644 --- a/nuttx/configs/pcblogic-pic32mx/README.txt +++ b/nuttx/configs/pcblogic-pic32mx/README.txt @@ -177,10 +177,14 @@ Toolchains C32 Toolchain Options: - CONFIG_PIC32MX_MICROCHIPW - MicroChip full toolchain for Windows - CONFIG_PIC32MX_MICROCHIPL - MicroChip full toolchain for Linux - CONFIG_PIC32MX_MICROCHIPW_LITE - MicroChip "Lite" toolchain for Windows - CONFIG_PIC32MX_MICROCHIPL_LITE - MicroChip "Lite" toolchain for Linux + CONFIG_MIPS32_TOOLCHAIN_MICROCHIPW - MicroChip full toolchain for Windows + CONFIG_MIPS32_TOOLCHAIN_MICROCHIPL - MicroChip full toolchain for Linux + CONFIG_MIPS32_TOOLCHAIN_MICROCHIPW_LITE - MicroChip "Lite" toolchain for Windows + CONFIG_MIPS32_TOOLCHAIN_MICROCHIPL_LITE - MicroChip "Lite" toolchain for Linux + CONFIG_MIPS32_TOOLCHAIN_PINGUINOL - Pinquino toolchain for Linux + CONFIG_MIPS32_TOOLCHAIN_PINGUINOW - Pinquino toolchain for Windows + CONFIG_MIPS32_TOOLCHAIN_MICROCHIPOPENL - Microchip open toolchain for Linux + CONFIG_MIPS32_TOOLCHAIN_GNU_ELF - General mips-elf toolchain for Linux NOTE: The "Lite" versions of the toolchain does not support C++. Also certain optimization levels are not supported by the "Lite" toolchain. diff --git a/nuttx/configs/pic32mx-starterkit/README.txt b/nuttx/configs/pic32mx-starterkit/README.txt index e17d940a9..c3ee13c4b 100644 --- a/nuttx/configs/pic32mx-starterkit/README.txt +++ b/nuttx/configs/pic32mx-starterkit/README.txt @@ -393,10 +393,14 @@ Toolchains C32 Toolchain Options: - CONFIG_PIC32MX_MICROCHIPW - MicroChip full toolchain for Windows - CONFIG_PIC32MX_MICROCHIPL - MicroChip full toolchain for Linux - CONFIG_PIC32MX_MICROCHIPW_LITE - MicroChip "Lite" toolchain for Windows - CONFIG_PIC32MX_MICROCHIPL_LITE - MicroChip "Lite" toolchain for Linux + CONFIG_MIPS32_TOOLCHAIN_MICROCHIPW - MicroChip full toolchain for Windows + CONFIG_MIPS32_TOOLCHAIN_MICROCHIPL - MicroChip full toolchain for Linux + CONFIG_MIPS32_TOOLCHAIN_MICROCHIPW_LITE - MicroChip "Lite" toolchain for Windows + CONFIG_MIPS32_TOOLCHAIN_MICROCHIPL_LITE - MicroChip "Lite" toolchain for Linux + CONFIG_MIPS32_TOOLCHAIN_PINGUINOL - Pinquino toolchain for Linux + CONFIG_MIPS32_TOOLCHAIN_PINGUINOW - Pinquino toolchain for Windows + CONFIG_MIPS32_TOOLCHAIN_MICROCHIPOPENL - Microchip open toolchain for Linux + CONFIG_MIPS32_TOOLCHAIN_GNU_ELF - General mips-elf toolchain for Linux NOTE: The "Lite" versions of the toolchain does not support C++. Also certain optimization levels are not supported by the "Lite" toolchain. diff --git a/nuttx/configs/pic32mx7mmb/README.txt b/nuttx/configs/pic32mx7mmb/README.txt index d48a852c1..935060054 100644 --- a/nuttx/configs/pic32mx7mmb/README.txt +++ b/nuttx/configs/pic32mx7mmb/README.txt @@ -161,10 +161,14 @@ Toolchains C32 Toolchain Options: - CONFIG_PIC32MX_MICROCHIPW - MicroChip full toolchain for Windows - CONFIG_PIC32MX_MICROCHIPL - MicroChip full toolchain for Linux - CONFIG_PIC32MX_MICROCHIPW_LITE - MicroChip "Lite" toolchain for Windows - CONFIG_PIC32MX_MICROCHIPL_LITE - MicroChip "Lite" toolchain for Linux + CONFIG_MIPS32_TOOLCHAIN_MICROCHIPW - MicroChip full toolchain for Windows + CONFIG_MIPS32_TOOLCHAIN_MICROCHIPL - MicroChip full toolchain for Linux + CONFIG_MIPS32_TOOLCHAIN_MICROCHIPW_LITE - MicroChip "Lite" toolchain for Windows + CONFIG_MIPS32_TOOLCHAIN_MICROCHIPL_LITE - MicroChip "Lite" toolchain for Linux + CONFIG_MIPS32_TOOLCHAIN_PINGUINOL - Pinquino toolchain for Linux + CONFIG_MIPS32_TOOLCHAIN_PINGUINOW - Pinquino toolchain for Windows + CONFIG_MIPS32_TOOLCHAIN_MICROCHIPOPENL - Microchip open toolchain for Linux + CONFIG_MIPS32_TOOLCHAIN_GNU_ELF - General mips-elf toolchain for Linux NOTE: The "Lite" versions of the toolchain does not support C++. Also certain optimization levels are not supported by the "Lite" toolchain. diff --git a/nuttx/configs/sure-pic32mx/README.txt b/nuttx/configs/sure-pic32mx/README.txt index 52ba8f54e..cd58fff98 100644 --- a/nuttx/configs/sure-pic32mx/README.txt +++ b/nuttx/configs/sure-pic32mx/README.txt @@ -248,10 +248,14 @@ Toolchains C32 Toolchain Options: - CONFIG_PIC32MX_MICROCHIPW - MicroChip full toolchain for Windows - CONFIG_PIC32MX_MICROCHIPL - MicroChip full toolchain for Linux - CONFIG_PIC32MX_MICROCHIPW_LITE - MicroChip "Lite" toolchain for Windows - CONFIG_PIC32MX_MICROCHIPL_LITE - MicroChip "Lite" toolchain for Linux + CONFIG_MIPS32_TOOLCHAIN_MICROCHIPW - MicroChip full toolchain for Windows + CONFIG_MIPS32_TOOLCHAIN_MICROCHIPL - MicroChip full toolchain for Linux + CONFIG_MIPS32_TOOLCHAIN_MICROCHIPW_LITE - MicroChip "Lite" toolchain for Windows + CONFIG_MIPS32_TOOLCHAIN_MICROCHIPL_LITE - MicroChip "Lite" toolchain for Linux + CONFIG_MIPS32_TOOLCHAIN_PINGUINOL - Pinquino toolchain for Linux + CONFIG_MIPS32_TOOLCHAIN_PINGUINOW - Pinquino toolchain for Windows + CONFIG_MIPS32_TOOLCHAIN_MICROCHIPOPENL - Microchip open toolchain for Linux + CONFIG_MIPS32_TOOLCHAIN_GNU_ELF - General mips-elf toolchain for Linux NOTE: The "Lite" versions of the toolchain does not support C++. Also certain optimization levels are not supported by the "Lite" toolchain. diff --git a/nuttx/configs/ubw32/README.txt b/nuttx/configs/ubw32/README.txt index e1a0a3785..8d80c46d1 100644 --- a/nuttx/configs/ubw32/README.txt +++ b/nuttx/configs/ubw32/README.txt @@ -186,10 +186,14 @@ Toolchains C32 Toolchain Options: - CONFIG_PIC32MX_MICROCHIPW - MicroChip full toolchain for Windows - CONFIG_PIC32MX_MICROCHIPL - MicroChip full toolchain for Linux - CONFIG_PIC32MX_MICROCHIPW_LITE - MicroChip "Lite" toolchain for Windows - CONFIG_PIC32MX_MICROCHIPL_LITE - MicroChip "Lite" toolchain for Linux + CONFIG_MIPS32_TOOLCHAIN_MICROCHIPW - MicroChip full toolchain for Windows + CONFIG_MIPS32_TOOLCHAIN_MICROCHIPL - MicroChip full toolchain for Linux + CONFIG_MIPS32_TOOLCHAIN_MICROCHIPW_LITE - MicroChip "Lite" toolchain for Windows + CONFIG_MIPS32_TOOLCHAIN_MICROCHIPL_LITE - MicroChip "Lite" toolchain for Linux + CONFIG_MIPS32_TOOLCHAIN_PINGUINOL - Pinquino toolchain for Linux + CONFIG_MIPS32_TOOLCHAIN_PINGUINOW - Pinquino toolchain for Windows + CONFIG_MIPS32_TOOLCHAIN_MICROCHIPOPENL - Microchip open toolchain for Linux + CONFIG_MIPS32_TOOLCHAIN_GNU_ELF - General mips-elf toolchain for Linux NOTE: The "Lite" versions of the toolchain does not support C++. Also certain optimization levels are not supported by the "Lite" toolchain. |