Changes in / [8d8eeb9:c6f08726] in mainline

Location:

boot

Files:

• arch/ia64/Makefile.inc (modified) (1 diff)
• arch/ia64/include/pal.h (deleted)
• arch/ia64/include/sal.h (deleted)
• arch/ia64/src/main.c (modified) (3 diffs)
• arch/ia64/src/pal.c (deleted)
• arch/ia64/src/pal_asm.S (deleted)
• arch/ia64/src/sal.c (deleted)
• arch/ia64/src/sal_asm.S (deleted)
• genarch/include/efi.h (modified) (2 diffs)
• genarch/src/efi.c (deleted)

boot/arch/ia64/Makefile.inc

@@ -45 +45 @@
         arch/$(BARCH)/src/asm.S \
         arch/$(BARCH)/src/main.c \
-        arch/$(BARCH)/src/sal.c \
-        arch/$(BARCH)/src/sal_asm.S \
-        arch/$(BARCH)/src/pal.c \
-        arch/$(BARCH)/src/pal_asm.S \
         arch/$(BARCH)/src/putchar.c \
         $(COMPS_C) \
-        genarch/src/efi.c \
         genarch/src/division.c \
         generic/src/balloc.c \

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");

boot/genarch/include/efi.h

@@ -30 +30 @@
 #define BOOT_EFI_H_
 
-#include <arch/types.h>
-
-typedef struct {
-        uint64_t signature;
-        uint32_t revision;
-        uint32_t header_size;
-        uint32_t crc32;
-        uint32_t reserved;
-} efi_table_header_t;
-
-#define SAL_SYSTEM_TABLE_GUID \
-        { \
-                { \
-                        0x32, 0x2d, 0x9d, 0xeb, 0x88, 0x2d, 0xd3, 0x11, \
-                        0x9a, 0x16, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d \
-                } \
-        }
-
-typedef union {
-        uint8_t bytes[16];
-        struct {
-                uint64_t low;
-                uint64_t high;
-        };
-} efi_guid_t;
-
-typedef struct {
-        efi_guid_t guid;
-        void *table;
-} efi_configuration_table_t;
-
-typedef struct {
-        efi_table_header_t hdr;
-        char *fw_vendor;
-        uint32_t fw_revision;
-        void *cons_in_handle;
-        void *cons_in;
-        void *cons_out_handle;
-        void *cons_out;
-        void *cons_err_handle;
-        void *cons_err;
-        void *runtime_services;
-        void *boot_services;
-        sysarg_t conf_table_entries;
-        efi_configuration_table_t *conf_table;
-} efi_system_table_t;
-
 typedef enum {
         EFI_RESERVED,
@@ -104 +57 @@
 #define EFI_PAGE_SIZE   4096
 
-extern void *efi_vendor_table_find(efi_system_table_t *, efi_guid_t);
-
 #endif