diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Kconfig.deprecated_options | 51 | ||||
| -rw-r--r-- | src/arch/i386/Kconfig | 8 | ||||
| -rw-r--r-- | src/cpu/amd/model_gx2/cache_as_ram.inc | 4 | ||||
| -rw-r--r-- | src/cpu/amd/model_lx/cache_as_ram.inc | 4 | ||||
| -rw-r--r-- | src/cpu/x86/32bit/entry32.inc | 2 | ||||
| -rw-r--r-- | src/include/boot/coreboot_tables.h | 10 | ||||
| -rw-r--r-- | src/pc80/usbdebug_serial.c | 3 |
7 files changed, 44 insertions, 38 deletions
diff --git a/src/Kconfig.deprecated_options b/src/Kconfig.deprecated_options index 448afca9b2..f6f6a4bedf 100644 --- a/src/Kconfig.deprecated_options +++ b/src/Kconfig.deprecated_options @@ -4,45 +4,48 @@ # It might be possible to consolidate hard_reset() to southbridges, # given that it (usually) uses its registers. -# The long term goal would be to eliminate hard_reset from boards. +# The long term goal would be to eliminate hard_reset() from boards. config BOARD_HAS_HARD_RESET - bool - default n - help - This variable specifies whether a given board has a reset.c - file containing a hard_reset() function. + bool + default n + help + This variable specifies whether a given board has a reset.c + file containing a hard_reset() function. # It might be possible to consolidate FADTs to southbridges. This would # improve code reuse in the tree. config BOARD_HAS_FADT - bool - default n - help - This variable specifies whether a given board has a board-local - FADT in fadt.c. Long-term, those should be moved to appropriate - chipset components (eg. southbridge) + bool + default n + help + This variable specifies whether a given board has a board-local + FADT in fadt.c. Long-term, those should be moved to appropriate + chipset components (eg. southbridge). # There ought to be a better place to put data than code. Also, make this # (or a similar) framework more universally usable, so all boards benefit # from sharing data between the various tables. config HAVE_BUS_CONFIG - bool - default n + bool + default n help This variable specifies whether a given board has a get_bus_conf.c file containing information about bus routing. -# Will be removed (alongside with the PS2 init code) once payloads -# reliably support PS2 init themselves. +# Will be removed (alongside with the PS/2 init code) once payloads +# reliably support PS/2 init themselves. config DRIVERS_PS2_KEYBOARD - bool "PS2 Keyboard init" + bool "PS/2 keyboard init" default y help - Enable this option to initialize PS2 keyboards found connected - to the PS2 port. Some payloads (eg, filo) require this - option. Other payloads (eg, SeaBIOS, Linux) do not require - it. Initializing a PS2 keyboard can take several hundred - milliseconds. + Enable this option to initialize PS/2 keyboards found connected + to the PS/2 port. + + Some payloads (eg, filo) require this option. Other payloads + (eg, SeaBIOS, Linux) do not require it. + Initializing a PS/2 keyboard can take several hundred milliseconds. + If you know you will only use a payload which does not require - this option, then you can say "n" here to speed up boot time. - Otherwise say "y". + this option, then you can say N here to speed up boot time. + Otherwise say Y. + diff --git a/src/arch/i386/Kconfig b/src/arch/i386/Kconfig index 7df5c53201..ef86d99119 100644 --- a/src/arch/i386/Kconfig +++ b/src/arch/i386/Kconfig @@ -76,10 +76,10 @@ config UPDATE_IMAGE default n depends on TINY_BOOTBLOCK help - If this option is activate, no new coreboot.rom file - is created. Instead it is expected that there already - is a suitable file for further processing. - The bootblock will not be modified. + If this option is enabled, no new coreboot.rom file + is created. Instead it is expected that there already + is a suitable file for further processing. + The bootblock will not be modified. config ROMCC bool diff --git a/src/cpu/amd/model_gx2/cache_as_ram.inc b/src/cpu/amd/model_gx2/cache_as_ram.inc index 09a7541676..433576c737 100644 --- a/src/cpu/amd/model_gx2/cache_as_ram.inc +++ b/src/cpu/amd/model_gx2/cache_as_ram.inc @@ -184,7 +184,7 @@ done_cache_as_ram_main: /* clear boot_complete flag */ xorl %ebp, %ebp __main: - post_code(0x11) /* post 11 */ + post_code(0x11) /* TODO For suspend/resume the cache will have to live between * CONFIG_RAMBASE and CONFIG_RAMTOP @@ -201,7 +201,7 @@ __main: call copy_and_run .Lhlt: - post_code(0xee) /* post fail ee */ + post_code(0xee) hlt jmp .Lhlt diff --git a/src/cpu/amd/model_lx/cache_as_ram.inc b/src/cpu/amd/model_lx/cache_as_ram.inc index b592bc51b9..a2e8f87e64 100644 --- a/src/cpu/amd/model_lx/cache_as_ram.inc +++ b/src/cpu/amd/model_lx/cache_as_ram.inc @@ -210,7 +210,7 @@ done_cache_as_ram_main: /* clear boot_complete flag */ xorl %ebp, %ebp __main: - post_code(0x11) /* post 11 */ + post_code(0x11) /* TODO For suspend/resume the cache will have to live between * CONFIG_RAMBASE and CONFIG_RAMTOP @@ -227,7 +227,7 @@ __main: call copy_and_run .Lhlt: - post_code(0xee) /* post fail ee */ + post_code(0xee) hlt jmp .Lhlt diff --git a/src/cpu/x86/32bit/entry32.inc b/src/cpu/x86/32bit/entry32.inc index abb4a97236..de3b6cdfaa 100644 --- a/src/cpu/x86/32bit/entry32.inc +++ b/src/cpu/x86/32bit/entry32.inc @@ -51,7 +51,7 @@ __protected_start: /* Save the BIST value */ movl %eax, %ebp - post_code(0x10) /* post 10 */ + post_code(0x10) movw $ROM_DATA_SEG, %ax movw %ax, %ds diff --git a/src/include/boot/coreboot_tables.h b/src/include/boot/coreboot_tables.h index 19d2881f43..cbfe3f3134 100644 --- a/src/include/boot/coreboot_tables.h +++ b/src/include/boot/coreboot_tables.h @@ -74,10 +74,10 @@ struct lb_header uint32_t table_entries; }; -/* Every entry in the boot enviroment list will correspond to a boot +/* Every entry in the boot environment list will correspond to a boot * info record. Encoding both type and size. The type is obviously * so you can tell what it is. The size allows you to skip that - * boot enviroment record if you don't know what it easy. This allows + * boot environment record if you don't know what it easy. This allows * forward compatibility with records not yet defined. */ struct lb_record { @@ -85,9 +85,9 @@ struct lb_record { uint32_t size; /* size of record (in bytes) */ }; -#define LB_TAG_UNUSED 0x0000 +#define LB_TAG_UNUSED 0x0000 -#define LB_TAG_MEMORY 0x0001 +#define LB_TAG_MEMORY 0x0001 struct lb_memory_range { struct lb_uint64 start; @@ -108,7 +108,7 @@ struct lb_memory { struct lb_memory_range map[0]; }; -#define LB_TAG_HWRPB 0x0002 +#define LB_TAG_HWRPB 0x0002 struct lb_hwrpb { uint32_t tag; uint32_t size; diff --git a/src/pc80/usbdebug_serial.c b/src/pc80/usbdebug_serial.c index f3e7d5f281..c58dce1294 100644 --- a/src/pc80/usbdebug_serial.c +++ b/src/pc80/usbdebug_serial.c @@ -1,6 +1,9 @@ /* * This file is part of the coreboot project. * + * Copyright (C) 2007 AMD + * Written by Yinghai Lu <yinghai.lu@amd.com> for AMD. + * * 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 * the Free Software Foundation; version 2 of the License. |