diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2017-10-01 17:49:40 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2017-10-01 20:46:32 +0200 |
| commit | fa6fcbc9f75bc5a5962f9dd4327ae80ea35c59a7 (patch) | |
| tree | 751a5d05ae0915dc85b97a43219f2de1370df833 | |
| parent | 728149c0fc8bfeb2460d7d0be4e1443a8d306a8f (diff) | |
frosted: fix config for qemu
| -rw-r--r-- | target/arm/systems/qemu-arm-lm3s6965evb | 6 | ||||
| -rw-r--r-- | toolchain/elf2flt/Makefile.inc | 13 | ||||
| -rw-r--r-- | toolchain/newlib/Makefile.inc | 3 | ||||
| -rw-r--r-- | toolchain/newlib/patches/frosted/fix-tooldir.patch | 12 |
4 files changed, 29 insertions, 5 deletions
diff --git a/target/arm/systems/qemu-arm-lm3s6965evb b/target/arm/systems/qemu-arm-lm3s6965evb index e82cc04f3..7d32e5cb8 100644 --- a/target/arm/systems/qemu-arm-lm3s6965evb +++ b/target/arm/systems/qemu-arm-lm3s6965evb @@ -5,6 +5,12 @@ config ADK_TARGET_SYSTEM_QEMU_ARM_LM3S6965EVB select ADK_TARGET_CPU_ARM_CORTEX_M3 select ADK_TARGET_ARCH_ARM_WITH_THUMB select ADK_TARGET_QEMU + select FROSTED_ARCH_LM3SVIRT + select FROSTED_KFLASHMEM_SIZE 128 + select FROSTED_KRAMMEM_SIZE 128 + select FROSTED_TASK_STACK_SIZE_4K + select FROSTED_USART_0 + select FROSTED_MEMFS help Qemu Emulator for ARM architecture (lm3s6965evb) without MMU. diff --git a/toolchain/elf2flt/Makefile.inc b/toolchain/elf2flt/Makefile.inc index 969b2cb8f..d3feb54a0 100644 --- a/toolchain/elf2flt/Makefile.inc +++ b/toolchain/elf2flt/Makefile.inc @@ -2,14 +2,19 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= elf2flt +PKG_VERSION:= 6d80ab6c93409e796f85da404bde84b841231531 +PKG_GIT:= hash +PKG_RELEASE:= 1 +PKG_SITES:= https://github.com/uclinux-dev/elf2flt.git ifeq ($(ADK_TARGET_ARCH_H8300),y) PKG_VERSION:= h8300 PKG_GIT:= branch PKG_RELEASE:= 1 PKG_SITES:= git://git.osdn.net/gitroot/uclinux-h8/elf2flt.git -else -PKG_VERSION:= 6d80ab6c93409e796f85da404bde84b841231531 -PKG_GIT:= hash +endif +ifeq ($(ADK_TARGET_OS_FROSTED),y) +PKG_VERSION:= master +PKG_GIT:= branch PKG_RELEASE:= 1 -PKG_SITES:= https://github.com/uclinux-dev/elf2flt.git +PKG_SITES:= https://github.com/insane-adding-machines/elf2flt-1.git endif diff --git a/toolchain/newlib/Makefile.inc b/toolchain/newlib/Makefile.inc index 3fe740835..31622c2b8 100644 --- a/toolchain/newlib/Makefile.inc +++ b/toolchain/newlib/Makefile.inc @@ -23,7 +23,8 @@ PKG_SITES:= https://github.com/riscv/riscv-newlib.git DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz endif ifeq ($(ADK_TARGET_LIB_NEWLIB_FROSTED),y) -PKG_VERSION:= git +PKG_VERSION:= frosted +PKG_GIT:= branch PKG_RELEASE:= 1 PKG_GIT_SUBMODULE:= 1 PKG_SITES:= https://github.com/insane-adding-machines/newlib.git diff --git a/toolchain/newlib/patches/frosted/fix-tooldir.patch b/toolchain/newlib/patches/frosted/fix-tooldir.patch new file mode 100644 index 000000000..652f7494b --- /dev/null +++ b/toolchain/newlib/patches/frosted/fix-tooldir.patch @@ -0,0 +1,12 @@ +diff -Nur newlib-2.2.0-1.orig/configure newlib-2.2.0-1/configure +--- newlib-2.2.0-1.orig/configure 2014-07-05 23:09:07.000000000 +0200 ++++ newlib-2.2.0-1/configure 2015-11-25 06:33:11.461178398 +0100 +@@ -6985,7 +6985,7 @@ + + # Some systems (e.g., one of the i386-aix systems the gas testers are + # using) don't handle "\$" correctly, so don't use it here. +-tooldir='${exec_prefix}'/${target_noncanonical} ++tooldir='${exec_prefix}' + build_tooldir=${tooldir} + + # Create a .gdbinit file which runs the one in srcdir |