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

View file

@ -28,8 +28,8 @@ SUBLEVEL = 0
have_dotconfig := $(wildcard .config) have_dotconfig := $(wildcard .config)
have_dotxcompile := $(wildcard .xcompile) have_dotxcompile := $(wildcard .xcompile)
src:=$(shell pwd) src := $(shell pwd)
obj:=$(shell pwd)/build obj := $(shell pwd)/build
export src obj export src obj
# Do not print "Entering directory ...". # Do not print "Entering directory ...".
@ -97,6 +97,7 @@ include device/Makefile
include console/Makefile include console/Makefile
include mainboard/$(MAINBOARDDIR)/Makefile include mainboard/$(MAINBOARDDIR)/Makefile
include arch/$(ARCH)/Makefile include arch/$(ARCH)/Makefile
endif endif
include util/Makefile include util/Makefile

View file

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

View file

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

View file

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

View file

@ -35,12 +35,12 @@ config LINUXBIOS_ROMSIZE_KB_512
config LINUXBIOS_ROMSIZE_KB_1024 config LINUXBIOS_ROMSIZE_KB_1024
bool "1024 KB (1 MB)" bool "1024 KB (1 MB)"
help 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 config LINUXBIOS_ROMSIZE_KB_2048
bool "2048 KB (2 MB)" bool "2048 KB (2 MB)"
help 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 endchoice