From 8471b19838d6f6acc2825d6f0b1007e29f7e350f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 2 Mar 2014 09:03:40 +0100
Subject: libc path is libx32 for x32 abi

---
 target/config/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/config/Config.in b/target/config/Config.in
index 00e7eefe3..bd1a65cac 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -179,7 +179,7 @@ endchoice
 config ADK_TARGET_LIBC_PATH
 	string
 	default "lib32" if ADK_n32
-	default "lib" if ADK_x32
+	default "libx32" if ADK_x32
 	default "lib64" if ADK_n64 \
 				|| ADK_64 \
 				|| ADK_LINUX_SPARC64 \
-- 
cgit v1.2.3


From b8baf73967b23844f8a15a9a58f0fb623a95d4f1 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 3 Mar 2014 08:37:34 +0100
Subject: do not put the intermediate file into firmware dir

---
 mk/image.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mk/image.mk b/mk/image.mk
index 3f199c9cc..ec61ff374 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -145,7 +145,7 @@ ${FW_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR}
 		sed "s#\(.*\)#:0:0::::::\1#" | sort | \
 		${STAGING_HOST_DIR}/usr/bin/cpio -o -Hustar -P | gzip -n9 >$@
 
-${FW_DIR}/${INITRAMFS}_list: ${TARGET_DIR}
+${STAGING_TARGET_DIR}/${INITRAMFS}_list: ${TARGET_DIR}
 	$(BASH) ${LINUX_DIR}/scripts/gen_initramfs_list.sh -u squash -g squash \
 		${TARGET_DIR}/ >$@
 	( \
@@ -159,8 +159,8 @@ ${FW_DIR}/${INITRAMFS}_list: ${TARGET_DIR}
 		echo "nod /dev/ram 0655 0 0 b 1 1"; \
 	) >>$@
 
-${FW_DIR}/${INITRAMFS}: ${FW_DIR}/${INITRAMFS}_list
-	${LINUX_DIR}/usr/gen_init_cpio ${FW_DIR}/${INITRAMFS}_list | \
+${FW_DIR}/${INITRAMFS}: ${STAGING_TARGET_DIR}/${INITRAMFS}_list
+	${LINUX_DIR}/usr/gen_init_cpio ${STAGING_TARGET_DIR}/${INITRAMFS}_list | \
 		${ADK_COMPRESSION_TOOL} -c >$@
 
 ${BUILD_DIR}/root.squashfs: ${TARGET_DIR}
@@ -172,13 +172,13 @@ ${FW_DIR}/${ROOTFSJFFS2}: ${TARGET_DIR}
 	${STAGING_HOST_DIR}/usr/bin/mkfs.jffs2 $(ADK_JFFS2_OPTS) -q -r ${TARGET_DIR} \
 		--pad=$(ADK_TARGET_MTD_SIZE) -o ${FW_DIR}/${ROOTFSJFFS2} $(MAKE_TRACE)
 
-createinitramfs: ${FW_DIR}/${INITRAMFS}_list
+createinitramfs: ${STAGING_TARGET_DIR}/${INITRAMFS}_list
 	${SED} 's/.*CONFIG_(BLK_DEV_INITRD|INITRAMFS_SOURCE|INITRAMFS_COMPRESSION).*//' \
 		${LINUX_DIR}/.config
 	( \
 		echo "CONFIG_BLK_DEV_INITRD=y"; \
 		echo "CONFIG_ACPI_INITRD_TABLE_OVERRIDE=n"; \
-		echo 'CONFIG_INITRAMFS_SOURCE="${FW_DIR}/${INITRAMFS}_list"'; \
+		echo 'CONFIG_INITRAMFS_SOURCE="${STAGING_TARGET_DIR}/${INITRAMFS}_list"'; \
 		echo '# CONFIG_INITRAMFS_COMPRESSION_NONE is not set'; \
 		echo 'CONFIG_INITRAMFS_ROOT_UID=0'; \
 		echo 'CONFIG_INITRAMFS_ROOT_GID=0'; \
-- 
cgit v1.2.3