##
## Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
## Copyright (C) 2008 Advanced Micro Devices, Inc.
+## Copyright (C) 2008 coresystems GmbH
##
## Redistribution and use in source and binary forms, with or without
## modification, are permitted provided that the following conditions
## SUCH DAMAGE.
##
-TARGETS-$(CONFIG_SERIAL_CONSOLE) += drivers/serial.o
-TARGETS-$(CONFIG_VGA_CONSOLE) += drivers/vga.o
-TARGETS-$(CONFIG_PC_KEYBOARD) += drivers/keyboard.o
-TARGETS-$(CONFIG_NVRAM) += drivers/cmos.o
+libc-$(CONFIG_PCI) += pci.c
+
+libc-$(CONFIG_SPEAKER) += speaker.c
+
+libc-$(CONFIG_SERIAL_CONSOLE) += serial.c
+
+libc-$(CONFIG_PC_KEYBOARD) += keyboard.c
+
+libc-$(CONFIG_NVRAM) += nvram.c
+libc-$(CONFIG_NVRAM) += options.c
+
+# Video console drivers
+libc-$(CONFIG_VIDEO_CONSOLE) += video/video.c
+libc-$(CONFIG_VGA_VIDEO_CONSOLE) += video/vga.c
+
+# Geode LX console drivers
+libc-$(CONFIG_GEODELX_VIDEO_CONSOLE) += video/geodelx.c
+libc-$(CONFIG_GEODELX_VIDEO_CONSOLE) += video/font8x16.c
+
+# coreboot generic framebuffer driver
+libc-$(CONFIG_COREBOOT_VIDEO_CONSOLE) += video/corebootfb.c
+libc-$(CONFIG_COREBOOT_VIDEO_CONSOLE) += video/font8x16.c
+
+# USB stack
+libc-$(CONFIG_USB) += usb/usbinit.c
+libc-$(CONFIG_USB) += usb/usb.c
+libc-$(CONFIG_USB) += usb/usb_dev.c
+libc-$(CONFIG_USB) += usb/quirks.c
+libc-$(CONFIG_USB_HUB) += usb/usbhub.c
+libc-$(CONFIG_USB_UHCI) += usb/uhci.c
+libc-$(CONFIG_USB_UHCI) += usb/uhci_rh.c
+libc-$(CONFIG_USB_OHCI) += usb/ohci.c
+libc-$(CONFIG_USB_OHCI) += usb/ohci_rh.c
+libc-$(CONFIG_USB_EHCI) += usb/ehci.c
+libc-$(CONFIG_USB_EHCI) += usb/ehci_rh.c
+libc-$(CONFIG_USB_XHCI) += usb/xhci.c
+libc-$(CONFIG_USB_XHCI) += usb/xhci_rh.c
+libc-$(CONFIG_USB_HID) += usb/usbhid.c
+libc-$(CONFIG_USB_MSC) += usb/usbmsc.c
+
+# used by both USB HID and keyboard
+libc-y += hid.c