Browse Source

use 5307 for now, which results in a working userland. need to investigate.

Waldemar Brodkorb 9 years ago
parent
commit
a3875719ff

+ 2 - 2
mk/vars.mk

@@ -94,8 +94,8 @@ TARGET_LDFLAGS:=	-L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \
 			-Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib
 
 ifeq ($(ADK_TARGET_BINFMT_FLAT),y)
-TARGET_CFLAGS+=		-Wl,-elf2flt
-TARGET_CXXFLAGS+=	-Wl,-elf2flt
+TARGET_CFLAGS+=		-Wl,-elf2flt -msep-data
+TARGET_CXXFLAGS+=	-Wl,-elf2flt -msep-data
 TARGET_LDFLAGS+=	-elf2flt
 endif
 

+ 1 - 0
package/busybox/config/shell/Config.in

@@ -161,6 +161,7 @@ config BUSYBOX_CTTYHACK
 	  # getty 115200 $(cttyhack)
 config BUSYBOX_HUSH
 	bool "hush"
+	default y if ADK_TARGET_UCLINUX
 	default n
 	help
 	  hush is a small shell (25k). It handles the normal flow control

+ 1 - 1
target/config/Config.in.target

@@ -3,7 +3,7 @@
 
 config ADK_TARGET_CFLAGS
 	string
-	default "-march=isaaplus -mcpu=5208" if ADK_CPU_CF_5208
+	default "-mcpu=5307" if ADK_CPU_CF_5208
 	default "-mcpu=v7.10.d" if ADK_CPU_MICROBLAZE
 	default "-m4 -ml" if ADK_CPU_SH4 && ADK_little
 	default "-m4 -mb" if ADK_CPU_SH4 && ADK_big

+ 5 - 9
target/m68k/kernel/qemu-m68k

@@ -7,18 +7,14 @@ CONFIG_CLOCK_FREQ=66666666
 CONFIG_CLOCK_DIV=1
 CONFIG_M5208EVB=y
 CONFIG_FREESCALE=y
-CONFIG_LARGE_ALLOCS=y
-CONFIG_4KSTACKS=y
 CONFIG_RAMBASE=0x40000000
-CONFIG_RAMSIZE=0x0
+CONFIG_RAMSIZE=0x2000000
 CONFIG_VECTORBASE=0x40000000
-CONFIG_KERNELBASE=0x40010000
-CONFIG_RAMAUTOBIT=y
+CONFIG_KERNELBASE=0x40020000
+CONFIG_RAMKERNEL=y
 CONFIG_BINFMT_FLAT=y
-CONFIG_BINFMT_ZFLAT=y
-CONFIG_BINFMT_SHARED_FLAT=y
 CONFIG_SERIAL_MCF=y
-CONFIG_SERIAL_MCF_BAUDRATE=19200
+CONFIG_SERIAL_MCF_BAUDRATE=115200
 CONFIG_SERIAL_MCF_CONSOLE=y
 CONFIG_BOOTPARAM=y
-CONFIG_BOOTPARAM_STRING="console=ttyS0,19200"
+CONFIG_BOOTPARAM_STRING="console=ttyS0,115200"

+ 1 - 1
toolchain/gcc/Makefile

@@ -140,7 +140,7 @@ GCC_CONFOPTS+=		--with-cpu=ultrasparc
 endif
 
 ifeq ($(ADK_CPU_CF_5208),y)
-GCC_CONFOPTS+=		--enable-multilib --with-arch=cf --with-cpu=5208
+GCC_CONFOPTS+=		--enable-multilib --with-arch=cf --with-cpu=5307
 endif
 
 ifneq ($(ADK_TARGET_MIPS_ABI),)