From 4807bb714efe97b630cbf8275f9ba7ac2fca81f2 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 23 Sep 2017 11:26:10 +0200 Subject: [PATCH] h8300: use elf2flt from ysato, upstream elf2flt still requires a small patch --- mk/image.mk | 1 + package/busybox/Config.in.manual | 6 +++--- package/strace/Makefile | 2 +- toolchain/elf2flt/Makefile.inc | 9 ++++++++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/mk/image.mk b/mk/image.mk index 2a0a03201..cd9551e28 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -172,6 +172,7 @@ ${STAGING_TARGET_DIR}/${INITRAMFS}_list: ${TARGET_DIR}/.adk echo "nod /dev/ttyAMA1 0660 0 0 c 204 65"; \ echo "nod /dev/ttySC0 0660 0 0 c 204 8"; \ echo "nod /dev/ttySC1 0660 0 0 c 204 9"; \ + echo "nod /dev/ttySC2 0660 0 0 c 204 10"; \ echo "nod /dev/ttyBF0 0660 0 0 c 204 64"; \ echo "nod /dev/ttyBF1 0660 0 0 c 204 65"; \ echo "nod /dev/ttyUL0 0660 0 0 c 204 187"; \ diff --git a/package/busybox/Config.in.manual b/package/busybox/Config.in.manual index 90afa3f48..ab4928e48 100644 --- a/package/busybox/Config.in.manual +++ b/package/busybox/Config.in.manual @@ -48,7 +48,7 @@ config ADK_PACKAGE_BUSYBOX_DEFAULT select BUSYBOX_HALT select BUSYBOX_HEAD select BUSYBOX_ID - select BUSYBOX_INIT + select BUSYBOX_INIT if ADK_RUNTIME_INIT_SYSV select BUSYBOX_LESS if !BUSYBOX_DISABLE_LESS select BUSYBOX_LN select BUSYBOX_LOSETUP @@ -124,7 +124,7 @@ config ADK_PACKAGE_BUSYBOX_MINIMAL select BUSYBOX_HALT select BUSYBOX_HEAD select BUSYBOX_ID - select BUSYBOX_INIT + select BUSYBOX_INIT if ADK_RUNTIME_INIT_SYSV select BUSYBOX_LESS if !BUSYBOX_DISABLE_LESS select BUSYBOX_LN select BUSYBOX_LS @@ -184,7 +184,7 @@ config ADK_PACKAGE_BUSYBOX_ALL select BUSYBOX_HALT select BUSYBOX_HEAD select BUSYBOX_ID - select BUSYBOX_INIT + select BUSYBOX_INIT if ADK_RUNTIME_INIT_SYSV select BUSYBOX_LESS if !BUSYBOX_DISABLE_LESS select BUSYBOX_LN select BUSYBOX_LS diff --git a/package/strace/Makefile b/package/strace/Makefile index a73a096cd..617e46b0b 100644 --- a/package/strace/Makefile +++ b/package/strace/Makefile @@ -11,7 +11,7 @@ PKG_DESCR:= system call trace program PKG_SECTION:= app/debug PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=strace/} -PKG_ARCH_DEPENDS:= !nds32 +PKG_ARCH_DEPENDS:= !h8300 !nds32 include ${ADK_TOPDIR}/mk/package.mk diff --git a/toolchain/elf2flt/Makefile.inc b/toolchain/elf2flt/Makefile.inc index 49412d9a9..969b2cb8f 100644 --- a/toolchain/elf2flt/Makefile.inc +++ b/toolchain/elf2flt/Makefile.inc @@ -2,7 +2,14 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= elf2flt -PKG_VERSION:= a87f68ae9e879360a9624f2a02999e67cfbe5a2f +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 PKG_RELEASE:= 1 PKG_SITES:= https://github.com/uclinux-dev/elf2flt.git +endif -- 2.11.4.GIT