From 022cd22f5d87fc564fc1e79cb11f0c480194ae33 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Mon, 5 Mar 2007 21:34:08 +0000 Subject: [PATCH] Various tiny cosmetic fixes (trivial). Signed-off-by: Uwe Hermann Acked-by: Uwe Hermann git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@192 f3766cd6-281f-0410-b1cd-43a5c92072e9 --- Makefile | 12 ++++++------ arch/powerpc/Kconfig | 5 ++--- arch/x86/Kconfig | 4 ++-- arch/x86/cachemain.c | 2 +- include/uart8250.h | 2 +- util/xcompile/xcompile | 12 ++++++------ 6 files changed, 18 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 747e06dba0..2ec5ba6baa 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ ## LinuxBIOS build system Lbuild ## ## Copyright (C) 2007 coresystems GmbH +## Written by Stefan Reinauer for coresystems GmbH. ## ## 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 @@ -26,12 +27,12 @@ SUBLEVEL = 0 have_dotconfig := $(wildcard .config) have_dotxcompile := $(wildcard .xcompile) - + src:=$(shell pwd) obj:=$(shell pwd)/lbobj export src obj -# Do not print "Entering directory ..." +# Do not print "Entering directory ...". MAKEFLAGS += --no-print-directory CC := gcc @@ -56,7 +57,7 @@ endif KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL) export KERNELVERSION -ifeq ($(strip $(have_dotconfig)),) +ifeq ($(strip $(have_dotconfig)),) all: $(Q)echo "Please run make menuconfig, xconfig or config first." @@ -81,8 +82,7 @@ LINUXBIOSINCLUDE := -I$(src) -Iinclude \ -include $(obj)/config.h \ -include $(obj)/build.h - -ifneq ($(strip $(have_dotxcompile)),) +ifneq ($(strip $(have_dotxcompile)),) include $(src)/.xcompile CC := $(CC_$(ARCH)) AS := $(AS_$(ARCH)) @@ -111,7 +111,7 @@ prepare2: $(Q)cp $(src)/.tmpconfig.h $(obj)/config.h $(Q)echo "#define LINUXBIOS_VERSION \"$(KERNELVERSION)\"" > $(obj)/build.h $(Q)echo "#define LINUXBIOS_EXTRA_VERSION \"$(LINUXBIOS_EXTRA_VERSION)\"" >> $(obj)/build.h - $(Q)echo "#define LINUXBIOS_BUILD \"`date`\"" >> $(obj)/build.h + $(Q)echo "#define LINUXBIOS_BUILD \"`date`\"" >> $(obj)/build.h clean: $(Q)echo -n "Cleaning up... " diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index b5e75231d8..5c7dfef10f 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -1,7 +1,7 @@ ## ## This file is part of the LinuxBIOS project. ## -## Copyright (C) 2006 coresystems GmbH +## Copyright (C) 2006-2007 coresystems GmbH ## Written by Stefan Reinauer for coresystems GmbH. ## ## This program is free software; you can redistribute it and/or modify @@ -30,6 +30,5 @@ config ARCH default powerpc depends ARCH_POWERPC help - This is the arch directory name - + This is the name of the respective subdirectory in arch/. diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 3d961ffd02..0706680d42 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1,7 +1,7 @@ ## ## This file is part of the LinuxBIOS project. ## -## Copyright (C) 2006 coresystems GmbH +## Copyright (C) 2006-2007 coresystems GmbH ## Written by Stefan Reinauer for coresystems GmbH. ## ## This program is free software; you can redistribute it and/or modify @@ -30,7 +30,7 @@ config ARCH default x86 depends ARCH_X86 help - This is the arch directory name + This is the name of the respective subdirectory in arch/. config CAR_TYPE_I586 boolean diff --git a/arch/x86/cachemain.c b/arch/x86/cachemain.c index 6981bb553c..2bbbb3f66f 100644 --- a/arch/x86/cachemain.c +++ b/arch/x86/cachemain.c @@ -31,7 +31,7 @@ void die(const char *msg); int find_file(struct mem_file *archive, char *filename, struct mem_file *result); // FIXME: This should go somewhere else (.config?) -#define LINUXBIOS_ROMSIZE_KB 256 +#define LINUXBIOS_ROMSIZE_KB 256 // Is this value correct? #define DCACHE_RAM_SIZE 0x8000 diff --git a/include/uart8250.h b/include/uart8250.h index e7e21594b1..3fd3725380 100644 --- a/include/uart8250.h +++ b/include/uart8250.h @@ -27,7 +27,7 @@ #endif #if ((115200%TTYSx_BAUD) != 0) -#error Bad ttys0 baud rate +#error Bad ttyS0 baud rate #endif #define TTYSx_DIV (115200/TTYSx_BAUD) diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile index 563e264c7d..b9fce6e0ef 100755 --- a/util/xcompile/xcompile +++ b/util/xcompile/xcompile @@ -28,22 +28,22 @@ ARCH=`uname -m | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ \ case "$ARCH" in "x86_64") echo "CC_x86 := \"gcc -m32\"" - echo "AS_x86 := \"as --32\"" + echo "AS_x86 := \"as --32\"" echo "LD_x86 := \"ld -b elf32-i386 -melf_i386\"" ;; "x86") echo "CC_x86 := \"gcc\"" - echo "AS_x86 := \"as\"" + echo "AS_x86 := \"as\"" echo "LD_x86 := \"ld\"" ;; *) - # FIXME: This should be detected + # FIXME: This should be detected. echo "CC_x86 := \"i386-linux-gcc\"" - echo "AS_x86 := \"i386-linux-as\"" + echo "AS_x86 := \"i386-linux-as\"" echo "LD_x86 := \"i386-linux-ld\"" ;; esac -# TODO: The same as above for powerpc, and other architectures -# as soon as they are supported by LinuxBIOSv3 +# TODO: The same as above for PowerPC, and other architectures +# as soon as they are supported by LinuxBIOSv3.