Make acpi_battery linked conditionally

diff --git a/frsh_api/Makefile.omk b/frsh_api/Makefile.omk
index ded3da6ad97ce5ab033540937d7d4309abe630b6..7758ff2567f41ca0a6e24b228cf283fe5c26acc0 100644 (file)
--- a/frsh_api/Makefile.omk
+++ b/frsh_api/Makefile.omk
@@ -14,7 +14,8 @@ frsh_resources_DEFINES = CONFIG_RESOURCE_DUMMY \
                         CONFIG_FWP \
                         CONFIG_RESOURCE_ITEM \
                         CONFIG_ACPI_LCD \
-                        CONFIG_ACPI_CPU
+                        CONFIG_ACPI_CPU \
+                        CONFIG_ACPI_BATTERY
 
 allocator-libs-$(CONFIG_RESOURCE_DUMMY) += fra_dummy
 allocator-libs-$(CONFIG_RESOURCE_ITEM) += fra_item
@@ -25,6 +26,7 @@ allocator-libs-$(CONFIG_DISKBFQ) += frshdiskbfq
 
 platform-libs-$(CONFIG_ACPI_CPU) += acpi_cpu
 platform-libs-$(CONFIG_ACPI_LCD) += acpi_lcd
+platform-libs-$(CONFIG_ACPI_BATTERY) += acpi_battery
 
 ifneq ($(AQUOSA_ROOT),)
 LOADLIBES += -L $(AQUOSA_ROOT)/lib

diff --git a/frsh_api/frsh_power.c b/frsh_api/frsh_power.c
index cd155ffc538400b47767528ad8166c42c720794b..ac5ffabb1ffe74c2b66c141534a1710727de4b8f 100644 (file)
--- a/frsh_api/frsh_power.c
+++ b/frsh_api/frsh_power.c
@@ -20,7 +20,9 @@
 #ifdef CONFIG_ACPI_CPU
 #  include <fra_acpi_cpu.h>
 #endif
-#include "fra_acpi_battery.h"
+#ifdef CONFIG_ACPI_BATTERY
+#  include "fra_acpi_battery.h"
+#endif
 #ifdef CONFIG_ACPI_LCD
 #  include <fra_acpi_lcd.h>
 #endif
@@ -346,7 +348,7 @@ ret:
 
 int frsh_battery_get_expiration(frsh_abs_time_t *expiration)
 {
-#ifdef CONFIG_ACPI_CPU
+#ifdef CONFIG_ACPI_BATTERY
        frsh_rel_time_t interval;
        int ret;
 

diff --git a/resources/acpi_battery/Makefile.omk b/resources/acpi_battery/Makefile.omk
index 6b95494149edacad50b88609e70dffc26c93caef..4e8cd4b832352af94d7a17942985a8bc174237e2 100644 (file)
--- a/resources/acpi_battery/Makefile.omk
+++ b/resources/acpi_battery/Makefile.omk
@@ -1,3 +1,6 @@
+default_CONFIG = CONFIG_ACPI_BATTERY=y
+
+ifeq ($(CONFIG_ACPI_BATTERY),y)
 shared_LIBRARIES = acpi_battery
 
 acpi_battery_SOURCES = fra_acpi_battery.c
@@ -6,4 +9,4 @@ acpi_battery_LIBS += fosa rt acpi
 include_HEADERS = fra_acpi_battery.h
 
 SUBDIRS=tests
-
+endif