diff --git a/arch/arm/configs/micro_fsl_frdm_k64f_defconfig b/arch/arm/configs/micro_fsl_frdm_k64f_defconfig
index ef51a6a06fe..80fb4918bea 100644
--- a/arch/arm/configs/micro_fsl_frdm_k64f_defconfig
+++ b/arch/arm/configs/micro_fsl_frdm_k64f_defconfig
@@ -16,7 +16,6 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
 #
 # Nanokernel Options
 #
-CONFIG_KERNEL_DIR="ukernel"
 # CONFIG_BOOT_BANNER is not set
 CONFIG_MAIN_STACK_SIZE=1024
 CONFIG_ISR_STACK_SIZE=2048
diff --git a/arch/arm/configs/micro_ti_lm3s6965_defconfig b/arch/arm/configs/micro_ti_lm3s6965_defconfig
index 3f6a27a6fe5..8057e9c9766 100644
--- a/arch/arm/configs/micro_ti_lm3s6965_defconfig
+++ b/arch/arm/configs/micro_ti_lm3s6965_defconfig
@@ -16,7 +16,6 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=12000000
 #
 # Nanokernel Options
 #
-CONFIG_KERNEL_DIR="ukernel"
 # CONFIG_BOOT_BANNER is not set
 CONFIG_MAIN_STACK_SIZE=1024
 CONFIG_ISR_STACK_SIZE=2048
diff --git a/arch/arm/configs/nano_fsl_frdm_k64f_defconfig b/arch/arm/configs/nano_fsl_frdm_k64f_defconfig
index a58d6904039..aa25b147c1a 100644
--- a/arch/arm/configs/nano_fsl_frdm_k64f_defconfig
+++ b/arch/arm/configs/nano_fsl_frdm_k64f_defconfig
@@ -16,7 +16,6 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
 #
 # Nanokernel Options
 #
-CONFIG_KERNEL_DIR="nkernel"
 # CONFIG_BOOT_BANNER is not set
 CONFIG_MAIN_STACK_SIZE=1024
 CONFIG_ISR_STACK_SIZE=2048
diff --git a/arch/arm/configs/nano_ti_lm3s6965_defconfig b/arch/arm/configs/nano_ti_lm3s6965_defconfig
index dd3b3d365ab..015a75d049f 100644
--- a/arch/arm/configs/nano_ti_lm3s6965_defconfig
+++ b/arch/arm/configs/nano_ti_lm3s6965_defconfig
@@ -16,7 +16,6 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=12000000
 #
 # Nanokernel Options
 #
-CONFIG_KERNEL_DIR="nkernel"
 # CONFIG_BOOT_BANNER is not set
 CONFIG_MAIN_STACK_SIZE=1024
 CONFIG_ISR_STACK_SIZE=2048
diff --git a/arch/arm/defconfig b/arch/arm/defconfig
index ef51a6a06fe..80fb4918bea 100644
--- a/arch/arm/defconfig
+++ b/arch/arm/defconfig
@@ -16,7 +16,6 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
 #
 # Nanokernel Options
 #
-CONFIG_KERNEL_DIR="ukernel"
 # CONFIG_BOOT_BANNER is not set
 CONFIG_MAIN_STACK_SIZE=1024
 CONFIG_ISR_STACK_SIZE=2048
diff --git a/arch/x86/configs/micro_generic_pc_defconfig b/arch/x86/configs/micro_generic_pc_defconfig
index d00141ad570..61421ab1f5b 100644
--- a/arch/x86/configs/micro_generic_pc_defconfig
+++ b/arch/x86/configs/micro_generic_pc_defconfig
@@ -22,7 +22,6 @@ CONFIG_ENHANCED_SECURITY=y
 #
 # Nanokernel Options
 #
-CONFIG_KERNEL_DIR="ukernel"
 # CONFIG_BOOT_BANNER is not set
 CONFIG_MAIN_STACK_SIZE=1024
 CONFIG_ISR_STACK_SIZE=2048
diff --git a/arch/x86/configs/micro_quark_defconfig b/arch/x86/configs/micro_quark_defconfig
index a3d277b4217..e171543bf91 100644
--- a/arch/x86/configs/micro_quark_defconfig
+++ b/arch/x86/configs/micro_quark_defconfig
@@ -22,7 +22,6 @@ CONFIG_ENHANCED_SECURITY=y
 #
 # Nanokernel Options
 #
-CONFIG_KERNEL_DIR="ukernel"
 # CONFIG_BOOT_BANNER is not set
 CONFIG_MAIN_STACK_SIZE=1024
 CONFIG_ISR_STACK_SIZE=2048
diff --git a/arch/x86/configs/nano_generic_pc_defconfig b/arch/x86/configs/nano_generic_pc_defconfig
index 32a433021ca..59c9d4a0b6f 100644
--- a/arch/x86/configs/nano_generic_pc_defconfig
+++ b/arch/x86/configs/nano_generic_pc_defconfig
@@ -22,7 +22,6 @@ CONFIG_ENHANCED_SECURITY=y
 #
 # Nanokernel Options
 #
-CONFIG_KERNEL_DIR="nkernel"
 # CONFIG_BOOT_BANNER is not set
 CONFIG_MAIN_STACK_SIZE=1024
 CONFIG_ISR_STACK_SIZE=2048
diff --git a/arch/x86/configs/nano_quark_defconfig b/arch/x86/configs/nano_quark_defconfig
index 942fbc73605..f52225932b4 100644
--- a/arch/x86/configs/nano_quark_defconfig
+++ b/arch/x86/configs/nano_quark_defconfig
@@ -22,7 +22,6 @@ CONFIG_ENHANCED_SECURITY=y
 #
 # Nanokernel Options
 #
-CONFIG_KERNEL_DIR="nkernel"
 # CONFIG_BOOT_BANNER is not set
 CONFIG_MAIN_STACK_SIZE=1024
 CONFIG_ISR_STACK_SIZE=2048
diff --git a/arch/x86/defconfig b/arch/x86/defconfig
index d00141ad570..61421ab1f5b 100644
--- a/arch/x86/defconfig
+++ b/arch/x86/defconfig
@@ -22,7 +22,6 @@ CONFIG_ENHANCED_SECURITY=y
 #
 # Nanokernel Options
 #
-CONFIG_KERNEL_DIR="ukernel"
 # CONFIG_BOOT_BANNER is not set
 CONFIG_MAIN_STACK_SIZE=1024
 CONFIG_ISR_STACK_SIZE=2048
diff --git a/kernel/microkernel/Kconfig b/kernel/microkernel/Kconfig
index dbb6fec1555..564fa2ae523 100644
--- a/kernel/microkernel/Kconfig
+++ b/kernel/microkernel/Kconfig
@@ -2,14 +2,6 @@ menu "Microkernel Options"
 
 source "kernel/microkernel/core/Kconfig"
 
-config KERNEL_DIR
-	string
-	default ukernel
-	depends on MICROKERNEL
-	help
-		This option holds the name of the directory used
-		by sysgen to locate the config1p.vpf file.
-
 config	WORKLOAD_MONITOR
 	bool
 	prompt "Workload monitoring [EXPERIMENTAL]"
diff --git a/kernel/nanokernel/Kconfig b/kernel/nanokernel/Kconfig
index 85cc168d1cd..7de3ae50059 100644
--- a/kernel/nanokernel/Kconfig
+++ b/kernel/nanokernel/Kconfig
@@ -1,13 +1,5 @@
 menu "Nanokernel Options"
 
-config KERNEL_DIR
-	string
-	default nkernel
-	depends on NANOKERNEL
-	help
-	This option holds the name of the directory used
-	by sysgen to locate the config1p.vpf file.
-
 source "kernel/nanokernel/core/Kconfig"
 
 endmenu
diff --git a/scripts/Makefile.preparch b/scripts/Makefile.preparch
index 36e38d84122..7a6b64a845e 100644
--- a/scripts/Makefile.preparch
+++ b/scripts/Makefile.preparch
@@ -28,11 +28,11 @@ define filechk_prj.vpf
 		done; \
 	fi; \
 	cat $(PROJECT)/$(VPFILE); \
-	cat $(srctree)/config/$(CONFIG_BSP_DIR)/$(CONFIG_KERNEL_DIR)/config1p.vpf;)
+	cat $(srctree)/config/$(CONFIG_BSP_DIR)/ukernel/config1p.vpf;)
 endef
 
 #Specific source code generation for Viper
-misc/generated/nodes/prj.vpf:	$(srctree)/config/$(CONFIG_BSP_DIR)/$(CONFIG_KERNEL_DIR)/config1p.vpf \
+misc/generated/nodes/prj.vpf:	$(srctree)/config/$(CONFIG_BSP_DIR)/ukernel/config1p.vpf \
 				$(PROJECT)/$(VPFILE) \
 				include/config/auto.conf FORCE
 	$(call filechk,prj.vpf)
@@ -110,4 +110,4 @@ cmd_cc_o_c = $(CC) $(KBUILD_CFLAGS) $(OFFSETS_INCLUDE) $(USERINCLUDE) -c -o $@ $
 include/generated/offsets.o: $(srctree)/arch/$(SRCARCH)/core/offsets/offsets.c FORCE
 	$(call if_changed_rule,cc_o_c)
 
-.PHONY: $(srctree)/config/$(CONFIG_BSP_DIR)/$(CONFIG_KERNEL_DIR)/config1p.vpf
+.PHONY: $(srctree)/config/$(CONFIG_BSP_DIR)/ukernel/config1p.vpf