coreboot October 2009

coreboot@coreboot.org

63 participants
534 discussions

[v2] r4878 - in trunk/coreboot-v2/src: arch/i386/boot boot console include lib
by svn＠coreboot.org 28 Oct '09

28 Oct '09

Author: myles Date: 2009-10-28 17:13:28 +0100 (Wed, 28 Oct 2009) New Revision: 4878 Added: trunk/coreboot-v2/src/include/lib.h Modified: trunk/coreboot-v2/src/arch/i386/boot/gdt.c trunk/coreboot-v2/src/arch/i386/boot/tables.c trunk/coreboot-v2/src/boot/selfboot.c trunk/coreboot-v2/src/console/vsprintf.c trunk/coreboot-v2/src/lib/cbfs.c trunk/coreboot-v2/src/lib/clog2.c trunk/coreboot-v2/src/lib/lzma.c trunk/coreboot-v2/src/lib/xmodem.c Log: Create lib.h for homeless prototypes. Signed-off-by: Myles Watson <mylesgw(a)gmail.com> Acked-by: Ronald G. Minnich <rminnich(a)gmail.com> Modified: trunk/coreboot-v2/src/arch/i386/boot/gdt.c =================================================================== --- trunk/coreboot-v2/src/arch/i386/boot/gdt.c 2009-10-28 15:30:11 UTC (rev 4877) +++ trunk/coreboot-v2/src/arch/i386/boot/gdt.c 2009-10-28 16:13:28 UTC (rev 4878) @@ -20,6 +20,7 @@ #include <types.h> #include <string.h> #include <cbmem.h> +#include <lib.h> #include <console/console.h> // Global Descriptor Table, defined in c_start.S @@ -33,7 +34,6 @@ } __attribute__((packed)); // Copy GDT to new location and reload it -void move_gdt(void); void move_gdt(void) { void *newgdt; Modified: trunk/coreboot-v2/src/arch/i386/boot/tables.c =================================================================== --- trunk/coreboot-v2/src/arch/i386/boot/tables.c 2009-10-28 15:30:11 UTC (rev 4877) +++ trunk/coreboot-v2/src/arch/i386/boot/tables.c 2009-10-28 16:13:28 UTC (rev 4878) @@ -30,11 +30,11 @@ #include <cpu/x86/multiboot.h> #include "coreboot_table.h" #include <cbmem.h> +#include <lib.h> uint64_t high_tables_base = 0; uint64_t high_tables_size; -void move_gdt(void); void cbmem_arch_init(void) { /* defined in gdt.c */ Modified: trunk/coreboot-v2/src/boot/selfboot.c =================================================================== --- trunk/coreboot-v2/src/boot/selfboot.c 2009-10-28 15:30:11 UTC (rev 4877) +++ trunk/coreboot-v2/src/boot/selfboot.c 2009-10-28 16:13:28 UTC (rev 4878) @@ -28,6 +28,7 @@ #include <stdlib.h> #include <string.h> #include <cbfs.h> +#include <lib.h> #ifndef CONFIG_BIG_ENDIAN #define ntohl(x) ( ((x&0xff)<<24) | ((x&0xff00)<<8) | \ @@ -462,7 +463,6 @@ switch(ptr->compression) { case CBFS_COMPRESS_LZMA: { printk_debug("using LZMA\n"); - unsigned long ulzma(unsigned char *src, unsigned char *dst); len = ulzma(src, dest); break; } Modified: trunk/coreboot-v2/src/console/vsprintf.c =================================================================== --- trunk/coreboot-v2/src/console/vsprintf.c 2009-10-28 15:30:11 UTC (rev 4877) +++ trunk/coreboot-v2/src/console/vsprintf.c 2009-10-28 16:13:28 UTC (rev 4878) @@ -20,6 +20,7 @@ */ #include <stdarg.h> +#include <string.h> #include <smp/spinlock.h> #include <console/vtxprintf.h> @@ -48,8 +49,6 @@ return i; } -int sprintf(char *buf, const char *fmt, ...); - int sprintf(char *buf, const char *fmt, ...) { va_list args; Added: trunk/coreboot-v2/src/include/lib.h =================================================================== --- trunk/coreboot-v2/src/include/lib.h (rev 0) +++ trunk/coreboot-v2/src/include/lib.h 2009-10-28 16:13:28 UTC (rev 4878) @@ -0,0 +1,30 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2009, Myles Watson <mylesgw(a)gmail.com> + * + * 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 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 + */ + +/* This file is for "nuisance prototypes" that have no other home. */ + +/* Defined in src/lib/clog2.c */ +unsigned long log2(unsigned long x); + +/* Defined in src/lib/lzma.c */ +unsigned long ulzma(unsigned char *src, unsigned char *dst); + +/* Defined in src/arch/i386/boot/gdt.c */ +void move_gdt(void); + Modified: trunk/coreboot-v2/src/lib/cbfs.c =================================================================== --- trunk/coreboot-v2/src/lib/cbfs.c 2009-10-28 15:30:11 UTC (rev 4877) +++ trunk/coreboot-v2/src/lib/cbfs.c 2009-10-28 16:13:28 UTC (rev 4878) @@ -21,6 +21,7 @@ #include <string.h> #include <console/console.h> #include <cbfs.h> +#include <lib.h> #ifndef CONFIG_BIG_ENDIAN #define ntohl(x) ( ((x&0xff)<<24) | ((x&0xff00)<<8) | \ @@ -29,8 +30,6 @@ #define ntohl(x) (x) #endif -unsigned long ulzma(unsigned char *src, unsigned char *dst); - int cbfs_decompress(int algo, void *src, void *dst, int len) { switch(algo) { Modified: trunk/coreboot-v2/src/lib/clog2.c =================================================================== --- trunk/coreboot-v2/src/lib/clog2.c 2009-10-28 15:30:11 UTC (rev 4877) +++ trunk/coreboot-v2/src/lib/clog2.c 2009-10-28 16:13:28 UTC (rev 4878) @@ -4,11 +4,11 @@ #include <console/console.h> #endif +#include <lib.h> + /* Assume 8 bits per byte */ #define CHAR_BIT 8 -unsigned long log2(unsigned long x); - unsigned long log2(unsigned long x) { // assume 8 bits per byte. Modified: trunk/coreboot-v2/src/lib/lzma.c =================================================================== --- trunk/coreboot-v2/src/lib/lzma.c 2009-10-28 15:30:11 UTC (rev 4877) +++ trunk/coreboot-v2/src/lib/lzma.c 2009-10-28 16:13:28 UTC (rev 4878) @@ -13,9 +13,8 @@ #include "lzmadecode.c" #include <console/console.h> #include <string.h> +#include <lib.h> -unsigned long ulzma(unsigned char * src, unsigned char * dst); - unsigned long ulzma(unsigned char * src, unsigned char * dst) { unsigned char properties[LZMA_PROPERTIES_SIZE]; Modified: trunk/coreboot-v2/src/lib/xmodem.c =================================================================== --- trunk/coreboot-v2/src/lib/xmodem.c 2009-10-28 15:30:11 UTC (rev 4877) +++ trunk/coreboot-v2/src/lib/xmodem.c 2009-10-28 16:13:28 UTC (rev 4878) @@ -19,11 +19,8 @@ #include <string.h> #include <delay.h> +#include <uart8250.h> -extern void uart8250_tx_byte(unsigned, unsigned char); -extern int uart8250_can_rx_byte(unsigned); -extern unsigned char uart8250_rx_byte(unsigned); - static int _inbyte(int msec) { while (!uart8250_can_rx_byte(CONFIG_TTYS0_BASE)) {

1 0

[PATCH] build vs. $(obj) in Makefiles (was Re: [v2] r4875 ...)
by Myles Watson 28 Oct '09

28 Oct '09

> > I noticed that there are some hard codes of ./build in the Makefile, > too. That breaks as soon as someone adjusts $(obj). > Attached patch fixes all hard-coded occurrences of build/ in the Makefiles. Signed-off-by: Myles Watson <mylesgw(a)gmail.com> Thanks, Myles

4 4

[v2] r4877 - in trunk/coreboot-v2: . src/arch/i386
by svn＠coreboot.org 28 Oct '09

28 Oct '09

Author: myles Date: 2009-10-28 16:30:11 +0100 (Wed, 28 Oct 2009) New Revision: 4877 Modified: trunk/coreboot-v2/Makefile trunk/coreboot-v2/src/arch/i386/Makefile.inc Log: Replace hard coded build with $(obj) paths. Signed-off-by: Myles Watson <mylesgw(a)gmail.com> Acked-by: Ronald G. Minnich <rminnich(a)gmail.com> Modified: trunk/coreboot-v2/Makefile =================================================================== --- trunk/coreboot-v2/Makefile 2009-10-28 14:57:14 UTC (rev 4876) +++ trunk/coreboot-v2/Makefile 2009-10-28 15:30:11 UTC (rev 4877) @@ -35,7 +35,7 @@ export src := $(top)/src export srck := $(top)/util/kconfig export obj := $(top)/build -export objk := $(top)/build/util/kconfig +export objk := $(obj)/util/kconfig export sconfig := $(top)/util/sconfig export yapps2_py := $(sconfig)/yapps2.py export config_g := $(sconfig)/config.g @@ -289,8 +289,8 @@ rm -rf $(DOXYGEN_OUTPUT_DIR) clean: doxygen-clean - rm -f $(allobjs) build/coreboot* .xcompile - rm -f build/option_table.* build/crt0_includes.h build/ldscript + rm -f $(allobjs) $(obj)/coreboot* .xcompile + rm -f $(obj)/option_table.* $(obj)/crt0_includes.h $(obj)/ldscript rm -f $(obj)/mainboard/$(MAINBOARDDIR)/static.c $(obj)/mainboard/$(MAINBOARDDIR)/config.py $(obj)/mainboard/$(MAINBOARDDIR)/static.dot rm -f $(obj)/mainboard/$(MAINBOARDDIR)/auto.inc $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s $(obj)/mainboard/$(MAINBOARDDIR)/crt0.disasm rmdir -p $(alldirs) 2>/dev/null >/dev/null || true @@ -300,7 +300,7 @@ rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig* update: - dongle.py -c /dev/term/1 build/coreboot.rom EOF + dongle.py -c /dev/term/1 $(obj)/coreboot.rom EOF # This include must come _before_ the pattern rules below! # Order _does_ matter for pattern rules. @@ -311,7 +311,7 @@ awk '/^#define ([^"])* ([^"])*$$/ {print $$2 " = " $$3 ";";}' $< > $@ $(obj)/romcc: $(top)/util/romcc/romcc.c - @printf " HOSTCC build/romcc (this may take a while)\n" + @printf " HOSTCC $(obj)/romcc (this may take a while)\n" $(HOSTCC) -g -O2 -Wall -o $@ $< .PHONY: $(PHONY) prepare prepare2 clean distclean doxygen doxy coreboot Modified: trunk/coreboot-v2/src/arch/i386/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/arch/i386/Makefile.inc 2009-10-28 14:57:14 UTC (rev 4876) +++ trunk/coreboot-v2/src/arch/i386/Makefile.inc 2009-10-28 15:30:11 UTC (rev 4877) @@ -25,14 +25,13 @@ @printf " PAYLOAD none (as specified by user)\n" else @printf " PAYLOAD $(CONFIG_FALLBACK_PAYLOAD_FILE) $(CBFS_PAYLOAD_COMPRESS_FLAG)\n" - $(CBFSTOOL) ./build/coreboot.rom add-payload $(CONFIG_FALLBACK_PAYLOAD_FILE) fallback/payload $(CBFS_PAYLOAD_COMPRESS_FLAG) + $(CBFSTOOL) $(obj)/coreboot.rom add-payload $(CONFIG_FALLBACK_PAYLOAD_FILE) fallback/payload $(CBFS_PAYLOAD_COMPRESS_FLAG) endif ifeq ($(CONFIG_VGA_BIOS),y) @printf " VGABIOS $(CONFIG_FALLBACK_VGA_BIOS_FILE) $(CONFIG_FALLBACK_VGA_BIOS_ID)\n" - $(CBFSTOOL) ./build/coreboot.rom add $(CONFIG_FALLBACK_VGA_BIOS_FILE) "pci$(CONFIG_FALLBACK_VGA_BIOS_ID).rom" optionrom + $(CBFSTOOL) $(obj)/coreboot.rom add $(CONFIG_FALLBACK_VGA_BIOS_FILE) "pci$(CONFIG_FALLBACK_VGA_BIOS_ID).rom" optionrom endif - @printf " CBFSPRINT build/coreboot.rom\n\n" - $(CBFSTOOL) build/coreboot.rom print + $(CBFSTOOL) $(obj)/coreboot.rom print #######################################################################

1 0

Re: [coreboot] [v2] r4871 - in trunk/coreboot-v2: src/arch/i386/boot src/arch/i386/include src/arch/i386/lib src/boot src/devices src/include src/include/cpu/x86 src/include/device src/lib src/pc80 src/southbridge/intel/i82371eb util/x86emu
by Stefan Reinauer 28 Oct '09

28 Oct '09

svn(a)coreboot.org wrote: > Modified: trunk/coreboot-v2/src/arch/i386/boot/gdt.c > =================================================================== > --- trunk/coreboot-v2/src/arch/i386/boot/gdt.c 2009-10-27 14:05:21 UTC (rev 4870) > +++ trunk/coreboot-v2/src/arch/i386/boot/gdt.c 2009-10-27 14:29:29 UTC (rev 4871) > @@ -33,6 +33,7 @@ > } __attribute__((packed)); > > // Copy GDT to new location and reload it > +void move_gdt(void); > void move_gdt(void) > { > void *newgdt; > > Modified: trunk/coreboot-v2/src/arch/i386/boot/tables.c > =================================================================== > --- trunk/coreboot-v2/src/arch/i386/boot/tables.c 2009-10-27 14:05:21 UTC (rev 4870) > +++ trunk/coreboot-v2/src/arch/i386/boot/tables.c 2009-10-27 14:29:29 UTC (rev 4871) > uint64_t high_tables_base = 0; > uint64_t high_tables_size; > > void move_gdt(void); > void cbmem_arch_init(void) > { > Not so nice... This warnings should be fixed, not just shut up. -- 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

2 1

small patch for prototypes and unused variables
by Maciej Pijanka 28 Oct '09

28 Oct '09

Hello see patch in attachment, best regards Maciej -- Maciej Pijanka, PLD-Linux Developer, Reg Linux user #133161 POE/Perl user

4 14

[v2] r4876 - trunk/coreboot-v2/src/devices
by svn＠coreboot.org 28 Oct '09

28 Oct '09

Author: stepan Date: 2009-10-28 15:57:14 +0100 (Wed, 28 Oct 2009) New Revision: 4876 Modified: trunk/coreboot-v2/src/devices/device.c Log: The check for zero sized resources is already done earlier. So don't redo it here. I think we don't ever want to drop the extra check, since it indicates that the components involved need fixing. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/coreboot-v2/src/devices/device.c =================================================================== --- trunk/coreboot-v2/src/devices/device.c 2009-10-27 23:14:54 UTC (rev 4875) +++ trunk/coreboot-v2/src/devices/device.c 2009-10-28 14:57:14 UTC (rev 4876) @@ -576,8 +576,7 @@ continue; /* Is it already outside the limits? */ - if (res->size && (((res->base + res->size -1) < lim->base) || - (res->base > lim->limit))) + if (((res->base + res->size -1) < lim->base) || (res->base > lim->limit)) continue; /* Choose to be above or below fixed resources. This

1 0

[PATCH] resource allocator hole handling (simple and old)
by Stefan Reinauer 28 Oct '09

28 Oct '09

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 Get the resource allocator work nicely on the kontron (with PCIe memory hole) Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Index: src/devices/device.c =================================================================== --- src/devices/device.c (revision 4842) +++ src/devices/device.c (working copy) @@ -576,7 +576,7 @@ continue; /* Is it already outside the limits? */ - if (res->size && (((res->base + res->size -1) < lim->base) || + if (!res->size || (((res->base + res->size -1) < lim->base) || (res->base > lim->limit))) continue;

2 3

Re: [coreboot] [v2] r4874 - in trunk/coreboot-v2: . src/arch/i386/boot src/arch/i386/lib src/console src/devices src/include/device src/northbridge/intel/i440bx src/southbridge/intel/i82371eb util/romcc util/sconfig util/x86emu
by Stefan Reinauer 28 Oct '09

28 Oct '09

svn(a)coreboot.org wrote: > Modified: trunk/coreboot-v2/src/console/vsprintf.c > =================================================================== > --- trunk/coreboot-v2/src/console/vsprintf.c 2009-10-27 16:24:22 UTC (rev 4873) > +++ trunk/coreboot-v2/src/console/vsprintf.c 2009-10-27 21:49:33 UTC (rev 4874) > @@ -48,6 +48,8 @@ > return i; > } > > +int sprintf(char *buf, const char *fmt, ...); > + > int sprintf(char *buf, const char *fmt, ...) > { > va_list args; > What's the reason for not just including "string.h" in this file? Putting the prototype right in front of the function just shuts up the warning. That warning's intention is to tell us that a caller of the function might assume a wrong prototype implicitly. I think if stuff is called externally, we should have their prototypes in header files. Otherwise they should be defined static. > Modified: trunk/coreboot-v2/src/devices/device.c > =================================================================== > --- trunk/coreboot-v2/src/devices/device.c 2009-10-27 16:24:22 UTC (rev 4873) > +++ trunk/coreboot-v2/src/devices/device.c 2009-10-27 21:49:33 UTC (rev 4874) > @@ -671,8 +671,11 @@ > device_t vga_pri = 0; > static void set_vga_bridge_bits(void) > { > -#warning "FIXME modify set_vga_bridge so it is less pci centric!" > -#warning "This function knows too much about PCI stuff, it should be just a iterator/visitor." > + /* > + * FIXME: Modify set_vga_bridge so it is less PCI centric! > + * This function knows too much about PCI stuff, it should be just > + * an iterator/visitor. > + */ > > /* FIXME: Handle the VGA palette snooping. */ > struct device *dev, *vga, *vga_onboard, *vga_first, *vga_last; > > Why was that warning removed? > Modified: trunk/coreboot-v2/src/devices/pciexp_device.c > =================================================================== > --- trunk/coreboot-v2/src/devices/pciexp_device.c 2009-10-27 16:24:22 UTC (rev 4873) > +++ trunk/coreboot-v2/src/devices/pciexp_device.c 2009-10-27 21:49:33 UTC (rev 4874) > @@ -34,8 +34,8 @@ > /* error... */ > return; > } > - printk_debug("PCIe: tuning %s\n", dev_path(dev)); > -#warning "IMPLEMENT PCI EXPRESS TUNING" > + // printk_debug("PCIe: tuning %s\n", dev_path(dev)); > + /* TODO: Implement PCI Express tuning. */ > } > > unsigned int pciexp_scan_bus(struct bus *bus, > What kind of tuning should be done here? Stefan -- 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

1 0

Re: [coreboot] [v2] r4875 - in trunk/coreboot-v2: . src/arch/i386 util/cbfstool util/sconfig
by Stefan Reinauer 28 Oct '09

28 Oct '09

svn(a)coreboot.org wrote: > Author: uwe > Date: 2009-10-28 00:14:54 +0100 (Wed, 28 Oct 2009) > New Revision: 4875 > > Modified: > trunk/coreboot-v2/Makefile > trunk/coreboot-v2/src/arch/i386/Makefile.inc > trunk/coreboot-v2/util/cbfstool/Makefile.inc > trunk/coreboot-v2/util/sconfig/config.g > trunk/coreboot-v2/util/sconfig/parsedesc.g > trunk/coreboot-v2/util/sconfig/yapps2.py > Log: > Prefix all build output file names of files which end up in the build > directory with "build/" for consistency (trivial, sort of). > Not so good.. the directory might not be called "build"... maybe it should be $(shell basename $(obj)) or something? Also, it's kind of obvious that created file end op in %(obj) so this seems to add more output but not more information ... Can we change this to say "Output directory is: $(obj)" once, without repeating it for every file? I noticed that there are some hard codes of ./build in the Makefile, too. That breaks as soon as someone adjusts $(obj). Stefan -- 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

1 0

[v2] r4875 - in trunk/coreboot-v2: . src/arch/i386 util/cbfstool util/sconfig
by svn＠coreboot.org 27 Oct '09

27 Oct '09

Author: uwe Date: 2009-10-28 00:14:54 +0100 (Wed, 28 Oct 2009) New Revision: 4875 Modified: trunk/coreboot-v2/Makefile trunk/coreboot-v2/src/arch/i386/Makefile.inc trunk/coreboot-v2/util/cbfstool/Makefile.inc trunk/coreboot-v2/util/sconfig/config.g trunk/coreboot-v2/util/sconfig/parsedesc.g trunk/coreboot-v2/util/sconfig/yapps2.py Log: Prefix all build output file names of files which end up in the build directory with "build/" for consistency (trivial, sort of). Also, drop printing of "config.g" input file, we usually only print generated/output files in the build output. Finally, rename non-existing COMPRESSFLAG variable to CBFS_PAYLOAD_COMPRESS_FLAG in a printf line. The build output now says PAYLOAD payload.elf l for payloads (the "l" specifies LZMA compression). Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/coreboot-v2/Makefile =================================================================== --- trunk/coreboot-v2/Makefile 2009-10-27 21:49:33 UTC (rev 4874) +++ trunk/coreboot-v2/Makefile 2009-10-27 23:14:54 UTC (rev 4875) @@ -311,7 +311,7 @@ awk '/^#define ([^"])* ([^"])*$$/ {print $$2 " = " $$3 ";";}' $< > $@ $(obj)/romcc: $(top)/util/romcc/romcc.c - @printf " HOSTCC romcc (this may take a while)\n" + @printf " HOSTCC build/romcc (this may take a while)\n" $(HOSTCC) -g -O2 -Wall -o $@ $< .PHONY: $(PHONY) prepare prepare2 clean distclean doxygen doxy coreboot Modified: trunk/coreboot-v2/src/arch/i386/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/arch/i386/Makefile.inc 2009-10-27 21:49:33 UTC (rev 4874) +++ trunk/coreboot-v2/src/arch/i386/Makefile.inc 2009-10-27 23:14:54 UTC (rev 4875) @@ -20,18 +20,18 @@ then \ $(CBFSTOOL) $@ add-stage fallback/coreboot_apc fallback/coreboot_apc $(CBFS_COMPRESS_FLAG); \ fi - $(CBFSTOOL) $@ add-stage $(obj)/coreboot_ram fallback/coreboot_ram $(CBFS_COMPRESS_FLAG) + $(CBFSTOOL) $@ add-stage $(obj)/coreboot_ram fallback/coreboot_ram $(CBFS_COMPRESS_FLAG) ifeq ($(CONFIG_PAYLOAD_NONE),y) @printf " PAYLOAD none (as specified by user)\n" else - @printf " PAYLOAD $(CONFIG_FALLBACK_PAYLOAD_FILE) $(COMPRESSFLAG)\n" - $(CBFSTOOL) ./build/coreboot.rom add-payload $(CONFIG_FALLBACK_PAYLOAD_FILE) fallback/payload $(CBFS_PAYLOAD_COMPRESS_FLAG) + @printf " PAYLOAD $(CONFIG_FALLBACK_PAYLOAD_FILE) $(CBFS_PAYLOAD_COMPRESS_FLAG)\n" + $(CBFSTOOL) ./build/coreboot.rom add-payload $(CONFIG_FALLBACK_PAYLOAD_FILE) fallback/payload $(CBFS_PAYLOAD_COMPRESS_FLAG) endif ifeq ($(CONFIG_VGA_BIOS),y) @printf " VGABIOS $(CONFIG_FALLBACK_VGA_BIOS_FILE) $(CONFIG_FALLBACK_VGA_BIOS_ID)\n" $(CBFSTOOL) ./build/coreboot.rom add $(CONFIG_FALLBACK_VGA_BIOS_FILE) "pci$(CONFIG_FALLBACK_VGA_BIOS_ID).rom" optionrom endif - @printf " CBFSPRINT ./build/coreboot.rom\n\n" + @printf " CBFSPRINT build/coreboot.rom\n\n" $(CBFSTOOL) build/coreboot.rom print @@ -39,7 +39,7 @@ # Build the bootblock $(obj)/coreboot.bootblock: $(obj)/coreboot - @printf " OBJCOPY $(subst $(obj)/,,$(@))\n" + @printf " OBJCOPY $(subst $(shell pwd)/,,$(@))\n" $(OBJCOPY) -O binary $< $@ $(obj)/ldscript.ld: $(ldscripts) $(obj)/ldoptions @@ -56,7 +56,7 @@ $(CC) -x assembler-with-cpp -DASSEMBLY -E -I$(src)/include -I$(src)/arch/i386/include -I$(obj) -include $(obj)/config.h -I. -I$(src) $< > $@.new && mv $@.new $@ $(obj)/coreboot: $(initobjs) $(obj)/ldscript.ld - @printf " LINK $(subst $(obj)/,,$(@))\n" + @printf " LINK $(subst $(shell pwd)/,,$(@))\n" $(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(obj)/ldscript.ld $(initobjs) $(NM) -n $(obj)/coreboot | sort > $(obj)/coreboot.map @@ -64,27 +64,27 @@ # i386 specific tools $(obj)/option_table.h $(obj)/option_table.c: $(obj)/build_opt_tbl $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout - @printf " OPTION $(subst $(obj)/,,$(@))\n" + @printf " OPTION $(subst $(shell pwd)/,,$(@))\n" $(obj)/build_opt_tbl --config $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout --header $(obj)/option_table.h --option $(obj)/option_table.c $(obj)/build_opt_tbl: $(top)/util/options/build_opt_tbl.c $(top)/src/include/pc80/mc146818rtc.h $(top)/src/include/boot/coreboot_tables.h $(obj)/config.h - @printf " HOSTCC $(subst $(obj)/,,$(@))\n" + @printf " HOSTCC $(subst $(shell pwd)/,,$(@))\n" $(HOSTCC) $(HOSTCFLAGS) -include $(obj)/config.h $< -o $@ ####################################################################### # Build the coreboot_ram (stage 2) $(obj)/coreboot_ram: $(obj)/coreboot_ram.o $(src)/config/coreboot_ram.ld #ldoptions - @printf " CC $(subst $(obj)/,,$(@))\n" + @printf " CC $(subst $(shell pwd)/,,$(@))\n" $(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(src)/config/coreboot_ram.ld $(obj)/coreboot_ram.o $(NM) -n $(obj)/coreboot_ram | sort > $(obj)/coreboot_ram.map $(obj)/coreboot_ram.o: $(obj)/arch/i386/lib/c_start.o $(drivers) $(obj)/coreboot.a $(LIBGCC_FILE_NAME) - @printf " CC $(subst $(obj)/,,$(@))\n" + @printf " CC $(subst $(shell pwd)/,,$(@))\n" $(CC) -nostdlib -r -o $@ $(obj)/arch/i386/lib/c_start.o $(drivers) -Wl,-$ $(obj)/coreboot.a $(LIBGCC_FILE_NAME) -Wl,-$ $(obj)/coreboot.a: $(objs) - @printf " AR $(subst $(obj)/,,$(@))\n" + @printf " AR $(subst $(shell pwd)/,,$(@))\n" rm -f $(obj)/coreboot.a $(AR) cr $(obj)/coreboot.a $(objs) Modified: trunk/coreboot-v2/util/cbfstool/Makefile.inc =================================================================== --- trunk/coreboot-v2/util/cbfstool/Makefile.inc 2009-10-27 21:49:33 UTC (rev 4874) +++ trunk/coreboot-v2/util/cbfstool/Makefile.inc 2009-10-27 23:14:54 UTC (rev 4875) @@ -22,35 +22,35 @@ mkdir -p $@ $(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/%.c - printf " HOSTCC $(subst $(obj)/,,$(@))\n" + printf " HOSTCC $(subst $(shell pwd)/,,$(@))\n" $(HOSTCC) $(CBFSTOOLFLAGS) $(HOSTCFLAGS) -c -o $@ $< $(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/%.cc - printf " HOSTCXX $(subst $(obj)/,,$(@))\n" + printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n" $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $< $(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Compress/LZMA/%.cpp - printf " HOSTCXX $(subst $(obj)/,,$(@))\n" + printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n" $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $< $(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Compress/LZ/%.cpp - printf " HOSTCXX $(subst $(obj)/,,$(@))\n" + printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n" $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $< $(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Compress/RangeCoder/%.cpp - printf " HOSTCXX $(subst $(obj)/,,$(@))\n" + printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n" $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $< $(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Common/%.cpp - printf " HOSTCXX $(subst $(obj)/,,$(@))\n" + printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n" $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $< $(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/Common/%.cpp - printf " HOSTCXX $(subst $(obj)/,,$(@))\n" + printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n" $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $< $(obj)/util/cbfstool/cbfstool: $(obj)/util/cbfstool $(addprefix $(obj)/util/cbfstool/,$(cbfsobj)) - printf " HOSTCXX $(subst $(obj)/,,$(@)) (link)\n" + printf " HOSTCXX $(subst $(shell pwd)/,,$(@)) (link)\n" $(HOSTCXX) $(CBFSTOOLFLAGS) -o $@ $(addprefix $(obj)/util/cbfstool/,$(cbfsobj)) endif Modified: trunk/coreboot-v2/util/sconfig/config.g =================================================================== --- trunk/coreboot-v2/util/sconfig/config.g 2009-10-27 21:49:33 UTC (rev 4874) +++ trunk/coreboot-v2/util/sconfig/config.g 2009-10-27 23:14:54 UTC (rev 4875) @@ -886,7 +886,7 @@ def writecode(image): filename = os.path.join(img_dir, "static.c") - print " SCONFIG Creating", os.path.basename(filename) + print " SCONFIG ", join(filename.split('/')[-5:], '/') file = safe_open(filename, 'w+') file.write("#include <device/device.h>\n") file.write("#include <device/pci.h>\n") @@ -920,7 +920,7 @@ def writegraph(image): filename = os.path.join(img_dir, "static.dot") - print " SCONFIG Creating", os.path.basename(filename) + print " SCONFIG ", join(filename.split('/')[-5:], '/') file = safe_open(filename, 'w+') file.write("digraph devicetree {\n") file.write(" rankdir=LR\n") Modified: trunk/coreboot-v2/util/sconfig/parsedesc.g =================================================================== --- trunk/coreboot-v2/util/sconfig/parsedesc.g 2009-10-27 21:49:33 UTC (rev 4874) +++ trunk/coreboot-v2/util/sconfig/parsedesc.g 2009-10-27 23:14:54 UTC (rev 4875) @@ -126,8 +126,7 @@ if inputfilename[-2:]=='.g': outputfilename = inputfilename[:-2]+'.py' else: raise "Invalid Filename", outputfilename - print ' SCONFIG Input Grammar:', os.path.basename(inputfilename) - print ' SCONFIG Output File:', os.path.basename(outputfilename) + print ' SCONFIG ', join(outputfilename.split('/')[-5:], '/') DIVIDER = '\n%%\n' # This pattern separates the pre/post parsers preparser, postparser = None, None # Code before and after the parser desc Modified: trunk/coreboot-v2/util/sconfig/yapps2.py =================================================================== --- trunk/coreboot-v2/util/sconfig/yapps2.py 2009-10-27 21:49:33 UTC (rev 4874) +++ trunk/coreboot-v2/util/sconfig/yapps2.py 2009-10-27 23:14:54 UTC (rev 4875) @@ -709,10 +709,9 @@ if not outputfilename: if inputfilename[-2:]=='.g': outputfilename = inputfilename[:-2]+'.py' else: raise "Invalid Filename", outputfilename - - print ' SCONFIG Input Grammar:', os.path.basename(inputfilename) - print ' SCONFIG Output File:', os.path.basename(outputfilename) - + + print ' SCONFIG ', join(outputfilename.split('/')[-5:], '/') + DIVIDER = '\n%%\n' # This pattern separates the pre/post parsers preparser, postparser = None, None # Code before and after the parser desc

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
54
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 October 2009