Merge pull request #285 from Derekduke/master

正点阿尔法测试有问题

board/ALPHA_I.MX_emmc_256ddr/Makefile

@@ -7,13 +7,13 @@ CC			:= $(CROSS_COMPILE)gcc
 LD			:= $(CROSS_COMPILE)ld
 OBJCOPY 		:= $(CROSS_COMPILE)objcopy
 OBJDUMP 		:= $(CROSS_COMPILE)objdump
-GCC_VERSION		:= 6.5.0 # 4.9.4
+GCC_VERSION		:= 4.9.4
 
 LD_SCRIPT_S		:= link.ld.S
 LD_SCRIPT_DIR		:= $(TOP_DIR)/arch/arm/arm-v7a/lds
 LD_SCRIPT		:= link.ld
 
-GCC_DIR			:= D:\Green\gcc-arm-linux-gnueabihf
+GCC_DIR                 := /home/duke/linux/gcc/gcc-linaro-4.9.4-2017.01-x86_64_arm-linux-gnueabihf
 OUT_ROOT		:= out
 OBJ_DIR			:= obj
 LIB_DIR			:= lib

board/ALPHA_I.MX_emmc_256ddr/link.ld

@@ -0,0 +1,66 @@
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+ENTRY(_start)
+SECTIONS
+{
+    . = 0X87800000;
+    _start = .;
+    .text : AT(0X87800000) {
+        __text_start = .;
+        KEEP(*(.text.vector))
+        *(.text)
+        *(.text.*)
+        KEEP(*(.init))
+        KEEP(*(.fini))
+    }
+    .ARM.extab : ALIGN(4) {
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+    }
+    __exidx_start = .;
+    .ARM.exidx : ALIGN(4) {
+        *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    }
+    __exidx_end = .;
+    .dummy_post_text : {
+        __text_end = .;
+    }
+    .rodata : ALIGN(4) {
+        __rodata_start = .;
+        *(.rodata)
+        *(.rodata.*)
+    }
+    .dummy_post_rodata : {
+        __rodata_end = .;
+    }
+    .data : ALIGN(4) {
+        __data_start = .;
+        *(.data)
+        *(.data.*)
+    }
+    .ctors : ALIGN(4) {
+        __ctor_list = .;
+        KEEP (*(SORT(.init_array.*)))
+        KEEP (*(.ctors .init_array*))
+        __ctor_end = .;
+    }
+    .dtors : ALIGN(4) {
+        __dtor_list = .;
+        KEEP (*(SORT(.fini_array.*)))
+        KEEP (*(.dtors .fini_array*))
+        __dtor_end = .;
+    }
+    .dummy_post_rodata : {
+        __data_end = .;
+    }
+    .bss : ALIGN(4) {
+        KEEP(*(.bss.prebss.*))
+        . = ALIGN(4);
+        __bss_start__ = .;
+        *(.bss .bss.*)
+        *(COMMON)
+        . = ALIGN(4);
+        __bss_end__ = .;
+    }
+    _end = .;
+    /DISCARD/ : { *(.comment .note) }
+}

kernel/core/include/tos_k.h

@@ -25,8 +25,8 @@
 #include <tos_config_default.h>
 #include <port_config.h>
 #include <tos_config_check.h>
-#include <tos_cpu_types.h>
 #include <tos_ktypes.h>
+#include <tos_cpu_types.h>
 #include <port.h>
 #include <tos_cpu.h>
 #include <tos_fault.h>