Home Explore Help
Register Sign In
oss
/
openadk
4
1
Fork 3
Files Issues 0 Pull Requests 0 Wiki
Browse Source

h8300: use elf2flt from ysato, upstream elf2flt still requires a small patch

Waldemar Brodkorb 8 years ago
parent
50b716ced8
commit
4807bb714e
4 changed files with 13 additions and 5 deletions
Unified View Show Diff Stats
  1. 1 0
      mk/image.mk
  2. 3 3
      package/busybox/Config.in.manual
  3. 1 1
      package/strace/Makefile
  4. 8 1
      toolchain/elf2flt/Makefile.inc

+ 1 - 0
mk/image.mk
View File 

@@ -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/ttyAMA1 0660 0 0 c 204 65"; \
 
 		echo "nod /dev/ttySC0 0660 0 0 c 204 8"; \
 
 		echo "nod /dev/ttySC0 0660 0 0 c 204 8"; \
 
 		echo "nod /dev/ttySC1 0660 0 0 c 204 9"; \
 
 		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/ttyBF0 0660 0 0 c 204 64"; \
 
 		echo "nod /dev/ttyBF1 0660 0 0 c 204 65"; \
 
 		echo "nod /dev/ttyBF1 0660 0 0 c 204 65"; \
 
 		echo "nod /dev/ttyUL0 0660 0 0 c 204 187"; \
 
 		echo "nod /dev/ttyUL0 0660 0 0 c 204 187"; \

+ 3 - 3
package/busybox/Config.in.manual
View File 

@@ -48,7 +48,7 @@ config ADK_PACKAGE_BUSYBOX_DEFAULT
 
 	select BUSYBOX_HALT
 
 	select BUSYBOX_HALT
 
 	select BUSYBOX_HEAD
 
 	select BUSYBOX_HEAD
 
 	select BUSYBOX_ID
 
 	select BUSYBOX_ID
 
-	select BUSYBOX_INIT
 
+	select BUSYBOX_INIT if ADK_RUNTIME_INIT_SYSV
 
 	select BUSYBOX_LESS if !BUSYBOX_DISABLE_LESS
 
 	select BUSYBOX_LESS if !BUSYBOX_DISABLE_LESS
 
 	select BUSYBOX_LN
 
 	select BUSYBOX_LN
 
 	select BUSYBOX_LOSETUP
 
 	select BUSYBOX_LOSETUP
 
@@ -124,7 +124,7 @@ config ADK_PACKAGE_BUSYBOX_MINIMAL
 
 	select BUSYBOX_HALT
 
 	select BUSYBOX_HALT
 
 	select BUSYBOX_HEAD
 
 	select BUSYBOX_HEAD
 
 	select BUSYBOX_ID
 
 	select BUSYBOX_ID
 
-	select BUSYBOX_INIT
 
+	select BUSYBOX_INIT if ADK_RUNTIME_INIT_SYSV
 
 	select BUSYBOX_LESS if !BUSYBOX_DISABLE_LESS
 
 	select BUSYBOX_LESS if !BUSYBOX_DISABLE_LESS
 
 	select BUSYBOX_LN
 
 	select BUSYBOX_LN
 
 	select BUSYBOX_LS
 
 	select BUSYBOX_LS
 
@@ -184,7 +184,7 @@ config ADK_PACKAGE_BUSYBOX_ALL
 
 	select BUSYBOX_HALT
 
 	select BUSYBOX_HALT
 
 	select BUSYBOX_HEAD
 
 	select BUSYBOX_HEAD
 
 	select BUSYBOX_ID
 
 	select BUSYBOX_ID
 
-	select BUSYBOX_INIT
 
+	select BUSYBOX_INIT if ADK_RUNTIME_INIT_SYSV
 
 	select BUSYBOX_LESS if !BUSYBOX_DISABLE_LESS
 
 	select BUSYBOX_LESS if !BUSYBOX_DISABLE_LESS
 
 	select BUSYBOX_LN
 
 	select BUSYBOX_LN
 
 	select BUSYBOX_LS
 
 	select BUSYBOX_LS

+ 1 - 1
package/strace/Makefile
View File 

@@ -11,7 +11,7 @@ PKG_DESCR:=		system call trace program
 
 PKG_SECTION:=		app/debug
 
 PKG_SECTION:=		app/debug
 
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=strace/}
 
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=strace/}
 
 
 
-PKG_ARCH_DEPENDS:=	!nds32
 
+PKG_ARCH_DEPENDS:=	!h8300 !nds32
 
 
 
 include ${ADK_TOPDIR}/mk/package.mk
 
 include ${ADK_TOPDIR}/mk/package.mk

+ 8 - 1
toolchain/elf2flt/Makefile.inc
View File 

@@ -2,7 +2,14 @@
 
 # material, please see the LICENCE file in the top-level directory.
 
 # material, please see the LICENCE file in the top-level directory.
 
 
 
 PKG_NAME:=		elf2flt
 
 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_GIT:=		hash
 
 PKG_RELEASE:=		1
 
 PKG_RELEASE:=		1
 
 PKG_SITES:=		https://github.com/uclinux-dev/elf2flt.git
 
 PKG_SITES:=		https://github.com/uclinux-dev/elf2flt.git
 
+endif