summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2017-02-15 20:34:10 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2017-02-24 08:21:33 +0100
commit5596f405ff03cd5de12ad592a6d696e112fed0c1 (patch)
tree815c9bfaff0e54e0179553bf2bfc5b91747335b8
parent40c5c3f8fcf8913c630329f45eead1fd5ec7fcbb (diff)
downloadbarebox-5596f405ff03cd5de12ad592a6d696e112fed0c1.tar.gz
barebox-5596f405ff03cd5de12ad592a6d696e112fed0c1.tar.xz
efi: move clocksource out of arch
as efi is not an arch but a boot mode from where barebox is started Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/efi/Kconfig1
-rw-r--r--arch/efi/efi/Makefile1
-rw-r--r--drivers/clocksource/Kconfig4
-rw-r--r--drivers/clocksource/Makefile1
-rw-r--r--drivers/clocksource/efi.c (renamed from arch/efi/efi/clocksource.c)0
5 files changed, 6 insertions, 1 deletions
diff --git a/arch/efi/Kconfig b/arch/efi/Kconfig
index d8d0592e51..01301c04f7 100644
--- a/arch/efi/Kconfig
+++ b/arch/efi/Kconfig
@@ -7,6 +7,7 @@ config ARCH_EFI
select EFI_DEVICEPATH
select PRINTF_UUID
select GENERIC_FIND_NEXT_BIT
+ select CLOCKSOURCE_EFI
config ARCH_TEXT_BASE
hex
diff --git a/arch/efi/efi/Makefile b/arch/efi/efi/Makefile
index f088c7a942..51db60b881 100644
--- a/arch/efi/efi/Makefile
+++ b/arch/efi/efi/Makefile
@@ -1,4 +1,3 @@
-obj-y += clocksource.o
obj-y += efi.o
obj-y += efi-device.o
obj-y += efi-image.o
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index f1ab554f96..ae1f10eae5 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -34,6 +34,10 @@ config CLOCKSOURCE_DUMMY_RATE
The option CONFIG_CLOCKSOURCE_DUMMY_RATE is used to adjust this clocksource.
The bigger rate valuest makes clocksource "faster".
+config CLOCKSOURCE_EFI
+ bool
+ depends on ARCH_EFI
+
config CLOCKSOURCE_MVEBU
bool
depends on ARCH_MVEBU
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
index 39982ffb28..e83fdeeec2 100644
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@ -3,6 +3,7 @@ obj-$(CONFIG_ARM_SMP_TWD) += arm_smp_twd.o
obj-$(CONFIG_CLOCKSOURCE_BCM283X) += bcm2835.o
obj-$(CONFIG_CLOCKSOURCE_CLPS711X) += clps711x.o
obj-$(CONFIG_CLOCKSOURCE_DIGIC) += digic.o
+obj-$(CONFIG_CLOCKSOURCE_EFI) += efi.o
obj-$(CONFIG_CLOCKSOURCE_MVEBU) += mvebu.o
obj-$(CONFIG_CLOCKSOURCE_NOMADIK) += nomadik.o
obj-$(CONFIG_CLOCKSOURCE_ORION) += orion.o
diff --git a/arch/efi/efi/clocksource.c b/drivers/clocksource/efi.c
index c92c35b112..c92c35b112 100644
--- a/arch/efi/efi/clocksource.c
+++ b/drivers/clocksource/efi.c