Various 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@200 f3766cd6-281f-0410-b1cd-43a5c92072e9
This commit is contained in:
Uwe Hermann 2007-03-06 05:08:31 +00:00
parent 474e9c7761
commit 54bfbf97e5
7 changed files with 24 additions and 20 deletions

12
Kconfig
View file

@ -8,8 +8,8 @@ mainmenu "LinuxBIOS Configuration"
menu "General setup"
config EXPERIMENTAL
bool "Prompt for development and/or incomplete code/mainboards"
---help---
bool "Prompt for development and/or incomplete code/mainboards"
help
Enable this option if you want to test development features or
incomplete/unsupported mainboards.
@ -17,8 +17,8 @@ config EXPERIMENTAL
as EXPERIMENTAL! You have been warned!
config EXPERT
bool "Expert mode"
---help---
bool "Expert mode"
help
This allows you to select certain advanced configuration options.
It is mainly intended for LinuxBIOS developers.
@ -26,8 +26,8 @@ config EXPERT
doing! You have been warned!
config LOCALVERSION
string "Local version - append to LinuxBIOS release"
help
string "Local version - append to LinuxBIOS release"
help
Append an extra string to the end of the LinuxBIOS version.
endmenu

View file

@ -28,8 +28,8 @@ SUBLEVEL = 0
have_dotconfig := $(wildcard .config)
have_dotxcompile := $(wildcard .xcompile)
src:=$(shell pwd)
obj:=$(shell pwd)/build
src := $(shell pwd)
obj := $(shell pwd)/build
export src obj
# Do not print "Entering directory ...".
@ -97,6 +97,7 @@ include device/Makefile
include console/Makefile
include mainboard/$(MAINBOARDDIR)/Makefile
include arch/$(ARCH)/Makefile
endif
include util/Makefile
@ -126,7 +127,7 @@ distclean: clean
%.o: %.c
$(Q)echo "Compiling $<"
$(Q)$(CC) $(CFLAGS) -o $@ -c $<
$(Q)$(CC) $(CFLAGS) -o $@ -c $<
.PHONY: doc

View file

@ -38,6 +38,7 @@ LINUXBIOS_COMPONENTS := linuxbios.lar linuxbios.vpd stage0.init
$(obj)/linuxbios.rom: $(patsubst %,$(obj)/%,$(LINUXBIOS_COMPONENTS))
$(Q)cat $^ > $@
#
# Build the LAR archive.
#
@ -75,9 +76,9 @@ STAGE0_ARCH_X86_OBJ = $(obj)/cachemain.o $(obj)/console.o $(obj)/serial.o \
ifeq ($(CONFIG_CAR_TYPE_I586),y)
STAGE0_CAR_OBJ = $(obj)/stage0_i586.o
STAGE0_CAR_OBJ = $(obj)/stage0_i586.o
else
STAGE0_CAR_OBJ = $(obj)/stage0_i586.o
STAGE0_CAR_OBJ = $(obj)/stage0_i586.o
endif
STAGE0_OBJ := $(STAGE0_CONSOLE_OBJ) $(STAGE0_LIB_OBJ) $(STAGE0_ARCH_X86_OBJ) $(STAGE0_CAR_OBJ)
@ -125,6 +126,7 @@ $(obj)/linuxbios.stage2: $(obj)/stage0.init $(STAGE2_OBJ)
$(Q)objcopy -O binary $(obj)/linuxbios.stage2.o $(obj)/linuxbios.stage2
$(Q)printf "done\n"
#
# The payload as we love it. Get it from somewhere.
# Is this a place to incorporate buildrom?
@ -137,15 +139,17 @@ payload:
$(Q)printf "Building payload... skipped\n"
# build rules
#
# Build rules.
#
$(obj)/%.o: $(src)/arch/x86/%.c
$(Q)$(CC) $(INITCFLAGS) -c $< -o $@
$(obj)/%.o: $(src)/mainboard/$(MAINBOARDDIR)/%.c
$(Q)$(CC) $(INITCFLAGS) -c $< -o $@
# Building asm stub
# Building asm stub.
$(obj)/stage0%.o: $(src)/arch/x86/stage0%.S
$(Q)$(CC) -E $(LINUXBIOSINCLUDE) $< \
-o $(obj)/stage0_asm.s -DBOOTBLK=0x1f00 -DRESRVED=0xf0 \

View file

@ -22,5 +22,5 @@
$(obj)/%.o: $(src)/device/%.c
$(Q)$(CC) $(INITCFLAGS) -c $< -o $@
STAGE2_DEVICE_OBJ = $(obj)/device.o $(obj)/device_util.o \
$(obj)/root_device.o $(obj)/pci_device.o $(obj)/pci_ops.o
STAGE2_DEVICE_OBJ = $(obj)/device.o $(obj)/device_util.o \
$(obj)/root_device.o $(obj)/pci_device.o $(obj)/pci_ops.o

View file

@ -1,8 +1,7 @@
#
# Documentation Makefile
# Documentation Makefile.
#
dochelp:
@echo ' LinuxBIOS internal documentation in different formats:'
@echo ' pdfdocs (PDF)'

View file

@ -35,12 +35,12 @@ config LINUXBIOS_ROMSIZE_KB_512
config LINUXBIOS_ROMSIZE_KB_1024
bool "1024 KB (1 MB)"
help
Choose this option if you have a 1 MB (1024 KB) ROM chip.
Choose this option if you have a 1024 KB (1 MB) ROM chip.
config LINUXBIOS_ROMSIZE_KB_2048
bool "2048 KB (2 MB)"
help
Choose this option if you have a 2 MB (2048 KB) ROM chip.
Choose this option if you have a 2048 KB (2 MB) ROM chip.
endchoice

View file

@ -24,7 +24,7 @@ extern struct device_operations i440bxemulation_pcidomainops;
struct northbridge_intel_i440bx_config
{
/* The various emulators don't always get 440BX right. So we are
* going to allow users to set the RAM size via Kconfig.
* going to allow users to set the RAM size via Kconfig.
*/
int ramsize;
};