clkconf: move clkconf from libgpio to it's own lib

Clock configuration will be needed by other/future subsystems such as i2c.
Extract the functionality from libgpio and put it into it's own library.

Change-Id: I6f6de0b3fb4d305ddfeac74123b78c983d1318dd

diff --git a/distrib/sets/lists/minix/md.evbarm b/distrib/sets/lists/minix/md.evbarm
index 8b9113f1ca5c4acc0f48cd3daee68b0ce98018d9..fab0b0f55bfdad676e37b29e8265def10ec1f07d 100644 (file)
--- a/distrib/sets/lists/minix/md.evbarm
+++ b/distrib/sets/lists/minix/md.evbarm
@@ -92,6 +92,8 @@
 ./usr/include/evbarm/vmparam.h         minix-sys
 ./usr/include/evbarm/wchar_limits.h    minix-sys
 ./usr/include/i386                     minix-sys       obsolete
+./usr/lib/libclkconf.a                 minix-sys
+./usr/lib/libclkconf_pic.a             minix-sys
 ./usr/lib/libgpio.a                    minix-sys
 ./usr/lib/libgpio_pic.a                        minix-sys
 ./usr/lib/libpadconf.a                 minix-sys

diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi
index 6ffeb55a6ec251a12293815a5a8beab363965669..549c80ea6f887634bae778e2971ac717427c95fc 100644 (file)
--- a/distrib/sets/lists/minix/mi
+++ b/distrib/sets/lists/minix/mi
@@ -625,6 +625,7 @@
 ./usr/include/minix/btrace.h           minix-sys
 ./usr/include/minix/callnr.h           minix-sys
 ./usr/include/minix/chardriver.h       minix-sys
+./usr/include/minix/clkconf.h          minix-sys
 ./usr/include/minix/com.h              minix-sys
 ./usr/include/minix/compiler.h         minix-sys
 ./usr/include/minix/config.h           minix-sys

diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 7cb5a9cc8d42ff477b61f20e76b51cf396416f4c..ceeef86a079fab9a2c9dfb36f341e33825158165 100644 (file)
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -3,7 +3,7 @@ PROG=   gpio
 SRCS=  gpio.c
 
 DPADD+=        ${LIBBLOCKDRIVER} ${LIBSYS}
-LDADD+=        -lvtreefs -lsys -lgpio -lpadconf
+LDADD+=        -lvtreefs -lsys -lgpio -lpadconf -lclkconf
 
 #
 # This is a system driver.

diff --git a/include/minix/Makefile b/include/minix/Makefile
index f52c0ce086b9cd42d993b99ac987740c064c1a85..071d38770b7481b26fc18ff784cb219272e0dbb3 100644 (file)
--- a/include/minix/Makefile
+++ b/include/minix/Makefile
@@ -6,7 +6,7 @@ INCS+=  dirent.h paths.h param.h
 INCS+= acpi.h audio_fw.h bitmap.h \
        bdev.h blockdriver.h blockdriver_mt.h \
        btrace.h \
-       callnr.h chardriver.h com.h compiler.h \
+       callnr.h chardriver.h clkconf.h com.h compiler.h \
        config.h const.h cpufeature.h crtso.h \
        debug.h devio.h devman.h dmap.h \
        driver.h drivers.h drvlib.h ds.h \

diff --git a/lib/libgpio/clkconf.h b/include/minix/clkconf.h
similarity index 100%
rename from lib/libgpio/clkconf.h
rename to include/minix/clkconf.h

diff --git a/lib/Makefile b/lib/Makefile
index 40e4f4cb7ed611e4be0f4b2a4d78d32dcae022f9..87b1179dc5d37f42eab6afa41c95c78f8f831c0e 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -54,7 +54,7 @@ SUBDIR += libvassert libhgfs libvboxfs libvirtio
 .endif
 
 .if (${MACHINE_ARCH} == "earm")
-SUBDIR += libgpio libpadconf
+SUBDIR += libclkconf libgpio libpadconf
 .endif
 
 .if (${MKRUMP} != "no")

diff --git a/lib/libclkconf/Makefile b/lib/libclkconf/Makefile
new file mode 100644 (file)
index 0000000..88ac3c3
--- /dev/null
+++ b/lib/libclkconf/Makefile
@@ -0,0 +1,10 @@
+# Makefile for libclkconf
+
+CPPFLAGS+= -D_SYSTEM
+
+LIB=   clkconf
+
+SRCS=  \
+       clkconf.c
+
+.include <bsd.lib.mk>

diff --git a/lib/libgpio/clkconf.c b/lib/libclkconf/clkconf.c
similarity index 97%
rename from lib/libgpio/clkconf.c
rename to lib/libclkconf/clkconf.c
index 7fb73cdfe1b711b10eae8e9c12c9a6e46e40c958..e830c07f2d89bb9872ecabbcfe7787e92a625354 100644 (file)
--- a/lib/libgpio/clkconf.c
+++ b/lib/libclkconf/clkconf.c
@@ -3,6 +3,7 @@
 #include <minix/drvlib.h>
 #include <minix/log.h>
 #include <minix/mmio.h>
+#include <minix/clkconf.h>
 
 /* system headers */
 #include <sys/mman.h>
@@ -16,9 +17,6 @@
 #include <errno.h>
 #include <assert.h>
 
-/* local headers */
-#include "clkconf.h"
-
 /* used for logging */
 static struct log log = {
        .name = "omap_clkconf",

diff --git a/lib/libgpio/Makefile b/lib/libgpio/Makefile
index 8c5cb2be3bdc3d1da7d9d6f6af80290897c89174..e60d45bd10af8c4803cf889c36a54c6570da8094 100644 (file)
--- a/lib/libgpio/Makefile
+++ b/lib/libgpio/Makefile
@@ -5,7 +5,7 @@ CPPFLAGS+= -D_SYSTEM
 LIB=   gpio
 
 SRCS=  \
-       gpio_omap.c  clkconf.c
+       gpio_omap.c
 
 WARNS?=        5
 

diff --git a/lib/libgpio/gpio_omap.c b/lib/libgpio/gpio_omap.c
index dcfc10a29eb747da6230fb3c01d524ae57c37ab3..22f73499c87b6f37149c23dc03ba7180908a428b 100644 (file)
--- a/lib/libgpio/gpio_omap.c
+++ b/lib/libgpio/gpio_omap.c
@@ -4,6 +4,7 @@
 #include <minix/log.h>
 #include <minix/mmio.h>
 #include <minix/gpio.h>
+#include <minix/clkconf.h>
 
 /* system headers */
 #include <sys/mman.h>
@@ -17,8 +18,6 @@
 #include <errno.h>
 #include <assert.h>
 
-#include "clkconf.h"
-
 /* local headers */
 
 /* used for logging */