diff options
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/Config.lb | 15 | ||||
| -rw-r--r-- | src/config/Options.lb | 41 |
2 files changed, 45 insertions, 11 deletions
diff --git a/src/config/Config.lb b/src/config/Config.lb index 4a99d07ffa..636e5537c6 100644 --- a/src/config/Config.lb +++ b/src/config/Config.lb @@ -7,7 +7,7 @@ makedefine LIBGCC_FILE_NAME := $(shell $(CC) -print-libgcc-file-name) makedefine GCC_INC_DIR := $(shell $(CC) -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp") makedefine CPPFLAGS := -I$(TOP)/src/include -I$(TOP)/src/arch/$(ARCH)/include -I$(GCC_INC_DIR) $(CPUFLAGS) -makedefine ROMCCPPFLAGS := -D__ROMCC__=0 -D__ROMCC_MINOR__=37 +makedefine ROMCCPPFLAGS := -D__ROMCC__=0 -D__ROMCC_MINOR__=38 makedefine CFLAGS := $(CPU_OPT) $(CPPFLAGS) -Os -nostdinc -nostdlib -fno-builtin -Wall makedefine HOSTCFLAGS:= -Os -Wall @@ -116,12 +116,12 @@ end makerule ./romcc depends "$(TOP)/util/romcc/romcc.c" - action "$(HOSTCC) -g $(HOSTCFLAGS) -DVERSION='\"0.37\"' -DRELEASE_DATE='\"21 October 2003\"' $< -o $@" + action "$(HOSTCC) -g $(HOSTCFLAGS) -DVERSION='\"0.38\"' -DRELEASE_DATE='\"18 December 2003\"' $< -o $@" end makerule build_opt_tbl - depends "$(TOP)/util/options/build_opt_tbl.c $(TOP)/src/include/pc80/mc146818rtc.h $(TOP)/src/include/boot/linuxbios_tables.h" - action "$(HOSTCC) $(HOSTCFLAGS) $< -o $@" + depends "$(TOP)/util/options/build_opt_tbl.c $(TOP)/src/include/pc80/mc146818rtc.h $(TOP)/src/include/boot/linuxbios_tables.h Makefile.settings Makefile" + action "$(HOSTCC) $(HOSTCFLAGS) $(CPUFLAGS) $< -o $@" end #makerule /$(TARGET_DIR)/option_table.c @@ -131,7 +131,12 @@ end makerule option_table.c depends "build_opt_tbl $(MAINBOARD)/cmos.layout" - action "./build_opt_tbl -b --config $(MAINBOARD)/cmos.layout" + action "./build_opt_tbl -b --config $(MAINBOARD)/cmos.layout --header option_table.h" +end + +makerule option_table.h + depends "build_opt_tbl $(MAINBOARD)/cmos.layout" + action "./build_opt_tbl -b --config $(MAINBOARD)/cmos.layout --header option_table.h" end if HAVE_OPTION_TABLE diff --git a/src/config/Options.lb b/src/config/Options.lb index 936f9c3727..a175f358e8 100644 --- a/src/config/Options.lb +++ b/src/config/Options.lb @@ -117,7 +117,7 @@ define OBJCOPY comment "Objcopy command" end define LINUXBIOS_VERSION - default "1.1.5" + default "1.1.6" export always comment "LinuxBIOS version" end @@ -318,6 +318,12 @@ define CONFIG_UNCOMPRESSED export always comment "Set for uncompressed image" end +define CONFIG_LB_MEM_TOPK + format "%d" + default 1024 + export always + comment "Kilobytes of memory to initialized before executing code from RAM" +end define HAVE_OPTION_TABLE default 0 export always @@ -331,6 +337,29 @@ define USE_OPTION_TABLE end ############################################### +# CMOS variable options +############################################### +define LB_CKS_RANGE_START + default 49 + format "%d" + export always + comment "First CMOS byte to use for LinuxBIOS options" +end +define LB_CKS_RANGE_END + default 125 + format "%d" + export always + comment "Last CMOS byte to use for LinuxBIOS options" +end +define LB_CKS_LOC + default 126 + format "%d" + export always + comment "Pair of bytes to use for CMOS checksum" +end + + +############################################### # Build targets ############################################### @@ -427,15 +456,15 @@ define MAINBOARD_VENDOR export always comment "Vendor of mainboard" end -define CONFIG_SYS_CLK_FREQ +define MAINBOARD_POWER_ON_AFTER_POWER_FAIL default none export used - comment "System clock frequency in MHz" + comment "Default power on after power fail setting" end -define CONFIG_KEYBOARD - default 0 +define CONFIG_SYS_CLK_FREQ + default none export used - comment "Run PC keyboard enable code" + comment "System clock frequency in MHz" end define CONFIG_LEGACY_VGABIOS default 0 |