diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 6c20116e954..c61d6531c0c 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -37,11 +37,16 @@ config ARCH_MIPS32 default n select ARCH_HAVE_VFORK -config ARCH_MIPS_24KC +config ARCH_MIPS_M4K bool default n -config ARCH_MIPS_M14K +config ARCH_MIPS_MICROAPTIV + bool + default n + select ARCH_HAVE_MICROMIPS + +config ARCH_MIPS_M5150 bool default n select ARCH_HAVE_MICROMIPS diff --git a/arch/mips/src/mips32/Toolchain.defs b/arch/mips/src/mips32/Toolchain.defs index 673381b24bd..909116df906 100644 --- a/arch/mips/src/mips32/Toolchain.defs +++ b/arch/mips/src/mips32/Toolchain.defs @@ -122,11 +122,14 @@ endif # Pick correct MIPS architecture selection -ifeq ($(CONFIG_ARCH_MIPS_M14K),y) - MIPS_MARCH = m14k +ifeq ($(CONFIG_ARCH_MIPS_M5150),y) + MIPS_MARCH = mips32r2 + MIPS_MPROCESSOR = elf32pic32mz +else ifeq ($(CONFIG_ARCH_MIPS_MICROAPTIV), y) + MIPS_MARCH = mips32r2 MIPS_MPROCESSOR = elf32pic32mz else - MIPS_MARCH = 24kc + MIPS_MARCH = m4k MIPS_MPROCESSOR = elf32pic32mx endif diff --git a/arch/mips/src/pic32mx/Kconfig b/arch/mips/src/pic32mx/Kconfig index 4f570623274..01ba20d013e 100644 --- a/arch/mips/src/pic32mx/Kconfig +++ b/arch/mips/src/pic32mx/Kconfig @@ -14,453 +14,453 @@ config ARCH_CHIP_PIC32MX110F016B bool "PIC32MX110F016B" select ARCH_CHIP_PIC32MX1 ---help--- - Microchip PIC32MX110F016B (MPS32 24KC) + Microchip PIC32MX110F016B (MPS32 M4K) ARCH_CHIP_PIC32MX1 config ARCH_CHIP_PIC32MX110F016C bool "PIC32MX110F016C" select ARCH_CHIP_PIC32MX1 ---help--- - Microchip PIC32MX110F016C (MPS32 24KC) + Microchip PIC32MX110F016C (MPS32 M4K) config ARCH_CHIP_PIC32MX110F016D bool "PIC32MX110F016D" select ARCH_CHIP_PIC32MX1 ---help--- - Microchip PIC32MX110F016D (MPS32 24KC) + Microchip PIC32MX110F016D (MPS32 M4K) config ARCH_CHIP_PIC32MX120F032B bool "PIC32MX120F032B" select ARCH_CHIP_PIC32MX1 ---help--- - Microchip PIC32MX120F032B (MPS32 24KC) + Microchip PIC32MX120F032B (MPS32 M4K) config ARCH_CHIP_PIC32MX120F032C bool "PIC32MX120F032C" select ARCH_CHIP_PIC32MX1 ---help--- - Microchip PIC32MX120F032C (MPS32 24KC) + Microchip PIC32MX120F032C (MPS32 M4K) config ARCH_CHIP_PIC32MX120F032D bool "PIC32MX120F032D" select ARCH_CHIP_PIC32MX1 ---help--- - Microchip PIC32MX120F032D (MPS32 24KC) + Microchip PIC32MX120F032D (MPS32 M4K) config ARCH_CHIP_PIC32MX130F064B bool "PIC32MX130F064B" select ARCH_CHIP_PIC32MX1 ---help--- - Microchip PIC32MX130F064B (MPS32 24KC) + Microchip PIC32MX130F064B (MPS32 M4K) config ARCH_CHIP_PIC32MX130F064C bool "PIC32MX130F064C" select ARCH_CHIP_PIC32MX1 ---help--- - Microchip PIC32MX130F064C (MPS32 24KC) + Microchip PIC32MX130F064C (MPS32 M4K) config ARCH_CHIP_PIC32MX130F064D bool "PIC32MX130F064D" select ARCH_CHIP_PIC32MX1 ---help--- - Microchip PIC32MX130F064D (MPS32 24KC) + Microchip PIC32MX130F064D (MPS32 M4K) config ARCH_CHIP_PIC32MX150F128B bool "PIC32MX150F128B" select ARCH_CHIP_PIC32MX1 ---help--- - Microchip PIC32MX150F128B (MPS32 24KC) + Microchip PIC32MX150F128B (MPS32 M4K) config ARCH_CHIP_PIC32MX150F128C bool "PIC32MX150F128C" select ARCH_CHIP_PIC32MX1 ---help--- - Microchip PIC32MX150F128C (MPS32 24KC) + Microchip PIC32MX150F128C (MPS32 M4K) config ARCH_CHIP_PIC32MX150F128D bool "PIC32MX150F128D" select ARCH_CHIP_PIC32MX1 ---help--- - Microchip PIC32MX150F128D (MPS32 24KC) + Microchip PIC32MX150F128D (MPS32 M4K) config ARCH_CHIP_PIC32MX210F016B bool "PIC32MX210F016B" select ARCH_CHIP_PIC32MX2 ---help--- - Microchip PIC32MX210F016B (MPS32 24KC) + Microchip PIC32MX210F016B (MPS32 M4K) config ARCH_CHIP_PIC32MX210F016C bool "PIC32MX210F016C" select ARCH_CHIP_PIC32MX2 ---help--- - Microchip PIC32MX210F016C (MPS32 24KC) + Microchip PIC32MX210F016C (MPS32 M4K) config ARCH_CHIP_PIC32MX210F016D bool "PIC32MX210F016D" select ARCH_CHIP_PIC32MX2 ---help--- - Microchip PIC32MX210F016D (MPS32 24KC) + Microchip PIC32MX210F016D (MPS32 M4K) config ARCH_CHIP_PIC32MX220F032B bool "PIC32MX220F032B" select ARCH_CHIP_PIC32MX2 ---help--- - Microchip PIC32MX220F032B (MPS32 24KC) + Microchip PIC32MX220F032B (MPS32 M4K) config ARCH_CHIP_PIC32MX220F032C bool "PIC32MX220F032C" select ARCH_CHIP_PIC32MX2 ---help--- - Microchip PIC32MX220F032C (MPS32 24KC) + Microchip PIC32MX220F032C (MPS32 M4K) config ARCH_CHIP_PIC32MX220F032D bool "PIC32MX220F032D" select ARCH_CHIP_PIC32MX2 ---help--- - Microchip PIC32MX220F032D (MPS32 24KC) + Microchip PIC32MX220F032D (MPS32 M4K) config ARCH_CHIP_PIC32MX230F064B bool "PIC32MX230F064B" select ARCH_CHIP_PIC32MX2 ---help--- - Microchip PIC32MX230F064B (MPS32 24KC) + Microchip PIC32MX230F064B (MPS32 M4K) config ARCH_CHIP_PIC32MX230F064C bool "PIC32MX230F064C" select ARCH_CHIP_PIC32MX2 ---help--- - Microchip PIC32MX230F064C (MPS32 24KC) + Microchip PIC32MX230F064C (MPS32 M4K) config ARCH_CHIP_PIC32MX230F064D bool "PIC32MX230F064D" select ARCH_CHIP_PIC32MX2 ---help--- - Microchip PIC32MX230F064D (MPS32 24KC) + Microchip PIC32MX230F064D (MPS32 M4K) config ARCH_CHIP_PIC32MX250F128B bool "PIC32MX250F128B" select ARCH_CHIP_PIC32MX2 ---help--- - Microchip PIC32MX250F128B (MPS32 24KC) + Microchip PIC32MX250F128B (MPS32 M4K) config ARCH_CHIP_PIC32MX250F128C bool "PIC32MX250F128C" select ARCH_CHIP_PIC32MX2 ---help--- - Microchip PIC32MX250F128C (MPS32 24KC) + Microchip PIC32MX250F128C (MPS32 M4K) config ARCH_CHIP_PIC32MX250F128D bool "PIC32MX250F128D" select ARCH_CHIP_PIC32MX2 ---help--- - Microchip PIC32MX250F128D (MPS32 24KC) + Microchip PIC32MX250F128D (MPS32 M4K) config ARCH_CHIP_PIC32MX320F032H bool "PIC32MX320F032H" select ARCH_CHIP_PIC32MX3 ---help--- - Microchip PIC32MX320F032H (MPS32 24KC) + Microchip PIC32MX320F032H (MPS32 M4K) config ARCH_CHIP_PIC32MX320F064H bool "PIC32MX320F064H" select ARCH_CHIP_PIC32MX3 ---help--- - Microchip PIC32MX320F064H (MPS32 24KC) + Microchip PIC32MX320F064H (MPS32 M4K) config ARCH_CHIP_PIC32MX320F128H bool "PIC32MX320F128H" select ARCH_CHIP_PIC32MX3 ---help--- - Microchip PIC32MX320F128H (MPS32 24KC) + Microchip PIC32MX320F128H (MPS32 M4K) config ARCH_CHIP_PIC32MX320F128L bool "PIC32MX320F128L" select ARCH_CHIP_PIC32MX3 ---help--- - Microchip PIC32MX320F128L (MPS32 24KC) + Microchip PIC32MX320F128L (MPS32 M4K) config ARCH_CHIP_PIC32MX340F128H bool "PIC32MX340F128H" select ARCH_CHIP_PIC32MX3 ---help--- - Microchip PIC32MX340F128H (MPS32 24KC) + Microchip PIC32MX340F128H (MPS32 M4K) config ARCH_CHIP_PIC32MX340F256H bool "PIC32MX340F256H" select ARCH_CHIP_PIC32MX3 ---help--- - Microchip PIC32MX340F256H (MPS32 24KC) + Microchip PIC32MX340F256H (MPS32 M4K) config ARCH_CHIP_PIC32MX340F512H bool "PIC32MX340F512H" select ARCH_CHIP_PIC32MX3 ---help--- - Microchip PIC32MX340F512H (MPS32 24KC) + Microchip PIC32MX340F512H (MPS32 M4K) config ARCH_CHIP_PIC32MX340F128L bool "PIC32MX340F128L" select ARCH_CHIP_PIC32MX3 ---help--- - Microchip PIC32MX340F128L (MPS32 24KC) + Microchip PIC32MX340F128L (MPS32 M4K) config ARCH_CHIP_PIC32MX360F256L bool "PIC32MX360F256L" select ARCH_CHIP_PIC32MX3 ---help--- - Microchip PIC32MX360F256L (MPS32 24KC) + Microchip PIC32MX360F256L (MPS32 M4K) config ARCH_CHIP_PIC32MX360F512L bool "PIC32MX360F512L" select ARCH_CHIP_PIC32MX3 ---help--- - Microchip PIC32MX360F512L (MPS32 24KC) + Microchip PIC32MX360F512L (MPS32 M4K) config ARCH_CHIP_PIC32MX420F032H bool "PIC32MX420F032H" select ARCH_CHIP_PIC32MX4 ---help--- - Microchip PIC32MX420F032H (MPS32 24KC) + Microchip PIC32MX420F032H (MPS32 M4K) config ARCH_CHIP_PIC32MX440F128H bool "PIC32MX440F128H" select ARCH_CHIP_PIC32MX4 ---help--- - Microchip PIC32MX440F128H (MPS32 24KC) + Microchip PIC32MX440F128H (MPS32 M4K) config ARCH_CHIP_PIC32MX440F128L bool "PIC32MX440F128L" select ARCH_CHIP_PIC32MX4 ---help--- - Microchip PIC32MX440F128L (MPS32 24KC) + Microchip PIC32MX440F128L (MPS32 M4K) config ARCH_CHIP_PIC32MX440F256H bool "PIC32MX440F256H" select ARCH_CHIP_PIC32MX4 ---help--- - Microchip PIC32MX440F256H (MPS32 24KC) + Microchip PIC32MX440F256H (MPS32 M4K) config ARCH_CHIP_PIC32MX440F512H bool "PIC32MX440F512H" select ARCH_CHIP_PIC32MX4 ---help--- - Microchip PIC32MX440F512H (MPS32 24KC) + Microchip PIC32MX440F512H (MPS32 M4K) config ARCH_CHIP_PIC32MX460F256L bool "PIC32MX460F256L" select ARCH_CHIP_PIC32MX4 ---help--- - Microchip PIC32MX460F256L (MPS32 24KC) + Microchip PIC32MX460F256L (MPS32 M4K) config ARCH_CHIP_PIC32MX460F512L bool "PIC32MX460F512L" select ARCH_CHIP_PIC32MX4 ---help--- - Microchip PIC32MX460F512L (MPS32 24KC) + Microchip PIC32MX460F512L (MPS32 M4K) config ARCH_CHIP_PIC32MX534F064H bool "PIC32MX534F064H" select ARCH_CHIP_PIC32MX5 ---help--- - Microchip PIC32MX534F064H (MPS32 24KC) + Microchip PIC32MX534F064H (MPS32 M4K) config ARCH_CHIP_PIC32MX534F064L bool "PIC32MX534F064L" select ARCH_CHIP_PIC32MX5 ---help--- - Microchip PIC32MX534F064L (MPS32 24KC) + Microchip PIC32MX534F064L (MPS32 M4K) config ARCH_CHIP_PIC32MX564F064H bool "PIC32MX564F064H" select ARCH_CHIP_PIC32MX5 ---help--- - Microchip PIC32MX564F064H (MPS32 24KC) + Microchip PIC32MX564F064H (MPS32 M4K) config ARCH_CHIP_PIC32MX564F064L bool "PIC32MX564F064L" select ARCH_CHIP_PIC32MX5 ---help--- - Microchip PIC32MX564F064L (MPS32 24KC) + Microchip PIC32MX564F064L (MPS32 M4K) config ARCH_CHIP_PIC32MX564F128H bool "PIC32MX564F128H" select ARCH_CHIP_PIC32MX5 ---help--- - Microchip PIC32MX564F128H (MPS32 24KC) + Microchip PIC32MX564F128H (MPS32 M4K) config ARCH_CHIP_PIC32MX564F128L bool "PIC32MX564F128L" select ARCH_CHIP_PIC32MX5 ---help--- - Microchip PIC32MX564F128L (MPS32 24KC) + Microchip PIC32MX564F128L (MPS32 M4K) config ARCH_CHIP_PIC32MX575F256H bool "PIC32MX575F256H" select ARCH_CHIP_PIC32MX5 ---help--- - Microchip PIC32MX575F256H (MPS32 24KC) + Microchip PIC32MX575F256H (MPS32 M4K) config ARCH_CHIP_PIC32MX575F256L bool "PIC32MX575F256L" select ARCH_CHIP_PIC32MX5 ---help--- - Microchip PIC32MX575F256L (MPS32 24KC) + Microchip PIC32MX575F256L (MPS32 M4K) config ARCH_CHIP_PIC32MX575F512H bool "PIC32MX575F512H" select ARCH_CHIP_PIC32MX5 ---help--- - Microchip PIC32MX575F512H (MPS32 24KC) + Microchip PIC32MX575F512H (MPS32 M4K) config ARCH_CHIP_PIC32MX575F512L bool "PIC32MX575F512L" select ARCH_CHIP_PIC32MX5 ---help--- - Microchip PIC32MX575F512L (MPS32 24KC) + Microchip PIC32MX575F512L (MPS32 M4K) config ARCH_CHIP_PIC32MX664F064H bool "PIC32MX664F064H" select ARCH_CHIP_PIC32MX6 ---help--- - Microchip PIC32MX664F064H (MPS32 24KC) + Microchip PIC32MX664F064H (MPS32 M4K) config ARCH_CHIP_PIC32MX664F064L bool "PIC32MX664F064L" select ARCH_CHIP_PIC32MX6 ---help--- - Microchip PIC32MX664F064L (MPS32 24KC) + Microchip PIC32MX664F064L (MPS32 M4K) config ARCH_CHIP_PIC32MX664F128H bool "PIC32MX664F128H" select ARCH_CHIP_PIC32MX6 ---help--- - Microchip PIC32MX664F128H (MPS32 24KC) + Microchip PIC32MX664F128H (MPS32 M4K) config ARCH_CHIP_PIC32MX664F128L bool "PIC32MX664F128L" select ARCH_CHIP_PIC32MX6 ---help--- - Microchip PIC32MX664F128L (MPS32 24KC) + Microchip PIC32MX664F128L (MPS32 M4K) config ARCH_CHIP_PIC32MX675F256H bool "PIC32MX675F256H" select ARCH_CHIP_PIC32MX6 ---help--- - Microchip PIC32MX675F256H (MPS32 24KC) + Microchip PIC32MX675F256H (MPS32 M4K) config ARCH_CHIP_PIC32MX675F256L bool "PIC32MX675F256L" select ARCH_CHIP_PIC32MX6 ---help--- - Microchip PIC32MX675F256L (MPS32 24KC) + Microchip PIC32MX675F256L (MPS32 M4K) config ARCH_CHIP_PIC32MX675F512H bool "PIC32MX675F512H" select ARCH_CHIP_PIC32MX6 ---help--- - Microchip PIC32MX675F512H (MPS32 24KC) + Microchip PIC32MX675F512H (MPS32 M4K) config ARCH_CHIP_PIC32MX675F512L bool "PIC32MX675F512L" select ARCH_CHIP_PIC32MX6 ---help--- - Microchip PIC32MX675F512L (MPS32 24KC) + Microchip PIC32MX675F512L (MPS32 M4K) config ARCH_CHIP_PIC32MX695F512H bool "PIC32MX695F512H" select ARCH_CHIP_PIC32MX6 ---help--- - Microchip PIC32MX695F512H (MPS32 24KC) + Microchip PIC32MX695F512H (MPS32 M4K) config ARCH_CHIP_PIC32MX695F512L bool "PIC32MX695F512L" select ARCH_CHIP_PIC32MX6 ---help--- - Microchip PIC32MX695F512L (MPS32 24KC) + Microchip PIC32MX695F512L (MPS32 M4K) config ARCH_CHIP_PIC32MX764F128H bool "PIC32MX764F128H" select ARCH_CHIP_PIC32MX7 ---help--- - Microchip PIC32MX764F128H (MPS32 24KC) + Microchip PIC32MX764F128H (MPS32 M4K) config ARCH_CHIP_PIC32MX764F128L bool "PIC32MX764F128L" select ARCH_CHIP_PIC32MX7 ---help--- - Microchip PIC32MX764F128L (MPS32 24KC) + Microchip PIC32MX764F128L (MPS32 M4K) config ARCH_CHIP_PIC32MX775F256H bool "PIC32MX775F256H" select ARCH_CHIP_PIC32MX7 ---help--- - Microchip PIC32MX775F256H (MPS32 24KC) + Microchip PIC32MX775F256H (MPS32 M4K) config ARCH_CHIP_PIC32MX775F256L bool "PIC32MX775F256L" select ARCH_CHIP_PIC32MX7 ---help--- - Microchip PIC32MX775F256L (MPS32 24KC) + Microchip PIC32MX775F256L (MPS32 M4K) config ARCH_CHIP_PIC32MX775F512H bool "PIC32MX775F512H" select ARCH_CHIP_PIC32MX7 ---help--- - Microchip PIC32MX775F512H (MPS32 24KC) + Microchip PIC32MX775F512H (MPS32 M4K) config ARCH_CHIP_PIC32MX775F512L bool "PIC32MX775F512L" select ARCH_CHIP_PIC32MX7 ---help--- - Microchip PIC32MX775F512L (MPS32 24KC) + Microchip PIC32MX775F512L (MPS32 M4K) config ARCH_CHIP_PIC32MX795F512H bool "PIC32MX795F512H" select ARCH_CHIP_PIC32MX7 ---help--- - Microchip PIC32MX795F512H (MPS32 24KC) + Microchip PIC32MX795F512H (MPS32 M4K) config ARCH_CHIP_PIC32MX795F512L bool "PIC32MX795F512L" select ARCH_CHIP_PIC32MX7 ---help--- - Microchip PIC32MX795F512L (MPS32 24KC) + Microchip PIC32MX795F512L (MPS32 M4K) endchoice config ARCH_CHIP_PIC32MX1 bool default n - select ARCH_MIPS_24KC + select ARCH_MIPS_M4K config ARCH_CHIP_PIC32MX2 bool default n - select ARCH_MIPS_24KC + select ARCH_MIPS_M4K config ARCH_CHIP_PIC32MX3 bool default n - select ARCH_MIPS_24KC + select ARCH_MIPS_M4K config ARCH_CHIP_PIC32MX4 bool default n - select ARCH_MIPS_24KC + select ARCH_MIPS_M4K config ARCH_CHIP_PIC32MX5 bool default n - select ARCH_MIPS_24KC + select ARCH_MIPS_M4K config ARCH_CHIP_PIC32MX6 bool default n - select ARCH_MIPS_24KC + select ARCH_MIPS_M4K config ARCH_CHIP_PIC32MX7 bool default n - select ARCH_MIPS_24KC + select ARCH_MIPS_M4K config PIC32MX_MVEC bool diff --git a/arch/mips/src/pic32mz/Kconfig b/arch/mips/src/pic32mz/Kconfig index e5404b49765..d121535bf5a 100644 --- a/arch/mips/src/pic32mz/Kconfig +++ b/arch/mips/src/pic32mz/Kconfig @@ -14,7 +14,7 @@ config ARCH_CHIP_PIC32MZ2048ECH bool "PIC32MZ2048ECH" select ARCH_CHIP_PIC32MZEC ---help--- - Microchip PIC32MZ2048ECH (MIPS32 M14K) such as the + Microchip PIC32MZ2048ECH (MIPS32 microAptiv) such as the PIC32MZ2048ECH144-I/PH used with the PIC32MZ EC STARTER KIT DM320006 (no longer available) @@ -22,7 +22,7 @@ config ARCH_CHIP_PIC32MZ2048ECM bool "PIC32MZ2048ECM" select ARCH_CHIP_PIC32MZEC ---help--- - Microchip PIC32MZ2048ECM with Crypto Engine (MIPS32 M14K) such as + Microchip PIC32MZ2048ECM with Crypto Engine (MIPS32 microAptiv) such as the ARCH_CHIP_PIC32MZ2048ECM144-I/PH used with the PIC32MZ EC STARTER KIT DM320006-C (no longer available) @@ -30,7 +30,7 @@ config ARCH_CHIP_PIC32MZ2048EFH bool "PIC32MZ2048EFH" select ARCH_CHIP_PIC32MZEF ---help--- - Microchip PIC32MZ2048EFH (MIPS32 M14K) such as the + Microchip PIC32MZ2048EFH (MIPS32 M5150) such as the PIC32MZ2048EFH144-I/PH used in the PIC32MZ EF STARTER KIT or as the PIC32MZ2048EFH100 used with the Mikroe Flip&Click for PIC32MZ. @@ -38,7 +38,7 @@ config ARCH_CHIP_PIC32MZ2048EFM bool "PIC32MZ2048EFM" select ARCH_CHIP_PIC32MZEF ---help--- - Microchip PIC32MZ2048EFH with Crypto Engine (MIPS32 M14K) such as + Microchip PIC32MZ2048EFH with Crypto Engine (MIPS32 M5150) such as the PIC32MZ2048EFM144-I/PH used in the PIC32MZ EF STARTER KIT endchoice @@ -46,14 +46,14 @@ endchoice config ARCH_CHIP_PIC32MZEC bool default n - select ARCH_MIPS_M14K + select ARCH_MIPS_MICROAPTIV select MIPS32_HAVE_ICACHE select MIPS32_HAVE_DCACHE config ARCH_CHIP_PIC32MZEF bool default n - select ARCH_MIPS_M14K + select ARCH_MIPS_M5150 select MIPS32_HAVE_ICACHE select MIPS32_HAVE_DCACHE