Merge branch 'master' of git+ssh://openadk.org/git/openadk

mk/kernel-vars.mk

@@ -18,4 +18,4 @@ ADK_KCPPFLAGS+=		-DBCM47XX_OVERRIDE_FLASHSIZE=0x800000 \
 			-DBCM47XX_OVERRIDE_CFESIZE=0x40000
 endif
 
-KERNEL_MAKE_ENV+=	KCPPFLAGS='${ADK_KCPPFLAGS}'
+KERNEL_MAKE_ENV+=	KCPPFLAGS='${ADK_KCPPFLAGS}' PATH="$$PATH:${TOOLS_DIR}"

package/libgcc/Makefile

@@ -11,7 +11,7 @@ PKG_DFLT_LIBGCC:=	y if !ADK_TOOLCHAIN_ONLY
 
 NO_DISTFILES:=		1
 
-PKG_ARCH_DEPENDS:=	!sh
+PKG_ARCH_DEPENDS:=	!sh !avr32
 
 include ${TOPDIR}/mk/package.mk
 

target/tools/uboot-mkimage/Makefile

@@ -1,4 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-all: mkimage.c crc32.c
-	$(CC_FOR_BUILD) ${FLAGS_FOR_BUILD} -o ${STAGING_HOST_DIR}/bin/mkimage mkimage.c crc32.c

toolchain/binutils/Makefile

@@ -25,8 +25,6 @@ $(WRKBUILD)/.configured:
 	(cd $(WRKBUILD); \
 		$(WRKBUILD)/configure \
 		--prefix=$(STAGING_HOST_DIR) \
-		--build=$(GNU_HOST_NAME) \
-		--host=$(GNU_HOST_NAME) \
 		--target=$(REAL_GNU_TARGET_NAME) \
 		--with-sysroot=$(STAGING_TARGET_DIR) \
 		--disable-multilib \

toolchain/eglibc/Makefile

@@ -64,6 +64,7 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
 		$(MAKE) install-headers install-bootstrap-headers=yes \
 	);
 	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h
+	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-64.h
 	touch $@
 
 ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)

tools/Makefile

@@ -3,7 +3,7 @@
 
 include $(TOPDIR)/rules.mk
 
-TARGETS:=adk mkcrypt cpio
+TARGETS:=adk mkcrypt cpio mkimage
 
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))

tools/mkimage/Makefile

@@ -0,0 +1,11 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+install: ${TOOLS_DIR}/mkimage
+
+${TOOLS_DIR}/mkimage: mkimage.c crc32.c
+	$(CC_FOR_BUILD) ${FLAGS_FOR_BUILD} -o $@ mkimage.c crc32.c
+
+include $(TOPDIR)/mk/tools.mk