diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-08-15 14:28:17 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-08-15 16:08:18 +0200 |
| commit | a3875719fff2c2f74218a5d4f199328997167ad4 (patch) | |
| tree | 80effe93b7052a10e6271d802548526af0cc5199 | |
| parent | cb69247047cdf267c54f5a7540863a3ea7a8fbd6 (diff) | |
use 5307 for now, which results in a working userland. need to investigate.
| -rw-r--r-- | mk/vars.mk | 4 | ||||
| -rw-r--r-- | package/busybox/config/shell/Config.in | 1 | ||||
| -rw-r--r-- | target/config/Config.in.target | 2 | ||||
| -rw-r--r-- | target/m68k/kernel/qemu-m68k | 14 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile | 2 |
5 files changed, 10 insertions, 13 deletions
diff --git a/mk/vars.mk b/mk/vars.mk index a3dac0bed..443d42139 100644 --- a/mk/vars.mk +++ b/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 diff --git a/package/busybox/config/shell/Config.in b/package/busybox/config/shell/Config.in index 488041e22..b1b8ad4b2 100644 --- a/package/busybox/config/shell/Config.in +++ b/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 diff --git a/target/config/Config.in.target b/target/config/Config.in.target index 3abb99b9e..b6204060d 100644 --- a/target/config/Config.in.target +++ b/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 diff --git a/target/m68k/kernel/qemu-m68k b/target/m68k/kernel/qemu-m68k index 613653648..681785452 100644 --- a/target/m68k/kernel/qemu-m68k +++ b/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" diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 25c396e1b..8d45b5bc6 100644 --- a/toolchain/gcc/Makefile +++ b/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),) |