diff --git a/arch/x86/soc/intel_quark/quark_d2000/Kconfig b/arch/x86/soc/intel_quark/quark_d2000/Kconfig
index d5dcb6b2331..5423cf3e991 100644
--- a/arch/x86/soc/intel_quark/quark_d2000/Kconfig
+++ b/arch/x86/soc/intel_quark/quark_d2000/Kconfig
@@ -8,14 +8,14 @@
 
 if X86 && SOC_QUARK_D2000
 
-config BSP_SHARED_GDT_RAM_ADDR
+config SHARED_GDT_RAM_ADDR
 	hex "Address of the shared RAM with the QMSI Bootloader"
 	default 0x00281FE0
 	help
 	  Address of the memory shared between the BSP and the Bootloader in order
 	  to store the GDT.
 
-config BSP_SHARED_GDT_RAM_SIZE
+config SHARED_GDT_RAM_SIZE
 	hex "Size of the shared RAM with the QMSI Bootloader"
 	depends on !SET_GDT
 	default 0x20
diff --git a/arch/x86/soc/intel_quark/quark_d2000/linker.ld b/arch/x86/soc/intel_quark/quark_d2000/linker.ld
index 1b79dac3c84..afee01cc145 100644
--- a/arch/x86/soc/intel_quark/quark_d2000/linker.ld
+++ b/arch/x86/soc/intel_quark/quark_d2000/linker.ld
@@ -27,7 +27,7 @@
 #ifdef CONFIG_SET_GDT
 #define PHYS_RAM_SIZE CONFIG_RAM_SIZE*1K
 #else /* !CONFIG_SET_GDT */
-#define PHYS_RAM_SIZE CONFIG_RAM_SIZE*1K - CONFIG_BSP_SHARED_GDT_RAM_SIZE
+#define PHYS_RAM_SIZE CONFIG_RAM_SIZE*1K - CONFIG_SHARED_GDT_RAM_SIZE
 #endif
 
 MEMORY
@@ -39,8 +39,8 @@ MEMORY
     RAM (wx)	    : ORIGIN = PHYS_LOAD_ADDR, LENGTH = PHYS_RAM_SIZE
 #endif /* CONFIG_XIP */
 #ifndef CONFIG_SET_GDT
-    BSP_SHARED_GDT_RAM (rw) : ORIGIN = CONFIG_BSP_SHARED_GDT_RAM_ADDR,
-                              LENGTH = CONFIG_BSP_SHARED_GDT_RAM_SIZE
+    SHARED_GDT_RAM (rw) : ORIGIN = CONFIG_SHARED_GDT_RAM_ADDR,
+                              LENGTH = CONFIG_SHARED_GDT_RAM_SIZE
 #endif /* !CONFIG_SET_GDT */
 
     /*
diff --git a/arch/x86/soc/intel_quark/quark_se/Kconfig b/arch/x86/soc/intel_quark/quark_se/Kconfig
index c0f16915c0f..e6847a9a183 100644
--- a/arch/x86/soc/intel_quark/quark_se/Kconfig
+++ b/arch/x86/soc/intel_quark/quark_se/Kconfig
@@ -90,14 +90,14 @@ config BSP_SHARED_RESTORE_INFO_SIZE
 	  Size of the memory shared between the BSP and the Bootloader in order
 	  to store restore information.
 
-config BSP_SHARED_GDT_RAM_ADDR
+config SHARED_GDT_RAM_ADDR
 	hex "Address of the GDT in RAM shared with the QMSI Bootloader"
 	default 0xA8013FE0
 	help
 	  Address of the memory shared between the BSP and the Bootloader in order
 	  to store the GDT.
 
-config BSP_SHARED_GDT_RAM_SIZE
+config SHARED_GDT_RAM_SIZE
 	hex "Size of the GDT in RAM shared with the QMSI Bootloader"
 	default 0x20
 	help
diff --git a/arch/x86/soc/intel_quark/quark_se/linker.ld b/arch/x86/soc/intel_quark/quark_se/linker.ld
index dd8f750e344..ae8236fa4bb 100644
--- a/arch/x86/soc/intel_quark/quark_se/linker.ld
+++ b/arch/x86/soc/intel_quark/quark_se/linker.ld
@@ -26,7 +26,7 @@
 
 /* total shared RAM size (restore info + gdt) */
 #define BSP_SHARED_RAM_SIZE \
-	(CONFIG_BSP_SHARED_GDT_RAM_SIZE+CONFIG_BSP_SHARED_RESTORE_INFO_SIZE)
+	(CONFIG_SHARED_GDT_RAM_SIZE+CONFIG_BSP_SHARED_RESTORE_INFO_SIZE)
 /*
  * When DEEP_SLEEP is not enabled, the shared memory can be re-used after boot.
  * Since the memory regions area are at fixed address locations, only the
@@ -38,7 +38,7 @@
 #ifdef CONFIG_SET_GDT
 #define PHYS_RAM_SIZE CONFIG_RAM_SIZE*1K
 #else
-#define PHYS_RAM_SIZE CONFIG_RAM_SIZE*1K - CONFIG_BSP_SHARED_GDT_RAM_SIZE
+#define PHYS_RAM_SIZE CONFIG_RAM_SIZE*1K - CONFIG_SHARED_GDT_RAM_SIZE
 #endif
 #endif
 
@@ -55,8 +55,8 @@ MEMORY
                           LENGTH = CONFIG_BSP_SHARED_RESTORE_INFO_SIZE
 #endif /* CONFIG_SYS_POWER_DEEP_SLEEP */
 #ifndef CONFIG_SET_GDT
-    BSP_SHARED_GDT_RAM (rw) : ORIGIN = CONFIG_BSP_SHARED_GDT_RAM_ADDR,
-                              LENGTH = CONFIG_BSP_SHARED_GDT_RAM_SIZE
+    SHARED_GDT_RAM (rw) : ORIGIN = CONFIG_SHARED_GDT_RAM_ADDR,
+                              LENGTH = CONFIG_SHARED_GDT_RAM_SIZE
 #endif /* !CONFIG_SET_GDT */
 
     /*