Changeset 1b492b5 in mainline

Timestamp:

2005-09-05T12:48:54Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

2d9869b

Parents:

8f2153b

Message:

Backported amd64 build process back to ia32.

Location:

arch

Files:

• amd64/Makefile.inc (modified) (1 diff)
• amd64/_link.ld.in (modified) (2 diffs)
• ia32/Makefile.inc (modified) (1 diff)
• ia32/_link.ld.in (moved) (moved from arch/ia32/_link.ld ) (4 diffs)

arch/amd64/Makefile.inc

@@ -26 +26 @@
 LFLAGS=-M 
 
-../arch/amd64/_link.ld: ../arch/amd64/_link.ld.in
+../arch/$(ARCH)/_link.ld: ../arch/$(ARCH)/_link.ld.in
         $(CC) $(CFLAGS) -E -x c $< | grep -v "^\#" > $@
 

arch/amd64/_link.ld.in

@@ -38 +38 @@
                 *(.rodata*);            /* string literals */
                 hardcoded_load_address = .;
-                QUAD(ktext_start - SIZEOF(.unmapped));
+                QUAD(PA2KA(BOOT_OFFSET+BOOTSTRAP_OFFSET));
                 hardcoded_ktext_size = .;
                 QUAD(ktext_end - ktext_start + (unmapped_ktext_end - unmapped_ktext_start));
@@ -62 +62 @@
 
         _hardcoded_kernel_size = (ktext_end - ktext_start) + (unmapped_ktext_end - unmapped_ktext_start) + (kdata_end - kdata_start) + (unmapped_kdata_end - unmapped_kdata_start);
-        _boot_offset = 0x100000;
-        _ka2pa_offset = 0xffffffff80000000;
-        _map_address = _ka2pa_offset + _boot_offset;
-
 
         e820table_boot = KA2PA(e820table) - BOOT_OFFSET;

arch/ia32/Makefile.inc

@@ -21 +21 @@
 CFLAGS=$(CPPFLAGS) -nostdlib -fno-builtin -fomit-frame-pointer -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3
 LFLAGS=-M -no-check-sections
+
+../arch/$(ARCH)/_link.ld: ../arch/$(ARCH)/_link.ld.in
+        $(CC) $(CFLAGS) -E -x c $< | grep -v "^\#" > $@
 
 arch_sources= \

arch/ia32/_link.ld.in

@@ -9 +9 @@
  */
 
+#define __ASM__
+#include <arch/boot/boot.h>
+#include <arch/mm/page.h>
+
 OUTPUT_FORMAT(binary)
 ENTRY(kernel_image_start)
 
 SECTIONS {
-        .unmapped 0x8000: AT (0x8000) {
+        .unmapped BOOTSTRAP_OFFSET: AT (BOOTSTRAP_OFFSET) {
                 unmapped_ktext_start = .;
                 *(K_TEXT_START);
@@ -24 +28 @@
         }
         
-        .mapped (0x80100000+0x8000+SIZEOF(.unmapped)): AT (0x8000+SIZEOF(.unmapped)) { 
+        .mapped (PA2KA(BOOT_OFFSET+BOOTSTRAP_OFFSET)+SIZEOF(.unmapped)): AT (BOOTSTRAP_OFFSET+SIZEOF(.unmapped)) { 
                 ktext_start = .;
                 *(BOOT_DATA)
@@ -35 +39 @@
                 *(COMMON);              /* global variables */
                 hardcoded_load_address = .;
-                LONG(0x80108000);
+                LONG(PA2KA(BOOT_OFFSET+BOOTSTRAP_OFFSET));
                 hardcoded_ktext_size = .;
                 LONG(ktext_end - ktext_start + (unmapped_ktext_end - unmapped_ktext_start));
@@ -56 +60 @@
         _hardcoded_unmapped_size = (unmapped_ktext_end - unmapped_ktext_start) + (unmapped_kdata_end - unmapped_kdata_start);
         
-        _map_address = 0x80100000;
-        e820table_boot = e820table - _map_address;
-        e820counter_boot = e820counter - _map_address;
-        real_bootstrap_gdtr = real_bootstrap_gdtr_boot + 0x80000000;
+        e820table_boot = KA2PA(e820table) - BOOT_OFFSET;
+        e820counter_boot = KA2PA(e820counter) - BOOT_OFFSET;
+        real_bootstrap_gdtr = PA2KA(real_bootstrap_gdtr_boot);
 }