From 6b06d5fa61262ad17c952d8be46024a2d8c0fb83 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 16 Dec 2014 16:22:52 -0600 Subject: [PATCH] Remove packaging indications for TM4C129 configuration variables --- configs/Kconfig | 2 +- configs/dk-tm4c129x/README.txt | 2 +- configs/dk-tm4c129x/nsh/defconfig | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/Kconfig b/configs/Kconfig index 2a0eedb65e..0006da30ad 100644 --- a/configs/Kconfig +++ b/configs/Kconfig @@ -98,7 +98,7 @@ config ARCH_BOARD_DEMOS92S12NEC64 config ARCH_BOARD_DK_TM4C129X bool "Tiva DK-TM4C129x Connected Development Kit" - depends on ARCH_CHIP_TM4C129XNCZAD + depends on ARCH_CHIP_TM4C129XNC select ARCH_HAVE_LEDS select ARCH_HAVE_BUTTONS select ARCH_HAVE_IRQBUTTONS diff --git a/configs/dk-tm4c129x/README.txt b/configs/dk-tm4c129x/README.txt index 965332e34d..fcae4c64fd 100644 --- a/configs/dk-tm4c129x/README.txt +++ b/configs/dk-tm4c129x/README.txt @@ -356,7 +356,7 @@ DK-TM4129X Configuration Options CONFIG_ARCH_CHIP_name - For use in C code to identify the exact chip: - CONFIG_ARCH_CHIP_TM4C129XNCZAD + CONFIG_ARCH_CHIP_TM4C129XNC CONFIG_ARCH_BOARD - Identifies the configs subdirectory and hence, the board that supports the particular chip or SoC. diff --git a/configs/dk-tm4c129x/nsh/defconfig b/configs/dk-tm4c129x/nsh/defconfig index 220cc28baa..81be4aabbc 100644 --- a/configs/dk-tm4c129x/nsh/defconfig +++ b/configs/dk-tm4c129x/nsh/defconfig @@ -121,8 +121,8 @@ CONFIG_ARMV7M_OABI_TOOLCHAIN=y # # CONFIG_ARCH_CHIP_TM4C123GH6ZRB is not set # CONFIG_ARCH_CHIP_TM4C123GH6PMI is not set -CONFIG_ARCH_CHIP_TM4C129XNCZAD=y -# CONFIG_ARCH_CHIP_TM4C1294NCPDT is not set +CONFIG_ARCH_CHIP_TM4C129XNC=y +# CONFIG_ARCH_CHIP_TM4C1294NC is not set # CONFIG_ARCH_CHIP_CC3200 is not set CONFIG_ARCH_CHIP_TM4C=y # CONFIG_TIVA_BOARD_EARLYINIT is not set