From 8e2707b81b0c90295c9fdf92a576925442d22147 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 20 Aug 2014 21:11:13 +0200
Subject: add sash, simpleinit and a uclibc config for nonmmu case

---
 mk/image.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'mk')

diff --git a/mk/image.mk b/mk/image.mk
index 321794f76..e47a82ac1 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -6,6 +6,8 @@ ifeq (${ADK_BINSH_ASH},y)
 BINSH:=ash
 else ifeq (${ADK_BINSH_BASH},y)
 BINSH:=bash
+else ifeq (${ADK_BINSH_SASH},y)
+BINSH:=sash
 else ifeq (${ADK_BINSH_HUSH},y)
 BINSH:=hush
 else ifeq (${ADK_BINSH_MKSH},y)
@@ -21,6 +23,8 @@ ifeq (${ADK_ROOTSH_ASH},y)
 ROOTSH:=/bin/ash
 else ifeq (${ADK_ROOTSH_BASH},y)
 ROOTSH:=/bin/bash
+else ifeq (${ADK_ROOTSH_SASH},y)
+ROOTSH:=/bin/sash
 else ifeq (${ADK_ROOTSH_HUSH},y)
 ROOTSH:=/bin/hush
 else ifeq (${ADK_ROOTSH_MKSH},y)
@@ -54,9 +58,13 @@ image-prepare-post:
 			mkfontdir ${TARGET_DIR}/usr/share/fonts/X11/$${i}; \
 		done; \
 	fi
+ifeq (${ADK_ROOTSH_SASH},)
 	$(SED) '/^root:/s!:/bin/sh$$!:${ROOTSH}!' ${TARGET_DIR}/etc/passwd
+endif
+ifeq (${ADK_BINSH_SASH},)
 	-rm -f ${TARGET_DIR}/bin/sh
 	ln -sf ${BINSH} ${TARGET_DIR}/bin/sh
+endif
 	test -z $(GIT) || \
 	     $(GIT) log -1|head -1|sed -e 's#commit ##' \
 		> $(TARGET_DIR)/etc/.adkversion
-- 
cgit v1.2.3


From 9d6eef9b39547d230d5a7cb871735bae71f5fd55 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 26 Aug 2014 12:28:55 +0200
Subject: we need to remove crtbegin.o/crtend.o from gcc specs file. otherwise
 broken executables (f.e. sash) with a wrong data start are created by
 elf2flt)

---
 mk/kernel-vars.mk | 2 +-
 mk/vars.mk        | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'mk')

diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk
index e9771855e..17a8d23a2 100644
--- a/mk/kernel-vars.mk
+++ b/mk/kernel-vars.mk
@@ -17,4 +17,4 @@ else
 KERNEL_MAKE_OPTS+=	HOSTCFLAGS='${HOST_CFLAGS}'
 endif
 
-KERNEL_MAKE_ENV:=	PATH="${STAGING_HOST_DIR}/usr/bin:$$PATH"
+KERNEL_MAKE_ENV:=	PATH="${TOOLCHAIN_DIR}/usr/bin:${STAGING_HOST_DIR}/usr/bin:$$PATH"
diff --git a/mk/vars.mk b/mk/vars.mk
index 443d42139..c6971ee83 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -74,8 +74,13 @@ ifneq ($(strip ${ADK_USE_CCACHE}),)
 TARGET_COMPILER_PREFIX=$(STAGING_HOST_DIR)/usr/bin/ccache ${TARGET_CROSS}
 endif
 
+# use a gcc wrapper for uClinux
+ifeq ($(ADK_TARGET_UCLINUX),y)
+TARGET_CC:=		adk-uclinux-gcc
+else
 # target tools
 TARGET_CC:=		${TARGET_COMPILER_PREFIX}gcc
+endif
 TARGET_CXX:=		${TARGET_COMPILER_PREFIX}g++
 TARGET_LD:=		${TARGET_COMPILER_PREFIX}ld
 TARGET_AR:=		${TARGET_COMPILER_PREFIX}ar
@@ -94,8 +99,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 -msep-data
-TARGET_CXXFLAGS+=	-Wl,-elf2flt -msep-data
+TARGET_CFLAGS+=		-msep-data
+TARGET_CXXFLAGS+=	-msep-data
 TARGET_LDFLAGS+=	-elf2flt
 endif
 
-- 
cgit v1.2.3


From b52fe4c13975bf421359a59284857204c04c8d28 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 26 Aug 2014 14:06:03 +0200
Subject: activate some options, fix root= missing

---
 mk/rootfs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mk')

diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index f816ff3ee..5645d1ef3 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -40,7 +40,7 @@ ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
 ROOTFS:=	root=/dev/mmcblk0p2 rootwait
 endif
 
-ifeq ($(ADK_TARGET_SYSTEM_CUBOX_I),y)
+ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y)
 ROOTFS:=	root=/dev/mmcblk0p1 rootwait
 endif
 
-- 
cgit v1.2.3