Changeset 66def8d in mainline for arch/ia32/_link.ld.in

Timestamp:

2006-01-08T17:51:36Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8725fb4

Parents:

078a0a1

Message:

simplify and cleanup ia32 boot process, remove obsolete stuff

File:

• arch/ia32/_link.ld.in (modified) (4 diffs)

arch/ia32/_link.ld.in

@@ -14 +14 @@
 
 SECTIONS {
-        .unmapped BOOTSTRAP_OFFSET: AT (BOOTSTRAP_OFFSET) {
+        .unmapped BOOT_OFFSET: AT (0) {
                 unmapped_ktext_start = .;
                 *(K_TEXT_START);
-                *(K_TEXT_START_2);
                 unmapped_ktext_end = .;
         
@@ -25 +24 @@
         }
         
-        .mapped (PA2KA(BOOT_OFFSET+BOOTSTRAP_OFFSET)+SIZEOF(.unmapped)): AT (BOOTSTRAP_OFFSET+SIZEOF(.unmapped)) { 
+        .mapped (PA2KA(BOOT_OFFSET)+SIZEOF(.unmapped)): AT (SIZEOF(.unmapped)) { 
                 ktext_start = .;
                 *(.text);
@@ -35 +34 @@
                 *(COMMON);                      /* global variables */
                 hardcoded_load_address = .;
-                LONG(PA2KA(BOOT_OFFSET+BOOTSTRAP_OFFSET));
+                LONG(PA2KA(BOOT_OFFSET));
                 hardcoded_ktext_size = .;
                 LONG((ktext_end - ktext_start) + (unmapped_ktext_end - unmapped_ktext_start));
@@ -54 +53 @@
                 *(.comment);
         }
+        
+#ifdef CONFIG_SMP       
+        
+        _hardcoded_unmapped_size = (unmapped_ktext_end - unmapped_ktext_start) + (unmapped_kdata_end - unmapped_kdata_start);
+        ap_boot = unmapped_ap_boot - BOOT_OFFSET + AP_BOOT_OFFSET;
+        ap_gdtr = unmapped_ap_gdtr - BOOT_OFFSET + AP_BOOT_OFFSET;
+        protected_ap_gdtr = PA2KA(ap_gdtr);
 
-        
-        _hardcoded_kernel_size = (ktext_end - ktext_start) + (unmapped_ktext_end - unmapped_ktext_start) + (kdata_end - kdata_start) + (unmapped_kdata_end - unmapped_kdata_start);
-        _hardcoded_unmapped_size = (unmapped_ktext_end - unmapped_ktext_start) + (unmapped_kdata_end - unmapped_kdata_start);
-        
-        e820table_boot = KA2PA(e820table) - BOOT_OFFSET;
-        e820counter_boot = KA2PA(e820counter) - BOOT_OFFSET;
-        real_bootstrap_gdtr = PA2KA(real_bootstrap_gdtr_boot);
+#endif /* CONFIG_SMP */
+
 }