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
This commit is contained in:
Thomas Cort 2013-06-17 08:23:31 -04:00 committed by Kees Jongenburger
parent fa86f72420
commit ba92d5219d
10 changed files with 19 additions and 9 deletions

View file

@ -92,6 +92,8 @@
./usr/include/evbarm/vmparam.h minix-sys ./usr/include/evbarm/vmparam.h minix-sys
./usr/include/evbarm/wchar_limits.h minix-sys ./usr/include/evbarm/wchar_limits.h minix-sys
./usr/include/i386 minix-sys obsolete ./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.a minix-sys
./usr/lib/libgpio_pic.a minix-sys ./usr/lib/libgpio_pic.a minix-sys
./usr/lib/libpadconf.a minix-sys ./usr/lib/libpadconf.a minix-sys

View file

@ -625,6 +625,7 @@
./usr/include/minix/btrace.h minix-sys ./usr/include/minix/btrace.h minix-sys
./usr/include/minix/callnr.h minix-sys ./usr/include/minix/callnr.h minix-sys
./usr/include/minix/chardriver.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/com.h minix-sys
./usr/include/minix/compiler.h minix-sys ./usr/include/minix/compiler.h minix-sys
./usr/include/minix/config.h minix-sys ./usr/include/minix/config.h minix-sys

View file

@ -3,7 +3,7 @@ PROG= gpio
SRCS= gpio.c SRCS= gpio.c
DPADD+= ${LIBBLOCKDRIVER} ${LIBSYS} DPADD+= ${LIBBLOCKDRIVER} ${LIBSYS}
LDADD+= -lvtreefs -lsys -lgpio -lpadconf LDADD+= -lvtreefs -lsys -lgpio -lpadconf -lclkconf
# #
# This is a system driver. # This is a system driver.

View file

@ -6,7 +6,7 @@ INCS+= dirent.h paths.h param.h
INCS+= acpi.h audio_fw.h bitmap.h \ INCS+= acpi.h audio_fw.h bitmap.h \
bdev.h blockdriver.h blockdriver_mt.h \ bdev.h blockdriver.h blockdriver_mt.h \
btrace.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 \ config.h const.h cpufeature.h crtso.h \
debug.h devio.h devman.h dmap.h \ debug.h devio.h devman.h dmap.h \
driver.h drivers.h drvlib.h ds.h \ driver.h drivers.h drvlib.h ds.h \

View file

@ -54,7 +54,7 @@ SUBDIR += libvassert libhgfs libvboxfs libvirtio
.endif .endif
.if (${MACHINE_ARCH} == "earm") .if (${MACHINE_ARCH} == "earm")
SUBDIR += libgpio libpadconf SUBDIR += libclkconf libgpio libpadconf
.endif .endif
.if (${MKRUMP} != "no") .if (${MKRUMP} != "no")

10
lib/libclkconf/Makefile Normal file
View file

@ -0,0 +1,10 @@
# Makefile for libclkconf
CPPFLAGS+= -D_SYSTEM
LIB= clkconf
SRCS= \
clkconf.c
.include <bsd.lib.mk>

View file

@ -3,6 +3,7 @@
#include <minix/drvlib.h> #include <minix/drvlib.h>
#include <minix/log.h> #include <minix/log.h>
#include <minix/mmio.h> #include <minix/mmio.h>
#include <minix/clkconf.h>
/* system headers */ /* system headers */
#include <sys/mman.h> #include <sys/mman.h>
@ -16,9 +17,6 @@
#include <errno.h> #include <errno.h>
#include <assert.h> #include <assert.h>
/* local headers */
#include "clkconf.h"
/* used for logging */ /* used for logging */
static struct log log = { static struct log log = {
.name = "omap_clkconf", .name = "omap_clkconf",

View file

@ -5,7 +5,7 @@ CPPFLAGS+= -D_SYSTEM
LIB= gpio LIB= gpio
SRCS= \ SRCS= \
gpio_omap.c clkconf.c gpio_omap.c
WARNS?= 5 WARNS?= 5

View file

@ -4,6 +4,7 @@
#include <minix/log.h> #include <minix/log.h>
#include <minix/mmio.h> #include <minix/mmio.h>
#include <minix/gpio.h> #include <minix/gpio.h>
#include <minix/clkconf.h>
/* system headers */ /* system headers */
#include <sys/mman.h> #include <sys/mman.h>
@ -17,8 +18,6 @@
#include <errno.h> #include <errno.h>
#include <assert.h> #include <assert.h>
#include "clkconf.h"
/* local headers */ /* local headers */
/* used for logging */ /* used for logging */