diff --git a/arch/x86/bsp/Makefile b/arch/x86/bsp/Makefile
index 59079cb911b..4beec990581 100644
--- a/arch/x86/bsp/Makefile
+++ b/arch/x86/bsp/Makefile
@@ -8,4 +8,4 @@ obj-y += cache_s.o
 endif
 
 obj-$(CONFIG_CLFLUSH_INSTRUCTION_SUPPORTED) += cache.o
-obj-$(CONFIG_X86_TSC_RANDOM_GENERATOR) += rand32-timestamp.o
+
diff --git a/drivers/random/Makefile b/drivers/random/Makefile
index 90ac1137836..bb6ba03b6b6 100644
--- a/drivers/random/Makefile
+++ b/drivers/random/Makefile
@@ -1,4 +1,4 @@
 ccflags-y +=-I$(srctree)/arch/$(ARCH)
-ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_BSP_DIR))
 
 obj-$(CONFIG_TIMER_RANDOM_GENERATOR) = rand32-timer.o
+obj-$(CONFIG_X86_TSC_RANDOM_GENERATOR) += rand32-timestamp.o
diff --git a/arch/x86/bsp/rand32-timestamp.c b/drivers/random/rand32-timestamp.c
similarity index 100%
rename from arch/x86/bsp/rand32-timestamp.c
rename to drivers/random/rand32-timestamp.c