summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/Makefile1
-rw-r--r--arch/x86/bios/Makefile3
-rw-r--r--arch/x86/bios/bios_disk.S (renamed from arch/x86/lib/bios_disk.S)0
-rw-r--r--arch/x86/bios/memory16.S (renamed from arch/x86/lib/memory16.S)0
-rw-r--r--arch/x86/bios/traveler.S (renamed from arch/x86/lib/traveler.S)0
-rw-r--r--arch/x86/lib/Makefile3
6 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index da17d70bdc..640c24b62a 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -40,6 +40,7 @@ endif
common-y += $(BOARD) $(MACH)
common-y += arch/x86/lib/
common-y += arch/x86/boot/
+common-$(CONFIG_X86_BIOS_BRINGUP) += arch/x86/bios/
# arch/x86/cpu/
diff --git a/arch/x86/bios/Makefile b/arch/x86/bios/Makefile
new file mode 100644
index 0000000000..414ee42a4a
--- /dev/null
+++ b/arch/x86/bios/Makefile
@@ -0,0 +1,3 @@
+obj-y += memory16.o
+obj-y += traveler.o
+obj-y += bios_disk.o
diff --git a/arch/x86/lib/bios_disk.S b/arch/x86/bios/bios_disk.S
index cce33e67af..cce33e67af 100644
--- a/arch/x86/lib/bios_disk.S
+++ b/arch/x86/bios/bios_disk.S
diff --git a/arch/x86/lib/memory16.S b/arch/x86/bios/memory16.S
index 76ee72b56c..76ee72b56c 100644
--- a/arch/x86/lib/memory16.S
+++ b/arch/x86/bios/memory16.S
diff --git a/arch/x86/lib/traveler.S b/arch/x86/bios/traveler.S
index 113b19802e..113b19802e 100644
--- a/arch/x86/lib/traveler.S
+++ b/arch/x86/bios/traveler.S
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index b67629f115..6054b9e3f3 100644
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -3,7 +3,4 @@ obj-y += memory.o
obj-y += gdt.o
# needed, when running via a 16 bit BIOS
-obj-$(CONFIG_X86_BIOS_BRINGUP) += memory16.o
-obj-$(CONFIG_X86_BIOS_BRINGUP) += traveler.o
-obj-$(CONFIG_X86_BIOS_BRINGUP) += bios_disk.o
obj-$(CONFIG_CMD_LINUX16) += linux_start.o