Various tiny cosmetic fixes (trivial).
Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de> Acked-by: Uwe Hermann <uwe@hermann-uwe.de> git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@192 f3766cd6-281f-0410-b1cd-43a5c92072e9
This commit is contained in:
parent
b41e38e4a2
commit
022cd22f5d
6 changed files with 18 additions and 19 deletions
12
Makefile
12
Makefile
|
|
@ -4,6 +4,7 @@
|
|||
## LinuxBIOS build system Lbuild
|
||||
##
|
||||
## Copyright (C) 2007 coresystems GmbH
|
||||
## Written by Stefan Reinauer <stepan@coresystems.de> 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... "
|
||||
|
|
|
|||
|
|
@ -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 <stepan@coresystems.de> 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/.
|
||||
|
||||
|
|
|
|||
|
|
@ -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 <stepan@coresystems.de> 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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue