Forráskód Böngészése

or1k: update kernel and gcc

Waldemar Brodkorb 8 éve
szülő
commit
b54977a453

+ 3 - 3
target/config/Config.in.gcc

@@ -9,7 +9,7 @@ default ADK_TOOLCHAIN_GCC_4_8_5 if ADK_TARGET_ARCH_C6X
 default ADK_TOOLCHAIN_GCC_4_9_3 if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_SH
 default ADK_TOOLCHAIN_GCC_4_9_3 if ADK_TARGET_SYSTEM_KINETIS_K70
 default ADK_TOOLCHAIN_GCC_4_8_ARC if ADK_TARGET_ARCH_ARC
-default ADK_TOOLCHAIN_GCC_5_2_OR1K if ADK_TARGET_ARCH_OR1K
+default ADK_TOOLCHAIN_GCC_5_3_OR1K if ADK_TARGET_ARCH_OR1K
 default ADK_TOOLCHAIN_GCC_GIT if ADK_TARGET_WITHOUT_MMU && ADK_TARGET_ARCH_XTENSA
 default ADK_TOOLCHAIN_GCC_5_3_0
 
@@ -57,8 +57,8 @@ config ADK_TOOLCHAIN_GCC_4_8_5
 	depends on !ADK_TARGET_ARCH_METAG
 	depends on !ADK_TARGET_ARCH_OR1K
 
-config ADK_TOOLCHAIN_GCC_5_2_OR1K
-	bool "5.2-or1k"
+config ADK_TOOLCHAIN_GCC_5_3_OR1K
+	bool "5.3-or1k"
 	select ADK_DISABLE_HONOUR_CFLAGS
 	depends on ADK_TARGET_ARCH_OR1K
 

+ 3 - 2
target/or1k/or1ksim.cfg

@@ -639,7 +639,8 @@ section uart
   baseaddr = 0x90000000
   irq = 2
   /* channel = "file:uart0.rx,uart0.tx" */
-  channel = "xterm:"
+  channel = "tcp:10084"
+  /*channel = "xterm:"*/ 
   jitter = -1                     /* async behaviour */
   16550 = 1
 end
@@ -708,7 +709,7 @@ end
 */
 
 section ethernet
-  enabled = 0
+  enabled = 1
   baseaddr = 0x92000000
   /* dma = 0 */
   irq = 4

+ 1 - 1
target/or1k/systems/or1k-sim

@@ -5,7 +5,7 @@ config ADK_TARGET_SYSTEM_OR1K_SIM
 	select ADK_TARGET_WITH_NET
 	select ADK_TARGET_KERNEL_VERSION_GIT
 	select ADK_TARGET_KERNEL_REPO "https://github.com/openrisc/linux.git"
-	select ADK_TARGET_KERNEL_HASH "83bdd078d607f3b592afeb4033800687bdeeb1f3"
+	select ADK_TARGET_KERNEL_HASH "69ebcc44388021120b863c433ee68677098b9c37"
 	help
 	  Simulator for OR1K architecture.
 

+ 2 - 2
toolchain/gcc/Makefile.inc

@@ -10,8 +10,8 @@ PKG_RELEASE:=		1
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 LIBSTDCXXVER:=		21
 endif
-ifeq ($(ADK_TOOLCHAIN_GCC_5_2_OR1K),y)
-PKG_VERSION:=		musl-5.2.0
+ifeq ($(ADK_TOOLCHAIN_GCC_5_3_OR1K),y)
+PKG_VERSION:=		musl-5.3.0
 PKG_GIT:=		branch
 PKG_SITES:=		https://github.com/openrisc/or1k-gcc.git
 PKG_RELEASE:=		1