diff --git a/arch/Kconfig b/arch/Kconfig
index 37b3e4d1a2..9d87a1b33a 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -118,7 +118,7 @@ config ARCH_DMA
 	bool
 	default n
 
-config ARCH_IRQPRIO
+config ARCH_HAVE_IRQPRIO
 	bool
 	default n
 
@@ -137,6 +137,19 @@ config ARCH_HAVE_VFORK
 config ARCH_HAVE_MMU
 	bool
 
+config ARCH_IRQPRIO
+	bool "Prioritized interrupt support"
+	default n
+	depends on ARCH_HAVE_IRQPRIO
+	---help---
+		Enable support for prioritized interrupts.
+
+		NOTE: The use of interrupt priorities implies that you also have
+		support for nested interrupts.  Most architectures do not support
+		nesting of interupts or, if they do, they only supported nested
+		interrupts with certain configuration options.  So this selection
+		should be used with caution.
+
 config ARCH_STACKDUMP
 	bool "Dump stack on assertions"
 	default n
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 350306b749..2ec96c66b9 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -169,30 +169,30 @@ config ARCH_ARM920T
 config ARCH_CORTEXM0
 	bool
 	default n
-	select ARCH_IRQPRIO
+	select ARCH_HAVE_IRQPRIO
 
 config ARCH_CORTEXM3
 	bool
 	default n
-	select ARCH_IRQPRIO
+	select ARCH_HAVE_IRQPRIO
 	select ARCH_HAVE_RAMVECTORS
 
 config ARCH_CORTEXM4
 	bool
 	default n
-	select ARCH_IRQPRIO
+	select ARCH_HAVE_IRQPRIO
 	select ARCH_HAVE_RAMVECTORS
 
 config ARCH_CORTEXA5
 	bool
 	default n
-	select ARCH_IRQPRIO
+	select ARCH_HAVE_IRQPRIO
 	select ARCH_HAVE_MMU
 
 config ARCH_CORTEXA8
 	bool
 	default n
-	select ARCH_IRQPRIO
+	select ARCH_HAVE_IRQPRIO
 	select ARCH_HAVE_MMU
 
 config ARCH_FAMILY
diff --git a/arch/arm/src/a1x/Kconfig b/arch/arm/src/a1x/Kconfig
index fef656278e..a15ecab9cb 100644
--- a/arch/arm/src/a1x/Kconfig
+++ b/arch/arm/src/a1x/Kconfig
@@ -303,7 +303,7 @@ config A1X_IRQ_PERFMU
 	default n
 
 config A1X_GPU
-	bool GPU"
+	bool "GPU"
 	default n
 
 endmenu
diff --git a/arch/avr/src/at32uc3/at32uc3_irq.c b/arch/avr/src/at32uc3/at32uc3_irq.c
index 70ade3e2a0..78410ac2d2 100644
--- a/arch/avr/src/at32uc3/at32uc3_irq.c
+++ b/arch/avr/src/at32uc3/at32uc3_irq.c
@@ -268,6 +268,7 @@ int up_prioritize_irq(int irq, int priority)
           return OK;
         }
     }
+
   return -EINVAL;
 }
 #endif
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 5a9a1cd9f7..4c5ed8b9d1 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -11,7 +11,7 @@ choice
 config ARCH_CHIP_PIC32MX
 	bool "PIC32MX"
 	select ARCH_MIPS32
-	select ARCH_IRQPRIO
+	select ARCH_HAVE_IRQPRIO
 	select ARCH_VECNOTIRQ
 	select ARCH_HAVE_RAMFUNCS
 	---help---
diff --git a/arch/z16/Kconfig b/arch/z16/Kconfig
index 52ea95c29a..ac79b574ab 100644
--- a/arch/z16/Kconfig
+++ b/arch/z16/Kconfig
@@ -13,28 +13,28 @@ choice
 config ARCH_CHIP_Z16F2810
 	bool "Z16F2810"
 	select ARCH_CHIP_Z16F
-	select ARCH_IRQPRIO
+	select ARCH_HAVE_IRQPRIO
 	---help---
 		ZiLOG Z16F2810
 
 config ARCH_CHIP_Z16F2811
 	bool "Z16F2811"
 	select ARCH_CHIP_Z16F
-	select ARCH_IRQPRIO
+	select ARCH_HAVE_IRQPRIO
 	---help---
 		ZiLOG Z16F2811
 
 config ARCH_CHIP_Z16F3211
 	bool "Z16F3211"
 	select ARCH_CHIP_Z16F
-	select ARCH_IRQPRIO
+	select ARCH_HAVE_IRQPRIO
 	---help---
 		ZiLOG Z16F321
 
 config ARCH_CHIP_Z16F6411
 	bool "Z16F6411"
 	select ARCH_CHIP_Z16F
-	select ARCH_IRQPRIO
+	select ARCH_HAVE_IRQPRIO
 	---help---
 		ZiLOG Z16F6411
 
diff --git a/configs/sama5d3x-ek/Kconfig b/configs/sama5d3x-ek/Kconfig
index a209d2c190..c677b5f5c2 100644
--- a/configs/sama5d3x-ek/Kconfig
+++ b/configs/sama5d3x-ek/Kconfig
@@ -56,7 +56,6 @@ choice
 
 config SAMA5_NAND_FTL
 	bool "Create NAND FLASH block driver"
-	default n
 	depends on MTD && MTD_NAND
 	---help---
 		Create the MTD driver for the NAND and "wrap" the NAND as a standard
@@ -71,7 +70,6 @@ config SAMA5_NAND_FTL
 
 config SAMA5_NAND_NXFFS
 	bool "Create NAND FLASH NXFFS file system"
-	default n
 	depends on MTD && MTD_NAND && FS_NXFFS && NXFFS_NAND
 	---help---
 		Create the MTD driver for the NAND and mount the NAND device as