Changeset bae6169 in mainline

Timestamp:

2009-09-14T14:08:59Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

19b5929

Parents:

c35aabe

Message:

Do not define the hardcoded_* variables twice.
These variables should be defined in the linker script.

Location:

kernel/generic

Files:

• include/main/main.h (modified) (1 diff)
• src/main/main.c (modified) (1 diff)

kernel/generic/include/main/main.h

@@ -38 +38 @@
 #include <arch/types.h>
 
+extern size_t hardcoded_kdata_size;
+extern size_t hardcoded_ktext_size;
+extern uintptr_t hardcoded_load_address;
 extern uintptr_t stack_safe;
 

kernel/generic/src/main/main.c

@@ -101 +101 @@
 context_t ctx;
 
-/*
- * These 'hardcoded' variables will be intialized by
- * the linker or the low level assembler code with
- * appropriate sizes and addresses.
- */
-
-/** Virtual address of where the kernel is loaded. */
-uintptr_t hardcoded_load_address = 0;
-/** Size of the kernel code in bytes. */
-size_t hardcoded_ktext_size = 0;
-/** Size of the kernel data in bytes. */
-size_t hardcoded_kdata_size = 0;
 /** Lowest safe stack virtual address. */
 uintptr_t stack_safe = 0;