See patch.
Uwe. -- http://www.hermann-uwe.de | http://www.holsham-traders.de http://www.crazy-hacks.org | http://www.unmaintained-free-software.org
Drop the tiny and almost-empty Makefile.inc files, include their contents in our top-level Makefile. Build-tested with the default libpayload config. Signed-off-by: Uwe Hermann <[EMAIL PROTECTED]> Index: crypto/Makefile.inc =================================================================== --- crypto/Makefile.inc (Revision 3493) +++ crypto/Makefile.inc (Arbeitskopie) @@ -1,30 +0,0 @@ -## -## This file is part of the libpayload project. -## -## Copyright (C) 2008 Uwe Hermann <[EMAIL PROTECTED]> -## -## Redistribution and use in source and binary forms, with or without -## modification, are permitted provided that the following conditions -## are met: -## 1. Redistributions of source code must retain the above copyright -## notice, this list of conditions and the following disclaimer. -## 2. Redistributions in binary form must reproduce the above copyright -## notice, this list of conditions and the following disclaimer in the -## documentation and/or other materials provided with the distribution. -## 3. The name of the author may not be used to endorse or promote products -## derived from this software without specific prior written permission. -## -## THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -## ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -## ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -## FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -## DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -## OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -## HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -## LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -## OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -## SUCH DAMAGE. -## - -TARGETS-y += crypto/sha1.o Index: curses/Makefile.inc =================================================================== --- curses/Makefile.inc (Revision 3493) +++ curses/Makefile.inc (Arbeitskopie) @@ -1,32 +0,0 @@ -## -## This file is part of the libpayload project. -## -## Copyright (C) 2008 Advanced Micro Devices, Inc. -## -## Redistribution and use in source and binary forms, with or without -## modification, are permitted provided that the following conditions -## are met: -## 1. Redistributions of source code must retain the above copyright -## notice, this list of conditions and the following disclaimer. -## 2. Redistributions in binary form must reproduce the above copyright -## notice, this list of conditions and the following disclaimer in the -## documentation and/or other materials provided with the distribution. -## 3. The name of the author may not be used to endorse or promote products -## derived from this software without specific prior written permission. -## -## THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -## ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -## ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -## FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -## DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -## OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -## HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -## LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -## OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -## SUCH DAMAGE. -## - -TARGETS-$(CONFIG_TINYCURSES) += curses/keyboard.o -TARGETS-$(CONFIG_TINYCURSES) += curses/tinycurses.o -TARGETS-$(CONFIG_TINYCURSES) += curses/colors.o Index: i386/Makefile.inc =================================================================== --- i386/Makefile.inc (Revision 3493) +++ i386/Makefile.inc (Arbeitskopie) @@ -1,32 +0,0 @@ -## -## This file is part of the libpayload project. -## -## Copyright (C) 2008 Advanced Micro Devices, Inc. -## -## Redistribution and use in source and binary forms, with or without -## modification, are permitted provided that the following conditions -## are met: -## 1. Redistributions of source code must retain the above copyright -## notice, this list of conditions and the following disclaimer. -## 2. Redistributions in binary form must reproduce the above copyright -## notice, this list of conditions and the following disclaimer in the -## documentation and/or other materials provided with the distribution. -## 3. The name of the author may not be used to endorse or promote products -## derived from this software without specific prior written permission. -## -## THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -## ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -## ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -## FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -## DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -## OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -## HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -## LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -## OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -## SUCH DAMAGE. -## - -TARGETS-y += i386/head.S.o i386/main.o i386/sysinfo.o -TARGETS-y += i386/timer.o i386/coreboot.o i386/util.S.o -TARGETS-y += i386/exec.S.o Index: libc/Makefile.inc =================================================================== --- libc/Makefile.inc (Revision 3493) +++ libc/Makefile.inc (Arbeitskopie) @@ -1,33 +0,0 @@ -## -## 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 -## are met: -## 1. Redistributions of source code must retain the above copyright -## notice, this list of conditions and the following disclaimer. -## 2. Redistributions in binary form must reproduce the above copyright -## notice, this list of conditions and the following disclaimer in the -## documentation and/or other materials provided with the distribution. -## 3. The name of the author may not be used to endorse or promote products -## derived from this software without specific prior written permission. -## -## THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -## ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -## ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -## FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -## DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -## OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -## HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -## LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -## OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -## SUCH DAMAGE. -## - -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 Index: Makefile =================================================================== --- Makefile (Revision 3493) +++ Makefile (Arbeitskopie) @@ -66,13 +66,28 @@ ARCHDIR-$(CONFIG_TARGET_I386) := i386 -PLATFORM-y += $(ARCHDIR-y)/Makefile.inc TARGETS-y := -BUILD-y := crypto/Makefile.inc libc/Makefile.inc drivers/Makefile.inc -BUILD-$(CONFIG_TINYCURSES) += curses/Makefile.inc +# Objects to build/use: +TARGETS-y += crypto/sha1.o +TARGETS-y += i386/head.S.o i386/main.o i386/sysinfo.o i386/timer.o +TARGETS-y += i386/coreboot.o i386/util.S.o i386/exec.S.o +TARGETS-$(CONFIG_TINYCURSES) += curses/keyboard.o curses/tinycurses.o +TARGETS-$(CONFIG_TINYCURSES) += curses/colors.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 drivers/options.o +TARGETS-$(CONFIG_VIDEO_CONSOLE) += drivers/video/video.o +TARGETS-$(CONFIG_VGA_VIDEO_CONSOLE) += drivers/video/vga.o +TARGETS-$(CONFIG_GEODE_VIDEO_CONSOLE) += drivers/video/geode.o +TARGETS-$(CONFIG_GEODE_VIDEO_CONSOLE) += drivers/video/font8x16.o +TARGETS-$(CONFIG_LIBC) += libc/malloc.o libc/printf.o libc/console.o +TARGETS-$(CONFIG_LIBC) += libc/string.o libc/memory.o libc/ctype.o +TARGETS-$(CONFIG_LIBC) += libc/ipchecksum.o libc/lib.o libc/rand.o libc/time.o +TARGETS-$(CONFIG_LIBC) += libc/lar.o libc/exec.o -include $(PLATFORM-y) $(BUILD-y) OBJS := $(patsubst %,$(obj)/%,$(TARGETS-y)) INCLUDES := -Iinclude -Ibuild Index: drivers/Makefile.inc =================================================================== --- drivers/Makefile.inc (Revision 3493) +++ drivers/Makefile.inc (Arbeitskopie) @@ -1,49 +0,0 @@ -## -## This file is part of the libpayload project. -## -## Copyright (C) 2007 Uwe Hermann <[EMAIL PROTECTED]> -## 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 -## are met: -## 1. Redistributions of source code must retain the above copyright -## notice, this list of conditions and the following disclaimer. -## 2. Redistributions in binary form must reproduce the above copyright -## notice, this list of conditions and the following disclaimer in the -## documentation and/or other materials provided with the distribution. -## 3. The name of the author may not be used to endorse or promote products -## derived from this software without specific prior written permission. -## -## THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -## ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -## ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -## FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -## DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -## OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -## HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -## LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -## OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -## SUCH DAMAGE. -## - -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 - -# Video console drivers -TARGETS-$(CONFIG_VIDEO_CONSOLE) += drivers/video/video.o -TARGETS-$(CONFIG_VGA_VIDEO_CONSOLE) += drivers/video/vga.o - -# Geode console drivers -TARGETS-$(CONFIG_GEODE_VIDEO_CONSOLE) += drivers/video/geode.o -TARGETS-$(CONFIG_GEODE_VIDEO_CONSOLE) += drivers/video/font8x16.o
-- coreboot mailing list [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
