diff --git a/repos/libports/run/acpica.run b/repos/libports/run/acpica.run index 2491955861..2e5bde8056 100644 --- a/repos/libports/run/acpica.run +++ b/repos/libports/run/acpica.run @@ -201,7 +201,7 @@ install_config $config set boot_modules { core init - ld.lib.so libc.lib.so + ld.lib.so timer ps2_drv input_merger @@ -209,7 +209,6 @@ set boot_modules { dynamic_rom acpica acpi_input - debug-acpica test-input } diff --git a/repos/libports/src/app/acpica/debug/printf.cc b/repos/libports/src/app/acpica/debug/printf.cc deleted file mode 100644 index 67e3aa8ba1..0000000000 --- a/repos/libports/src/app/acpica/debug/printf.cc +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2016-2017 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - -#include -#include - -extern "C" -void AcpiOsPrintf (const char *fmt, ...) -{ - va_list va; - va_start(va, fmt); - vprintf(fmt, va); - va_end(va); -} - -extern "C" -void AcpiOsVprintf (const char *fmt, va_list va) -{ - vprintf(fmt, va); -} - diff --git a/repos/libports/src/app/acpica/debug/target.mk b/repos/libports/src/app/acpica/debug/target.mk deleted file mode 100644 index d7e8ea769d..0000000000 --- a/repos/libports/src/app/acpica/debug/target.mk +++ /dev/null @@ -1,7 +0,0 @@ -TARGET = debug-acpica -LIBS = libc -SRC_CC = os.cc printf.cc - -include $(PRG_DIR)/../target.inc - -vpath os.cc $(PRG_DIR)/.. diff --git a/repos/libports/src/app/acpica/os.cc b/repos/libports/src/app/acpica/os.cc index c1da60e8aa..6a4c2bb0fd 100644 --- a/repos/libports/src/app/acpica/os.cc +++ b/repos/libports/src/app/acpica/os.cc @@ -12,7 +12,6 @@ #include #include -#include #include #include #include @@ -303,7 +302,6 @@ ACPI_STATUS AcpiOsInstallInterruptHandler(UINT32 irq, ACPI_OSD_HANDLER handler, } -/* used by normal (no-printf-debug) target */ void Component::construct(Genode::Env &env) { /* XXX execute constructors of global statics */ @@ -311,6 +309,3 @@ void Component::construct(Genode::Env &env) static Acpica::Main main(env); } - -/* used by debug target (using printf of libc) */ -void Libc::Component::construct(Libc::Env &env) { static Acpica::Main main(env); } diff --git a/repos/libports/src/app/acpica/target.inc b/repos/libports/src/app/acpica/target.inc deleted file mode 100644 index 20668181e0..0000000000 --- a/repos/libports/src/app/acpica/target.inc +++ /dev/null @@ -1,3 +0,0 @@ -REQUIRES := x86 - -LIBS += base acpica diff --git a/repos/libports/src/app/acpica/target.mk b/repos/libports/src/app/acpica/target.mk index 7a5e7880e0..449d6de33f 100644 --- a/repos/libports/src/app/acpica/target.mk +++ b/repos/libports/src/app/acpica/target.mk @@ -1,4 +1,4 @@ -TARGET = acpica -SRC_CC = os.cc printf.cc - -include $(PRG_DIR)/target.inc +TARGET := acpica +SRC_CC := os.cc printf.cc +REQUIRES := x86 +LIBS += base acpica