Rename almost all occurences of LinuxBIOS to coreboot.
Due to the automatic nature of this update, I am self-acking. It worked in abuild. Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3053 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer
committed by
Stefan Reinauer
Stefan Reinauer
parent
7e61e45402
commit
f8ee1806ac
@@ -27,102 +27,102 @@ end
|
||||
# action "perl -e 'foreach $$var (split(\" \", $$ENV{VARIABLES})) { if ($$ENV{$$var} =~ m/^(0x[0-9a-fA-F]+|0[0-7]+|[0-9]+)$$/) { print \"$$var = $$ENV{$$var};\n\"; }}' > $@"
|
||||
#end
|
||||
|
||||
makerule linuxbios.strip
|
||||
depends "linuxbios"
|
||||
action "$(OBJCOPY) -O binary linuxbios linuxbios.strip"
|
||||
makerule coreboot.strip
|
||||
depends "coreboot"
|
||||
action "$(OBJCOPY) -O binary coreboot coreboot.strip"
|
||||
end
|
||||
|
||||
makerule linuxbios.a
|
||||
makerule coreboot.a
|
||||
depends "$(OBJECTS)"
|
||||
action "rm -f linuxbios.a"
|
||||
action "ar cr linuxbios.a $(OBJECTS)"
|
||||
action "rm -f coreboot.a"
|
||||
action "ar cr coreboot.a $(OBJECTS)"
|
||||
end
|
||||
|
||||
makerule linuxbios_ram.o
|
||||
depends "$(DRIVER) linuxbios.a $(LIBGCC_FILE_NAME)"
|
||||
action "$(CC) -nostdlib -r -o $@ c_start.o $(DRIVER) linuxbios.a $(LIBGCC_FILE_NAME)"
|
||||
makerule coreboot_ram.o
|
||||
depends "$(DRIVER) coreboot.a $(LIBGCC_FILE_NAME)"
|
||||
action "$(CC) -nostdlib -r -o $@ c_start.o $(DRIVER) coreboot.a $(LIBGCC_FILE_NAME)"
|
||||
end
|
||||
|
||||
makerule linuxbios_ram
|
||||
depends "linuxbios_ram.o $(TOP)/src/config/linuxbios_ram.ld ldoptions"
|
||||
action "$(CC) -nostdlib -nostartfiles -static -o $@ -T $(TOP)/src/config/linuxbios_ram.ld linuxbios_ram.o"
|
||||
action "$(CROSS_COMPILE)nm -n linuxbios_ram | sort > linuxbios_ram.map"
|
||||
makerule coreboot_ram
|
||||
depends "coreboot_ram.o $(TOP)/src/config/linuxbios_ram.ld ldoptions"
|
||||
action "$(CC) -nostdlib -nostartfiles -static -o $@ -T $(TOP)/src/config/linuxbios_ram.ld coreboot_ram.o"
|
||||
action "$(CROSS_COMPILE)nm -n coreboot_ram | sort > coreboot_ram.map"
|
||||
end
|
||||
|
||||
##
|
||||
## By default compress the part of linuxbios that runs from RAM
|
||||
## By default compress the part of coreboot that runs from RAM
|
||||
##
|
||||
makedefine LINUXBIOS_RAM-$(CONFIG_COMPRESS):=linuxbios_ram.nrv2b
|
||||
makedefine LINUXBIOS_RAM-$(CONFIG_UNCOMPRESSED):=linuxbios_ram.bin
|
||||
makedefine COREBOOT_RAM-$(CONFIG_COMPRESS):=coreboot_ram.nrv2b
|
||||
makedefine COREBOOT_RAM-$(CONFIG_UNCOMPRESSED):=coreboot_ram.bin
|
||||
|
||||
makerule linuxbios_ram.bin
|
||||
depends "linuxbios_ram"
|
||||
makerule coreboot_ram.bin
|
||||
depends "coreboot_ram"
|
||||
action "$(OBJCOPY) -O binary $< $@"
|
||||
end
|
||||
|
||||
makerule linuxbios_ram.nrv2b
|
||||
depends "linuxbios_ram.bin nrv2b"
|
||||
makerule coreboot_ram.nrv2b
|
||||
depends "coreboot_ram.bin nrv2b"
|
||||
action "./nrv2b e $< $@"
|
||||
end
|
||||
|
||||
makerule linuxbios_ram.rom
|
||||
depends "$(LINUXBIOS_RAM-1)"
|
||||
action "cp $(LINUXBIOS_RAM-1) linuxbios_ram.rom"
|
||||
makerule coreboot_ram.rom
|
||||
depends "$(COREBOOT_RAM-1)"
|
||||
action "cp $(COREBOOT_RAM-1) coreboot_ram.rom"
|
||||
end
|
||||
|
||||
makedefine LINUXBIOS_APC:=
|
||||
makedefine COREBOOT_APC:=
|
||||
|
||||
if CONFIG_AP_CODE_IN_CAR
|
||||
#for ap code in cache
|
||||
|
||||
makerule linuxbios_apc.a
|
||||
makerule coreboot_apc.a
|
||||
depends "apc_auto.o"
|
||||
action "rm -f linuxbios_apc.a"
|
||||
action "ar cr linuxbios_apc.a apc_auto.o"
|
||||
action "rm -f coreboot_apc.a"
|
||||
action "ar cr coreboot_apc.a apc_auto.o"
|
||||
end
|
||||
|
||||
makerule linuxbios_apc.o
|
||||
depends "linuxbios_apc.a c_start.o $(LIBGCC_FILE_NAME)"
|
||||
action "$(CC) -nostdlib -r -o $@ c_start.o linuxbios_apc.a $(LIBGCC_FILE_NAME)"
|
||||
makerule coreboot_apc.o
|
||||
depends "coreboot_apc.a c_start.o $(LIBGCC_FILE_NAME)"
|
||||
action "$(CC) -nostdlib -r -o $@ c_start.o coreboot_apc.a $(LIBGCC_FILE_NAME)"
|
||||
end
|
||||
|
||||
makerule linuxbios_apc
|
||||
depends "linuxbios_apc.o $(TOP)/src/config/linuxbios_apc.ld ldoptions"
|
||||
action "$(CC) -nostdlib -nostartfiles -static -o $@ -T $(TOP)/src/config/linuxbios_apc.ld linuxbios_apc.o"
|
||||
action "$(CROSS_COMPILE)nm -n linuxbios_apc | sort > linuxbios_apc.map"
|
||||
makerule coreboot_apc
|
||||
depends "coreboot_apc.o $(TOP)/src/config/linuxbios_apc.ld ldoptions"
|
||||
action "$(CC) -nostdlib -nostartfiles -static -o $@ -T $(TOP)/src/config/linuxbios_apc.ld coreboot_apc.o"
|
||||
action "$(CROSS_COMPILE)nm -n coreboot_apc | sort > coreboot_apc.map"
|
||||
end
|
||||
|
||||
##
|
||||
## By default compress the part of linuxbios that runs from cache as ram
|
||||
## By default compress the part of coreboot that runs from cache as ram
|
||||
##
|
||||
makedefine LINUXBIOS_APC-$(CONFIG_COMPRESS):=linuxbios_apc.nrv2b
|
||||
makedefine LINUXBIOS_APC-$(CONFIG_UNCOMPRESSED):=linuxbios_apc.bin
|
||||
makedefine COREBOOT_APC-$(CONFIG_COMPRESS):=coreboot_apc.nrv2b
|
||||
makedefine COREBOOT_APC-$(CONFIG_UNCOMPRESSED):=coreboot_apc.bin
|
||||
|
||||
makerule linuxbios_apc.bin
|
||||
depends "linuxbios_apc"
|
||||
makerule coreboot_apc.bin
|
||||
depends "coreboot_apc"
|
||||
action "$(OBJCOPY) -O binary $< $@"
|
||||
end
|
||||
|
||||
makerule linuxbios_apc.nrv2b
|
||||
depends "linuxbios_apc.bin nrv2b"
|
||||
makerule coreboot_apc.nrv2b
|
||||
depends "coreboot_apc.bin nrv2b"
|
||||
action "./nrv2b e $< $@"
|
||||
end
|
||||
|
||||
makerule linuxbios_apc.rom
|
||||
depends "$(LINUXBIOS_APC-1)"
|
||||
action "cp $(LINUXBIOS_APC-1) linuxbios_apc.rom"
|
||||
makerule coreboot_apc.rom
|
||||
depends "$(COREBOOT_APC-1)"
|
||||
action "cp $(COREBOOT_APC-1) coreboot_apc.rom"
|
||||
end
|
||||
|
||||
makedefine LINUXBIOS_APC:=linuxbios_apc.rom
|
||||
makedefine COREBOOT_APC:=coreboot_apc.rom
|
||||
|
||||
end
|
||||
|
||||
makedefine LINUXBIOS_RAM_ROM:=linuxbios_ram.rom
|
||||
makedefine COREBOOT_RAM_ROM:=coreboot_ram.rom
|
||||
|
||||
makerule linuxbios
|
||||
depends "crt0.o $(INIT-OBJECTS) $(LINUXBIOS_APC) $(LINUXBIOS_RAM_ROM) ldscript.ld"
|
||||
makerule coreboot
|
||||
depends "crt0.o $(INIT-OBJECTS) $(COREBOOT_APC) $(COREBOOT_RAM_ROM) ldscript.ld"
|
||||
action "$(CC) -nostdlib -nostartfiles -static -o $@ -T ldscript.ld crt0.o $(INIT-OBJECTS)"
|
||||
action "$(CROSS_COMPILE)nm -n linuxbios | sort > linuxbios.map"
|
||||
action "$(CROSS_COMPILE)nm -n coreboot | sort > coreboot.map"
|
||||
end
|
||||
|
||||
#makerule crt0.S
|
||||
@@ -158,14 +158,14 @@ makerule tags
|
||||
depends "$(SOURCES)"
|
||||
action "ctags $(SOURCES)"
|
||||
end
|
||||
makerule LinuxBIOSDoc.config
|
||||
depends "$(TOP)/src/config/LinuxBIOSDoc.config"
|
||||
action "cat $(TOP)/src/config/LinuxBIOSDoc.config > LinuxBIOSDoc.config"
|
||||
action "echo 'INPUT=$(SOURCES)' >> LinuxBIOSDoc.config"
|
||||
makerule corebootDoc.config
|
||||
depends "$(TOP)/src/config/corebootDoc.config"
|
||||
action "cat $(TOP)/src/config/corebootDoc.config > corebootDoc.config"
|
||||
action "echo 'INPUT=$(SOURCES)' >> corebootDoc.config"
|
||||
end
|
||||
makerule documentation
|
||||
depends "LinuxBIOSDoc.config"
|
||||
action "doxygen LinuxBIOSDoc.config"
|
||||
depends "corebootDoc.config"
|
||||
action "doxygen corebootDoc.config"
|
||||
end
|
||||
|
||||
makerule ./romcc
|
||||
@@ -204,12 +204,12 @@ object ./option_table.o
|
||||
end
|
||||
|
||||
makerule clean
|
||||
action "rm -f linuxbios.* *~"
|
||||
action "rm -f linuxbios"
|
||||
action "rm -f coreboot.* *~"
|
||||
action "rm -f coreboot"
|
||||
action "rm -f ldscript.ld"
|
||||
action "rm -f a.out *.s *.l *.o *.E *.inc"
|
||||
action "rm -f TAGS tags romcc*"
|
||||
action "rm -f docipl buildrom* chips.c *chip.c linuxbios_apc* linuxbios_ram* linuxbios_pay*"
|
||||
action "rm -f docipl buildrom* chips.c *chip.c coreboot_apc* coreboot_ram* coreboot_pay*"
|
||||
action "rm -f build_opt_tbl* nrv2b* option_table.c crt0.S"
|
||||
end
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#---------------------------------------------------------------------------
|
||||
# Project related configuration options
|
||||
#---------------------------------------------------------------------------
|
||||
PROJECT_NAME = LinuxBIOS
|
||||
PROJECT_NAME = coreboot
|
||||
PROJECT_NUMBER =
|
||||
OUTPUT_DIRECTORY = .
|
||||
CREATE_SUBDIRS = NO
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#######################################################
|
||||
#
|
||||
# Main options file for LinuxBIOS
|
||||
# Main options file for coreboot
|
||||
#
|
||||
# Each option used by a part must be defined in
|
||||
# this file. The format for options is:
|
||||
@@ -96,62 +96,62 @@ define OBJCOPY
|
||||
export always
|
||||
comment "Objcopy command"
|
||||
end
|
||||
define LINUXBIOS_VERSION
|
||||
define COREBOOT_VERSION
|
||||
default "2.0.0"
|
||||
export always
|
||||
format "\"%s\""
|
||||
comment "LinuxBIOS version"
|
||||
comment "coreboot version"
|
||||
end
|
||||
define LINUXBIOS_EXTRA_VERSION
|
||||
define COREBOOT_EXTRA_VERSION
|
||||
default ""
|
||||
export used
|
||||
format "\"%s\""
|
||||
comment "LinuxBIOS extra version"
|
||||
comment "coreboot extra version"
|
||||
end
|
||||
define LINUXBIOS_BUILD
|
||||
define COREBOOT_BUILD
|
||||
default "$(shell date)"
|
||||
export always
|
||||
format "\"%s\""
|
||||
comment "Build date"
|
||||
end
|
||||
define LINUXBIOS_COMPILE_TIME
|
||||
define COREBOOT_COMPILE_TIME
|
||||
default "$(shell date +%T)"
|
||||
export always
|
||||
format "\"%s\""
|
||||
comment "Build time"
|
||||
end
|
||||
define LINUXBIOS_COMPILE_BY
|
||||
define COREBOOT_COMPILE_BY
|
||||
default "$(shell whoami)"
|
||||
export always
|
||||
format "\"%s\""
|
||||
comment "Who build this image"
|
||||
end
|
||||
define LINUXBIOS_COMPILE_HOST
|
||||
define COREBOOT_COMPILE_HOST
|
||||
default "$(shell hostname)"
|
||||
export always
|
||||
format "\"%s\""
|
||||
comment "Build host"
|
||||
end
|
||||
|
||||
define LINUXBIOS_COMPILE_DOMAIN
|
||||
define COREBOOT_COMPILE_DOMAIN
|
||||
default "$(shell dnsdomainname)"
|
||||
export always
|
||||
format "\"%s\""
|
||||
comment "Build domain name"
|
||||
end
|
||||
define LINUXBIOS_COMPILER
|
||||
define COREBOOT_COMPILER
|
||||
default "$(shell $(CC) $(CFLAGS) -v 2>&1 | tail -n 1)"
|
||||
export always
|
||||
format "\"%s\""
|
||||
comment "Build compiler"
|
||||
end
|
||||
define LINUXBIOS_LINKER
|
||||
define COREBOOT_LINKER
|
||||
default "$(shell $(CC) -Wl,--version 2>&1 | grep version | tail -n 1)"
|
||||
export always
|
||||
format "\"%s\""
|
||||
comment "Build linker"
|
||||
end
|
||||
define LINUXBIOS_ASSEMBLER
|
||||
define COREBOOT_ASSEMBLER
|
||||
default "$(shell touch dummy.s ; $(CC) -c -Wa,-v dummy.s 2>&1; rm -f dummy.s dummy.o )"
|
||||
export always
|
||||
format "\"%s\""
|
||||
@@ -242,13 +242,13 @@ define _ROMBASE
|
||||
default {PAYLOAD_SIZE}
|
||||
format "0x%x"
|
||||
export always
|
||||
comment "Base address of LinuxBIOS in ROM"
|
||||
comment "Base address of coreboot in ROM"
|
||||
end
|
||||
define _ROMSTART
|
||||
default none
|
||||
format "0x%x"
|
||||
export used
|
||||
comment "Start address of LinuxBIOS in ROM"
|
||||
comment "Start address of coreboot in ROM"
|
||||
end
|
||||
define _RESET
|
||||
default {_ROMBASE}
|
||||
@@ -278,13 +278,13 @@ define _RAMBASE
|
||||
default none
|
||||
format "0x%x"
|
||||
export always
|
||||
comment "Base address of LinuxBIOS in RAM"
|
||||
comment "Base address of coreboot in RAM"
|
||||
end
|
||||
define _RAMSTART
|
||||
default none
|
||||
format "0x%x"
|
||||
export used
|
||||
comment "Start address of LinuxBIOS in RAM"
|
||||
comment "Start address of coreboot in RAM"
|
||||
end
|
||||
define USE_DCACHE_RAM
|
||||
default 0
|
||||
@@ -317,7 +317,7 @@ end
|
||||
define CONFIG_AP_CODE_IN_CAR
|
||||
default 0
|
||||
export always
|
||||
comment "will copy linuxbios_apc to AP cache ane execute in AP"
|
||||
comment "will copy coreboot_apc to AP cache ane execute in AP"
|
||||
end
|
||||
define MEM_TRAIN_SEQ
|
||||
default 0
|
||||
@@ -333,13 +333,13 @@ define XIP_ROM_BASE
|
||||
default 0
|
||||
format "0x%x"
|
||||
export used
|
||||
comment "Start address of area to cache during LinuxBIOS execution directly from ROM"
|
||||
comment "Start address of area to cache during coreboot execution directly from ROM"
|
||||
end
|
||||
define XIP_ROM_SIZE
|
||||
default 0
|
||||
format "0x%x"
|
||||
export used
|
||||
comment "Size of area to cache during LinuxBIOS execution directly from ROM"
|
||||
comment "Size of area to cache during coreboot execution directly from ROM"
|
||||
end
|
||||
define CONFIG_COMPRESS
|
||||
default 1
|
||||
@@ -377,13 +377,13 @@ define LB_CKS_RANGE_START
|
||||
default 49
|
||||
format "%d"
|
||||
export always
|
||||
comment "First CMOS byte to use for LinuxBIOS options"
|
||||
comment "First CMOS byte to use for coreboot options"
|
||||
end
|
||||
define LB_CKS_RANGE_END
|
||||
default 125
|
||||
format "%d"
|
||||
export always
|
||||
comment "Last CMOS byte to use for LinuxBIOS options"
|
||||
comment "Last CMOS byte to use for coreboot options"
|
||||
end
|
||||
define LB_CKS_LOC
|
||||
default 126
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
|
||||
# by quotes) that should identify the project.
|
||||
|
||||
PROJECT_NAME = "LinuxBIOS"
|
||||
PROJECT_NAME = "coreboot"
|
||||
|
||||
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
|
||||
# This could be handy for archiving the generated documentation or
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
/*
|
||||
* Written by Johan Rydberg, based on work by Daniel Kahlin.
|
||||
* Rewritten by Eric Biederman
|
||||
* 2005.12 yhlu add linuxbios_ram cross the vga font buffer handling
|
||||
* 2005.12 yhlu add coreboot_ram cross the vga font buffer handling
|
||||
* 2006.05 yhlu tailed it to use it for AP code in cache
|
||||
*/
|
||||
/*
|
||||
@@ -85,12 +85,12 @@ SECTIONS
|
||||
}
|
||||
_eheap = .;
|
||||
/* The ram segment
|
||||
* This is all address of the memory resident copy of linuxBIOS.
|
||||
* This is all address of the memory resident copy of coreboot.
|
||||
*/
|
||||
_ram_seg = _text;
|
||||
_eram_seg = _eheap;
|
||||
|
||||
_bogus = ASSERT( ( _eram_seg <= ((DCACHE_RAM_BASE + DCACHE_RAM_SIZE - DCACHE_RAM_GLOBAL_VAR_SIZE))) , "linuxbios_apc is too big");
|
||||
_bogus = ASSERT( ( _eram_seg <= ((DCACHE_RAM_BASE + DCACHE_RAM_SIZE - DCACHE_RAM_GLOBAL_VAR_SIZE))) , "coreboot_apc is too big");
|
||||
|
||||
/DISCARD/ : {
|
||||
*(.comment)
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
/*
|
||||
* Written by Johan Rydberg, based on work by Daniel Kahlin.
|
||||
* Rewritten by Eric Biederman
|
||||
* 2005.12 yhlu add linuxbios_ram cross the vga font buffer handling
|
||||
* 2005.12 yhlu add coreboot_ram cross the vga font buffer handling
|
||||
*/
|
||||
/*
|
||||
* We use ELF as output format. So that we can
|
||||
@@ -57,7 +57,7 @@ SECTIONS
|
||||
/*
|
||||
* kevinh/Ispiri - Added an align, because the objcopy tool
|
||||
* incorrectly converts sections that are not long word aligned.
|
||||
* This breaksthe linuxbios.strip target.
|
||||
* This breaks the coreboot.strip target.
|
||||
*/
|
||||
. = ALIGN(4);
|
||||
|
||||
@@ -104,7 +104,7 @@ SECTIONS
|
||||
}
|
||||
_eheap = .;
|
||||
/* The ram segment
|
||||
* This is all address of the memory resident copy of linuxBIOS.
|
||||
* This is all address of the memory resident copy of coreboot.
|
||||
*/
|
||||
_ram_seg = _text;
|
||||
_eram_seg = _eheap;
|
||||
|
||||
Reference in New Issue
Block a user