diff --git a/arch/arm/include/tiva/chip.h b/arch/arm/include/tiva/chip.h index 2475552293..73d23f2efe 100644 --- a/arch/arm/include/tiva/chip.h +++ b/arch/arm/include/tiva/chip.h @@ -58,6 +58,7 @@ # define TIVA_NWIDETIMERS 0 /* No general purpose wide timers */ # define TIVA_NWDT 1 /* One watchdog timer */ # define TIVA_NETHCONTROLLERS 1 /* One Ethernet controller */ +# define TIVA_NLCD 0 /* No LCD controller */ # undef TIVA_ETHTS /* No timestamp register */ # define TIVA_NSSI 2 /* Two SSI modules */ # define TIVA_NUARTS 2 /* Two UART modules */ @@ -68,6 +69,7 @@ # define TIVA_NPORTS 8 /* 8 Ports (GPIOA-H) 5-38 GPIOs */ # define TIVA_NCANCONTROLLER 0 /* No CAN controllers */ # define TIVA_NUSBOTGFS 0 /* No USB 2.0 OTG FS */ +# define TIVA_NUSBOTGHS 0 /* No USB 2.0 OTG HS */ #elif defined(CONFIG_ARCH_CHIP_LM3S6432) # define LM3S 1 /* LM3S family */ # undef LM4F /* Not LM4F family */ @@ -76,6 +78,7 @@ # define TIVA_NWIDETIMERS 0 /* No general purpose wide timers */ # define TIVA_NWDT 1 /* One watchdog timer */ # define TIVA_NETHCONTROLLERS 1 /* One Ethernet controller */ +# define TIVA_NLCD 0 /* No LCD controller */ # undef TIVA_ETHTS /* No timestamp register */ # define TIVA_NSSI 1 /* One SSI module */ # define TIVA_NUARTS 2 /* Two UART modules */ @@ -86,6 +89,7 @@ # define TIVA_NPORTS 7 /* 7 Ports (GPIOA-G), 0-42 GPIOs */ # define TIVA_NCANCONTROLLER 0 /* No CAN controllers */ # define TIVA_NUSBOTGFS 0 /* No USB 2.0 OTG FS */ +# define TIVA_NUSBOTGHS 0 /* No USB 2.0 OTG HS */ #elif defined(CONFIG_ARCH_CHIP_LM3S6965) # define LM3S 1 /* LM3S family */ # undef LM4F /* Not LM4F family */ @@ -94,6 +98,7 @@ # define TIVA_NWIDETIMERS 0 /* No general purpose wide timers */ # define TIVA_NWDT 1 /* One watchdog timer */ # define TIVA_NETHCONTROLLERS 1 /* One Ethernet controller */ +# define TIVA_NLCD 0 /* No LCD controller */ # undef TIVA_ETHTS /* No timestamp register */ # define TIVA_NSSI 1 /* One SSI module */ # define TIVA_NUARTS 3 /* Three UART modules */ @@ -104,6 +109,7 @@ # define TIVA_NPORTS 7 /* 7 Ports (GPIOA-G), 0-42 GPIOs */ # define TIVA_NCANCONTROLLER 0 /* No CAN controllers */ # define TIVA_NUSBOTGFS 0 /* No USB 2.0 OTG FS */ +# define TIVA_NUSBOTGHS 0 /* No USB 2.0 OTG HS */ #elif defined(CONFIG_ARCH_CHIP_LM3S9B96) # define LM3S 1 /* LM3S family */ # undef LM4F /* Not LM4F family */ @@ -112,6 +118,7 @@ # define TIVA_NWIDETIMERS 0 /* No general purpose wide timers */ # define TIVA_NWDT 1 /* One watchdog timer */ # define TIVA_NETHCONTROLLERS 1 /* One Ethernet controller */ +# define TIVA_NLCD 0 /* No LCD controller */ # undef TIVA_ETHTS /* No timestamp register */ # define TIVA_NSSI 2 /* Two SSI modules */ # define TIVA_NUARTS 3 /* Three UART modules */ @@ -123,6 +130,7 @@ # define TIVA_NPORTS 9 /* 9 Ports (GPIOA-H,J) 0-65 GPIOs */ # define TIVA_NCANCONTROLLER 0 /* No CAN controllers */ # define TIVA_NUSBOTGFS 0 /* No USB 2.0 OTG FS */ +# define TIVA_NUSBOTGHS 0 /* No USB 2.0 OTG HS */ #elif defined(CONFIG_ARCH_CHIP_LM3S8962) # define LM3S 1 /* LM3S family */ # undef LM4F /* Not LM4F family */ @@ -131,6 +139,7 @@ # define TIVA_NWIDETIMERS 0 /* No general purpose wide timers */ # define TIVA_NWDT 1 /* One watchdog timer */ # define TIVA_NETHCONTROLLERS 1 /* One Ethernet controller */ +# define TIVA_NLCD 0 /* No LCD controller */ # define TIVA_NSSI 1 /* One SSI module */ # define TIVA_NUARTS 3 /* Two UART modules */ # define TIVA_NI2C 2 /* One I2C module */ @@ -140,6 +149,7 @@ # define TIVA_NPORTS 7 /* 7 Ports (GPIOA-G), 5-42 GPIOs */ # define TIVA_NCANCONTROLLER 1 /* One CAN controller */ # define TIVA_NUSBOTGFS 0 /* No USB 2.0 OTG FS */ +# define TIVA_NUSBOTGHS 0 /* No USB 2.0 OTG HS */ #elif defined(CONFIG_ARCH_CHIP_LM4F120) # undef LM3S /* Not LM3S family */ # define LM4F 1 /* LM4F family */ @@ -148,6 +158,7 @@ # define TIVA_NWIDETIMERS 6 /* Six general purpose wide timers */ # define TIVA_NWDT 2 /* Two watchdog timer timers */ # define TIVA_NETHCONTROLLERS 0 /* No Ethernet controller */ +# define TIVA_NLCD 0 /* No LCD controller */ # define TIVA_NSSI 4 /* Four SSI module */ # define TIVA_NUARTS 8 /* Eight UART modules */ # define TIVA_NI2C 4 /* Four I2C modules */ @@ -157,6 +168,7 @@ # define TIVA_NPORTS 6 /* 6 Ports (GPIOA-F), 0-43 GPIOs */ # define TIVA_NCANCONTROLLER 1 /* One CAN controller */ # define TIVA_NUSBOTGFS 0 /* No USB 2.0 OTG FS */ +# define TIVA_NUSBOTGHS 0 /* No USB 2.0 OTG HS */ #elif defined(CONFIG_ARCH_CHIP_TM4C123GH6PGE) || defined(CONFIG_ARCH_CHIP_TM4C123GH6PZ) || \ defined(CONFIG_ARCH_CHIP_TM4C123GH6ZRB) # undef LM3S /* Not LM3S family */ @@ -166,6 +178,7 @@ # define TIVA_NWIDETIMERS 6 /* Six general purpose wide timers */ # define TIVA_NWDT 2 /* Two watchdog timers */ # define TIVA_NETHCONTROLLERS 0 /* No Ethernet controller */ +# define TIVA_NLCD 0 /* No LCD controller */ # define TIVA_NSSI 4 /* Four SSI module */ # define TIVA_NUARTS 8 /* Eight UART modules */ # define TIVA_NI2C 6 /* Six I2C modules */ @@ -175,6 +188,7 @@ # define TIVA_NPORTS 15 /* Fifteen Ports (GPIOA-H, J-N, P-Q) */ # define TIVA_NCANCONTROLLER 2 /* Two CAN controllers */ # define TIVA_NUSBOTGFS 1 /* One USB 2.0 OTG FS */ +# define TIVA_NUSBOTGHS 0 /* No USB 2.0 OTG HS */ #elif defined(CONFIG_ARCH_CHIP_TM4C123GH6PMI) # undef LM3S /* Not LM3S family */ # undef LM4F /* Not LM4F family */ @@ -183,6 +197,7 @@ # define TIVA_NWIDETIMERS 6 /* Six general purpose wide timers */ # define TIVA_NWDT 2 /* Two watchdog timers */ # define TIVA_NETHCONTROLLERS 0 /* No Ethernet controller */ +# define TIVA_NLCD 0 /* No LCD controller */ # define TIVA_NSSI 4 /* Four SSI module */ # define TIVA_NUARTS 8 /* Eight UART modules */ # define TIVA_NI2C 4 /* Four I2C modules */ @@ -192,6 +207,26 @@ # define TIVA_NPORTS 6 /* Six Ports (GPIOA-F) */ # define TIVA_NCANCONTROLLER 2 /* Two CAN controllers */ # define TIVA_NUSBOTGFS 1 /* One USB 2.0 OTG FS */ +# define TIVA_NUSBOTGHS 0 /* No USB 2.0 OTG HS */ +#elif defined(CONFIG_ARCH_CHIP_TM4C129XNCZAD) || defined(CONFIG_ARCH_CHIP_TM4C1294NCPDT) +# undef LM3S /* Not LM3S family */ +# undef LM4F /* Not LM4F family */ +# define TM4C 1 /* TM4C family */ +# define TIVA_NTIMERS 6 /* Six general purpose timers */ +# define TIVA_NWIDETIMERS 6 /* Six general purpose wide timers */ +# define TIVA_NWDT 2 /* Two watchdog timers */ +# define TIVA_NETHCONTROLLERS 1 /* One 10/100Mbit Ethernet controller */ +# define TIVA_NLCD 1 /* One LCD controller */ +# define TIVA_NSSI 4 /* Four SSI module */ +# define TIVA_NUARTS 8 /* Eight UART modules */ +# define TIVA_NI2C 10 /* Ten I2C modules */ +# define TIVA_NADC 2 /* Two ADC modules */ +# define TIVA_NPWM 2 /* Two PWM generator modules */ +# define TIVA_NQEI 1 /* One quadrature encoders */ +# define TIVA_NPORTS 15 /* Fifteen Ports (GPIOA-H, J-N, P-Q) */ +# define TIVA_NCANCONTROLLER 2 /* Two CAN controllers */ +# define TIVA_NUSBOTGFS 0 /* No USB 2.0 OTG FS */ +# define TIVA_NUSBOTGHS 1 /* One USB 2.0 OTG HS */ #elif defined(CONFIG_ARCH_CHIP_CC3200) # undef LM3S /* Not LM3S family */ # undef LM4F /* Not LM4F family */ @@ -199,6 +234,7 @@ # define TIVA_NTIMERS 4 /* Four general purpose timers */ # define TIVA_NWIDETIMERS 2 /* Two general purpose wide timers */ # define TIVA_NETHCONTROLLERS 0 /* No Ethernet controller */ +# define TIVA_NLCD 0 /* No LCD controller */ # define TIVA_NSSI 0 /* No SSI module */ # define TIVA_NUARTS 2 /* Two UART modules */ # define TIVA_NI2C 2 /* Two I2C modules */ diff --git a/arch/arm/src/tiva/Kconfig b/arch/arm/src/tiva/Kconfig index 5f220edd9e..5544437e90 100644 --- a/arch/arm/src/tiva/Kconfig +++ b/arch/arm/src/tiva/Kconfig @@ -67,10 +67,24 @@ config ARCH_CHIP_TM4C123GH6PMI select ARCH_CHIP_TM4C select ARCH_HAVE_FPU +config ARCH_CHIP_TM4C129XNCZAD + bool "TM4C129XNCZAD" + depends on ARCH_CHIP_TIVA + select ARCH_CORTEXM4 + select ARCH_CHIP_TM4C + select ARCH_HAVE_FPU + +config ARCH_CHIP_TM4C1294NCPDT + bool "TM4C1294NCPDT" + depends on ARCH_CHIP_TIVA + select ARCH_CORTEXM4 + select ARCH_CHIP_TM4C + select ARCH_HAVE_FPU + config ARCH_CHIP_CC3200 - bool "CC3200" - depends on ARCH_CHIP_TIVA - select ARCH_CORTEXM4 + bool "CC3200" + depends on ARCH_CHIP_TIVA + select ARCH_CORTEXM4 endchoice