From e5c3874a3bc211e4cadc70e8377417f4cf6810e6 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 30 Aug 2019 08:46:57 -0600 Subject: [PATCH] Tiva directories: Fix TM4C129XNCZAD part number in Kconfig and identifiers. Rationale: Fully specify that this is the 212-pin BGA package (ZAD ending) and for consistency with earlier changes to other Tiva TM4C12x part numbers in Kconfig names and identifiers. --- arch/arm/include/tiva/chip.h | 2 +- arch/arm/include/tiva/tm4c_irq.h | 2 +- arch/arm/src/tiva/Kconfig | 4 ++-- arch/arm/src/tiva/Make.defs | 2 +- arch/arm/src/tiva/hardware/tm4c/tm4c_flash.h | 2 +- arch/arm/src/tiva/hardware/tm4c/tm4c_memorymap.h | 4 ++-- arch/arm/src/tiva/hardware/tm4c/tm4c_pinmap.h | 2 +- boards/Kconfig | 2 +- boards/arm/tiva/dk-tm4c129x/README.txt | 2 +- boards/arm/tiva/dk-tm4c129x/configs/ipv6/defconfig | 2 +- boards/arm/tiva/dk-tm4c129x/configs/nsh/defconfig | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/include/tiva/chip.h b/arch/arm/include/tiva/chip.h index 3bb96f0ed2..7c577af048 100644 --- a/arch/arm/include/tiva/chip.h +++ b/arch/arm/include/tiva/chip.h @@ -296,7 +296,7 @@ # define TIVA_NAES 0 /* No AES module */ # define TIVA_NDES 0 /* No DES module */ # define TIVA_NHASH 0 /* No SHA1/MD5 hash module */ -#elif defined(CONFIG_ARCH_CHIP_TM4C129XNC) +#elif defined(CONFIG_ARCH_CHIP_TM4C129XNCZAD) # undef LM3S /* Not LM3S family */ # undef LM4F /* Not LM4F family */ # define TM4C 1 /* TM4C family */ diff --git a/arch/arm/include/tiva/tm4c_irq.h b/arch/arm/include/tiva/tm4c_irq.h index 534522acc7..cbfd5ea531 100644 --- a/arch/arm/include/tiva/tm4c_irq.h +++ b/arch/arm/include/tiva/tm4c_irq.h @@ -552,7 +552,7 @@ # define NR_IRQS (155) /* (Really fewer because of reserved vectors) */ -#elif defined(CONFIG_ARCH_CHIP_TM4C129XNC) +#elif defined(CONFIG_ARCH_CHIP_TM4C129XNCZAD) # define TIVA_IRQ_GPIOA (16) /* Vector 16: GPIO Port A */ # define TIVA_IRQ_GPIOB (17) /* Vector 17: GPIO Port B */ # define TIVA_IRQ_GPIOC (18) /* Vector 18: GPIO Port C */ diff --git a/arch/arm/src/tiva/Kconfig b/arch/arm/src/tiva/Kconfig index 2ba163f802..281f9fe9d5 100644 --- a/arch/arm/src/tiva/Kconfig +++ b/arch/arm/src/tiva/Kconfig @@ -146,8 +146,8 @@ config ARCH_CHIP_TM4C1294NCPDT select TIVA_HAVE_GPIOQ_IRQS select TIVA_HAVE_QEI0 -config ARCH_CHIP_TM4C129XNC - bool "TM4C129XNC" +config ARCH_CHIP_TM4C129XNCZAD + bool "TM4C129XNCZAD" depends on ARCH_CHIP_TIVA select ARCH_CHIP_TM4C select ARCH_CHIP_TM4C129 diff --git a/arch/arm/src/tiva/Make.defs b/arch/arm/src/tiva/Make.defs index 6a802eda51..76b023636a 100644 --- a/arch/arm/src/tiva/Make.defs +++ b/arch/arm/src/tiva/Make.defs @@ -88,7 +88,7 @@ else endif CHIP_ASRCS = -CHIP_CSRCS = tiva_allocateheap.c tiva_irq.c tiva_lowputc.c tiva_serial.c +CHIP_CSRCS = tiva_allocateheap.c tiva_irq.c tiva_lowputc.c tiva_serial.c CHIP_CSRCS += tiva_ssi.c ifeq ($(CONFIG_ARCH_CHIP_LM3S),y) diff --git a/arch/arm/src/tiva/hardware/tm4c/tm4c_flash.h b/arch/arm/src/tiva/hardware/tm4c/tm4c_flash.h index b960775472..f6eb5f4a13 100644 --- a/arch/arm/src/tiva/hardware/tm4c/tm4c_flash.h +++ b/arch/arm/src/tiva/hardware/tm4c/tm4c_flash.h @@ -52,7 +52,7 @@ ************************************************************************************/ /* FLASH dimensions ****************************************************************/ -#if defined(CONFIG_ARCH_CHIP_TM4C129XNC) || defined(CONFIG_ARCH_CHIP_TM4C1294NCPDT) +#if defined(CONFIG_ARCH_CHIP_TM4C129XNCZAD) || defined(CONFIG_ARCH_CHIP_TM4C1294NCPDT) /* For the TM4C129X family, the Flash memory is configured in groups of four banks * four banks of 16K x 128 bits (4 * 256 KB total) which are two-way interleaved. diff --git a/arch/arm/src/tiva/hardware/tm4c/tm4c_memorymap.h b/arch/arm/src/tiva/hardware/tm4c/tm4c_memorymap.h index 87432edddf..0e9b6ece1b 100644 --- a/arch/arm/src/tiva/hardware/tm4c/tm4c_memorymap.h +++ b/arch/arm/src/tiva/hardware/tm4c/tm4c_memorymap.h @@ -71,7 +71,7 @@ # define TIVA_ETM_BASE 0xe0041000 /* -0xe0041fff: Embedded Trace Macrocell */ /* -0xffffffff: Reserved */ -#elif defined(CONFIG_ARCH_CHIP_TM4C129XNC) || defined(CONFIG_ARCH_CHIP_TM4C1294NCPDT) +#elif defined(CONFIG_ARCH_CHIP_TM4C129XNCZAD) || defined(CONFIG_ARCH_CHIP_TM4C1294NCPDT) # define TIVA_FLASH_BASE 0x00000000 /* -0x000fffff: On-chip FLASH */ /* -0x01ffffff: Reserved */ # define TIVA_ROM_BASE 0x02000000 /* -0x02ffffff: On-chip ROM (16 MB) */ @@ -336,7 +336,7 @@ # define TIVA_SYSCON_BASE (TIVA_PERIPH_BASE + 0xfe000) /* -0xfefff: System Control */ # define TIVA_UDMA_BASE (TIVA_PERIPH_BASE + 0xff000) /* -0xfffff: Micro Direct Memory Access */ -#elif defined(CONFIG_ARCH_CHIP_TM4C129XNC) +#elif defined(CONFIG_ARCH_CHIP_TM4C129XNCZAD) /* Peripheral region 1 */ diff --git a/arch/arm/src/tiva/hardware/tm4c/tm4c_pinmap.h b/arch/arm/src/tiva/hardware/tm4c/tm4c_pinmap.h index 3cf0d84f58..61824a1bc5 100644 --- a/arch/arm/src/tiva/hardware/tm4c/tm4c_pinmap.h +++ b/arch/arm/src/tiva/hardware/tm4c/tm4c_pinmap.h @@ -816,7 +816,7 @@ # define GPIO_WTIM5_CCP0 (GPIO_FUNC_PFIO | GPIO_ALT_7 | GPIO_PORTD | GPIO_PIN_6) # define GPIO_WTIM5_CCP1 (GPIO_FUNC_PFIO | GPIO_ALT_7 | GPIO_PORTD | GPIO_PIN_7) -#elif defined(CONFIG_ARCH_CHIP_TM4C129XNC) +#elif defined(CONFIG_ARCH_CHIP_TM4C129XNCZAD) # define GPIO_ADC_AIN0 (GPIO_FUNC_ANINPUT | GPIO_PORTE | GPIO_PIN_3) # define GPIO_ADC_AIN1 (GPIO_FUNC_ANINPUT | GPIO_PORTE | GPIO_PIN_2) diff --git a/boards/Kconfig b/boards/Kconfig index 28fd3dca1c..827ee3c8a2 100644 --- a/boards/Kconfig +++ b/boards/Kconfig @@ -101,7 +101,7 @@ config ARCH_BOARD_DEMOS92S12NEC64 config ARCH_BOARD_DK_TM4C129X bool "Tiva DK-TM4C129x Connected Development Kit" - depends on ARCH_CHIP_TM4C129XNC + depends on ARCH_CHIP_TM4C129XNCZAD select ARCH_HAVE_LEDS select ARCH_HAVE_BUTTONS select ARCH_HAVE_IRQBUTTONS diff --git a/boards/arm/tiva/dk-tm4c129x/README.txt b/boards/arm/tiva/dk-tm4c129x/README.txt index b64787c88e..f178456502 100644 --- a/boards/arm/tiva/dk-tm4c129x/README.txt +++ b/boards/arm/tiva/dk-tm4c129x/README.txt @@ -560,7 +560,7 @@ DK-TM4129X Configuration Options CONFIG_ARCH_CHIP_name - For use in C code to identify the exact chip: - CONFIG_ARCH_CHIP_TM4C129XNC + CONFIG_ARCH_CHIP_TM4C129XNCZAD CONFIG_ARCH_BOARD - Identifies the boards/ subdirectory and hence, the board that supports the particular chip or SoC. diff --git a/boards/arm/tiva/dk-tm4c129x/configs/ipv6/defconfig b/boards/arm/tiva/dk-tm4c129x/configs/ipv6/defconfig index 65b03390d5..1a2c6d087c 100644 --- a/boards/arm/tiva/dk-tm4c129x/configs/ipv6/defconfig +++ b/boards/arm/tiva/dk-tm4c129x/configs/ipv6/defconfig @@ -17,7 +17,7 @@ CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="tiva" CONFIG_ARCH_CHIP_TIVA=y CONFIG_ARCH_CHIP_TM4C129=y -CONFIG_ARCH_CHIP_TM4C129XNC=y +CONFIG_ARCH_CHIP_TM4C129XNCZAD=y CONFIG_ARCH_CHIP_TM4C=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/tiva/dk-tm4c129x/configs/nsh/defconfig b/boards/arm/tiva/dk-tm4c129x/configs/nsh/defconfig index 85b85384f5..14e793eaaf 100644 --- a/boards/arm/tiva/dk-tm4c129x/configs/nsh/defconfig +++ b/boards/arm/tiva/dk-tm4c129x/configs/nsh/defconfig @@ -15,7 +15,7 @@ CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="tiva" CONFIG_ARCH_CHIP_TIVA=y CONFIG_ARCH_CHIP_TM4C129=y -CONFIG_ARCH_CHIP_TM4C129XNC=y +CONFIG_ARCH_CHIP_TM4C129XNCZAD=y CONFIG_ARCH_CHIP_TM4C=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y