summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/efi/efi/Makefile5
-rw-r--r--drivers/Makefile1
-rw-r--r--drivers/block/Makefile1
-rw-r--r--drivers/block/efi-block-io.c (renamed from arch/efi/efi/efi-block-io.c)0
4 files changed, 6 insertions, 1 deletions
diff --git a/arch/efi/efi/Makefile b/arch/efi/efi/Makefile
index a856e5907c..f088c7a942 100644
--- a/arch/efi/efi/Makefile
+++ b/arch/efi/efi/Makefile
@@ -1,2 +1,5 @@
-obj-y += efi.o clocksource.o efi-block-io.o efi-device.o efi-image.o
+obj-y += clocksource.o
+obj-y += efi.o
+obj-y += efi-device.o
+obj-y += efi-image.o
bbenv-y += env-efi
diff --git a/drivers/Makefile b/drivers/Makefile
index 6a70f6ee19..9ff261ad29 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -1,4 +1,5 @@
obj-y += base/
+obj-y += block/
obj-$(CONFIG_ARM_AMBA) += amba/
obj-y += net/
obj-y += serial/
diff --git a/drivers/block/Makefile b/drivers/block/Makefile
new file mode 100644
index 0000000000..8812c0faec
--- /dev/null
+++ b/drivers/block/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_EFI_BOOTUP) += efi-block-io.o
diff --git a/arch/efi/efi/efi-block-io.c b/drivers/block/efi-block-io.c
index e02d3b49cc..e02d3b49cc 100644
--- a/arch/efi/efi/efi-block-io.c
+++ b/drivers/block/efi-block-io.c