Changeset 5146


Ignore:
Timestamp:
Feb 22, 2010, 5:41:49 PM (5 years ago)
Author:
uwe
Message:

Random cosmetic fixes (trivial).

  • Fix typos.
  • Whitespace and consistency fixes.
  • Make "menuconfig" help easily readable in 80x25 terminals / xterms.
  • Use full/correct prototype for cbfs_and_run_core() everywhere.
  • More cosmetic fixes in license headers.


Signed-off-by: Uwe Hermann <uwe@…>
Acked-by: Uwe Hermann <uwe@…>

Location:
trunk/src
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/arch/i386/lib/cbfs_and_run.c

    r4863 r5146  
    66 * This program is free software; you can redistribute it and/or
    77 * modify it under the terms of the GNU General Public License as
    8  * published by the Free Software Foundation; version 2 of
    9  * the License.
     8 * published by the Free Software Foundation; version 2 of the License.
    109 *
    1110 * This program is distributed in the hope that it will be useful,
     
    1615 * You should have received a copy of the GNU General Public License
    1716 * along with this program; if not, write to the Free Software
    18  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    19  * MA 02110-1301 USA
     17 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
    2018 */
    2119
     
    2321#include <cbfs.h>
    2422
    25 void cbfs_and_run_core(char *filename, unsigned ebp)
     23void cbfs_and_run_core(const char *filename, unsigned ebp)
    2624{
    2725        u8 *dst;
  • trunk/src/cpu/amd/car/copy_and_run.c

    r5102 r5146  
    44*/
    55
    6 void cbfs_and_run_core(const char*, unsigned ebp);
     6void cbfs_and_run_core(const char *filename, unsigned ebp);
    77
    88static void copy_and_run(void)
  • trunk/src/cpu/x86/car/copy_and_run.c

    r5136 r5146  
    88 * This program is free software; you can redistribute it and/or
    99 * modify it under the terms of the GNU General Public License as
    10  * published by the Free Software Foundation; version 2 of
    11  * the License.
     10 * published by the Free Software Foundation; version 2 of the License.
    1211 *
    1312 * This program is distributed in the hope that it will be useful,
     
    1817 * You should have received a copy of the GNU General Public License
    1918 * along with this program; if not, write to the Free Software
    20  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    21  * MA 02110-1301 USA
     19 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
    2220 */
    2321
    24 void cbfs_and_run_core(const char *, unsigned ebp);
     22void cbfs_and_run_core(const char *filename, unsigned ebp);
    2523
    2624static void copy_and_run(unsigned cpu_reset)
  • trunk/src/devices/Kconfig

    r5135 r5146  
    6060
    6161config PCI_OPTION_ROM_RUN_YABEL
    62         prompt "Secure Mode"
     62        prompt "Secure mode"
    6363        bool
    6464        help
    6565          If you select this option, the x86emu CPU emulator will be used to
    6666          execute PCI option ROMs.
    67           This option prevents option ROMs from doing dirty tricks with the
    68           system (such as installing SMM modules or hypervisors), but it is also
    69           significantly slower than the native option ROM initialization method.
     67
     68          This option prevents option ROMs from doing dirty tricks with the
     69          system (such as installing SMM modules or hypervisors), but it is
     70          also significantly slower than the native option ROM initialization
     71          method.
     72
    7073          This is the default choice for non-x86 systems.
     74
    7175endchoice
    7276
     
    7882        depends on PCI_OPTION_ROM_RUN_YABEL
    7983        help
    80           Set CONFIG_YABEL_DEBUG_FLAGS is a binary switch that allows you
     84          CONFIG_YABEL_DEBUG_FLAGS is a binary switch that allows you
    8185          to select the following items to debug. 1=on 0=off. After you
    82           decide what you want to debug create the binary value, convert to hex
    83           and set the Option (Ex. CONFIG_YABEL_DEBUG_FLAGS = 0x31FF //Debug All).
    84 
    85           |-DEBUG_JMP - print info about JMP and RETF opcodes from x86emu
    86           ||-DEBUG_TRACE_X86EMU - print _all_ opcodes that are executed by x86emu (WARNING: this will produce a LOT of output)
     86          decide what you want to debug create the binary value, convert to
     87          hex and set the option.
     88
     89          Example for "debug all":
     90            CONFIG_YABEL_DEBUG_FLAGS = 0x31FF
     91
     92          |-DEBUG_JMP - Print info about JMP and RETF opcodes from x86emu
     93          ||-DEBUG_TRACE_X86EMU - Print _all_ opcodes that are executed by
     94          ||                      x86emu (WARNING: this will produce a LOT
     95          ||                      of output)
    8796          |||-Currently unused
    8897          ||||-Currently unused
    8998          |||||-Currently unused
    90           ||||||-DEBUG_PNP - Print Plug And Play access made by option rom
     99          ||||||-DEBUG_PNP - Print Plug And Play accesses made by option ROM
    91100          |||||||-DEBUG_DISK - Print Disk I/O related messages, currently unused
    92           ||||||||-DEBUG_PMM - Print messages related to POST Memory Manager (PMM)
    93           |||||||||-DEBUG_VBE - Print messages related to VESA BIOS Extension (VBE) functions
    94           ||||||||||-DEBUG_PRINT_INT10 - let INT10 (i.e. character output) calls print messages to Debug output
     101          ||||||||-DEBUG_PMM - Print messages related to POST Memory
     102          ||||||||             Manager (PMM)
     103          |||||||||-DEBUG_VBE - Print messages related to VESA BIOS Extension
     104          |||||||||             (VBE) functions
     105          ||||||||||-DEBUG_PRINT_INT10 - Let INT10 (i.e. character output)
     106          ||||||||||                     calls print messages to debug output
    95107          |||||||||||-DEBUG_INTR - Print messages related to interrupt handling
    96           ||||||||||||-DEBUG_CHECK_VMEM_ACCESS - Print messages related to accesse to certain areas of the virtual Memory (e.g. BDA (BIOS Data Area) or Interrupt Vectors)
    97           |||||||||||||-DEBUG_MEM - Print memory access made by option rom (NOTE: this also includes accesses to fetch instructions)
    98           ||||||||||||||-DEBUG_IO - Print I/O access made by option rom
    99           11000111111111 - Max Binary Value, Debug All (WARNING: - This could run for hours)
    100        
    101           DEBUG_IO                0x0001
    102           DEBUG_MEM               0x0002
    103           DEBUG_CHECK_VMEM_ACCESS 0x0004
    104           DEBUG_INTR              0x0008
    105           DEBUG_PRINT_INT10       0x0010
    106           DEBUG_VBE               0x0020
    107           DEBUG_PMM               0x0040
    108           DEBUG_DISK              0x0080
    109           DEBUG_PNP               0x0100
    110           DEBUG_TRACE_X86EMU      0x1000
    111           DEBUG_JMP               0x2000
    112 
    113           See debug.h for values 0 is no debug output, 0x31ff is _verbose_.
     108          ||||||||||||-DEBUG_CHECK_VMEM_ACCESS - Print messages related to
     109          ||||||||||||                           accesses to certain areas of
     110          ||||||||||||                           the virtual memory (e.g. BDA
     111          ||||||||||||                           (BIOS Data Area) or interrupt
     112          ||||||||||||                           vectors)
     113          |||||||||||||-DEBUG_MEM - Print memory accesses made by option ROM
     114          |||||||||||||             (NOTE: this also includes accesses to
     115          |||||||||||||             fetch instructions)
     116          ||||||||||||||-DEBUG_IO - Print I/O accesses made by option ROM
     117          11000111111111 - Maximum binary value, i.e. "debug all"
     118                           (WARNING: This could run for hours)
     119
     120          DEBUG_IO                      0x0001
     121          DEBUG_MEM                     0x0002
     122          DEBUG_CHECK_VMEM_ACCESS       0x0004
     123          DEBUG_INTR                    0x0008
     124          DEBUG_PRINT_INT10             0x0010
     125          DEBUG_VBE                     0x0020
     126          DEBUG_PMM                     0x0040
     127          DEBUG_DISK                    0x0080
     128          DEBUG_PNP                     0x0100
     129          DEBUG_TRACE_X86EMU            0x1000
     130          DEBUG_JMP                     0x2000
     131
     132          See debug.h for values. 0 is no debug output, 0x31ff is _verbose_.
    114133
    115134config YABEL_PCI_ACCESS_OTHER_DEVICES
    116         prompt "Allow option roms to acces other devices"
    117         bool
    118         depends on PCI_OPTION_ROM_RUN_YABEL
    119         help
    120           Per default, YABEL only allows option roms to access the PCI device
     135        prompt "Allow option ROMs to access other devices"
     136        bool
     137        depends on PCI_OPTION_ROM_RUN_YABEL
     138        help
     139          Per default, YABEL only allows option ROMs to access the PCI device
    121140          that they are associated with. However, this causes trouble for some
    122           onboard graphics chips whose option rom needs to reconfigure the
    123           north bridge. 
     141          onboard graphics chips whose option ROM needs to reconfigure the
     142          north bridge.
    124143
    125144config YABEL_VIRTMEM_LOCATION
     
    133152
    134153config YABEL_DIRECTHW
    135         prompt "Direct Hardware Access"
     154        prompt "Direct hardware access"
    136155        bool
    137156        depends on PCI_OPTION_ROM_RUN_YABEL
    138157        help
    139158          YABEL consists of two parts: It uses x86emu for the CPU emulation and
    140           additionally provides a PC system emulation that filters bad device and
    141           memory access (such as PCI config space access to other devices than the
    142           initialized one).
     159          additionally provides a PC system emulation that filters bad device
     160          and memory access (such as PCI config space access to other devices
     161          than the initialized one).
     162
    143163          When choosing this option, x86emu will pass through all hardware
    144           accesses to memory and IO devices to the underlying memory and IO
     164          accesses to memory and I/O devices to the underlying memory and I/O
    145165          addresses. While this option prevents option ROMs from doing dirty
    146166          tricks with the CPU (such as installing SMM modules or hypervisors),
     
    154174        help
    155175          This option shows a graphical bootsplash screen. The grapics are
    156           loaded from the CBFS file bootsplash.jpg
    157 
     176          loaded from the CBFS file bootsplash.jpg.
     177
     178# TODO: Turn this into a "choice".
    158179config FRAMEBUFFER_VESA_MODE
    159180        prompt "VESA framebuffer video mode"
     
    163184        help
    164185          This option sets the resolution used for the coreboot framebuffer and
    165           bootsplash screen. Set to 0x117 for 1024x768x16. A diligent soul will 
     186          bootsplash screen. Set to 0x117 for 1024x768x16. A diligent soul will
    166187          some day make this a "choice".
    167188
     
    172193        help
    173194          This option keeps the framebuffer mode set after coreboot finishes
    174           execution. If this option is enabled, coreboot will pass a framebuffer
    175           entry in its coreboot table and the payload will need a framebuffer
    176           driver. If this option is disabled, coreboot will switch back to
    177           text mode before handing control to a payload.
     195          execution. If this option is enabled, coreboot will pass a
     196          framebuffer entry in its coreboot table and the payload will need a
     197          framebuffer driver. If this option is disabled, coreboot will switch
     198          back to text mode before handing control to a payload.
    178199
    179200config CONSOLE_VGA_MULTI
  • trunk/src/include/boot/coreboot_tables.h

    r5135 r5146  
    99 * other means, such as quering the hardware directly.
    1010 *
    11  * All of the information should be Position Independent Data. 
     11 * All of the information should be Position Independent Data.
    1212 * That is it should be safe to relocated any of the information
    1313 * without it's meaning/correctnes changing.   For table that
     
    3232 */
    3333
    34 /* Since coreboot is usually compiled 32bit, gcc will align 64bit 
    35  * types to 32bit boundaries. If the coreboot table is dumped on a 
     34/* Since coreboot is usually compiled 32bit, gcc will align 64bit
     35 * types to 32bit boundaries. If the coreboot table is dumped on a
    3636 * 64bit system, a uint64_t would be aligned to 64bit boundaries,
    3737 * breaking the table format.
     
    5151static inline uint64_t unpack_lb64(struct lb_uint64 value)
    5252{
    53         uint64_t result;
    54         result = value.hi;
    55         result = (result << 32) + value.lo;
    56         return result;
     53        uint64_t result;
     54        result = value.hi;
     55        result = (result << 32) + value.lo;
     56        return result;
    5757}
    5858
    5959static inline struct lb_uint64 pack_lb64(uint64_t value)
    6060{
    61         struct lb_uint64 result;
    62         result.lo = (value >> 0) & 0xffffffff;
    63         result.hi = (value >> 32) & 0xffffffff;
    64         return result;
     61        struct lb_uint64 result;
     62        result.lo = (value >> 0) & 0xffffffff;
     63        result.hi = (value >> 32) & 0xffffffff;
     64        return result;
    6565}
    66 
    67 
    6866
    6967struct lb_header
     
    179177        uint32_t size;
    180178
    181         uint64_t physical_address;
    182         uint32_t x_resolution;
    183         uint32_t y_resolution;
    184         uint32_t bytes_per_line;
    185         uint8_t bits_per_pixel;
    186         uint8_t red_mask_pos;
    187         uint8_t red_mask_size;
    188         uint8_t green_mask_pos;
    189         uint8_t green_mask_size;
    190         uint8_t blue_mask_pos;
    191         uint8_t blue_mask_size;
    192         uint8_t reserved_mask_pos;
    193         uint8_t reserved_mask_size;
     179        uint64_t physical_address;
     180        uint32_t x_resolution;
     181        uint32_t y_resolution;
     182        uint32_t bytes_per_line;
     183        uint8_t bits_per_pixel;
     184        uint8_t red_mask_pos;
     185        uint8_t red_mask_size;
     186        uint8_t green_mask_pos;
     187        uint8_t green_mask_size;
     188        uint8_t blue_mask_pos;
     189        uint8_t blue_mask_size;
     190        uint8_t reserved_mask_pos;
     191        uint8_t reserved_mask_size;
    194192};
    195193
     
    267265};
    268266
    269 
    270 
    271267#endif /* COREBOOT_TABLES_H */
  • trunk/src/include/cbfs.h

    r4752 r5146  
    170170struct cbfs_header *cbfs_master_header(void);
    171171struct cbfs_file *cbfs_find(const char *name);
    172 void cbfs_and_run_core(char* filename, unsigned int ebp);
     172void cbfs_and_run_core(const char *filename, unsigned int ebp);
    173173
    174174#endif
  • trunk/src/lib/jpeg.c

    r5135 r5146  
    11/*
    22 * This file is part of the coreboot project.
    3  * 
    4  * Copyright (C) 2001 by Michael Schroeder
     3 *
     4 * Copyright (C) 2001 Michael Schroeder
    55 *
    66 * This program is free software; you can redistribute it and/or
    77 * modify it under the terms of the GNU General Public License as
    8  * published by the Free Software Foundation; version 2 of
    9  * the License.
     8 * published by the Free Software Foundation; version 2 of the License.
    109 *
    1110 * This program is distributed in the hope that it will be useful,
     
    1615 * You should have received a copy of the GNU General Public License
    1716 * along with this program; if not, write to the Free Software
    18  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    19  * MA 02110-1301 USA
     17 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
    2018 */
    2119
  • trunk/src/lib/jpeg.h

    r5135 r5146  
    11/*
    22 * This file is part of the coreboot project.
    3  * 
    4  * Copyright (C) 2001 by Michael Schroeder
     3 *
     4 * Copyright (C) 2001 Michael Schroeder
    55 *
    66 * This program is free software; you can redistribute it and/or
    77 * modify it under the terms of the GNU General Public License as
    8  * published by the Free Software Foundation; version 2 of
    9  * the License.
     8 * published by the Free Software Foundation; version 2 of the License.
    109 *
    1110 * This program is distributed in the hope that it will be useful,
     
    1615 * You should have received a copy of the GNU General Public License
    1716 * along with this program; if not, write to the Free Software
    18  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    19  * MA 02110-1301 USA
     17 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
    2018 */
    2119
Note: See TracChangeset for help on using the changeset viewer.