Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset db6e419 in mainline for boot/arch/ia64/src/main.c


Ignore:
Timestamp:
2011-08-16T18:53:00Z (10 years ago)
Author:
Petr Koupy <petr.koupy@…>
Branches:
lfn, master
Children:
49160c4
Parents:
e0e922d (diff), 45058baa (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • boot/arch/ia64/src/main.c

    re0e922d rdb6e419  
    3535#include <arch/_components.h>
    3636#include <genarch/efi.h>
     37#include <arch/sal.h>
     38#include <arch/pal.h>
    3739#include <halt.h>
    3840#include <printf.h>
     
    117119}
    118120
    119 static void read_sal_configuration(void)
    120 {
    121         if (!bootpar) {
     121static void read_pal_configuration(void)
     122{
     123        if (bootpar) {
     124                bootinfo.freq_scale = pal_proc_freq_ratio();
     125        } else {
    122126                /* Configure default values for simulators. */
    123127                bootinfo.freq_scale = DEFAULT_FREQ_SCALE;
    124                 bootinfo.sys_freq = DEFAULT_SYS_FREQ;
     128        }
     129}
     130
     131static void read_sal_configuration(void)
     132{
     133        if (bootpar && bootpar->efi_system_table) {
     134                efi_guid_t sal_guid = SAL_SYSTEM_TABLE_GUID;
     135                sal_system_table_header_t *sal_st;
     136               
     137                sal_st = efi_vendor_table_find(
     138                    (efi_system_table_t *) bootpar->efi_system_table, sal_guid);
     139
     140                sal_system_table_parse(sal_st);
     141               
     142                bootinfo.sys_freq = sal_base_clock_frequency();
    125143        } else {
    126                 /* TODO: read the real values from SAL */
    127                 bootinfo.freq_scale = DEFAULT_FREQ_SCALE;
     144                /* Configure default values for simulators. */
    128145                bootinfo.sys_freq = DEFAULT_SYS_FREQ;
    129146        }
     
    189206        read_efi_memmap();
    190207        read_sal_configuration();
     208        read_pal_configuration();
    191209       
    192210        printf("Booting the kernel ...\n");
Note: See TracChangeset for help on using the changeset viewer.