Changes in boot/arch/ia64/src/main.c [699f3bc:bbe4828] in mainline

File:

• boot/arch/ia64/src/main.c (modified) (3 diffs)

boot/arch/ia64/src/main.c

@@ -35 +35 @@
 #include <arch/_components.h>
 #include <genarch/efi.h>
-#include <arch/sal.h>
-#include <arch/pal.h>
 #include <halt.h>
 #include <printf.h>
@@ -119 +117 @@
 }
 
-static void read_pal_configuration(void)
+static void read_sal_configuration(void)
 {
-        if (bootpar) {
-                bootinfo.freq_scale = pal_proc_freq_ratio();
-        } else {
+        if (!bootpar) {
                 /* Configure default values for simulators. */
                 bootinfo.freq_scale = DEFAULT_FREQ_SCALE;
-        }
-}
-
-static void read_sal_configuration(void)
-{
-        if (bootpar && bootpar->efi_system_table) {
-                efi_guid_t sal_guid = SAL_SYSTEM_TABLE_GUID;
-                sal_system_table_header_t *sal_st;
-                
-                sal_st = efi_vendor_table_find(
-                    (efi_system_table_t *) bootpar->efi_system_table, sal_guid);
-
-                sal_system_table_parse(sal_st);
-                
-                bootinfo.sys_freq = sal_base_clock_frequency();
+                bootinfo.sys_freq = DEFAULT_SYS_FREQ;
         } else {
-                /* Configure default values for simulators. */
+                /* TODO: read the real values from SAL */
+                bootinfo.freq_scale = DEFAULT_FREQ_SCALE;
                 bootinfo.sys_freq = DEFAULT_SYS_FREQ;
         }
@@ -206 +189 @@
         read_efi_memmap();
         read_sal_configuration();
-        read_pal_configuration();
         
         printf("Booting the kernel ...\n");