# HG changeset patch # User Florian Pose # Date 1504871406 -7200 # Node ID 56587a22d05c89455183176f73f5b2bcd498b7e8 # Parent 1079c149f22c2b3684a9ed74de2abdc2f22731fb Do not build GPIO part of CCAT if GPIO is not configured in kernel. diff -r 1079c149f22c -r 56587a22d05c devices/ccat/Kbuild.in --- a/devices/ccat/Kbuild.in Fri Sep 08 13:16:57 2017 +0200 +++ b/devices/ccat/Kbuild.in Fri Sep 08 13:50:06 2017 +0200 @@ -34,14 +34,18 @@ TOPDIR := $(src)/../.. ifeq (@ENABLE_CCAT@,1) - EC_CCAT_OBJ := \ - gpio.o \ + obj-m += ec_ccat.o + + ec_ccat-objs := \ module.o \ netdev.o \ sram.o \ update.o - obj-m += ec_ccat.o - ec_ccat-objs := $(EC_CCAT_OBJ) + +ifdef CONFIG_GPIO + ec_ccat-objs += gpio.o +endif + CFLAGS_ccat_main-ethercat.o = -DREV=$(REV) endif diff -r 1079c149f22c -r 56587a22d05c devices/ccat/module.c --- a/devices/ccat/module.c Fri Sep 08 13:16:57 2017 +0200 +++ b/devices/ccat/module.c Fri Sep 08 13:50:06 2017 +0200 @@ -54,7 +54,9 @@ ð_dma_driver, /* load Ethernet MAC/EtherCAT Master driver with DMA support from netdev.c */ #endif ð_eim_driver, /* load Ethernet MAC/EtherCAT Master driver without DMA support from */ +#ifdef CONFIG_GPIO &gpio_driver, /* load GPIO driver from gpio.c */ +#endif &sram_driver, /* load SRAM driver from sram.c */ &update_driver, /* load Update driver from update.c */ }; diff -r 1079c149f22c -r 56587a22d05c devices/ccat/module.h --- a/devices/ccat/module.h Fri Sep 08 13:16:57 2017 +0200 +++ b/devices/ccat/module.h Fri Sep 08 13:50:06 2017 +0200 @@ -37,10 +37,13 @@ extern const struct ccat_driver eth_eim_driver; extern const struct ccat_driver eth_dma_driver; +#ifdef CONFIG_GPIO extern const struct ccat_driver gpio_driver; +#endif extern const struct ccat_driver sram_driver; extern const struct ccat_driver update_driver; + /** * CCAT function type identifiers (u16) */