[resend] Hi, attached patches change libpayload to use the coreboot build system copied into libpayload. Among the advantages is that it simplifies building a more standard set of libraries (eg. libcurses, libc, libpci) which simplifies porting code to libpayload a bit (as Makefiles can be used with fewer changes).
For compatibility purposes, the build system still generates a libpayload.a, which is simply a superset over all other libraries. The first patch changes the build system to the new style. The second patch fixes up the tree so it compiles with the tighter warning/error regime imposed by the build system. As a bonus, the third patch adds openbsd's strlcpy (in addition to strlcat which we already have). Signed-off-by: Patrick Georgi <[email protected]>
Use coreboot build system for libpayload, too. Signed-off-by: Patrick Georgi <[email protected]> --- payloads/libpayload/Makefile | 345 +++++++++++++++---------- 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, 370 insertions(+), 178 deletions(-) create mode 100644 payloads/libpayload/Makefile.inc diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile index 4363590..a2d4452 100644 --- a/payloads/libpayload/Makefile +++ b/payloads/libpayload/Makefile @@ -3,184 +3,267 @@ ## ## Copyright (C) 2008 Advanced Micro Devices, Inc. ## Copyright (C) 2008 Uwe Hermann <[email protected]> +## 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 -## 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 program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; version 2 of the License. ## -## 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. +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. ## +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +## + +ifeq ($(INNER_SCANBUILD),y) +CC_real:=$(CC) +endif -export src := $(shell pwd) -export srctree := $(src) -export srck := $(src)/util/kconfig -export obj := $(src)/build -export objk := $(src)/build/util/kconfig +$(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 KERNELVERSION := 0.2.0 -export KCONFIG_AUTOHEADER := $(obj)/include/libpayload-config.h +export top := $(CURDIR) +export src := src +export srck := $(top)/util/kconfig +export obj ?= build +export objutil ?= $(obj)/util +export objk := $(objutil)/kconfig + + +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:=$(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 0000000..0af79a6 --- /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 <[email protected]> +## 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 $@ $< || 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 6461b72..2be5e54 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 ddfb9fb..bfbec27 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 8d9f082..3996728 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 7d5597c..44e3ab7 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 e9496a6..360a258 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 d629ccc..4ec2a02 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 5c3c3ea..f542acb 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 -- 1.7.4.4
Reduce warnings/errors in libpayload when using picky compiler options Signed-off-by: Patrick Georgi <[email protected]> --- payloads/libpayload/Config.in | 4 ++++ payloads/libpayload/arch/i386/coreboot.c | 2 +- payloads/libpayload/arch/i386/main.c | 1 + payloads/libpayload/arch/i386/multiboot.c | 4 ++-- payloads/libpayload/arch/i386/virtual.c | 1 + payloads/libpayload/arch/powerpc/coreboot.c | 2 +- payloads/libpayload/arch/powerpc/main.c | 1 + payloads/libpayload/arch/powerpc/virtual.c | 1 + payloads/libpayload/curses/keyboard.c | 20 ++++++++++---------- payloads/libpayload/curses/tinycurses.c | 2 +- payloads/libpayload/drivers/keyboard.c | 14 +++++++------- payloads/libpayload/drivers/serial.c | 2 +- payloads/libpayload/drivers/usb/uhci.c | 2 +- payloads/libpayload/drivers/usb/usbhid.c | 12 ++++++------ payloads/libpayload/include/libpayload.h | 1 + payloads/libpayload/libc/getopt_long.c | 4 +--- payloads/libpayload/libc/printf.c | 2 +- payloads/libpayload/libc/strings.c | 2 ++ payloads/libpayload/libc/sysinfo.c | 2 -- payloads/libpayload/libpci/libpci.c | 10 ++++++---- 20 files changed, 49 insertions(+), 40 deletions(-) diff --git a/payloads/libpayload/Config.in b/payloads/libpayload/Config.in index 0a9265d..fe53400 100644 --- a/payloads/libpayload/Config.in +++ b/payloads/libpayload/Config.in @@ -73,6 +73,10 @@ config TARGET_POWERPC endchoice +config MEMMAP_RAM_ONLY + bool "Only consider RAM entries in memory map for further processing" + default n + config MULTIBOOT bool "Multiboot header support" depends on TARGET_I386 diff --git a/payloads/libpayload/arch/i386/coreboot.c b/payloads/libpayload/arch/i386/coreboot.c index 8441903..e3c944d 100644 --- a/payloads/libpayload/arch/i386/coreboot.c +++ b/payloads/libpayload/arch/i386/coreboot.c @@ -57,7 +57,7 @@ static void cb_parse_memory(unsigned char *ptr, struct sysinfo_t *info) struct cb_memory_range *range = (struct cb_memory_range *)MEM_RANGE_PTR(mem, i); -#if MEMMAP_RAM_ONLY +#ifdef CONFIG_MEMMAP_RAM_ONLY if (range->type != CB_MEM_RAM) continue; #endif diff --git a/payloads/libpayload/arch/i386/main.c b/payloads/libpayload/arch/i386/main.c index 48d6ef5..378c6f3 100644 --- a/payloads/libpayload/arch/i386/main.c +++ b/payloads/libpayload/arch/i386/main.c @@ -41,6 +41,7 @@ char *main_argv[MAX_ARGC_COUNT]; * This is our C entry function - set up the system * and jump into the payload entry point. */ +void start_main(void); void start_main(void) { extern int main(int argc, char **argv); diff --git a/payloads/libpayload/arch/i386/multiboot.c b/payloads/libpayload/arch/i386/multiboot.c index 82736b1..fa0c576 100644 --- a/payloads/libpayload/arch/i386/multiboot.c +++ b/payloads/libpayload/arch/i386/multiboot.c @@ -45,7 +45,7 @@ static void mb_parse_mmap(struct multiboot_header *table, while(ptr < (start + table->mmap_length)) { struct multiboot_mmap *mmap = (struct multiboot_mmap *) ptr; -#if MEMMAP_RAM_ONLY +#ifdef CONFIG_MEMMAP_RAM_ONLY /* 1 == normal RAM. Ignore everything else for now */ if (mmap->type == 1) { @@ -56,7 +56,7 @@ static void mb_parse_mmap(struct multiboot_header *table, if (++info->n_memranges == SYSINFO_MAX_MEM_RANGES) return; -#if MEMMAP_RAM_ONLY +#ifdef CONFIG_MEMMAP_RAM_ONLY } #endif diff --git a/payloads/libpayload/arch/i386/virtual.c b/payloads/libpayload/arch/i386/virtual.c index 256bfc2..59768db 100644 --- a/payloads/libpayload/arch/i386/virtual.c +++ b/payloads/libpayload/arch/i386/virtual.c @@ -27,6 +27,7 @@ * SUCH DAMAGE. */ +#include <unistd.h> unsigned long virtual_offset = 0; diff --git a/payloads/libpayload/arch/powerpc/coreboot.c b/payloads/libpayload/arch/powerpc/coreboot.c index 95d8f16..ee1842c 100644 --- a/payloads/libpayload/arch/powerpc/coreboot.c +++ b/payloads/libpayload/arch/powerpc/coreboot.c @@ -57,7 +57,7 @@ static void cb_parse_memory(unsigned char *ptr, struct sysinfo_t *info) struct cb_memory_range *range = (struct cb_memory_range *)MEM_RANGE_PTR(mem, i); -#if MEMMAP_RAM_ONLY +#ifdef CONFIG_MEMMAP_RAM_ONLY if (range->type != CB_MEM_RAM) continue; #endif diff --git a/payloads/libpayload/arch/powerpc/main.c b/payloads/libpayload/arch/powerpc/main.c index 48d6ef5..378c6f3 100644 --- a/payloads/libpayload/arch/powerpc/main.c +++ b/payloads/libpayload/arch/powerpc/main.c @@ -41,6 +41,7 @@ char *main_argv[MAX_ARGC_COUNT]; * This is our C entry function - set up the system * and jump into the payload entry point. */ +void start_main(void); void start_main(void) { extern int main(int argc, char **argv); diff --git a/payloads/libpayload/arch/powerpc/virtual.c b/payloads/libpayload/arch/powerpc/virtual.c index 6312ae1..6ff588c 100644 --- a/payloads/libpayload/arch/powerpc/virtual.c +++ b/payloads/libpayload/arch/powerpc/virtual.c @@ -27,6 +27,7 @@ * SUCH DAMAGE. */ +#include <unistd.h> unsigned long virtual_offset = 0; diff --git a/payloads/libpayload/curses/keyboard.c b/payloads/libpayload/curses/keyboard.c index a750675..7ebb04f 100644 --- a/payloads/libpayload/curses/keyboard.c +++ b/payloads/libpayload/curses/keyboard.c @@ -71,7 +71,7 @@ static int getkeyseq(char *buffer, int len, int max) } static struct { - char *seq; + const char *seq; int key; } escape_codes[] = { { "[A", KEY_UP }, @@ -109,7 +109,7 @@ static int handle_escape(void) return 27; for(i = 0; escape_codes[i].seq != NULL; i++) { - char *p = escape_codes[i].seq; + const char *p = escape_codes[i].seq; for(t = 0; t < len; t++) { if (!*p || *p != buffer[t]) @@ -144,7 +144,7 @@ static int cook_serial(unsigned char ch) /* ================ Keyboard ================ */ -static int curses_getchar(int delay) +static int curses_getchar(int _delay) { #if defined(CONFIG_USB_HID) || defined(CONFIG_PC_KEYBOARD) || defined(CONFIG_SERIAL_CONSOLE) unsigned short c; @@ -175,12 +175,12 @@ static int curses_getchar(int delay) } #endif - if (delay == 0) + if (_delay == 0) break; - if (delay > 0) { + if (_delay > 0) { mdelay(1); - delay--; + _delay--; } @@ -193,14 +193,14 @@ static int curses_getchar(int delay) int wgetch(WINDOW *win) { - int delay = -1; + int _delay = -1; if (_halfdelay) - delay = _halfdelay; + _delay = _halfdelay; else - delay = win->_delay; + _delay = win->_delay; - return curses_getchar(delay); + return curses_getchar(_delay); } int nodelay(WINDOW *win, NCURSES_BOOL flag) diff --git a/payloads/libpayload/curses/tinycurses.c b/payloads/libpayload/curses/tinycurses.c index cb1d695..4d3e8e1 100644 --- a/payloads/libpayload/curses/tinycurses.c +++ b/payloads/libpayload/curses/tinycurses.c @@ -971,7 +971,7 @@ int wsetscrreg(WINDOW *win, int top, int bottom) } // void wsyncdown (WINDOW *) {} // void wsyncup (WINDOW *) {} -/* D */ void wtimeout(WINDOW *win, int delay) { win->_delay = delay; } +/* D */ void wtimeout(WINDOW *win, int _delay) { win->_delay = _delay; } /* D */ int wtouchln(WINDOW *win, int y, int n, int changed) { int i; diff --git a/payloads/libpayload/drivers/keyboard.c b/payloads/libpayload/drivers/keyboard.c index 2b2ac26..a1860c5 100644 --- a/payloads/libpayload/drivers/keyboard.c +++ b/payloads/libpayload/drivers/keyboard.c @@ -37,7 +37,7 @@ #define I8042_MODE_XLATE 0x40 struct layout_maps { - char *country; + const char *country; unsigned short map[4][0x57]; }; @@ -261,22 +261,22 @@ int keyboard_getchar(void) static int keyboard_wait_read(void) { - int timeout = 10000; + int retries = 10000; - while(timeout-- && !(inb(0x64) & 0x01)) + while(retries-- && !(inb(0x64) & 0x01)) udelay(50); - return (timeout <= 0) ? -1 : 0; + return (retries <= 0) ? -1 : 0; } static int keyboard_wait_write(void) { - int timeout = 10000; + int retries = 10000; - while(timeout-- && (inb(0x64) & 0x02)) + while(retries-- && (inb(0x64) & 0x02)) udelay(50); - return (timeout <= 0) ? -1 : 0; + return (retries <= 0) ? -1 : 0; } static unsigned char keyboard_get_mode(void) diff --git a/payloads/libpayload/drivers/serial.c b/payloads/libpayload/drivers/serial.c index 0674ec8..c6804d2 100644 --- a/payloads/libpayload/drivers/serial.c +++ b/payloads/libpayload/drivers/serial.c @@ -195,7 +195,7 @@ int serial_getchar(void) /* A vt100 doesn't do color, setaf/setab below are from xterm-color. */ #define VT100_SET_COLOR "\e[3%d;4%dm" -static void serial_putcmd(char *str) +static void serial_putcmd(const char *str) { while(*str) serial_putchar(*(str++)); diff --git a/payloads/libpayload/drivers/usb/uhci.c b/payloads/libpayload/drivers/usb/uhci.c index 721fde0..1f80c6a 100644 --- a/payloads/libpayload/drivers/usb/uhci.c +++ b/payloads/libpayload/drivers/usb/uhci.c @@ -65,7 +65,7 @@ static void td_dump (td_t *td) { char td_value[3]; - char *td_type; + const char *td_type; switch (td->pid) { case UHCI_SETUP: td_type="SETUP"; diff --git a/payloads/libpayload/drivers/usb/usbhid.c b/payloads/libpayload/drivers/usb/usbhid.c index 84de0c8..bf3ec1e 100644 --- a/payloads/libpayload/drivers/usb/usbhid.c +++ b/payloads/libpayload/drivers/usb/usbhid.c @@ -62,7 +62,7 @@ static int keycount; #define KEYBOARD_BUFFER_SIZE 16 static short keybuffer[KEYBOARD_BUFFER_SIZE]; -char *countries[36][2] = { +const char *countries[36][2] = { { "not supported", "us" }, { "Arabic", "ae" }, { "Belgian", "be" }, @@ -105,13 +105,13 @@ char *countries[36][2] = { struct layout_maps { - char *country; - short map[4][0x80]; + const char *country; + const short map[4][0x80]; }; -static struct layout_maps *map; +static const struct layout_maps *map; -static struct layout_maps keyboard_layouts[] = { +static const struct layout_maps keyboard_layouts[] = { // #ifdef CONFIG_PC_KEYBOARD_LAYOUT_US { .country = "us", .map = { { /* No modifier */ @@ -378,7 +378,7 @@ static struct console_input_driver cons = { }; -int usb_hid_set_layout (char *country) +static int usb_hid_set_layout (const char *country) { /* FIXME should be per keyboard */ int i; diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h index 74fb79a..6ce7548 100644 --- a/payloads/libpayload/include/libpayload.h +++ b/payloads/libpayload/include/libpayload.h @@ -272,6 +272,7 @@ typedef struct { void SHA1Init(SHA1_CTX *context); void SHA1Transform(u32 state[5], const u8 buffer[SHA1_BLOCK_LENGTH]); void SHA1Update(SHA1_CTX *context, const u8 *data, size_t len); +void SHA1Pad(SHA1_CTX *context); void SHA1Final(u8 digest[SHA1_DIGEST_LENGTH], SHA1_CTX *context); u8 *sha1(const u8 *data, size_t len, u8 *buf); /** @} */ diff --git a/payloads/libpayload/libc/getopt_long.c b/payloads/libpayload/libc/getopt_long.c index 493df4d..365bc4a 100644 --- a/payloads/libpayload/libc/getopt_long.c +++ b/payloads/libpayload/libc/getopt_long.c @@ -57,10 +57,8 @@ #include <libpayload.h> #include <getopt.h> #define warnx(x...) printf(x) -/* #include <stdlib.h> #include <string.h> -*/ #define REPLACE_GETOPT /* use this getopt as the system getopt(3) */ #ifdef REPLACE_GETOPT @@ -84,7 +82,7 @@ int posixly_correct = 0; #define BADARG ((*options == ':') ? (int)':' : (int)'?') #define INORDER (int)1 -#define EMSG "" +#define EMSG (char*)"" static int getopt_internal(int, char * const *, const char *, const struct option *, int *, int); diff --git a/payloads/libpayload/libc/printf.c b/payloads/libpayload/libc/printf.c index 389d227..e3cf8bb 100644 --- a/payloads/libpayload/libc/printf.c +++ b/payloads/libpayload/libc/printf.c @@ -114,7 +114,7 @@ static int printf_putstr(const char *str, struct printf_spec *ps) size_t count; if (str == NULL) { - char *nullstr = "(NULL)"; + const char *nullstr = "(NULL)"; return printf_putnchars(nullstr, strlen(nullstr), ps); } diff --git a/payloads/libpayload/libc/strings.c b/payloads/libpayload/libc/strings.c index 9a56ba1..465ae4f 100644 --- a/payloads/libpayload/libc/strings.c +++ b/payloads/libpayload/libc/strings.c @@ -27,6 +27,8 @@ * SUCH DAMAGE. */ +#include <strings.h> + int ffs(int i) { int count = 1; diff --git a/payloads/libpayload/libc/sysinfo.c b/payloads/libpayload/libc/sysinfo.c index 73a9ab5..b1cad50 100644 --- a/payloads/libpayload/libc/sysinfo.c +++ b/payloads/libpayload/libc/sysinfo.c @@ -30,8 +30,6 @@ #include <libpayload.h> #include <sysinfo.h> -extern struct sysinfo_t lib_sysinfo; - int sysinfo_have_multiboot(unsigned long *addr) { *addr = (unsigned long) lib_sysinfo.mbtable; diff --git a/payloads/libpayload/libpci/libpci.c b/payloads/libpayload/libpci/libpci.c index 0b54ba3..a62e30b 100644 --- a/payloads/libpayload/libpci/libpci.c +++ b/payloads/libpayload/libpci/libpci.c @@ -96,6 +96,8 @@ void pci_filter_init(struct pci_access* pacc, struct pci_filter* pf) pf->device = -1; } +static char *invalid_pci_device_string = (char*)"invalid pci device string"; + /* parse domain:bus:dev.func (with all components but "dev" optional) * into filter. * Returns NULL on success, a string pointer to the error message otherwise. @@ -109,7 +111,7 @@ char *pci_filter_parse_slot(struct pci_filter* filter, const char* id) char *funcp = strrchr(id, '.'); if (funcp) { filter->func = strtoul(funcp+1, &endptr, 0); - if (endptr[0] != '\0') return "invalid pci device string"; + if (endptr[0] != '\0') return invalid_pci_device_string; } char *devp = strrchr(id, ':'); @@ -118,7 +120,7 @@ char *pci_filter_parse_slot(struct pci_filter* filter, const char* id) } else { filter->dev = strtoul(devp+1, &endptr, 0); } - if (endptr != funcp) return "invalid pci device string"; + if (endptr != funcp) return invalid_pci_device_string; if (!devp) return NULL; char *busp = strchr(id, ':'); @@ -127,11 +129,11 @@ char *pci_filter_parse_slot(struct pci_filter* filter, const char* id) } else { filter->bus = strtoul(busp+1, &endptr, 0); } - if (endptr != funcp) return "invalid pci device string"; + if (endptr != funcp) return invalid_pci_device_string; if (busp == devp) return NULL; filter->domain = strtoul(id, &endptr, 0); - if (endptr != busp) return "invalid pci device string"; + if (endptr != busp) return invalid_pci_device_string; return NULL; } -- 1.7.4.4
Add strlcpy from OpenBSD Signed-off-by: Patrick Georgi <[email protected]> --- payloads/libpayload/include/string.h | 10 ++++++- payloads/libpayload/libc/Makefile.inc | 1 + payloads/libpayload/libc/strlcpy.c | 51 +++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 1 deletions(-) create mode 100644 payloads/libpayload/libc/strlcpy.c diff --git a/payloads/libpayload/include/string.h b/payloads/libpayload/include/string.h index 88054e0..9e4f791 100644 --- a/payloads/libpayload/include/string.h +++ b/payloads/libpayload/include/string.h @@ -55,7 +55,6 @@ int strncasecmp(const char *s1, const char *s2, size_t maxlen); char *strncpy(char *d, const char *s, size_t n); char *strcpy(char *d, const char *s); char *strncat(char *d, const char *s, size_t n); -size_t strlcat(char *d, const char *s, size_t n); char *strcat(char *d, const char *s); char *strchr(const char *s, int c); char *strrchr(const char *s, int c); @@ -68,4 +67,13 @@ char* strtok(char *str, const char *delim); char* strtok_r(char *str, const char *delim, char **ptr); /** @} */ +/** + * @defgroup string OpenBSD based safe string functions + * @{ + */ +size_t strlcpy(char *d, const char *s, size_t n); +size_t strlcat(char *d, const char *s, size_t n); +/** @} */ + + #endif diff --git a/payloads/libpayload/libc/Makefile.inc b/payloads/libpayload/libc/Makefile.inc index 4ec2a02..e5c626f 100644 --- a/payloads/libpayload/libc/Makefile.inc +++ b/payloads/libpayload/libc/Makefile.inc @@ -33,6 +33,7 @@ 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 +libc-$(CONFIG_LIBC) += strlcpy.c # should be moved to coreboot directory libc-$(CONFIG_LAR) += lar.c diff --git a/payloads/libpayload/libc/strlcpy.c b/payloads/libpayload/libc/strlcpy.c new file mode 100644 index 0000000..d32b659 --- /dev/null +++ b/payloads/libpayload/libc/strlcpy.c @@ -0,0 +1,51 @@ +/* $OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $ */ + +/* + * Copyright (c) 1998 Todd C. Miller <[email protected]> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include <sys/types.h> +#include <string.h> + +/* + * Copy src to string dst of size siz. At most siz-1 characters + * will be copied. Always NUL terminates (unless siz == 0). + * Returns strlen(src); if retval >= siz, truncation occurred. + */ +size_t +strlcpy(char *dst, const char *src, size_t siz) +{ + char *d = dst; + const char *s = src; + size_t n = siz; + + /* Copy as many bytes as will fit */ + if (n != 0) { + while (--n != 0) { + if ((*d++ = *s++) == '\0') + break; + } + } + + /* Not enough room in dst, add NUL and traverse rest of src */ + if (n == 0) { + if (siz != 0) + *d = '\0'; /* NUL-terminate dst */ + while (*s++) + ; + } + + return(s - src - 1); /* count does not include NUL */ +} -- 1.7.4.4
-- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
