coreboot February 2010

coreboot@coreboot.org

61 participants
310 discussions

[commit] r5116 - trunk/util/romcc
by repository service 11 Feb '10

11 Feb '10

Author: oxygene Date: Thu Feb 11 12:13:32 2010 New Revision: 5116 URL: http://tracker.coreboot.org/trac/coreboot/changeset/5116 Log: romcc: Ignore empty string tokens. So far, romcc emitted a single double-quote for them. Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Acked-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Modified: trunk/util/romcc/romcc.c Modified: trunk/util/romcc/romcc.c ============================================================================== --- trunk/util/romcc/romcc.c Thu Feb 11 09:44:20 2010 (r5115) +++ trunk/util/romcc/romcc.c Thu Feb 11 12:13:32 2010 (r5116) @@ -10782,6 +10782,9 @@ if (str_len < 0) { error(state, 0, "negative string constant length"); } + /* ignore empty string tokens */ + if (strcmp("\"", str) == 0) + continue; end = str + str_len; ptr = buf; buf = xmalloc(type->elements + str_len + 1, "string_constant");

1 0

[commit] r5114 - in trunk: . src/arch/i386 src/arch/i386/lib src/lib util/romcc
by repository service 11 Feb '10

11 Feb '10

Author: stepan Date: Thu Feb 11 04:21:29 2010 New Revision: 5114 URL: http://tracker.coreboot.org/trac/coreboot/changeset/5114 Log: separate build.h and config.h usage (now possible because newconfig is gone) Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Patrick Georgi <patrick.georgi(a)coresystems.de> This patch is slightly reworked to include a necessary romcc change that allows more than one -include specified on the command line, and gets rid of the explicit build.h dependencies of all files. (The files do keep an explicit config.h dependency though) Modified: trunk/Makefile trunk/src/arch/i386/Makefile.inc trunk/src/arch/i386/lib/console.c trunk/src/lib/version.c trunk/util/romcc/romcc.c Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Wed Feb 10 21:31:38 2010 (r5113) +++ trunk/Makefile Thu Feb 11 04:21:29 2010 (r5114) @@ -148,31 +148,31 @@ endef define objs_c_template -$(obj)/$(1)%.o: src/$(1)%.c $(obj)/build.h +$(obj)/$(1)%.o: src/$(1)%.c $(obj)/config.h @printf " CC $$(subst $$(obj)/,,$$(@))\n" $(CC) -m32 $$(CFLAGS) -c -o $$@ $$< endef define objs_S_template -$(obj)/$(1)%.o: src/$(1)%.S $(obj)/build.h +$(obj)/$(1)%.o: src/$(1)%.S $(obj)/config.h @printf " CC $$(subst $$(obj)/,,$$(@))\n" $(CC) -m32 -DASSEMBLY $$(CFLAGS) -c -o $$@ $$< endef define initobjs_c_template -$(obj)/$(1)%.o: src/$(1)%.c $(obj)/build.h +$(obj)/$(1)%.o: src/$(1)%.c $(obj)/config.h @printf " CC $$(subst $$(obj)/,,$$(@))\n" $(CC) -m32 $$(CFLAGS) -c -o $$@ $$< endef define initobjs_S_template -$(obj)/$(1)%.o: src/$(1)%.S $(obj)/build.h +$(obj)/$(1)%.o: src/$(1)%.S $(obj)/config.h @printf " CC $$(subst $$(obj)/,,$$(@))\n" $(CC) -m32 -DASSEMBLY $$(CFLAGS) -c -o $$@ $$< endef define drivers_c_template -$(obj)/$(1)%.o: src/$(1)%.c $(obj)/build.h +$(obj)/$(1)%.o: src/$(1)%.c $(obj)/config.h @printf " CC $$(subst $$(obj)/,,$$(@))\n" $(CC) -m32 $$(CFLAGS) -c -o $$@ $$< endef @@ -219,7 +219,7 @@ INCLUDES := -I$(top)/src -I$(top)/src/include -I$(obj) -I$(top)/src/arch/$(ARCHDIR-y)/include INCLUDES += -I$(shell $(CC) -print-search-dirs | head -n 1 | cut -d' ' -f2)include INCLUDES += -I$(top)/util/x86emu/include -INCLUDES += -include $(obj)/build.h +INCLUDES += -include $(obj)/config.h CFLAGS = $(INCLUDES) -Os -nostdinc CFLAGS += -nostdlib -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes @@ -250,7 +250,10 @@ $(obj)/build.h: @printf " GEN build.h\n" rm -f $(obj)/build.h - printf "#define COREBOOT_VERSION \"$(KERNELVERSION)\"\n" > $(obj)/build.ht + printf "/* build system definitions (autogenerated) */\n" > $(obj)/build.ht + printf "#ifndef __BUILD_H\n" >> $(obj)/build.ht + printf "#define __BUILD_H\n\n" >> $(obj)/build.ht + printf "#define COREBOOT_VERSION \"$(KERNELVERSION)\"\n" >> $(obj)/build.ht printf "#define COREBOOT_EXTRA_VERSION \"$(COREBOOT_EXTRA_VERSION)\"\n" >> $(obj)/build.ht printf "#define COREBOOT_BUILD \"`LANG= date`\"\n" >> $(obj)/build.ht printf "\n" >> $(obj)/build.ht @@ -261,7 +264,7 @@ printf "#define COREBOOT_COMPILE_BY \"$(subst \,@,$(shell PATH=$$PATH:/usr/ucb whoami))\"\n" >> $(obj)/build.ht printf "#define COREBOOT_COMPILE_HOST \"$(shell hostname -s)\"\n" >> $(obj)/build.ht printf "#define COREBOOT_COMPILE_DOMAIN \"$(shell test `uname -s` = "Linux" && dnsdomainname || domainname)\"\n" >> $(obj)/build.ht - printf "#include \"config.h\"\n" >> $(obj)/build.ht + printf "#endif\n" >> $(obj)/build.ht mv $(obj)/build.ht $(obj)/build.h doxy: doxygen Modified: trunk/src/arch/i386/Makefile.inc ============================================================================== --- trunk/src/arch/i386/Makefile.inc Wed Feb 10 21:31:38 2010 (r5113) +++ trunk/src/arch/i386/Makefile.inc Thu Feb 11 04:21:29 2010 (r5114) @@ -79,11 +79,11 @@ $(obj)/romcc $(ROMCCFLAGS) --label-prefix=failover $(INCLUDES) $(src)/arch/i386/lib/failover.c -o $@ $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/romcc $(OPTION_TABLE_H) $(obj)/build.h - $(obj)/romcc $(ROMCCFLAGS) $(INCLUDES) $< -o $@ + $(obj)/romcc $(ROMCCFLAGS) -include $(obj)/build.h $(INCLUDES) $< -o $@ else $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(OPTION_TABLE_H) $(obj)/build.h - $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $< -o - | sed -e 's/\.rodata/.rom.data/g' -e 's/\.text/.section .rom.text/g' > $@.tmp + $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -include $(obj)/build.h -I$(src) -I. -c -S $< -o - | sed -e 's/\.rodata/.rom.data/g' -e 's/\.text/.section .rom.text/g' > $@.tmp mv $@.tmp $@ endif endif Modified: trunk/src/arch/i386/lib/console.c ============================================================================== --- trunk/src/arch/i386/lib/console.c Wed Feb 10 21:31:38 2010 (r5113) +++ trunk/src/arch/i386/lib/console.c Thu Feb 11 04:21:29 2010 (r5114) @@ -1,3 +1,4 @@ +#include <build.h> #include <console/loglevel.h> #if CONFIG_USE_PRINTK_IN_CAR == 0 @@ -6,10 +7,6 @@ #include "console_printk.c" #endif /* CONFIG_USE_PRINTK_IN_CAR */ -#ifndef COREBOOT_EXTRA_VERSION -#define COREBOOT_EXTRA_VERSION "" -#endif - void console_init(void) { static const char console_test[] = @@ -22,7 +19,6 @@ print_info(console_test); } - void die(const char *str) { print_emerg(str); Modified: trunk/src/lib/version.c ============================================================================== --- trunk/src/lib/version.c Wed Feb 10 21:31:38 2010 (r5113) +++ trunk/src/lib/version.c Thu Feb 11 04:21:29 2010 (r5114) @@ -1,4 +1,5 @@ #include <version.h> +#include <build.h> #ifndef CONFIG_MAINBOARD_VENDOR #error CONFIG_MAINBOARD_VENDOR not defined Modified: trunk/util/romcc/romcc.c ============================================================================== --- trunk/util/romcc/romcc.c Wed Feb 10 21:31:38 2010 (r5113) +++ trunk/util/romcc/romcc.c Thu Feb 11 04:21:29 2010 (r5114) @@ -3,8 +3,8 @@ #undef RELEASE_DATE #undef VERSION #define VERSION_MAJOR "0" -#define VERSION_MINOR "71" -#define RELEASE_DATE "03 April 2009" +#define VERSION_MINOR "72" +#define RELEASE_DATE "10 February 2010" #define VERSION VERSION_MAJOR "." VERSION_MINOR #include <stdarg.h> @@ -127,6 +127,14 @@ * Where do I place phi functions and how do I make that decision. * */ + +struct filelist { + const char *filename; + struct filelist *next; +}; + +struct filelist *include_filelist = NULL; + static void die(char *fmt, ...) { va_list args; @@ -24927,12 +24935,13 @@ } } -static void compile(const char *filename, const char *includefile, +static void compile(const char *filename, struct compiler_state *compiler, struct arch_state *arch) { int i; struct compile_state state; struct triple *ptr; + struct filelist *includes = include_filelist; memset(&state, 0, sizeof(state)); state.compiler = compiler; state.arch = arch; @@ -25002,8 +25011,11 @@ register_builtins(&state); compile_file(&state, filename, 1); - if (includefile) - compile_file(&state, includefile, 1); + + while (includes) { + compile_file(&state, includes->filename, 1); + includes=includes->next; + } /* Stop if all we want is preprocessor output */ if (state.compiler->flags & COMPILER_PP_ONLY) { @@ -25070,7 +25082,6 @@ int main(int argc, char **argv) { const char *filename; - const char *includefile = NULL; struct compiler_state compiler; struct arch_state arch; int all_opts; @@ -25121,14 +25132,16 @@ result = arch_encode_flag(&arch, argv[1]+2); } else if (strncmp(argv[1], "-include", 10) == 0) { - if (includefile) { - arg_error("Only one -include option may be specified.\n"); - } else { - argv++; - argc--; - includefile = argv[1]; - result = 0; - } + struct filelist *old_head = include_filelist; + include_filelist = malloc(sizeof(struct filelist)); + if (!include_filelist) { + die("Out of memory.\n"); + } + argv++; + argc--; + include_filelist->filename = argv[1]; + include_filelist->next = old_head; + result = 0; } if (result < 0) { arg_error("Invalid option specified: %s\n", @@ -25149,7 +25162,7 @@ if (!filename) { arg_error("No filename specified\n"); } - compile(filename, includefile, &compiler, &arch); + compile(filename, &compiler, &arch); return 0; }

3 3

Recall: Where to find document for bayou.xml?
by JasonZhao＠viatech.com.cn 11 Feb '10

11 Feb '10

Jason Zhao would like to recall the message, "[coreboot] Where to find document for bayou.xml?".

1 0

Where to find document for bayou.xml?
by jasonzhao 11 Feb '10

11 Feb '10

hi Jordan, Do you have any document talking about how to write a BAYOU xml file,where to get it? Or, can you tell me where is wrong in the bayou.xml at below? Many thanks. I have a bios.bin.elf(seabios binary file) and coreinfo.elf included in my bayou.elf, so a bayou.xml is written based on bayou.xml.example, but BAYOU fails to parse it at run time: The serial output has some messy code, and the screen output only have "default chain" and "y"(keyboard can be used to choose, but pressing [return] has no response). Here are the details info: -------------bayou.xml.example------------- -------------my bayou.xml------------- <BayouConfig> <BayouConfig> <global> <global> <timeout>10</timeout> <timeout>10</timeout> </global> </global> <payloads> <payloads> <payload type="chain" flags="default"> <payload type="chain" flags="default"> <title>Default Chain</title> <title>Default Chain</title> <chain> <chain> <file>payloads/passwd.elf</file> <file>bios.bin.elf</file> <lar>passwd</lar> </chain> </chain> <chain> <chain> <file>coreinfo.elf</file> <file>payloads/coreinfo.elf</file> </chain> </chain> </payload> </payload> <payload type="chooser"> <payload type="chooser"> <file>coreinfo.elf</file> <file>payloads/coreinfo.elf</file> </payload> </payload> </payloads> </payloads> </BayouConfig> </BayouConfig> ---------serial ouput of my bayou.xml------ ------------screen ouput of my bayou.xml ------ <-[H<-[JBayou Payload Chooser v0.3 --------payload chooser-------- Press ESC for the menu (10)... | | Press ESC for the menu ( 9)... | default chain | Press ESC for the menu ( 8)... | y | -------------------------------

5 10

[PATCH] drop DISTRO_CFLAGS
by Stefan Reinauer 11 Feb '10

11 Feb '10

See patch -- coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br. Tel.: +49 761 7668825 • Fax: +49 761 7664613 Email: info(a)coresystems.de • http://www.coresystems.de/ Registergericht: Amtsgericht Freiburg • HRB 7656 Geschäftsführer: Stefan Reinauer • Ust-IdNr.: DE245674866

3 2

[commit] r5115 - in trunk/src: arch/i386 mainboard/gigabyte/ga_2761gxdk mainboard/gigabyte/m57sli mainboard/msi/ms7260 mainboard/msi/ms9282 mainboard/nvidia/l1_2pvv mainboard/tyan/s2912 mainboard/t...
by repository service 11 Feb '10

11 Feb '10

Author: oxygene Date: Thu Feb 11 09:44:20 2010 New Revision: 5115 URL: http://tracker.coreboot.org/trac/coreboot/changeset/5115 Log: $(DISTRO_CFLAGS) is newconfig heritage and was never used on Kconfig. We do what it was supposed to do in xcompile now.. Moved ap_romstage.o rule to src/arch/i386/Makefile.inc, too. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Ronald G. Minnich <rminnich(a)gmail.com> Modified: trunk/src/arch/i386/Makefile.inc trunk/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc trunk/src/mainboard/gigabyte/m57sli/Makefile.inc trunk/src/mainboard/msi/ms7260/Makefile.inc trunk/src/mainboard/msi/ms9282/Makefile.inc trunk/src/mainboard/nvidia/l1_2pvv/Makefile.inc trunk/src/mainboard/tyan/s2912/Makefile.inc trunk/src/mainboard/tyan/s2912_fam10/Makefile.inc Modified: trunk/src/arch/i386/Makefile.inc ============================================================================== --- trunk/src/arch/i386/Makefile.inc Thu Feb 11 04:21:29 2010 (r5114) +++ trunk/src/arch/i386/Makefile.inc Thu Feb 11 09:44:20 2010 (r5115) @@ -82,8 +82,12 @@ $(obj)/romcc $(ROMCCFLAGS) -include $(obj)/build.h $(INCLUDES) $< -o $@ else + +$(obj)/mainboard/$(MAINBOARDDIR)/ap_romstage.o: $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c $(obj)/option_table.h + $(CC) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c -o $@ + $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(OPTION_TABLE_H) $(obj)/build.h - $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -include $(obj)/build.h -I$(src) -I. -c -S $< -o - | sed -e 's/\.rodata/.rom.data/g' -e 's/\.text/.section .rom.text/g' > $@.tmp + $(CC) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -include $(obj)/build.h -I$(src) -I. -c -S $< -o - | sed -e 's/\.rodata/.rom.data/g' -e 's/\.text/.section .rom.text/g' > $@.tmp mv $@.tmp $@ endif endif Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc ============================================================================== --- trunk/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc Thu Feb 11 04:21:29 2010 (r5114) +++ trunk/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc Thu Feb 11 09:44:20 2010 (r5115) @@ -46,9 +46,3 @@ ldscripts += $(src)/arch/i386/init/ldscript_apc.lb endif -ifdef POST_EVALUATION - -$(obj)/mainboard/$(MAINBOARDDIR)/ap_romstage.o: $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c $(obj)/option_table.h - $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c -o $@ - -endif Modified: trunk/src/mainboard/gigabyte/m57sli/Makefile.inc ============================================================================== --- trunk/src/mainboard/gigabyte/m57sli/Makefile.inc Thu Feb 11 04:21:29 2010 (r5114) +++ trunk/src/mainboard/gigabyte/m57sli/Makefile.inc Thu Feb 11 09:44:20 2010 (r5115) @@ -51,9 +51,3 @@ ldscripts += $(src)/arch/i386/init/ldscript_apc.lb endif -ifdef POST_EVALUATION - -$(obj)/mainboard/$(MAINBOARDDIR)/ap_romstage.o: $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c $(obj)/option_table.h - $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c -o $@ - -endif Modified: trunk/src/mainboard/msi/ms7260/Makefile.inc ============================================================================== --- trunk/src/mainboard/msi/ms7260/Makefile.inc Thu Feb 11 04:21:29 2010 (r5114) +++ trunk/src/mainboard/msi/ms7260/Makefile.inc Thu Feb 11 09:44:20 2010 (r5115) @@ -46,9 +46,3 @@ ldscripts += $(src)/arch/i386/init/ldscript_apc.lb endif -ifdef POST_EVALUATION - -$(obj)/mainboard/$(MAINBOARDDIR)/ap_romstage.o: $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c $(obj)/option_table.h - $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c -o $@ - -endif Modified: trunk/src/mainboard/msi/ms9282/Makefile.inc ============================================================================== --- trunk/src/mainboard/msi/ms9282/Makefile.inc Thu Feb 11 04:21:29 2010 (r5114) +++ trunk/src/mainboard/msi/ms9282/Makefile.inc Thu Feb 11 09:44:20 2010 (r5115) @@ -48,9 +48,3 @@ ldscripts += $(src)/arch/i386/init/ldscript_apc.lb endif -ifdef POST_EVALUATION - -$(obj)/mainboard/$(MAINBOARDDIR)/ap_romstage.o: $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c $(obj)/option_table.h - $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c -o $@ - -endif Modified: trunk/src/mainboard/nvidia/l1_2pvv/Makefile.inc ============================================================================== --- trunk/src/mainboard/nvidia/l1_2pvv/Makefile.inc Thu Feb 11 04:21:29 2010 (r5114) +++ trunk/src/mainboard/nvidia/l1_2pvv/Makefile.inc Thu Feb 11 09:44:20 2010 (r5115) @@ -48,9 +48,3 @@ ldscripts += $(src)/arch/i386/init/ldscript_apc.lb endif -ifdef POST_EVALUATION - -$(obj)/mainboard/$(MAINBOARDDIR)/ap_romstage.o: $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c $(obj)/option_table.h - $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c -o $@ - -endif Modified: trunk/src/mainboard/tyan/s2912/Makefile.inc ============================================================================== --- trunk/src/mainboard/tyan/s2912/Makefile.inc Thu Feb 11 04:21:29 2010 (r5114) +++ trunk/src/mainboard/tyan/s2912/Makefile.inc Thu Feb 11 09:44:20 2010 (r5115) @@ -48,9 +48,3 @@ ldscripts += $(src)/arch/i386/init/ldscript_apc.lb endif -ifdef POST_EVALUATION - -$(obj)/mainboard/$(MAINBOARDDIR)/ap_romstage.o: $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c $(obj)/option_table.h - $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c -o $@ - -endif Modified: trunk/src/mainboard/tyan/s2912_fam10/Makefile.inc ============================================================================== --- trunk/src/mainboard/tyan/s2912_fam10/Makefile.inc Thu Feb 11 04:21:29 2010 (r5114) +++ trunk/src/mainboard/tyan/s2912_fam10/Makefile.inc Thu Feb 11 09:44:20 2010 (r5115) @@ -41,9 +41,3 @@ ldscripts += $(src)/arch/i386/init/ldscript_apc.lb endif -ifdef POST_EVALUATION - -$(obj)/mainboard/$(MAINBOARDDIR)/ap_romstage.o: $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c $(obj)/option_table.h - $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c -o $@ - -endif

1 0

[PATCH] separate build.h and config.h
by Stefan Reinauer 11 Feb '10

11 Feb '10

3 4

[commit] r5113 - in trunk: . util/xcompile
by repository service 10 Feb '10

10 Feb '10

Author: oxygene Date: Wed Feb 10 21:31:38 2010 New Revision: 5113 URL: http://tracker.coreboot.org/trac/coreboot/changeset/5113 Log: Improve compiler detection and configuration in xcompile. Move -fno-stack-protector support from Makefile to xcompile. Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/Makefile trunk/util/xcompile/xcompile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Wed Feb 10 20:52:35 2010 (r5112) +++ trunk/Makefile Wed Feb 10 21:31:38 2010 (r5113) @@ -221,19 +221,7 @@ INCLUDES += -I$(top)/util/x86emu/include INCLUDES += -include $(obj)/build.h -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,) - -CFLAGS = $(STACKPROTECT) $(INCLUDES) -Os -nostdinc +CFLAGS = $(INCLUDES) -Os -nostdinc CFLAGS += -nostdlib -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes CFLAGS += -Wwrite-strings -Wredundant-decls -Wno-trigraphs CFLAGS += -Wstrict-aliasing -Wshadow Modified: trunk/util/xcompile/xcompile ============================================================================== --- trunk/util/xcompile/xcompile Wed Feb 10 20:52:35 2010 (r5112) +++ trunk/util/xcompile/xcompile Wed Feb 10 21:31:38 2010 (r5113) @@ -1,3 +1,31 @@ +#!/bin/sh +# +# This file is part of the coreboot project. +# +# Copyright (C) 2007-2010 coresystems GmbH +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# 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 +# + +testcc() +{ + echo "_start(void) {}" > .$$$$.c + $1 -nostdlib $2 .$$$$.c -o .$$$$.tmp 2>/dev/null >/dev/null + ret=$? + rm -f .$$$$.c .$$$$.tmp + return $ret +} for make in make gmake gnumake; do if [ "`$make --version 2>/dev/null | grep -c GNU`" -gt 0 ]; then @@ -8,39 +36,67 @@ GCCPREFIX=invalid TMP=`mktemp /tmp/temp.XXXX 2>/dev/null || echo /tmp/temp.78gOIUGz` -echo "mov %eax, %eax" > ${TMP}.s -printf "\x7fELF\n" > ${TMP}.compare -for gccprefixes in `pwd`/util/crossgcc/xgcc/bin/i386-elf- i386-elf- ""; do - if which ${gccprefixes}as 2>/dev/null >/dev/null; then - printf "" - else +touch $TMP + +# This should be a loop over all supported architectures +TARCH=i386 +TWIDTH=32 +for gccprefixes in `pwd`/util/crossgcc/xgcc/bin/${TARCH}-elf- ${TARCH}-elf- ""; do + if ! which ${gccprefixes}as 2>/dev/null >/dev/null; then continue fi rm -f ${TMP}.o - if ${gccprefixes}as --32 -o ${TMP}.o ${TMP}.s; then - cut -c-4 ${TMP}.o > ${TMP}.test 2>/dev/null - if cmp ${TMP}.test ${TMP}.compare; then + if ${gccprefixes}as -o ${TMP}.o ${TMP}; then + TYPE=`${gccprefixes}objdump -p ${TMP}.o` + if [ ${TYPE##* } == "elf${TWIDTH}-${TARCH}" ]; then + GCCPREFIX=$gccprefixes + ASFLAGS= + CFLAGS= + LDFLAGS= + break + fi + fi + if ${gccprefixes}as --32 -o ${TMP}.o ${TMP}; then + TYPE=`${gccprefixes}objdump -p ${TMP}.o` + if [ ${TYPE##* } == "elf${TWIDTH}-${TARCH}" ]; then GCCPREFIX=$gccprefixes + ASFLAGS=--32 + CFLAGS="-m32 " + LDFLAGS="-b elf32-i386" break fi fi done -rm -f $TMP ${TMP}.s ${TMP}.o ${TMP}.compare ${TMP}.test +rm -f $TMP ${TMP}.o if [ "$GCCPREFIX" = "invalid" ]; then echo '$(error no suitable gcc found)' exit 1 fi -cat << afteroptions -AS:=${GCCPREFIX}as --32 -CC:=${GCCPREFIX}gcc -m32 +CC="${GCCPREFIX}gcc" +testcc "$CC" "$CFLAGS-fno-stack-protector " && CFLAGS="$CFLAGS-fno-stack-protector " +testcc "$CC" "$CFLAGS-Wl,--build-id=none " && CFLAGS="$CFLAGS-Wl,--build-id=none " + +if which gcc 2>/dev/null >/dev/null; then + HOSTCC=gcc +else + HOSTCC=cc +fi + +cat << EOF +# elf${TWIDTH}-${TARCH} toolchain +AS:=${GCCPREFIX}as ${ASFLAGS} +CC:=${GCCPREFIX}gcc ${CFLAGS} CPP:=${GCCPREFIX}cpp AR:=${GCCPREFIX}ar -LD:=${GCCPREFIX}ld -b elf32-i386 +LD:=${GCCPREFIX}ld ${LDFLAGS} STRIP:=${GCCPREFIX}strip NM:=${GCCPREFIX}nm OBJCOPY:=${GCCPREFIX}objcopy OBJDUMP:=${GCCPREFIX}objdump -HOSTCC:=gcc -afteroptions + +# native toolchain +HOSTCC:=${HOSTCC} +EOF +

1 0

[PATCH]Test for, and use --build-id=none
by Patrick Georgi 10 Feb '10

10 Feb '10

Hi, This patch brings a buildtarget feature over to Kconfig: Use --build-id=none to avoid spurious sections to end up in the object files, if it exists. If not, do nothing (and hope for the best) Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de>

2 2

[commit] r5112 - trunk/util/cbfstool
by repository service 10 Feb '10

10 Feb '10

Author: uwe Date: Wed Feb 10 20:52:35 2010 New Revision: 5112 URL: http://tracker.coreboot.org/trac/coreboot/changeset/5112 Log: Do not print the full path name to coreboot.rom in "cbfstool print" (trivial). This makes the output look a lot nicer, e.g. /home/uwe/foo/bar/baz/whatever/build/coreboot.rom: 256 kB, bootblocksize 65536, romsize 262144, offset 0x0 now becomes: coreboot.rom: 256 kB, bootblocksize 65536, romsize 262144, offset 0x0 Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/util/cbfstool/common.c Modified: trunk/util/cbfstool/common.c ============================================================================== --- trunk/util/cbfstool/common.c Wed Feb 10 20:40:10 2010 (r5111) +++ trunk/util/cbfstool/common.c Wed Feb 10 20:52:35 2010 (r5112) @@ -21,6 +21,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <libgen.h> #include "common.h" #include "cbfs.h" #include "elf.h" @@ -153,7 +154,7 @@ { printf ("%s: %d kB, bootblocksize %d, romsize %d, offset 0x%x\nAlignment: %d bytes\n\n", - filename, romsize / 1024, ntohl(master_header->bootblocksize), + basename((char *)filename), romsize / 1024, ntohl(master_header->bootblocksize), romsize, ntohl(master_header->offset), align); printf("%-30s %-10s %-12s Size\n", "Name", "Offset", "Type"); uint32_t current = phys_start;

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot February 2010