diff --git a/configs/Kconfig b/configs/Kconfig index fa45a76ce4..542949257c 100644 --- a/configs/Kconfig +++ b/configs/Kconfig @@ -553,7 +553,7 @@ config ARCH_BOARD_PCDUINO_A10 but the others may be compatible. config ARCH_BOARD_PIC32MX_STARTERKIT - bool "Microchip PIC32 Ethernet Starter Kit (DM320004)" + bool "Microchip PIC32MX Ethernet Starter Kit (DM320004)" depends on ARCH_CHIP_PIC32MX795F512L select ARCH_HAVE_LEDS ---help--- @@ -569,6 +569,22 @@ config ARCH_BOARD_PIC32MX7MMB This is the port NuttX to the Mikroelektronika PIC32MX7 Multimedia Board (MMB). See http://www.mikroe.com/ for further information. +config ARCH_BOARD_PIC32MZ_STARTERKIT + bool "Microchip PIC32MZ Ethernet Starter Kit ((DM320006)" + depends on ARCH_CHIP_PIC32MZ2048ECH || ARCH_CHIP_PIC32MZ2048ECM + select ARCH_HAVE_LEDS + ---help--- + This is the port of NuttX to the Microchip PIC32MZ Embedded + Connectivity (EC) Starter Kit. There are two configurations of the + starter kit: + + 1) The PIC32MZ Embedded Connectivity Starter Kit based on the + PIC32MZ2048ECH144-I/PH chip (DM320006), and + 2) The PIC32MZ Embedded Connectivity Starter Kit based on the + PIC32MZ2048ECM144-I/PH w/Crypto Engine (DM320006-C) + + See www.microchip.com for further information. + config ARCH_BOARD_PIRELLI_DPL10 bool "Pirelli DPL10 phone" depends on ARCH_CHIP_CALYPSO @@ -1111,6 +1127,7 @@ config ARCH_BOARD default "pcduino-a10" if ARCH_BOARD_PCDUINO_A10 default "pic32mx-starterkit" if ARCH_BOARD_PIC32MX_STARTERKIT default "pic32mx7mmb" if ARCH_BOARD_PIC32MX7MMB + default "pic32mz-starterkit" if ARCH_BOARD_PIC32MZ_STARTERKIT default "pirelli_dpl10" if ARCH_BOARD_PIRELLI_DPL10 default "nucleo-f4x1re" if ARCH_BOARD_NUCLEO_F401RE || ARCH_BOARD_NUCLEO_F411RE default "qemu-i486" if ARCH_BOARD_QEMU_I486 @@ -1379,6 +1396,9 @@ endif if ARCH_BOARD_PIC32MX7MMB source "configs/pic32mx7mmb/Kconfig" endif +if ARCH_BOARD_PIC32MZ_STARTERKIT +source "configs/pic32mz-starterkit/Kconfig" +endif if ARCH_BOARD_PIRELLI_DPL10 source "configs/pirelli_dpl10/Kconfig" endif diff --git a/configs/README.txt b/configs/README.txt index f43a6b8105..a7f8069fc4 100644 --- a/configs/README.txt +++ b/configs/README.txt @@ -463,6 +463,18 @@ configs/pic32mx7mmb http://www.mikroe.com/ for further information. configs/pirelli_dpl10 +configs/pic32mz-starterkit + This directory contains the port of NuttX to the Microchip PIC32MZ + Embedded Connectivity (EC) Starter Kit. There are two configurations of + the starter kit: + + 1) The PIC32MZ Embedded Connectivity Starter Kit based on the + PIC32MZ2048ECH144-I/PH chip (DM320006), and + 2) The PIC32MZ Embedded Connectivity Starter Kit based on the + PIC32MZ2048ECM144-I/PH w/Crypto Engine (DM320006-C) + + See www.microchip.com for further information. + This directory contains the board support for Pirelli "Discus" DP-L10 phones. It is a variant of the compal_e88 config with the small changes for the differences in the board. diff --git a/configs/pic32mz-starterkit/README.txt b/configs/pic32mz-starterkit/README.txt index cafec5b830..6682dea643 100644 --- a/configs/pic32mz-starterkit/README.txt +++ b/configs/pic32mz-starterkit/README.txt @@ -182,6 +182,9 @@ Where is one of the following: 2. Serial Output The OS test produces all of its test output on the serial console. - This configuration has UART1 enabled as a serial console. I have - been unable to get this UART work on the MEB. But on the Expansion - I/O board, this maps to RX = J11 pin 41 and TX = J11 pin 43 + This configuration has UART1 enabled as a serial console. + + 3. Toolchain + + By default, the Pinguino MIPs tool chain is used. This toolchain + selection can easily be changed with 'make menuconfig'. diff --git a/configs/pic32mz-starterkit/nsh/defconfig b/configs/pic32mz-starterkit/nsh/defconfig index 16920c833d..0ea714f2c4 100644 --- a/configs/pic32mz-starterkit/nsh/defconfig +++ b/configs/pic32mz-starterkit/nsh/defconfig @@ -70,6 +70,7 @@ CONFIG_ARCH_MIPS=y CONFIG_ARCH="mips" CONFIG_ARCH_FAMILY="mips32" CONFIG_ARCH_CHIP="pic32mz" +# CONFIG_ARCH_CHIP_PIC32MX is not set CONFIG_ARCH_CHIP_PIC32MZ=y CONFIG_ARCH_MIPS32=y @@ -78,162 +79,89 @@ CONFIG_ARCH_MIPS32=y # # CONFIG_MIPS32_TOOLCHAIN_GNU_ELF is not set # CONFIG_MIPS32_TOOLCHAIN_MICROCHIPW is not set -CONFIG_MIPS32_TOOLCHAIN_MICROCHIPW_LITE=y -# CONFIG_MIPS32_TOOLCHAIN_PINGUINOW is not set +# CONFIG_MIPS32_TOOLCHAIN_MICROCHIPW_LITE is not set +CONFIG_MIPS32_TOOLCHAIN_PINGUINOW=y # CONFIG_MIPS32_FRAMEPOINTER is not set # -# PIC32MX Configuration Options +# PIC32MZ Configuration Options # -# CONFIG_ARCH_CHIP_PIC32MX110F016B is not set -# CONFIG_ARCH_CHIP_PIC32MX110F016C is not set -# CONFIG_ARCH_CHIP_PIC32MX110F016D is not set -# CONFIG_ARCH_CHIP_PIC32MX120F032B is not set -# CONFIG_ARCH_CHIP_PIC32MX120F032C is not set -# CONFIG_ARCH_CHIP_PIC32MX120F032D is not set -# CONFIG_ARCH_CHIP_PIC32MX130F064B is not set -# CONFIG_ARCH_CHIP_PIC32MX130F064C is not set -# CONFIG_ARCH_CHIP_PIC32MX130F064D is not set -# CONFIG_ARCH_CHIP_PIC32MX150F128B is not set -# CONFIG_ARCH_CHIP_PIC32MX150F128C is not set -# CONFIG_ARCH_CHIP_PIC32MX150F128D is not set -# CONFIG_ARCH_CHIP_PIC32MX210F016B is not set -# CONFIG_ARCH_CHIP_PIC32MX210F016C is not set -# CONFIG_ARCH_CHIP_PIC32MX210F016D is not set -# CONFIG_ARCH_CHIP_PIC32MX220F032B is not set -# CONFIG_ARCH_CHIP_PIC32MX220F032C is not set -# CONFIG_ARCH_CHIP_PIC32MX220F032D is not set -# CONFIG_ARCH_CHIP_PIC32MX230F064B is not set -# CONFIG_ARCH_CHIP_PIC32MX230F064C is not set -# CONFIG_ARCH_CHIP_PIC32MX230F064D is not set -# CONFIG_ARCH_CHIP_PIC32MX250F128B is not set -# CONFIG_ARCH_CHIP_PIC32MX250F128C is not set -# CONFIG_ARCH_CHIP_PIC32MX250F128D is not set -# CONFIG_ARCH_CHIP_PIC32MX320F032H is not set -# CONFIG_ARCH_CHIP_PIC32MX320F064H is not set -# CONFIG_ARCH_CHIP_PIC32MX320F128H is not set -# CONFIG_ARCH_CHIP_PIC32MX320F128L is not set -# CONFIG_ARCH_CHIP_PIC32MX340F128H is not set -# CONFIG_ARCH_CHIP_PIC32MX340F256H is not set -# CONFIG_ARCH_CHIP_PIC32MX340F512H is not set -# CONFIG_ARCH_CHIP_PIC32MX340F128L is not set -# CONFIG_ARCH_CHIP_PIC32MX360F256L is not set -# CONFIG_ARCH_CHIP_PIC32MX360F512L is not set -# CONFIG_ARCH_CHIP_PIC32MX420F032H is not set -# CONFIG_ARCH_CHIP_PIC32MX440F128H is not set -# CONFIG_ARCH_CHIP_PIC32MX440F128L is not set -# CONFIG_ARCH_CHIP_PIC32MX440F256H is not set -# CONFIG_ARCH_CHIP_PIC32MX440F512H is not set -# CONFIG_ARCH_CHIP_PIC32MX460F256L is not set -# CONFIG_ARCH_CHIP_PIC32MX460F512L is not set -# CONFIG_ARCH_CHIP_PIC32MX534F064H is not set -# CONFIG_ARCH_CHIP_PIC32MX534F064L is not set -# CONFIG_ARCH_CHIP_PIC32MX564F064H is not set -# CONFIG_ARCH_CHIP_PIC32MX564F064L is not set -# CONFIG_ARCH_CHIP_PIC32MX564F128H is not set -# CONFIG_ARCH_CHIP_PIC32MX564F128L is not set -# CONFIG_ARCH_CHIP_PIC32MX575F256H is not set -# CONFIG_ARCH_CHIP_PIC32MX575F256L is not set -# CONFIG_ARCH_CHIP_PIC32MX575F512H is not set -# CONFIG_ARCH_CHIP_PIC32MX575F512L is not set -# CONFIG_ARCH_CHIP_PIC32MX664F064H is not set -# CONFIG_ARCH_CHIP_PIC32MX664F064L is not set -# CONFIG_ARCH_CHIP_PIC32MX664F128H is not set -# CONFIG_ARCH_CHIP_PIC32MX664F128L is not set -# CONFIG_ARCH_CHIP_PIC32MX675F256H is not set -# CONFIG_ARCH_CHIP_PIC32MX675F256L is not set -# CONFIG_ARCH_CHIP_PIC32MX675F512H is not set -# CONFIG_ARCH_CHIP_PIC32MX675F512L is not set -# CONFIG_ARCH_CHIP_PIC32MX695F512H is not set -# CONFIG_ARCH_CHIP_PIC32MX695F512L is not set -# CONFIG_ARCH_CHIP_PIC32MX764F128H is not set -# CONFIG_ARCH_CHIP_PIC32MX764F128L is not set -# CONFIG_ARCH_CHIP_PIC32MX775F256H is not set -# CONFIG_ARCH_CHIP_PIC32MX775F256L is not set -# CONFIG_ARCH_CHIP_PIC32MX775F512H is not set -# CONFIG_ARCH_CHIP_PIC32MX775F512L is not set -# CONFIG_ARCH_CHIP_PIC32MX795F512H is not set -CONFIG_ARCH_CHIP_PIC32MX795F512L=y -# CONFIG_ARCH_CHIP_PIC32MX1 is not set -# CONFIG_ARCH_CHIP_PIC32MX2 is not set -# CONFIG_ARCH_CHIP_PIC32MX3 is not set -# CONFIG_ARCH_CHIP_PIC32MX4 is not set -# CONFIG_ARCH_CHIP_PIC32MX5 is not set -# CONFIG_ARCH_CHIP_PIC32MX6 is not set -CONFIG_ARCH_CHIP_PIC32MX7=y -# CONFIG_PIC32MX_MVEC is not set -CONFIG_PIC32MX_T1=y +# CONFIG_ARCH_CHIP_PIC32MZ2048ECH is not set +CONFIG_ARCH_CHIP_PIC32MZ2048ECM=y +CONFIG_ARCH_CHIP_PIC32MZEC=y +# CONFIG_PIC32MZ_MVEC is not set +CONFIG_PIC32MZ_T1=y # -# PIC32MX Peripheral Support +# PIC32MZ Peripheral Support # -# CONFIG_PIC32MX_WDT is not set -# CONFIG_PIC32MX_T2 is not set -# CONFIG_PIC32MX_T3 is not set -# CONFIG_PIC32MX_T4 is not set -# CONFIG_PIC32MX_T5 is not set -# CONFIG_PIC32MX_IC1 is not set -# CONFIG_PIC32MX_IC2 is not set -# CONFIG_PIC32MX_IC3 is not set -# CONFIG_PIC32MX_IC4 is not set -# CONFIG_PIC32MX_IC5 is not set -# CONFIG_PIC32MX_OC1 is not set -# CONFIG_PIC32MX_OC2 is not set -# CONFIG_PIC32MX_OC3 is not set -# CONFIG_PIC32MX_OC4 is not set -# CONFIG_PIC32MX_OC5 is not set -# CONFIG_PIC32MX_I2C1 is not set -# CONFIG_PIC32MX_I2C2 is not set -# CONFIG_PIC32MX_I2C3 is not set -# CONFIG_PIC32MX_I2C4 is not set -# CONFIG_PIC32MX_I2C5 is not set -# CONFIG_PIC32MX_SPI1 is not set -# CONFIG_PIC32MX_SPI2 is not set -# CONFIG_PIC32MX_SPI3 is not set -# CONFIG_PIC32MX_SPI4 is not set -CONFIG_PIC32MX_UART1=y -# CONFIG_PIC32MX_UART2 is not set -# CONFIG_PIC32MX_UART3 is not set -# CONFIG_PIC32MX_UART4 is not set -# CONFIG_PIC32MX_UART5 is not set -# CONFIG_PIC32MX_UART6 is not set -# CONFIG_PIC32MX_ADC is not set -# CONFIG_PIC32MX_PMP is not set -# CONFIG_PIC32MX_CM1 is not set -# CONFIG_PIC32MX_CM2 is not set -# CONFIG_PIC32MX_CM3 is not set -# CONFIG_PIC32MX_RTCC is not set -# CONFIG_PIC32MX_DMA is not set -# CONFIG_PIC32MX_FLASH is not set -# CONFIG_PIC32MX_USBDEV is not set -# CONFIG_PIC32MX_USBHOST is not set -# CONFIG_PIC32MX_CAN1 is not set -# CONFIG_PIC32MX_CAN2 is not set -# CONFIG_PIC32MX_ETHERNET is not set -# CONFIG_PIC32MX_CTMU is not set +# CONFIG_PIC32MZ_WDT is not set +# CONFIG_PIC32MZ_T2 is not set +# CONFIG_PIC32MZ_T3 is not set +# CONFIG_PIC32MZ_T4 is not set +# CONFIG_PIC32MZ_T5 is not set +# CONFIG_PIC32MZ_IC1 is not set +# CONFIG_PIC32MZ_IC2 is not set +# CONFIG_PIC32MZ_IC3 is not set +# CONFIG_PIC32MZ_IC4 is not set +# CONFIG_PIC32MZ_IC5 is not set +# CONFIG_PIC32MZ_OC1 is not set +# CONFIG_PIC32MZ_OC2 is not set +# CONFIG_PIC32MZ_OC3 is not set +# CONFIG_PIC32MZ_OC4 is not set +# CONFIG_PIC32MZ_OC5 is not set +# CONFIG_PIC32MZ_I2C1 is not set +# CONFIG_PIC32MZ_I2C2 is not set +# CONFIG_PIC32MZ_I2C3 is not set +# CONFIG_PIC32MZ_I2C4 is not set +# CONFIG_PIC32MZ_I2C5 is not set +# CONFIG_PIC32MZ_SPI1 is not set +# CONFIG_PIC32MZ_SPI2 is not set +# CONFIG_PIC32MZ_SPI3 is not set +# CONFIG_PIC32MZ_SPI4 is not set +CONFIG_PIC32MZ_UART1=y +# CONFIG_PIC32MZ_UART2 is not set +# CONFIG_PIC32MZ_UART3 is not set +# CONFIG_PIC32MZ_UART4 is not set +# CONFIG_PIC32MZ_UART5 is not set +# CONFIG_PIC32MZ_UART6 is not set +# CONFIG_PIC32MZ_ADC is not set +# CONFIG_PIC32MZ_PMP is not set +# CONFIG_PIC32MZ_CM1 is not set +# CONFIG_PIC32MZ_CM2 is not set +# CONFIG_PIC32MZ_CM3 is not set +# CONFIG_PIC32MZ_RTCC is not set +# CONFIG_PIC32MZ_DMA is not set +# CONFIG_PIC32MZ_FLASH is not set +# CONFIG_PIC32MZ_USBDEV is not set +# CONFIG_PIC32MZ_USBHOST is not set +# CONFIG_PIC32MZ_CAN1 is not set +# CONFIG_PIC32MZ_CAN2 is not set +# CONFIG_PIC32MZ_ETHERNET is not set +# CONFIG_PIC32MZ_CTMU is not set # -# PIC32MX Peripheral Interrupt Priorities +# PIC32MZ Peripheral Interrupt Priorities # -CONFIG_PIC32MX_CTPRIO=16 -CONFIG_PIC32MX_CS0PRIO=16 -CONFIG_PIC32MX_CS1PRIO=16 -CONFIG_PIC32MX_INT0PRIO=16 -CONFIG_PIC32MX_INT1PRIO=16 -CONFIG_PIC32MX_INT2PRIO=16 -CONFIG_PIC32MX_INT3PRIO=16 -CONFIG_PIC32MX_INT4PRIO=16 -CONFIG_PIC32MX_T1PRIO=16 -CONFIG_PIC32MX_UART1PRIO=16 +CONFIG_PIC32MZ_CTPRIO=16 +CONFIG_PIC32MZ_CS0PRIO=16 +CONFIG_PIC32MZ_CS1PRIO=16 +CONFIG_PIC32MZ_INT0PRIO=16 +CONFIG_PIC32MZ_INT1PRIO=16 +CONFIG_PIC32MZ_INT2PRIO=16 +CONFIG_PIC32MZ_INT3PRIO=16 +CONFIG_PIC32MZ_INT4PRIO=16 +CONFIG_PIC32MZ_T1PRIO=16 +CONFIG_PIC32MZ_UART1PRIO=16 # # Device Configuration 0 (DEVCFG0) # -CONFIG_PIC32MX_DEBUGGER=2 -CONFIG_PIC32MX_ICESEL=1 -CONFIG_PIC32MX_PROGFLASHWP=0xff -CONFIG_PIC32MX_BOOTFLASHWP=1 -CONFIG_PIC32MX_CODEWP=1 +CONFIG_PIC32MZ_DEBUGGER=2 +CONFIG_PIC32MZ_ICESEL=1 +CONFIG_PIC32MZ_PROGFLASHWP=0xff +CONFIG_PIC32MZ_BOOTFLASHWP=1 +CONFIG_PIC32MZ_CODEWP=1 # # Device Configuration 1 (DEVCFG1) @@ -242,11 +170,11 @@ CONFIG_PIC32MX_CODEWP=1 # # Device Configuration 3 (DEVCFG3) # -CONFIG_PIC32MX_USBIDO=0 -CONFIG_PIC32MX_VBUSIO=0 -# CONFIG_PIC32MX_WDENABLE is not set -CONFIG_PIC32MX_FETHIO=0 -CONFIG_PIC32MX_FMIIEN=0 +CONFIG_PIC32MZ_USBIDO=0 +CONFIG_PIC32MZ_VBUSIO=0 +# CONFIG_PIC32MZ_WDENABLE is not set +CONFIG_PIC32MZ_FETHIO=0 +CONFIG_PIC32MZ_FMIIEN=0 # # Architecture Options @@ -305,7 +233,6 @@ CONFIG_RAM_SIZE=131072 # Board Selection # CONFIG_ARCH_BOARD_PIC32MZ_STARTERKIT=y -# CONFIG_ARCH_BOARD_PIC32MX7MMB is not set # CONFIG_ARCH_BOARD_CUSTOM is not set CONFIG_ARCH_BOARD="pic32mz-starterkit"