From b3db79e9965cb290615a02b324648bc64f805660 Mon Sep 17 00:00:00 2001
From: Patrick Georgi <patrick@georgi-clan.de>
Date: Thu, 21 Apr 2011 18:48:50 +0200
Subject: [PATCH] Use coreboot build system for libpayload, too.

This change makes building coreboot related projects more unified.

Change-Id: I0f1181e2fffde1e03675523f7dc9eef3119052c3
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-on: http://review.coreboot.org/71
Tested-by: build bot (Jenkins)
Reviewed-by: Uwe Hermann <uwe@hermann-uwe.de>
---
 payloads/libpayload/Makefile                  | 315 ++++++++++++------
 payloads/libpayload/Makefile.inc              | 105 ++++++
 payloads/libpayload/arch/i386/Makefile.inc    |   9 +-
 payloads/libpayload/arch/powerpc/Makefile.inc |   7 +-
 payloads/libpayload/crypto/Makefile.inc       |   2 +-
 payloads/libpayload/curses/Makefile.inc       |   8 +-
 payloads/libpayload/drivers/Makefile.inc      |  56 ++--
 payloads/libpayload/libc/Makefile.inc         |  14 +-
 payloads/libpayload/libpci/Makefile.inc       |   2 +-
 9 files changed, 360 insertions(+), 158 deletions(-)
 create mode 100644 payloads/libpayload/Makefile.inc

diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile
index 4363590a1..b976baa1d 100644
--- a/payloads/libpayload/Makefile
+++ b/payloads/libpayload/Makefile
@@ -1,8 +1,10 @@
 ##
-## This file is part of the libpayload project.
+## This file is part of the coreboot project.
 ##
 ## Copyright (C) 2008 Advanced Micro Devices, Inc.
 ## Copyright (C) 2008 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2009-2010 coresystems GmbH
+## Copyright (C) 2011 secunet Security Networks AG
 ##
 ## Redistribution and use in source and binary forms, with or without
 ## modification, are permitted provided that the following conditions
@@ -28,159 +30,250 @@
 ## SUCH DAMAGE.
 ##
 
-export src := $(shell pwd)
-export srctree := $(src)
-export srck := $(src)/util/kconfig
-export obj := $(src)/build
-export objk := $(src)/build/util/kconfig
+ifeq ($(INNER_SCANBUILD),y)
+CC_real:=$(CC)
+endif
+
+$(if $(wildcard .xcompile),,$(eval $(shell bash util/xcompile/xcompile > .xcompile)))
+include .xcompile
+
+ifeq ($(INNER_SCANBUILD),y)
+CC:=$(CC_real)
+HOSTCC:=$(CC_real) --hostcc
+HOSTCXX:=$(CC_real) --hostcxx
+endif
+
+export top := $(CURDIR)
+export src := src
+export srck := $(top)/util/kconfig
+export obj ?= build
+export objutil ?= $(obj)/util
+export objk := $(objutil)/kconfig
 
-export KERNELVERSION      := 0.2.0
-export KCONFIG_AUTOHEADER := $(obj)/include/libpayload-config.h
+
+export KCONFIG_AUTOHEADER := $(obj)/config.h
 export KCONFIG_AUTOCONFIG := $(obj)/auto.conf
 
+# directory containing the toplevel Makefile.inc
+TOPLEVEL := .
+
 CONFIG_SHELL := sh
 KBUILD_DEFCONFIG := configs/defconfig
 UNAME_RELEASE := $(shell uname -r)
-HAVE_DOTCONFIG := $(wildcard .config)
+DOTCONFIG ?= .config
+KCONFIG_CONFIG = $(DOTCONFIG)
+export KCONFIG_CONFIG
+HAVE_DOTCONFIG := $(wildcard $(DOTCONFIG))
 MAKEFLAGS += -rR --no-print-directory
 
 # Make is silent per default, but 'make V=1' will show all compiler calls.
+Q:=@
 ifneq ($(V),1)
-Q := @
+ifneq ($(Q),)
+.SILENT:
+endif
 endif
 
-$(if $(wildcard .xcompile),,$(eval $(shell bash util/xcompile/xcompile > .xcompile)))
-include .xcompile
-
-CC ?= gcc
+CPP:= $(CC) -x assembler-with-cpp -DASSEMBLY -E
 HOSTCC = gcc
 HOSTCXX = g++
-HOSTCFLAGS := -I$(srck) -I$(objk) -pipe
-HOSTCXXFLAGS := -I$(srck) -I$(objk) -pipe
-
-DESTDIR = $(src)/install
+HOSTCFLAGS := -I$(srck) -I$(objk) -g
+HOSTCXXFLAGS := -I$(srck) -I$(objk)
+LIBGCC_FILE_NAME := $(shell test -r `$(CC) -print-libgcc-file-name` && $(CC) -print-libgcc-file-name)
 
 DOXYGEN := doxygen
 DOXYGEN_OUTPUT_DIR := doxygen
 
+all: real-all
+
+# This include must come _before_ the pattern rules below!
+# Order _does_ matter for pattern rules.
+include util/kconfig/Makefile
+
+# Three cases where we don't need fully populated $(obj) lists:
+# 1. when no .config exists
+# 2. when make config (in any flavour) is run
+# 3. when make distclean is run
+# Don't waste time on reading all Makefile.incs in these cases
 ifeq ($(strip $(HAVE_DOTCONFIG)),)
+NOCOMPILE:=1
+endif
+ifneq ($(MAKECMDGOALS),)
+ifneq ($(filter %config distclean,$(MAKECMDGOALS)),)
+NOCOMPILE:=1
+endif
+endif
 
-all: config
+ifeq ($(NOCOMPILE),1)
+include $(TOPLEVEL)/Makefile.inc
+real-all: config
 
 else
 
-include $(src)/.config
+include $(HAVE_DOTCONFIG)
 
-ARCHDIR-$(CONFIG_TARGET_I386)    := i386
-ARCHDIR-$(CONFIG_TARGET_POWERPC) := powerpc
+ifneq ($(INNER_SCANBUILD),y)
+ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y)
+CC:=clang -m32
+HOSTCC:=clang
+endif
+endif
 
-PLATFORM-y += arch/$(ARCHDIR-y)/Makefile.inc
-TARGETS-y :=
+ifeq ($(CONFIG_CCACHE),y)
+CCACHE:=$(word 1,$(wildcard $(addsuffix /ccache,$(subst :, ,$(PATH)))))
+ifeq ($(CCACHE),)
+$(error ccache selected, but not found in PATH)
+endif
+CCACHE:=CCACHE_COMPILERCHECK=content CCACHE_BASEDIR=$(top) $(CCACHE)
+CC := $(CCACHE) $(CC)
+HOSTCC := $(CCACHE) $(HOSTCC)
+HOSTCXX := $(CCACHE) $(HOSTCXX)
+ROMCC := $(CCACHE) $(ROMCC)
+endif
 
-BUILD-y := crypto/Makefile.inc libc/Makefile.inc drivers/Makefile.inc libpci/Makefile.inc
-BUILD-$(CONFIG_TINYCURSES) += curses/Makefile.inc
+strip_quotes = $(subst ",,$(subst \",,$(1)))
 
 # The primary target needs to be here before we include the
 # other files
 
-all: lib
-
-include $(PLATFORM-y) $(BUILD-y)
-
-OBJS     := $(patsubst %,$(obj)/%,$(TARGETS-y))
-INCLUDES := -Iinclude -Iinclude/$(ARCHDIR-y) -I$(obj) -I$(obj)/include
-INCLUDES += -I$(shell $(CC) -print-search-dirs | head -n 1 | cut -d' ' -f2)include
-
-try-run= $(shell set -e; \
-TMP=".$$$$.tmp"; \
-if ($(1)) > /dev/null 2>&1; \
-then echo "$(2)"; \
-else echo "$(3)"; \
-fi; rm -rf "$$TMP")
-
-cc-option= $(call try-run,\
-$(CC) $(1) -S -xc /dev/null -o "$$TMP", $(1), $(2))
-
-STACKPROTECT += $(call cc-option, -fno-stack-protector,)
-
-# TODO: Re-add -Os as soon as we find out why it caused problems.
-CFLAGS := -Wall -Werror $(STACKPROTECT) -nostdinc $(INCLUDES) -ffreestanding -pipe
-
-all: lib
-
-lib: $(obj)/lib/libpayload.a $(obj)/lib/$(ARCHDIR-y)/head.o
+ifeq ($(INNER_SCANBUILD),y)
+CONFIG_SCANBUILD_ENABLE:=
+endif
 
-$(obj)/lib/$(ARCHDIR-y)/head.o: $(obj)/arch/$(ARCHDIR-y)/head.S.o
-	$(Q)printf "  CP      $(subst $(shell pwd)/,,$(@))\n"
-	$(Q)cp $< $@
+ifeq ($(CONFIG_SCANBUILD_ENABLE),y)
+ifneq ($(CONFIG_SCANBUILD_REPORT_LOCATION),)
+CONFIG_SCANBUILD_REPORT_LOCATION:=-o $(CONFIG_SCANBUILD_REPORT_LOCATION)
+endif
+real-all:
+	echo '#!/bin/sh' > .ccwrap
+	echo 'CC="$(CC)"' >> .ccwrap
+	echo 'if [ "$$1" = "--hostcc" ]; then shift; CC="$(HOSTCC)"; fi' >> .ccwrap
+	echo 'if [ "$$1" = "--hostcxx" ]; then shift; CC="$(HOSTCXX)"; fi' >> .ccwrap
+	echo 'eval $$CC $$*' >> .ccwrap
+	chmod +x .ccwrap
+	scan-build $(CONFIG_SCANBUILD_REPORT_LOCATION) -analyze-headers --use-cc=$(top)/.ccwrap --use-c++=$(top)/.ccwrap $(MAKE) INNER_SCANBUILD=y
+else
+real-all: real-target
+endif
 
-$(obj)/lib/libpayload.a: prepare $(OBJS)
-	$(Q)printf "  AR      $(subst $(shell pwd)/,,$(@))\n"
-	$(Q)$(AR) rc $@ $(OBJS)
+# must come rather early
+.SECONDEXPANSION:
+
+$(obj)/config.h:
+	$(MAKE) oldconfig
+
+# Add a new class of source/object files to the build system
+add-class= \
+	$(eval $(1)-srcs:=) \
+	$(eval $(1)-objs:=) \
+	$(eval classes+=$(1))
+
+# Special classes are managed types with special behaviour
+# On parse time, for each entry in variable $(1)-y
+# a handler $(1)-handler is executed with the arguments:
+# * $(1): directory the parser is in
+# * $(2): current entry
+add-special-class= \
+	$(eval $(1):=) \
+	$(eval special-classes+=$(1))
+
+# Clean -y variables, include Makefile.inc
+# Add paths to files in X-y to X-srcs
+# Add subdirs-y to subdirs
+includemakefiles= \
+	$(foreach class,classes subdirs $(classes) $(special-classes), $(eval $(class)-y:=)) \
+	$(eval -include $(1)) \
+	$(foreach class,$(classes-y), $(call add-class,$(class))) \
+	$(foreach class,$(classes), \
+		$(eval $(class)-srcs+= \
+			$$(subst $(top)/,, \
+			$$(abspath $$(addprefix $(dir $(1)),$$($(class)-y)))))) \
+	$(foreach special,$(special-classes), \
+		$(foreach item,$($(special)-y), $(call $(special)-handler,$(dir $(1)),$(item)))) \
+	$(eval subdirs+=$$(subst $(CURDIR)/,,$$(abspath $$(addprefix $(dir $(1)),$$(subdirs-y)))))
+
+# For each path in $(subdirs) call includemakefiles
+# Repeat until subdirs is empty
+evaluate_subdirs= \
+	$(eval cursubdirs:=$(subdirs)) \
+	$(eval subdirs:=) \
+	$(foreach dir,$(cursubdirs), \
+		$(eval $(call includemakefiles,$(dir)/Makefile.inc))) \
+	$(if $(subdirs),$(eval $(call evaluate_subdirs)))
+
+# collect all object files eligible for building
+subdirs:=$(TOPLEVEL)
+$(eval $(call evaluate_subdirs))
+
+src-to-obj=$(addsuffix .$(1).o, $(basename $(addprefix $(obj)/, $($(1)-srcs))))
+$(foreach class,$(classes),$(eval $(class)-objs:=$(call src-to-obj,$(class))))
+
+allsrcs:=$(foreach var, $(addsuffix -srcs,$(classes)), $($(var)))
+allobjs:=$(foreach var, $(addsuffix -objs,$(classes)), $($(var)))
+alldirs:=$(sort $(abspath $(dir $(allobjs))))
+
+# macro to define template macros that are used by use_template macro
+define create_cc_template
+# $1 obj class
+# $2 source suffix (c, S)
+# $3 additional compiler flags
+# $4 additional dependencies
+ifn$(EMPTY)def $(1)-objs_$(2)_template
+de$(EMPTY)fine $(1)-objs_$(2)_template
+$(obj)/$$(1).$(1).o: $$(1).$(2) $(obj)/config.h $(4)
+	@printf "    CC         $$$$(subst $$$$(obj)/,,$$$$(@))\n"
+	$(CC) $(3) -MMD $$$$(CFLAGS) -c -o $$$$@ $$$$<
+en$(EMPTY)def
+end$(EMPTY)if
+endef
+
+filetypes-of-class=$(subst .,,$(sort $(suffix $($(1)-srcs))))
+$(foreach class,$(classes), \
+	$(foreach type,$(call filetypes-of-class,$(class)), \
+		$(eval $(call create_cc_template,$(class),$(type),$($(class)-$(type)-ccopts),$($(class)-$(type)-deps)))))
+
+foreach-src=$(foreach file,$($(1)-srcs),$(eval $(call $(1)-objs_$(subst .,,$(suffix $(file)))_template,$(basename $(file)))))
+$(eval $(foreach class,$(classes),$(call foreach-src,$(class))))
+
+DEPENDENCIES = $(allobjs:.o=.d)
+-include $(DEPENDENCIES)
+
+printall:
+	@$(foreach class,$(classes),echo $(class)-objs:=$($(class)-objs); )
+	@echo alldirs:=$(alldirs)
+	@echo allsrcs=$(allsrcs)
+	@echo DEPENDENCIES=$(DEPENDENCIES)
+	@echo LIBGCC_FILE_NAME=$(LIBGCC_FILE_NAME)
+	@$(foreach class,$(special-classes),echo $(class):='$($(class))'; )
 
 endif
 
-install: lib
-	$(Q)printf "  INSTALL $(DESTDIR)/libpayload/lib\n"
-	$(Q)install -m 755 -d $(DESTDIR)/libpayload/lib
-	$(Q)install -m 644 $(obj)/lib/libpayload.a $(DESTDIR)/libpayload/lib/
-	$(Q)install -m 644 lib/libpayload.ldscript $(DESTDIR)/libpayload/lib/
-	$(Q)install -m 755 -d $(DESTDIR)/libpayload/lib/$(ARCHDIR-y)
-	$(Q)install -m 644 $(obj)/lib/$(ARCHDIR-y)/head.o $(DESTDIR)/libpayload/lib/$(ARCHDIR-y)
-	$(Q)printf "  INSTALL $(DESTDIR)/libpayload/include\n"
-	$(Q)install -m 755 -d $(DESTDIR)/libpayload/include
-	$(Q)for file in `find include -name *.h -type f`; do \
-		install -m 755 -d $(DESTDIR)/libpayload/`dirname $$file`; \
-		install -m 644 $$file $(DESTDIR)/libpayload/$$file; \
-	done
-	$(Q)install -m 644 $(KCONFIG_AUTOHEADER) $(DESTDIR)/libpayload/include
-	$(Q)printf "  INSTALL $(DESTDIR)/libpayload/bin\n"
-	$(Q)install -m 755 -d $(DESTDIR)/libpayload/bin
-	$(Q)install -m 755 bin/lpgcc $(DESTDIR)/libpayload/bin
-	$(Q)install -m 755 bin/lpas $(DESTDIR)/libpayload/bin
-	$(Q)install -m 644 bin/lp.functions $(DESTDIR)/libpayload/bin
-	$(Q)install -m 644 .config $(DESTDIR)/libpayload/libpayload.config
-
-prepare:
-	$(Q)mkdir -p $(obj)/util/kconfig/lxdialog
-	$(Q)mkdir -p $(obj)/crypto $(obj)/curses $(obj)/drivers/video
-	$(Q)mkdir -p $(obj)/drivers/usb
-	$(Q)mkdir -p $(obj)/arch/$(ARCHDIR-y) $(obj)/lib/$(ARCHDIR-y) $(obj)/libc $(obj)/libpci
-	$(Q)mkdir -p $(obj)/lib/$(ARCHDIR-y)
-	$(Q)mkdir -p $(obj)/include
+$(shell mkdir -p $(obj) $(objutil)/kconfig/lxdialog $(additional-dirs) $(alldirs))
+
+cscope:
+	cscope -bR
 
 doxy: doxygen
 doxygen:
-	$(Q)$(DOXYGEN) Doxyfile
+	$(DOXYGEN) Doxyfile
 
 doxyclean: doxygen-clean
 doxygen-clean:
-	$(Q)rm -rf $(DOXYGEN_OUTPUT_DIR)
-
-clean: doxygen-clean
-	$(Q)rm -rf $(obj)/crypto $(obj)/curses $(obj)/drivers
-	$(Q)rm -rf $(obj)/i386 $(obj)/powerpc $(obj)/lib $(obj)/libc
-
-distclean: clean
-	$(Q)rm -rf build # should be $(obj) ?
-	$(Q)rm -f .config .config.old .xcompile ..config.tmp .kconfig.d .tmpconfig*
-
-# This include must come _before_ the pattern rules below!
-# Order _does_ matter for pattern rules.
-include util/kconfig/Makefile
-
-ifeq ($(strip $(HAVE_DOTCONFIG)),)
-else
+	rm -rf $(DOXYGEN_OUTPUT_DIR)
 
-$(obj)/%.o: $(src)/%.c
-	$(Q)printf "  CC      $(subst $(shell pwd)/,,$(@))\n"
-	$(Q)$(CC) -m32 $(CFLAGS) -c -o $@ $<
+clean-for-update: doxygen-clean clean-for-update-target
+	rm -f $(allobjs) .xcompile
+	rm -f $(DEPENDENCIES)
+	rmdir -p $(alldirs) 2>/dev/null >/dev/null || true
 
-$(obj)/%.S.o: $(src)/%.S
-	$(Q)printf "  CC      $(subst $(shell pwd)/,,$(@))\n"
-	$(Q)$(CC) -m32 $(CFLAGS) -c -o $@ $<
+clean: clean-for-update clean-target
+	rm -f .ccwrap
 
-endif
+clean-cscope:
+	rm -f cscope.out
 
-.PHONY: $(PHONY) prepare install clean distclean doxygen doxy
+distclean: clean-cscope
+	rm -rf $(obj)
+	rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig* .ccwrap .xcompile
 
+.PHONY: $(PHONY) clean clean-cscope cscope distclean doxygen doxy .xcompile
diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc
new file mode 100644
index 000000000..08f7c9fa4
--- /dev/null
+++ b/payloads/libpayload/Makefile.inc
@@ -0,0 +1,105 @@
+##
+## This file is part of the libpayload project.
+##
+## Copyright (C) 2008 Advanced Micro Devices, Inc.
+## Copyright (C) 2008 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2011 secunet Security Networks AG
+##
+## 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.
+##
+
+export KERNELVERSION      := 0.2.0
+
+ARCHDIR-$(CONFIG_TARGET_I386)    := i386
+ARCHDIR-$(CONFIG_TARGET_POWERPC) := powerpc
+
+real-target: lib
+
+classes-$(CONFIG_PCI) += libpci
+classes-$(CONFIG_LIBC) += libc
+classes-$(CONFIG_TINYCURSES) += libcurses
+libraries := $(classes-y)
+classes-y += head.o
+
+libpci-c-deps = $(obj)/libpayload-config.h
+libc-c-deps = $(obj)/libpayload-config.h
+libcurses-c-deps = $(obj)/libpayload-config.h
+head.o-S-deps = $(obj)/libpayload-config.h
+
+subdirs-y := arch/$(ARCHDIR-y)
+subdirs-y += crypto libc drivers libpci
+subdirs-$(CONFIG_TINYCURSES) += curses
+
+INCLUDES := -Iinclude -Iinclude/$(ARCHDIR-y) -I$(obj)
+CFLAGS = $(INCLUDES) -O2 -pipe -g
+CFLAGS += -nostdlib -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS += -Wwrite-strings -Wredundant-decls -Wno-trigraphs
+CFLAGS += -Wstrict-aliasing -Wshadow -fno-builtin
+
+$(obj)/libpayload-config.h: $(KCONFIG_AUTOHEADER)
+	cmp $@ $< 2>/dev/null || cp $< $@
+
+library-targets = $(addsuffix .a,$(addprefix $(obj)/,$(libraries))) $(obj)/libpayload.a
+lib: $$(library-targets) $(obj)/head.o
+
+$(obj)/libpayload.a: $(foreach class,$(libraries),$$($(class)-objs))
+	printf "    AR         $(subst $(shell pwd)/,,$(@))\n"
+	$(AR) rc $@ $^
+
+$(obj)/%.a: $$(%-objs)
+	printf "    AR         $(subst $(shell pwd)/,,$(@))\n"
+	$(AR) rc $@ $^
+
+$(obj)/head.o: $(obj)/arch/$(ARCHDIR-y)/head.head.o.o
+	printf "    CP         $(subst $(shell pwd)/,,$(@))\n"
+	cp $^ $@
+
+install: real-target
+	printf "    INSTALL    $(DESTDIR)/libpayload/lib\n"
+	install -m 755 -d $(DESTDIR)/libpayload/lib
+	for lib in $(library-targets); do \
+		install -m 644 $$lib $(DESTDIR)/libpayload/lib/; \
+	done
+	install -m 644 lib/libpayload.ldscript $(DESTDIR)/libpayload/lib/
+	install -m 755 -d $(DESTDIR)/libpayload/lib/$(ARCHDIR-y)
+	install -m 644 $(obj)/head.o $(DESTDIR)/libpayload/lib/$(ARCHDIR-y)
+	printf "    INSTALL    $(DESTDIR)/libpayload/include\n"
+	install -m 755 -d $(DESTDIR)/libpayload/include
+	for file in `find include -name *.h -type f`; do \
+		install -m 755 -d $(DESTDIR)/libpayload/`dirname $$file`; \
+		install -m 644 $$file $(DESTDIR)/libpayload/$$file; \
+	done
+	install -m 644 $(obj)/libpayload-config.h $(DESTDIR)/libpayload/include
+	printf "    INSTALL    $(DESTDIR)/libpayload/bin\n"
+	install -m 755 -d $(DESTDIR)/libpayload/bin
+	install -m 755 bin/lpgcc $(DESTDIR)/libpayload/bin
+	install -m 755 bin/lpas $(DESTDIR)/libpayload/bin
+	install -m 644 bin/lp.functions $(DESTDIR)/libpayload/bin
+	install -m 644 .config $(DESTDIR)/libpayload/libpayload.config
+
+clean-for-update-target:
+	rm -f $(addsuffix .a,$(addprefix $(obj)/,$(libraries))) $(obj)/libpayload.a
+
+clean-target:
+prepare:
diff --git a/payloads/libpayload/arch/i386/Makefile.inc b/payloads/libpayload/arch/i386/Makefile.inc
index 6461b72b7..2be5e5478 100644
--- a/payloads/libpayload/arch/i386/Makefile.inc
+++ b/payloads/libpayload/arch/i386/Makefile.inc
@@ -27,9 +27,10 @@
 ## SUCH DAMAGE.
 ##
 
-TARGETS-y += arch/i386/head.S.o arch/i386/main.o arch/i386/sysinfo.o
-TARGETS-y += arch/i386/timer.o arch/i386/coreboot.o arch/i386/util.S.o
-TARGETS-y += arch/i386/exec.S.o arch/i386/virtual.o
+head.o-y += head.S
+libc-y += main.c sysinfo.c
+libc-y += timer.c coreboot.c util.S
+libc-y += exec.S virtual.c
 
 # Multiboot support is configurable
-TARGETS-$(CONFIG_MULTIBOOT) += arch/i386/multiboot.o
+libc-$(CONFIG_MULTIBOOT) += multiboot.c
diff --git a/payloads/libpayload/arch/powerpc/Makefile.inc b/payloads/libpayload/arch/powerpc/Makefile.inc
index ddfb9fb56..bfbec27a7 100644
--- a/payloads/libpayload/arch/powerpc/Makefile.inc
+++ b/payloads/libpayload/arch/powerpc/Makefile.inc
@@ -27,7 +27,8 @@
 ## SUCH DAMAGE.
 ##
 
-TARGETS-y += arch/powerpc/head.S.o arch/powerpc/main.o arch/powerpc/sysinfo.o
-TARGETS-y += arch/powerpc/timer.o arch/powerpc/coreboot.o arch/powerpc/util.S.o
-TARGETS-y += arch/powerpc/exec.S.o arch/powerpc/virtual.o
+head.o-y := head.S
+libc-y += main.c sysinfo.c
+libc-y += timer.c coreboot.c util.S.c
+libc-y += exec.S virtual.c
 
diff --git a/payloads/libpayload/crypto/Makefile.inc b/payloads/libpayload/crypto/Makefile.inc
index 8d9f082b4..399672823 100644
--- a/payloads/libpayload/crypto/Makefile.inc
+++ b/payloads/libpayload/crypto/Makefile.inc
@@ -27,4 +27,4 @@
 ## SUCH DAMAGE.
 ##
 
-TARGETS-y += crypto/sha1.o
+libc-y += sha1.c
diff --git a/payloads/libpayload/curses/Makefile.inc b/payloads/libpayload/curses/Makefile.inc
index 7d5597cee..44e3ab7eb 100644
--- a/payloads/libpayload/curses/Makefile.inc
+++ b/payloads/libpayload/curses/Makefile.inc
@@ -27,6 +27,8 @@
 ## SUCH DAMAGE.
 ##
 
-TARGETS-$(CONFIG_TINYCURSES) += curses/keyboard.o
-TARGETS-$(CONFIG_TINYCURSES) += curses/tinycurses.o
-TARGETS-$(CONFIG_TINYCURSES) += curses/colors.o
+subdirs-y := libform libpanel libmenu
+
+libcurses-$(CONFIG_TINYCURSES) += keyboard.c
+libcurses-$(CONFIG_TINYCURSES) += tinycurses.c
+libcurses-$(CONFIG_TINYCURSES) += colors.c
diff --git a/payloads/libpayload/drivers/Makefile.inc b/payloads/libpayload/drivers/Makefile.inc
index e9496a60e..360a25894 100644
--- a/payloads/libpayload/drivers/Makefile.inc
+++ b/payloads/libpayload/drivers/Makefile.inc
@@ -29,45 +29,45 @@
 ## SUCH DAMAGE.
 ##
 
-TARGETS-$(CONFIG_PCI) += drivers/pci.o
+libc-$(CONFIG_PCI) += pci.c
 
-TARGETS-$(CONFIG_SPEAKER) += drivers/speaker.o
+libc-$(CONFIG_SPEAKER) += speaker.c
 
-TARGETS-$(CONFIG_SERIAL_CONSOLE) += drivers/serial.o
+libc-$(CONFIG_SERIAL_CONSOLE) += serial.c
 
-TARGETS-$(CONFIG_PC_KEYBOARD) += drivers/keyboard.o
+libc-$(CONFIG_PC_KEYBOARD) += keyboard.c
 
-TARGETS-$(CONFIG_NVRAM) += drivers/nvram.o
-TARGETS-$(CONFIG_NVRAM) += drivers/options.o
+libc-$(CONFIG_NVRAM) += nvram.c
+libc-$(CONFIG_NVRAM) += options.c
 
 # Video console drivers
-TARGETS-$(CONFIG_VIDEO_CONSOLE) += drivers/video/video.o
-TARGETS-$(CONFIG_VGA_VIDEO_CONSOLE) += drivers/video/vga.o
+libc-$(CONFIG_VIDEO_CONSOLE) += video/video.c
+libc-$(CONFIG_VGA_VIDEO_CONSOLE) += video/vga.c
 
 # Geode LX console drivers
-TARGETS-$(CONFIG_GEODELX_VIDEO_CONSOLE) += drivers/video/geodelx.o
-TARGETS-$(CONFIG_GEODELX_VIDEO_CONSOLE) += drivers/video/font8x16.o
+libc-$(CONFIG_GEODELX_VIDEO_CONSOLE) += video/geodelx.c
+libc-$(CONFIG_GEODELX_VIDEO_CONSOLE) += video/font8x16.c
 
 # coreboot generic framebuffer driver
-TARGETS-$(CONFIG_COREBOOT_VIDEO_CONSOLE) += drivers/video/corebootfb.o
-TARGETS-$(CONFIG_COREBOOT_VIDEO_CONSOLE) += drivers/video/font8x16.o
+libc-$(CONFIG_COREBOOT_VIDEO_CONSOLE) += video/corebootfb.c
+libc-$(CONFIG_COREBOOT_VIDEO_CONSOLE) += video/font8x16.c
 
 # USB stack
-TARGETS-$(CONFIG_USB) += drivers/usb/usbinit.o
-TARGETS-$(CONFIG_USB) += drivers/usb/usb.o
-TARGETS-$(CONFIG_USB) += drivers/usb/usb_dev.o
-TARGETS-$(CONFIG_USB) += drivers/usb/quirks.o
-TARGETS-$(CONFIG_USB_HUB) += drivers/usb/usbhub.o
-TARGETS-$(CONFIG_USB_UHCI) += drivers/usb/uhci.o
-TARGETS-$(CONFIG_USB_UHCI) += drivers/usb/uhci_rh.o
-TARGETS-$(CONFIG_USB_OHCI) += drivers/usb/ohci.o
-TARGETS-$(CONFIG_USB_OHCI) += drivers/usb/ohci_rh.o
-TARGETS-$(CONFIG_USB_EHCI) += drivers/usb/ehci.o
-TARGETS-$(CONFIG_USB_EHCI) += drivers/usb/ehci_rh.o
-TARGETS-$(CONFIG_USB_XHCI) += drivers/usb/xhci.o
-TARGETS-$(CONFIG_USB_XHCI) += drivers/usb/xhci_rh.o
-TARGETS-$(CONFIG_USB_HID) += drivers/usb/usbhid.o
-TARGETS-$(CONFIG_USB_MSC) += drivers/usb/usbmsc.o
+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
-TARGETS-y += drivers/hid.o
+libc-y += hid.c
diff --git a/payloads/libpayload/libc/Makefile.inc b/payloads/libpayload/libc/Makefile.inc
index d629ccc01..4ec2a02c7 100644
--- a/payloads/libpayload/libc/Makefile.inc
+++ b/payloads/libpayload/libc/Makefile.inc
@@ -28,12 +28,12 @@
 ## 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/exec.o
-TARGETS-$(CONFIG_LIBC) += libc/readline.o libc/getopt_long.o libc/sysinfo.o
-TARGETS-$(CONFIG_LIBC) += libc/args.o libc/strings.o
+libc-$(CONFIG_LIBC) += malloc.c printf.c console.c string.c
+libc-$(CONFIG_LIBC) += memory.c ctype.c ipchecksum.c lib.c
+libc-$(CONFIG_LIBC) += rand.c time.c exec.c
+libc-$(CONFIG_LIBC) += readline.c getopt_long.c sysinfo.c
+libc-$(CONFIG_LIBC) += args.c strings.c
 
 # should be moved to coreboot directory
-TARGETS-$(CONFIG_LAR) += libc/lar.o
-#TARGETS-$(CONFIG_CBFS) += libc/cbfs.o
+libc-$(CONFIG_LAR) += lar.c
+#libc-$(CONFIG_CBFS) += cbfs.c
diff --git a/payloads/libpayload/libpci/Makefile.inc b/payloads/libpayload/libpci/Makefile.inc
index 5c3c3ea95..f542acb3b 100644
--- a/payloads/libpayload/libpci/Makefile.inc
+++ b/payloads/libpayload/libpci/Makefile.inc
@@ -27,4 +27,4 @@
 ## SUCH DAMAGE.
 ##
 
-TARGETS-y += libpci/libpci.o
+libpci-y += libpci.c
-- 
2.25.1