coreboot March 2012

coreboot@coreboot.org

58 participants
718 discussions

Patch merged into filo/master: 00e82ca makefile: recreate version.h only when needed
by gerrit＠coreboot.org 07 Mar '12

07 Mar '12

the following patch was just integrated into master: commit 00e82ca97042907951ee977ead2e93039ab1da6d Author: Mathias Krause <mathias.krause(a)secunet.com> Date: Tue Mar 6 13:26:48 2012 +0100 makefile: recreate version.h only when needed Don't recreate version.h on each make invokation but only when needed, i.e. when the make variables have changed. Also make version.h a prerequisite for the object files to rebuild them when the version information changes. Change-Id: I27a057be25902233ac0751db8061e9ad4cd50642 Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> Build-Tested: build bot (Jenkins) at Wed Mar 7 16:46:48 2012, giving +1 Reviewed-By: Stefan Reinauer <stefan.reinauer(a)coreboot.org> at Wed Mar 7 17:44:44 2012, giving +2 See http://review.coreboot.org/745 for details. -gerrit

1 0

Patch merged into filo/master: 1b31017 makefile: avoid unnecessary rebuilds
by gerrit＠coreboot.org 07 Mar '12

07 Mar '12

the following patch was just integrated into master: commit 1b310177b04d265622ca220ce27f696b41fd786e Author: Mathias Krause <mathias.krause(a)secunet.com> Date: Tue Mar 6 13:14:47 2012 +0100 makefile: avoid unnecessary rebuilds The make target libpayload is a phony target which makes filo and all the object files get rebuild on every make invokation. Avoid this by lifting the dependencies and rebuild, i.e. relink filo only when libpayload has changed. Also, when building libpayload as a prerequisite, use $(obj) as DESTDIR, as the user might want to use a different build directory then $(src)/build. Change-Id: Ifa42362ba1d8c88c9996d645314cfdbdf2994759 Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> Build-Tested: build bot (Jenkins) at Wed Mar 7 16:48:17 2012, giving +1 Reviewed-By: Stefan Reinauer <stefan.reinauer(a)coreboot.org> at Wed Mar 7 17:44:28 2012, giving +2 See http://review.coreboot.org/744 for details. -gerrit

1 0

Patch merged into filo/master: 348f295 makefile: create filo.map in separate step
by gerrit＠coreboot.org 07 Mar '12

07 Mar '12

the following patch was just integrated into master: commit 348f295d107eeabab00f80dbe371838a355b3e3d Author: Mathias Krause <mathias.krause(a)secunet.com> Date: Tue Mar 6 09:42:18 2012 +0100 makefile: create filo.map in separate step Instead of copying files around and creating files make is not aware of, use a dedicated target and rule to create filo.map. Also skip piping the result through sort as nm has an option to sort the symbols. Also drop the bogus dependency to libpayload as filo.elf is only the striped version of filo. Change-Id: If010b4ce269a47a99de06db16e0290c3fd90b559 Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> Build-Tested: build bot (Jenkins) at Wed Mar 7 16:49:46 2012, giving +1 Reviewed-By: Stefan Reinauer <stefan.reinauer(a)coreboot.org> at Wed Mar 7 17:44:12 2012, giving +2 See http://review.coreboot.org/743 for details. -gerrit

1 0

Patch set updated for filo: 348f295 makefile: create filo.map in separate step
by Mathias Krause 07 Mar '12

07 Mar '12

Mathias Krause (mathias.krause(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/743 -gerrit commit 348f295d107eeabab00f80dbe371838a355b3e3d Author: Mathias Krause <mathias.krause(a)secunet.com> Date: Tue Mar 6 09:42:18 2012 +0100 makefile: create filo.map in separate step Instead of copying files around and creating files make is not aware of, use a dedicated target and rule to create filo.map. Also skip piping the result through sort as nm has an option to sort the symbols. Also drop the bogus dependency to libpayload as filo.elf is only the striped version of filo. Change-Id: If010b4ce269a47a99de06db16e0290c3fd90b559 Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> --- Makefile | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 6603612..3461614 100644 --- a/Makefile +++ b/Makefile @@ -133,11 +133,9 @@ $(obj)/filo: $(OBJS) libpayload printf " LD $(subst $(shell pwd)/,,$(@))\n" $(LD) -N -T $(ARCHDIR-y)/ldscript -o $@ $(OBJS) $(LIBPAYLOAD) $(LIBGCC) -$(TARGET): $(obj)/filo libpayload - cp $(obj)/filo $@ - $(NM) $(obj)/filo | sort > $(obj)/filo.map +$(TARGET): $(obj)/filo $(obj)/filo.map printf " STRIP $(subst $(shell pwd)/,,$(@))\n" - $(STRIP) -s $@ + $(STRIP) -s $< -o $@ include util/kconfig/Makefile @@ -153,6 +151,10 @@ $(obj)/%.S.o: $(src)/%.S printf " AS $(subst $(shell pwd)/,,$(@))\n" $(AS) $(ASFLAGS) -o $@ $< +$(obj)/%.map: $(obj)/% + printf " SYMS $(subst $(shell pwd)/,,$(@))\n" + $(NM) -n $< > $@ + endif $(obj)/version.h: FORCE

1 0

Patch set updated for filo: 1b31017 makefile: avoid unnecessary rebuilds
by Mathias Krause 07 Mar '12

07 Mar '12

Mathias Krause (mathias.krause(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/744 -gerrit commit 1b310177b04d265622ca220ce27f696b41fd786e Author: Mathias Krause <mathias.krause(a)secunet.com> Date: Tue Mar 6 13:14:47 2012 +0100 makefile: avoid unnecessary rebuilds The make target libpayload is a phony target which makes filo and all the object files get rebuild on every make invokation. Avoid this by lifting the dependencies and rebuild, i.e. relink filo only when libpayload has changed. Also, when building libpayload as a prerequisite, use $(obj) as DESTDIR, as the user might want to use a different build directory then $(src)/build. Change-Id: Ifa42362ba1d8c88c9996d645314cfdbdf2994759 Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> --- Makefile | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 3461614..3b4a468 100644 --- a/Makefile +++ b/Makefile @@ -118,18 +118,19 @@ all: prepare $(obj)/version.h $(TARGET) HAVE_LIBPAYLOAD := $(wildcard $(LIBPAYLOAD)) ifneq ($(strip $(HAVE_LIBPAYLOAD)),) libpayload: - @printf "Found Libpayload $(LIBPAYLOAD).\n" + @printf "Found libpayload as $(LIBPAYLOAD)\n" else -libpayload: $(src)/$(LIB_CONFIG) - printf "building libpayload.\n" +libpayload: $(LIBPAYLOAD) +$(LIBPAYLOAD): $(src)/$(LIB_CONFIG) + @printf "Building libpayload...\n" $(MAKE) -C $(LIBCONFIG_PATH) obj=$(obj)/libpayload-build distclean cp lib.config $(LIBCONFIG_PATH)/.config mkdir -p $(LIBCONFIG_PATH)/build $(MAKE) -C $(LIBCONFIG_PATH) obj=$(obj)/libpayload-build oldconfig - $(MAKE) -C $(LIBCONFIG_PATH) obj=$(obj)/libpayload-build DESTDIR=$(src)/build install + $(MAKE) -C $(LIBCONFIG_PATH) obj=$(obj)/libpayload-build DESTDIR=$(obj) install endif -$(obj)/filo: $(OBJS) libpayload +$(obj)/filo: $(OBJS) $(LIBPAYLOAD) printf " LD $(subst $(shell pwd)/,,$(@))\n" $(LD) -N -T $(ARCHDIR-y)/ldscript -o $@ $(OBJS) $(LIBPAYLOAD) $(LIBGCC) @@ -142,7 +143,7 @@ include util/kconfig/Makefile $(KCONFIG_AUTOHEADER): $(src)/.config $(MAKE) silentoldconfig -$(OBJS): $(KCONFIG_AUTOHEADER) libpayload +$(OBJS): $(KCONFIG_AUTOHEADER) | libpayload $(obj)/%.o: $(src)/%.c printf " CC $(subst $(shell pwd)/,,$(@))\n" $(CC) -MMD $(CFLAGS) $(CPPFLAGS) -c -o $@ $< @@ -177,5 +178,4 @@ distclean: clean FORCE: -.PHONY: $(PHONY) prepare clean distclean FORCE - +.PHONY: $(PHONY) prepare clean distclean libpayload FORCE

1 0

Patch set updated for filo: 00e82ca makefile: recreate version.h only when needed
by Mathias Krause 07 Mar '12

07 Mar '12

Mathias Krause (mathias.krause(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/745 -gerrit commit 00e82ca97042907951ee977ead2e93039ab1da6d Author: Mathias Krause <mathias.krause(a)secunet.com> Date: Tue Mar 6 13:26:48 2012 +0100 makefile: recreate version.h only when needed Don't recreate version.h on each make invokation but only when needed, i.e. when the make variables have changed. Also make version.h a prerequisite for the object files to rebuild them when the version information changes. Change-Id: I27a057be25902233ac0751db8061e9ad4cd50642 Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> --- Makefile | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3b4a468..46a265f 100644 --- a/Makefile +++ b/Makefile @@ -112,8 +112,8 @@ TARGET = $(obj)/filo.elf HAVE_LIBCONFIG := $(wildcard $(LIBCONFIG_PATH)) -all: prepare $(obj)/version.h $(TARGET) +all: prepare $(TARGET) HAVE_LIBPAYLOAD := $(wildcard $(LIBPAYLOAD)) ifneq ($(strip $(HAVE_LIBPAYLOAD)),) @@ -143,7 +143,7 @@ include util/kconfig/Makefile $(KCONFIG_AUTOHEADER): $(src)/.config $(MAKE) silentoldconfig -$(OBJS): $(KCONFIG_AUTOHEADER) | libpayload +$(OBJS): $(KCONFIG_AUTOHEADER) $(obj)/version.h | libpayload $(obj)/%.o: $(src)/%.c printf " CC $(subst $(shell pwd)/,,$(@))\n" $(CC) -MMD $(CFLAGS) $(CPPFLAGS) -c -o $@ $< @@ -158,7 +158,8 @@ $(obj)/%.map: $(obj)/% endif -$(obj)/version.h: FORCE +$(obj)/version.h: Makefile + printf " GEN $(subst $(shell pwd)/,,$(@))\n" echo '#define PROGRAM_NAME "$(PROGRAM_NAME)"' > $@ echo '#define PROGRAM_VERSION "$(PROGRAM_VERSION)"' >> $@ echo '#define PROGRAM_VERSION_FULL "$(PROGRAM_VERSION) $(BUILD_INFO)"' >> $@ @@ -171,6 +172,7 @@ prepare: $(sort $(dir $(OBJS))) $(obj)/util/kconfig/lxdialog/ clean: rm -rf $(sort $(dir $(OBJS))) $(obj)/util + rm -rf $(obj)/version.h distclean: clean rm -rf $(obj)

1 0

Patch set updated for filo: baf1339 makefile: build system cleanup
by Mathias Krause 07 Mar '12

07 Mar '12

Mathias Krause (mathias.krause(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/746 -gerrit commit baf1339a1334616c73cbbf9cd7743d54b4a86ff3 Author: Mathias Krause <mathias.krause(a)secunet.com> Date: Tue Mar 6 13:37:05 2012 +0100 makefile: build system cleanup This patch cleans up the include hierarchies for the Makefile system to decrease the knowledge of the main Makefile about every subdirectory. This allows us to add new drivers without the need to patch the main Makefile but, instead, just add a line to the appropriate Makefile.inc. Also all standard make variables are cleaned up (e.g. CFLAGS, CPPFLAGS,..). This, in turn, allows modifying them as needed in the included Makefile.inc to add flags or even library dependencies. It's no Linux Kbuild yet, but we're close ;) Change-Id: I67be4fcdd07d6960a7e46bfb6a3c0ea41f280e2b Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> --- Makefile | 63 +++++++++++++++++++++----------------------- drivers/Makefile.inc | 5 ++- drivers/flash/Makefile.inc | 1 - i386/Makefile.inc | 3 +- main/Makefile.inc | 5 ++- main/grub/Makefile.inc | 2 - 6 files changed, 38 insertions(+), 41 deletions(-) diff --git a/Makefile b/Makefile index 46a265f..20b21bf 100644 --- a/Makefile +++ b/Makefile @@ -49,17 +49,27 @@ ifneq ($(Q),) endif endif +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)) + $(if $(wildcard .xcompile),,$(shell bash util/xcompile/xcompile > .xcompile)) include .xcompile -CROSS_PREFIX = +CROSS_PREFIX ?= CC ?= $(CROSS_PREFIX)gcc -m32 AS ?= $(CROSS_PREFIX)as --32 LD ?= $(CROSS_PREFIX)ld -belf32-i386 -STRIP ?= $(CROSS_PREFIX)strip NM ?= $(CROSS_PREFIX)nm -HOSTCC = gcc -HOSTCXX = g++ +STRIP ?= $(CROSS_PREFIX)strip +HOSTCC ?= gcc +HOSTCXX ?= g++ HOSTCFLAGS := -I$(srck) -I$(objk) -pipe HOSTCXXFLAGS := -I$(srck) -I$(objk) -pipe @@ -72,45 +82,32 @@ else include $(src)/.config -ARCHDIR-$(CONFIG_TARGET_I386) := i386 - -PLATFORM-y += $(ARCHDIR-y)/Makefile.inc -TARGETS-y := - -BUILD-y := main/Makefile.inc main/grub/Makefile.inc fs/Makefile.inc -BUILD-y += drivers/Makefile.inc -BUILD-y += drivers/flash/Makefile.inc - -include $(PLATFORM-y) $(BUILD-y) - LIBPAYLOAD_PREFIX ?= $(obj)/libpayload LIBPAYLOAD = $(LIBPAYLOAD_PREFIX)/lib/libpayload.a INCPAYLOAD = $(LIBPAYLOAD_PREFIX)/include LIBGCC = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name) +GCCINCDIR = $(shell $(CC) -print-search-dirs | head -n 1 | cut -d' ' -f2)include -OBJS := $(patsubst %,$(obj)/%,$(TARGETS-y)) -INCLUDES := -I$(INCPAYLOAD) -I$(INCPAYLOAD)/$(ARCHDIR-y) -Iinclude -I$(ARCHDIR-y)/include -Ibuild -INCLUDES += -I$(GCCINCDIR) +ARCHDIR-$(CONFIG_TARGET_I386) := i386 -try-run= $(shell set -e; \ -TMP=".$$$$.tmp"; \ -if ($(1)) > /dev/null 2>&1; \ -then echo "$(2)"; \ -else echo "$(3)"; \ -fi; rm -rf "$$TMP") +CPPFLAGS := -nostdinc -imacros $(obj)/config.h +CPPFLAGS += -I$(INCPAYLOAD) -I$(INCPAYLOAD)/$(ARCHDIR-y) +CPPFLAGS += -I$(ARCHDIR-y)/include -Iinclude -I$(obj) +CPPFLAGS += -I$(GCCINCDIR) -cc-option= $(call try-run,\ -$(CC) $(1) -S -xc /dev/null -o "$$TMP", $(1), $(2)) +CFLAGS := -Wall -Wshadow -Os -pipe +CFLAGS += -fomit-frame-pointer -fno-common -ffreestanding -fno-strict-aliasing +CFLAGS += $(call cc-option, -fno-stack-protector,) -STACKPROTECT += $(call cc-option, -fno-stack-protector,) +LIBS := $(LIBPAYLOAD) $(LIBGCC) -GCCINCDIR = $(shell $(CC) -print-search-dirs | head -n 1 | cut -d' ' -f2)include -CPPFLAGS = -nostdinc -imacros $(obj)/config.h -Iinclude -I$(GCCINCDIR) -MD -CFLAGS += $(STACKPROTECT) $(INCLUDES) -Wall -Os -fomit-frame-pointer -fno-common -ffreestanding -fno-strict-aliasing -Wshadow -pipe +SUBDIRS-y += main/ fs/ drivers/ +SUBDIRS-y += $(ARCHDIR-y)/ -TARGET = $(obj)/filo.elf +$(foreach subdir,$(SUBDIRS-y),$(eval include $(subdir)/Makefile.inc)) -HAVE_LIBCONFIG := $(wildcard $(LIBCONFIG_PATH)) +TARGET := $(obj)/filo.elf +OBJS := $(patsubst %,$(obj)/%,$(TARGETS-y)) all: prepare $(TARGET) @@ -132,7 +129,7 @@ endif $(obj)/filo: $(OBJS) $(LIBPAYLOAD) printf " LD $(subst $(shell pwd)/,,$(@))\n" - $(LD) -N -T $(ARCHDIR-y)/ldscript -o $@ $(OBJS) $(LIBPAYLOAD) $(LIBGCC) + $(LD) -N -T $(ARCHDIR-y)/ldscript $(OBJS) --start-group $(LIBS) --end-group -o $@ $(TARGET): $(obj)/filo $(obj)/filo.map printf " STRIP $(subst $(shell pwd)/,,$(@))\n" diff --git a/drivers/Makefile.inc b/drivers/Makefile.inc index 8f814e0..f93c287 100644 --- a/drivers/Makefile.inc +++ b/drivers/Makefile.inc @@ -16,9 +16,10 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # +include drivers/flash/Makefile.inc + TARGETS-$(CONFIG_IDE_DISK) += drivers/ide.o TARGETS-$(CONFIG_IDE_NEW_DISK) += drivers/ide_new.o TARGETS-$(CONFIG_VIA_SOUND) += drivers/via-sound.o TARGETS-$(CONFIG_USB_DISK) += drivers/usb.o -TARGETS-y += drivers/intel.o - +TARGETS-$(CONFIG_TARGET_I386) += drivers/intel.o diff --git a/drivers/flash/Makefile.inc b/drivers/flash/Makefile.inc index a862773..48bf1a1 100644 --- a/drivers/flash/Makefile.inc +++ b/drivers/flash/Makefile.inc @@ -17,4 +17,3 @@ # TARGETS-$(CONFIG_FLASH_DISK) += drivers/flash/lxflash.o - diff --git a/i386/Makefile.inc b/i386/Makefile.inc index 8f1a305..ce3e5c8 100644 --- a/i386/Makefile.inc +++ b/i386/Makefile.inc @@ -16,7 +16,8 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -TARGETS-y += i386/context.o i386/switch.S.o i386/segment.o i386/timer.o i386/sys_info.o +TARGETS-$(CONFIG_TARGET_I386) += i386/context.o i386/switch.S.o i386/segment.o +TARGETS-$(CONFIG_TARGET_I386) += i386/timer.o i386/sys_info.o TARGETS-$(CONFIG_LINUX_LOADER) += i386/linux_load.o TARGETS-$(CONFIG_WINCE_LOADER) += i386/wince_load.o TARGETS-$(CONFIG_ARTEC_BOOT) += i386/artecboot.o diff --git a/main/Makefile.inc b/main/Makefile.inc index e2fab04..fc7c851 100644 --- a/main/Makefile.inc +++ b/main/Makefile.inc @@ -16,8 +16,9 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -TARGETS-$(CONFIG_MULTIBOOT_IMAGE) += main/mb_hdr.o +include main/grub/Makefile.inc + TARGETS-y += main/filo.o main/strtox.o TARGETS-y += main/elfload.o main/ipchecksum.o TARGETS-$(CONFIG_SUPPORT_SOUND) += main/sound.o - +TARGETS-$(CONFIG_MULTIBOOT_IMAGE) += main/mb_hdr.o diff --git a/main/grub/Makefile.inc b/main/grub/Makefile.inc index b79f08f..00273f3 100644 --- a/main/grub/Makefile.inc +++ b/main/grub/Makefile.inc @@ -16,9 +16,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # - TARGETS-$(CONFIG_USE_GRUB) += main/grub/grub.o main/grub/builtins.o TARGETS-$(CONFIG_USE_GRUB) += main/grub/cmdline.o main/grub/char_io.o TARGETS-$(CONFIG_USE_GRUB) += main/grub/completions.o TARGETS-$(CONFIG_USE_MD5_PASSWORDS) += main/grub/md5.o -

1 0

Patch set updated for filo: dfc652a Fix some compiler warnings
by Mathias Krause 07 Mar '12

07 Mar '12

Mathias Krause (mathias.krause(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/747 -gerrit commit dfc652ad783639baabc71e83b2ac76a583c08975 Author: Mathias Krause <mathias.krause(a)secunet.com> Date: Tue Mar 6 16:10:27 2012 +0100 Fix some compiler warnings The makefile cleanup brought up quite a few compiler warnings about unused functions and/or variables, undefined behaviour, missing return values and type mismatches. Fix those. Change-Id: I0e01b5fafd9d7594ec41c01d849f6ef9a2d56299 Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> --- drivers/flash/lxflash.c | 14 ++------------ fs/blockdev.c | 14 +++++++------- fs/fsys_cramfs.c | 6 +++--- fs/fsys_ext2fs.c | 5 ++--- fs/fsys_xfs.c | 2 +- fs/mini_inflate.c | 5 ++++- i386/wince_load.c | 2 +- include/fs.h | 2 +- main/grub/builtins.c | 6 +++--- main/grub/completions.c | 2 +- main/grub/grub.c | 2 ++ 11 files changed, 27 insertions(+), 33 deletions(-) diff --git a/drivers/flash/lxflash.c b/drivers/flash/lxflash.c index ba76741..df18c8d 100644 --- a/drivers/flash/lxflash.c +++ b/drivers/flash/lxflash.c @@ -345,16 +345,6 @@ static __inline void NAND_writeByte(u8 b) outb(b, g_baseAddr + IO_NAND_DATA); } -static void NAND_writeData(u8 *pData, int nSize) -{ - int i; - if(nSize > 528) return; // oversized buffer? - - // write byte by byte, pedestrian way - for(i=0; i<nSize; i++) - NAND_writeByte(pData[i]); -} - //////////////////////////////////////////////////////////////////////////////// // // NAND_getStatus() @@ -521,7 +511,7 @@ __inline int IsECCWritten(u8 *pECC) //////////////////////////////////////////////////////////////////////////////// // -int NAND_close(void) +void NAND_close(void) { if (g_chipID >= 0) wrmsr(MSR_DIVIL_LBAR_FLSH0 + g_chipID, g_orig_flsh); @@ -650,7 +640,7 @@ int NAND_readPage(u32 pageAddr, u8 *pPageBuff) // sanity check if (pageAddr < (g_flashInfo.numBlocks * g_flashInfo.pagesPerBlock)) { - u8 bData = 0, bBadBlock = 0, bReserved = 0; + u8 bBadBlock = 0, bReserved = 0; u8 addr1 = (u8)(pageAddr & 0xff); u8 addr2 = (u8)((pageAddr >> 8) & 0xff); diff --git a/fs/blockdev.c b/fs/blockdev.c index 21d2c29..e1e9d57 100644 --- a/fs/blockdev.c +++ b/fs/blockdev.c @@ -385,8 +385,10 @@ static void *read_sector(unsigned long sector) int count = (NUM_CACHE-hash>8)?8:(NUM_CACHE-hash); int ret; ret = ide_read_blocks(dev_drive, sector, count, buf); - if (ret == 2) - goto nomedium; + if (ret == 2) { + printf("No disk in drive.\n"); + goto err_out; + } if (ret != 0) goto readerr; while (--count>0) { @@ -426,11 +428,9 @@ static void *read_sector(unsigned long sector) readerr: printf("Disk read error dev=%d drive=%d sector=%lu\n", dev_type, dev_drive, sector); - flush_cache(); - dev_name[0] = '\0'; /* force re-open the device next time */ - return 0; - nomedium: - printf("No disk in drive.\n"); +#ifdef CONFIG_IDE_NEW_DISK + err_out: +#endif flush_cache(); dev_name[0] = '\0'; /* force re-open the device next time */ return 0; diff --git a/fs/fsys_cramfs.c b/fs/fsys_cramfs.c index c5a9247..d7cb19b 100644 --- a/fs/fsys_cramfs.c +++ b/fs/fsys_cramfs.c @@ -103,8 +103,8 @@ struct cramfs_buf { struct cramfs_inode inode; char name[NAMELEN_MAX + 1]; u32 block_ptrs[CRAMFS_MAX_BLOCKS]; - char data[CRAMFS_BLOCK * 2]; - char temp[CRAMFS_BLOCK]; + unsigned char data[CRAMFS_BLOCK * 2]; + unsigned char temp[CRAMFS_BLOCK]; /* menu.lst is read 1 byte at a time, try to aleviate * * the performance problem */ long cached_block; /* the uncompressed block in cramfs_buf->data */ @@ -246,7 +246,7 @@ cramfs_read (char *buf, int len) memcpy(buf, cramfs_buf->temp + (filepos % CRAMFS_BLOCK), size); } else { /* just another full block read */ - size = decompress_block(buf, cramfs_buf->data + 2, memcpy); + size = decompress_block((unsigned char *)buf, cramfs_buf->data + 2, memcpy); } if (size < 0) { debug_cramfs("error in decomp (error %d)\n", size); diff --git a/fs/fsys_ext2fs.c b/fs/fsys_ext2fs.c index 30a78ec..96e2e68 100644 --- a/fs/fsys_ext2fs.c +++ b/fs/fsys_ext2fs.c @@ -631,10 +631,9 @@ static int ext4fs_block_map (int logical_block) { struct ext4_extent_header *eh; - struct ext4_extent *ex, *extent; - struct ext4_extent_idx *ei, *index; + struct ext4_extent_idx *ei; + struct ext4_extent *ex; int depth; - int i; #ifdef E2DEBUG unsigned char *i; diff --git a/fs/fsys_xfs.c b/fs/fsys_xfs.c index 4011479..c71af98 100644 --- a/fs/fsys_xfs.c +++ b/fs/fsys_xfs.c @@ -365,7 +365,7 @@ next_dentry (xfs_ino_t *ino) default: namelen = sfe->namelen; *ino = sf_ino ((char *)sfe, namelen); - name = sfe->name; + name = (char *) sfe->name; sfe = (xfs_dir2_sf_entry_t *) ((char *)sfe + namelen + 11 - xfs.i8param); } diff --git a/fs/mini_inflate.c b/fs/mini_inflate.c index 17e3390..eae371d 100644 --- a/fs/mini_inflate.c +++ b/fs/mini_inflate.c @@ -185,7 +185,10 @@ static void decompress_huffman(struct bitstream *stream, unsigned char *dest) dist += (symbol % 2) << ((symbol - 2) >> 1); } stream->decoded += length; - for (i = 0; i < length; i++) *(dest++) = dest[-dist]; + for (i = 0; i < length; i++) { + *dest = dest[-dist]; + dest++; + } } } while (symbol != 256); /* 256 is the end of the data block */ } diff --git a/i386/wince_load.c b/i386/wince_load.c index f3e5475..993815f 100644 --- a/i386/wince_load.c +++ b/i386/wince_load.c @@ -240,7 +240,7 @@ void wince_init_bootarg(u32 entryPoint) g_pBootArgs->dwEdbgBaseAddr = 0; // set the KITL device name to something adequate - strcpy(g_pBootArgs->szDeviceNameRoot, "FILO"); + strcpy((char *) g_pBootArgs->szDeviceNameRoot, "FILO"); g_pBootArgs->dwSig = BOOTARG_SIGNATURE; g_pBootArgs->dwLen = sizeof(BOOT_ARGS); diff --git a/include/fs.h b/include/fs.h index 1bd8ec7..3138ab5 100644 --- a/include/fs.h +++ b/include/fs.h @@ -46,7 +46,7 @@ int usb_read(const int drive, const sector_t sector, const int size, void *buffe #ifdef CONFIG_FLASH_DISK int flash_probe(int drive); int flash_read(int drive, sector_t sector, void *buffer); -int NAND_close(void); +void NAND_close(void); #endif #define DISK_IDE 1 diff --git a/main/grub/builtins.c b/main/grub/builtins.c index e2f4612..3451071 100644 --- a/main/grub/builtins.c +++ b/main/grub/builtins.c @@ -379,9 +379,9 @@ static int dumpmem_func(char *arg, int flags) } // FIXME - if (!safe_parse_maxint(&string_argv[1], &mem_base)) + if (!safe_parse_maxint(&string_argv[1], (int *)&mem_base)) return 1; - if (!safe_parse_maxint(&string_argv[2], &mem_len)) + if (!safe_parse_maxint(&string_argv[2], (int *)&mem_len)) return 1; grub_printf("Dumping memory at 0x%08x (0x%x bytes)\n", @@ -668,7 +668,7 @@ void copy_path_to_filo_bootline(char *arg, char *path, int use_rootdev, int appe char drivername[16]; int disk, part; unsigned long addr; - int i, len; + int i; memset(devicename, 0, 16); memset(drivername, 0, 16); diff --git a/main/grub/completions.c b/main/grub/completions.c index a3aeba2..abfe1d9 100644 --- a/main/grub/completions.c +++ b/main/grub/completions.c @@ -120,7 +120,7 @@ int print_completions(int is_filename, int is_completion) if (*buf == '(' && (incomplete || ! *ptr)) { if (!part_choice) { /* disk completions */ - int disk_no, i, j; + int i, j; if (!is_completion) grub_printf (" Possible disks are: "); diff --git a/main/grub/grub.c b/main/grub/grub.c index b4bee04..b629435 100644 --- a/main/grub/grub.c +++ b/main/grub/grub.c @@ -201,6 +201,7 @@ old: } +#ifdef CONFIG_NON_INTERACTIVE static void reboot(void) { for (;;) { grub_printf("Press any key to reboot.\n"); @@ -210,6 +211,7 @@ static void reboot(void) { } } } +#endif /* Define if there is user specified preset menu string */ /* #undef PRESET_MENU_STRING */

1 0

New patch to review for coreboot: f7a8b4e Move C labels to start-of-line
by Patrick Georgi 07 Mar '12

07 Mar '12

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/772 -gerrit commit f7a8b4e8327349825c0c2e51d44e3dd323372cb1 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Wed Mar 7 15:55:47 2012 +0100 Move C labels to start-of-line Also mark the corresponding lint test stable. Change-Id: Ib7c9ed88c5254bf56e68c01cdbd5ab91cd7bfc2f Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- src/arch/x86/boot/mpspec.c | 2 +- src/arch/x86/lib/cpu.c | 2 +- src/boot/selfboot.c | 2 +- src/console/vtxprintf.c | 2 +- src/cpu/x86/lapic/secondary.S | 2 +- src/devices/oprom/yabel/pmm.c | 2 +- src/lib/xmodem.c | 2 +- src/northbridge/amd/amdk8/raminit.c | 2 +- src/northbridge/amd/amdk8/raminit_f.c | 6 +++--- src/northbridge/amd/amdk8/raminit_test.c | 2 +- src/northbridge/intel/e7520/raminit.c | 6 +++--- src/northbridge/intel/e7525/raminit.c | 6 +++--- src/northbridge/intel/i3100/raminit.c | 6 +++--- src/northbridge/intel/i3100/raminit_ep80579.c | 2 +- src/northbridge/intel/i945/raminit.c | 2 +- src/southbridge/amd/cs5536/early_smbus.c | 2 +- util/lint/lint-004-style-labels | 22 ---------------------- util/lint/lint-stable-004-style-labels | 22 ++++++++++++++++++++++ 18 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/arch/x86/boot/mpspec.c b/src/arch/x86/boot/mpspec.c index d519cfa..e7d767b 100644 --- a/src/arch/x86/boot/mpspec.c +++ b/src/arch/x86/boot/mpspec.c @@ -267,7 +267,7 @@ void smp_write_intsrc_pci_bridge(struct mp_config_table *mc, smp_write_intsrc_pci_bridge(mc, irqtype, irqflag, child, dstapic, dstirq_x); } - next: +next: child = child->sibling; } diff --git a/src/arch/x86/lib/cpu.c b/src/arch/x86/lib/cpu.c index 8aacaac..a7f7b32 100644 --- a/src/arch/x86/lib/cpu.c +++ b/src/arch/x86/lib/cpu.c @@ -227,7 +227,7 @@ static void set_cpu_ops(struct device *cpu) } } return; - found: +found: cpu->ops = driver->ops; } diff --git a/src/boot/selfboot.c b/src/boot/selfboot.c index c45fa63..99b1493 100644 --- a/src/boot/selfboot.c +++ b/src/boot/selfboot.c @@ -511,7 +511,7 @@ static int selfboot(struct lb_memory *mem, struct cbfs_payload *payload) jmp_to_elf_entry((void*)entry, bounce_buffer, bounce_size); return 1; - out: +out: return 0; } diff --git a/src/console/vtxprintf.c b/src/console/vtxprintf.c index 944fd5b..4053023 100644 --- a/src/console/vtxprintf.c +++ b/src/console/vtxprintf.c @@ -123,7 +123,7 @@ int vtxprintf(void (*tx_byte)(unsigned char byte), const char *fmt, va_list args /* process flags */ flags = 0; - repeat: +repeat: ++fmt; /* this also skips first '%' */ switch (*fmt) { case '-': flags |= LEFT; goto repeat; diff --git a/src/cpu/x86/lapic/secondary.S b/src/cpu/x86/lapic/secondary.S index 5c1e760..dc00b08 100644 --- a/src/cpu/x86/lapic/secondary.S +++ b/src/cpu/x86/lapic/secondary.S @@ -47,7 +47,7 @@ _secondary_start: 1: hlt jmp 1b - gdtaddr: +gdtaddr: .word gdt_limit /* the table limit */ .long gdt /* we know the offset */ diff --git a/src/devices/oprom/yabel/pmm.c b/src/devices/oprom/yabel/pmm.c index 989bde4..19d14d4 100644 --- a/src/devices/oprom/yabel/pmm.c +++ b/src/devices/oprom/yabel/pmm.c @@ -267,7 +267,7 @@ void pmm_handleInt() rval = 0xFFFFFFFF; goto exit; } - exit: +exit: /* exit handler of this function, restore registers, put return value in DX:AX */ M.x86 = backup_regs; M.x86.R_DX = (u16) ((rval >> 16) & 0xFFFF); diff --git a/src/lib/xmodem.c b/src/lib/xmodem.c index 2d553be..a00653a 100644 --- a/src/lib/xmodem.c +++ b/src/lib/xmodem.c @@ -166,7 +166,7 @@ int xmodemReceive(unsigned char *dest, int destsz) _outbyte(ACK); continue; } - reject: +reject: flushinput(); _outbyte(NAK); } diff --git a/src/northbridge/amd/amdk8/raminit.c b/src/northbridge/amd/amdk8/raminit.c index eb33a39..9cb7c60 100644 --- a/src/northbridge/amd/amdk8/raminit.c +++ b/src/northbridge/amd/amdk8/raminit.c @@ -681,7 +681,7 @@ hw_err: #if CONFIG_QRANK_DIMM_SUPPORT sz.rank = 0; #endif - out: +out: return sz; } diff --git a/src/northbridge/amd/amdk8/raminit_f.c b/src/northbridge/amd/amdk8/raminit_f.c index dc3addb..33df485 100644 --- a/src/northbridge/amd/amdk8/raminit_f.c +++ b/src/northbridge/amd/amdk8/raminit_f.c @@ -49,7 +49,7 @@ /* for PCI_ADDR(0, 0x18, 2, 0x98) index, and PCI_ADDR(0x, 0x18, 2, 0x9c) data */ /* - index: +index: [29: 0] DctOffset (Dram Controller Offset) [30:30] DctAccessWrite (Dram Controller Read/Write Select) 0 = read access @@ -659,7 +659,7 @@ static void sdram_set_registers(const struct mem_controller *ctrl, struct sys_in /* for PCI_ADDR(0, 0x18, 2, 0x98) index, and PCI_ADDR(0x, 0x18, 2, 0x9c) data */ /* - index: +index: [29: 0] DctOffset (Dram Controller Offset) [30:30] DctAccessWrite (Dram Controller Read/Write Select) 0 = read access @@ -820,7 +820,7 @@ static void spd_get_dimm_size(unsigned device, struct dimm_size *sz) sz->col = 0; sz->bank = 0; sz->rank = 0; - out: +out: return; } diff --git a/src/northbridge/amd/amdk8/raminit_test.c b/src/northbridge/amd/amdk8/raminit_test.c index e2a13a3..fd2107c 100644 --- a/src/northbridge/amd/amdk8/raminit_test.c +++ b/src/northbridge/amd/amdk8/raminit_test.c @@ -419,7 +419,7 @@ static void do_test2(int i) raminit_main(); - done: +done: memcpy(&end_buf, &tmp_buf, sizeof(end_buf)); } diff --git a/src/northbridge/intel/e7520/raminit.c b/src/northbridge/intel/e7520/raminit.c index e9a60f1..d226085 100644 --- a/src/northbridge/intel/e7520/raminit.c +++ b/src/northbridge/intel/e7520/raminit.c @@ -161,7 +161,7 @@ static struct dimm_size spd_get_dimm_size(unsigned device) hw_err: sz.side1 = 0; sz.side2 = 0; - out: +out: return sz; } @@ -286,7 +286,7 @@ static int spd_set_row_attributes(const struct mem_controller *ctrl, /* If an hw_error occurs report that I have no memory */ hw_err: dra = 0; - out: +out: return dra; } @@ -658,7 +658,7 @@ static int spd_set_dram_controller_mode(const struct mem_controller *ctrl, /* If an hw_error occurs report that I have no memory */ hw_err: drc = 0; - out: +out: return drc; } diff --git a/src/northbridge/intel/e7525/raminit.c b/src/northbridge/intel/e7525/raminit.c index e341596..b5895bc 100644 --- a/src/northbridge/intel/e7525/raminit.c +++ b/src/northbridge/intel/e7525/raminit.c @@ -164,7 +164,7 @@ static struct dimm_size spd_get_dimm_size(unsigned device) hw_err: sz.side1 = 0; sz.side2 = 0; - out: +out: return sz; } @@ -291,7 +291,7 @@ static int spd_set_row_attributes(const struct mem_controller *ctrl, /* If an hw_error occurs report that I have no memory */ hw_err: dra = 0; - out: +out: return dra; } @@ -664,7 +664,7 @@ static int spd_set_dram_controller_mode(const struct mem_controller *ctrl, /* If an hw_error occurs report that I have no memory */ hw_err: drc = 0; - out: +out: return drc; } diff --git a/src/northbridge/intel/i3100/raminit.c b/src/northbridge/intel/i3100/raminit.c index ced3de1..926d5b3 100644 --- a/src/northbridge/intel/i3100/raminit.c +++ b/src/northbridge/intel/i3100/raminit.c @@ -154,7 +154,7 @@ static struct dimm_size spd_get_dimm_size(u16 device) hw_err: sz.side1 = 0; sz.side2 = 0; - out: +out: return sz; } @@ -281,7 +281,7 @@ static int spd_set_row_attributes(const struct mem_controller *ctrl, /* If an hw_error occurs report that I have no memory */ hw_err: dra = 0; - out: +out: return dra; } @@ -597,7 +597,7 @@ static int spd_set_dram_controller_mode(const struct mem_controller *ctrl, /* If an hw_error occurs report that I have no memory */ hw_err: drc = 0; - out: +out: return drc; } diff --git a/src/northbridge/intel/i3100/raminit_ep80579.c b/src/northbridge/intel/i3100/raminit_ep80579.c index de3ffce..79fc5f7 100644 --- a/src/northbridge/intel/i3100/raminit_ep80579.c +++ b/src/northbridge/intel/i3100/raminit_ep80579.c @@ -126,7 +126,7 @@ static struct dimm_size spd_get_dimm_size(u16 device) hw_err: sz.side1 = 0; sz.side2 = 0; - out: +out: print_debug("dimm "); print_debug_hex8(device); print_debug(" size = "); diff --git a/src/northbridge/intel/i945/raminit.c b/src/northbridge/intel/i945/raminit.c index d92c006..a4512d7 100644 --- a/src/northbridge/intel/i945/raminit.c +++ b/src/northbridge/intel/i945/raminit.c @@ -1478,7 +1478,7 @@ static struct dimm_size sdram_get_dimm_size(struct sys_info *sysinfo, u16 dimmno */ sz.side1 = 0; sz.side2 = 0; - out: +out: return sz; } diff --git a/src/southbridge/amd/cs5536/early_smbus.c b/src/southbridge/amd/cs5536/early_smbus.c index 5cb815d..814bc5a 100644 --- a/src/southbridge/amd/cs5536/early_smbus.c +++ b/src/southbridge/amd/cs5536/early_smbus.c @@ -194,7 +194,7 @@ static unsigned char do_smbus_read_byte(unsigned smbus_io_base, return smbus_get_result(smbus_io_base); - err: +err: print_debug("SMBUS READ ERROR:"); print_debug_hex8(error); print_debug(" device:"); diff --git a/util/lint/lint-004-style-labels b/util/lint/lint-004-style-labels deleted file mode 100755 index 31ad74e..0000000 --- a/util/lint/lint-004-style-labels +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# This file is part of the coreboot project. -# -# Copyright (C) 2012 Patrick Georgi <patrick(a)georgi-clan.de> -# -# 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 -# -# DESCR: Check that C labels begin at start-of-line - -LC_ALL=C export LC_ALL -find src -name '*.[scS]' -exec grep '^[[:space:]][[:space:]]*[a-z][a-z]*:[[:space:]]*$' {} + |grep -v "[^a-z_]default:" diff --git a/util/lint/lint-stable-004-style-labels b/util/lint/lint-stable-004-style-labels new file mode 100755 index 0000000..31ad74e --- /dev/null +++ b/util/lint/lint-stable-004-style-labels @@ -0,0 +1,22 @@ +#!/bin/sh +# This file is part of the coreboot project. +# +# Copyright (C) 2012 Patrick Georgi <patrick(a)georgi-clan.de> +# +# 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 +# +# DESCR: Check that C labels begin at start-of-line + +LC_ALL=C export LC_ALL +find src -name '*.[scS]' -exec grep '^[[:space:]][[:space:]]*[a-z][a-z]*:[[:space:]]*$' {} + |grep -v "[^a-z_]default:"

1 0

New patch to review for coreboot: cc2b317 lint: test that labels begin at start-of-line
by Patrick Georgi 07 Mar '12

07 Mar '12

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/771 -gerrit commit cc2b3173570a49dae0c780c1e1b8d2e12a0f5975 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Wed Mar 7 15:49:07 2012 +0100 lint: test that labels begin at start-of-line Some attempt at enforcing style Change-Id: Ibbfb86402ecc57e8db6c3857c8e0193085ed4fc2 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- util/lint/lint-004-style-labels | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/util/lint/lint-004-style-labels b/util/lint/lint-004-style-labels new file mode 100755 index 0000000..31ad74e --- /dev/null +++ b/util/lint/lint-004-style-labels @@ -0,0 +1,22 @@ +#!/bin/sh +# This file is part of the coreboot project. +# +# Copyright (C) 2012 Patrick Georgi <patrick(a)georgi-clan.de> +# +# 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 +# +# DESCR: Check that C labels begin at start-of-line + +LC_ALL=C export LC_ALL +find src -name '*.[scS]' -exec grep '^[[:space:]][[:space:]]*[a-z][a-z]*:[[:space:]]*$' {} + |grep -v "[^a-z_]default:"

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
72
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 March 2012