new menu structure for libpayload

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Peter Stuge <peter@stuge.se>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3488 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

3 files changed, 35 insertions, 12 deletions

diff --git a/payloads/libpayload/Config.in b/payloads/libpayload/Config.in
index 6c02c6ec42..2eb518afa6 100644
--- a/payloads/libpayload/Config.in
+++ b/payloads/libpayload/Config.in
@@ -2,6 +2,7 @@
 ## This file is part of the libpayload project.
 ##
 ## 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
@@ -34,7 +35,19 @@ config TARGET_I386
 	bool
 	default y
 
-menu "Output Options"
+menu "Standard Libraries"
+
+config LIBC
+	bool "Enable C library support"
+	default y
+
+config TINYCURSES
+	bool "Enable tinycurses support"
+	default y
+
+endmenu
+
+menu "Console Options"
 
 config SERIAL_CONSOLE
 	bool "See output on the serial port console"
@@ -73,6 +86,14 @@ config PC_KEYBOARD
 	bool "Allow input from a PC keyboard"
 	default y
 
+endmenu
+
+menu "Drivers"
+
+config PCI
+	bool "Support for PCI devices"
+	default y
+
 config NVRAM
 	bool "Support for reading/writing NVRAM bytes"
 	default y
@@ -93,12 +114,9 @@ config RTC_PORT_EXTENDED_VIA
 	  If you want to read or write CMOS bytes on computers with one of
 	  these chipsets, say 'y' here.
 
-endmenu
-
-menu "Build Options"
-
-config TINYCURSES
-	bool "Enable tinycurses support"
+config SPEAKER
+	bool "Support for PC speaker"
 	default y
 
 endmenu
+
diff --git a/payloads/libpayload/drivers/Makefile.inc b/payloads/libpayload/drivers/Makefile.inc
index fbd3d7ee6b..854082c511 100644
--- a/payloads/libpayload/drivers/Makefile.inc
+++ b/payloads/libpayload/drivers/Makefile.inc
@@ -3,6 +3,7 @@
 ##
 ## 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
@@ -28,11 +29,14 @@
 ## SUCH DAMAGE.
 ##
 
-TARGETS-y += drivers/pci.o
-TARGETS-y += drivers/speaker.o
+TARGETS-$(CONFIG_PCI) += drivers/pci.o
+
+TARGETS-$(CONFIG_SPEAKER) += drivers/speaker.o
 
 TARGETS-$(CONFIG_SERIAL_CONSOLE) += drivers/serial.o
+
 TARGETS-$(CONFIG_PC_KEYBOARD) += drivers/keyboard.o
+
 TARGETS-$(CONFIG_NVRAM) += drivers/nvram.o
 TARGETS-$(CONFIG_NVRAM) += drivers/options.o
 
diff --git a/payloads/libpayload/libc/Makefile.inc b/payloads/libpayload/libc/Makefile.inc
index 9b7a4d6d25..bc82c9bc39 100644
--- a/payloads/libpayload/libc/Makefile.inc
+++ b/payloads/libpayload/libc/Makefile.inc
@@ -2,6 +2,7 @@
 ## This file is part of the libpayload project.
 ##
 ## 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
@@ -27,6 +28,6 @@
 ## SUCH DAMAGE.
 ##
 
-TARGETS-y += libc/malloc.o libc/printf.o libc/console.o libc/string.o
-TARGETS-y += libc/memory.o libc/ctype.o libc/ipchecksum.o libc/lib.o
-TARGETS-y += libc/rand.o libc/time.o libc/lar.o libc/exec.o
+TARGETS-$(CONFIG_LIBC) += libc/malloc.o libc/printf.o libc/console.o libc/string.o
+TARGETS-$(CONFIG_LIBC) += libc/memory.o libc/ctype.o libc/ipchecksum.o libc/lib.o
+TARGETS-$(CONFIG_LIBC) += libc/rand.o libc/time.o libc/lar.o libc/exec.o