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

12 files changed, 24 insertions, 25 deletions

diff --git a/mk/image.mk b/mk/image.mk
index bbe9d47ac..ff95c5cb0 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -224,8 +224,8 @@ ifeq ($(ADK_KERNEL_COMP_BZIP2),y)
 		echo "CONFIG_INITRAMFS_COMPRESSION_BZIP2=y" >> ${LINUX_DIR}/.config
 endif
 	@-rm $(LINUX_DIR)/usr/initramfs_data.cpio* 2>/dev/null
-	$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
-		ARCH=$(ARCH) CC="$(TARGET_CC)" -j${ADK_MAKE_JOBS} $(ADK_TARGET_KERNEL) $(MAKE_TRACE)
+	env $(KERNEL_MAKE_ENV) $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKE_OPTS) \
+		-j${ADK_MAKE_JOBS} $(ADK_TARGET_KERNEL) $(MAKE_TRACE)
 
 ${FW_DIR}/${ROOTFSISO}: ${TARGET_DIR} kernel-package
 	mkdir -p ${TARGET_DIR}/boot/syslinux
diff --git a/target/arm/Makefile b/target/arm/Makefile
index a652003eb..a2bd23a8b 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -71,10 +71,10 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM)$(ADK_TARGET_SYSTEM_QEMU_ARMHF),y)
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfsarchive)
-imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)
+imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
-	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
+	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)"
 endif
 ifeq ($(ADK_TARGET_FS),initramfs)
 imageinstall: $(FW_DIR)/$(INITRAMFS)
diff --git a/target/m68k/Makefile b/target/m68k/Makefile
index d68393b84..0e7324c25 100644
--- a/target/m68k/Makefile
+++ b/target/m68k/Makefile
@@ -16,10 +16,10 @@ imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)
 	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
 endif
 ifeq ($(ADK_TARGET_FS),initramfsarchive)
-imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)
+imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
-	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
+	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)"
 endif
 ifeq ($(ADK_TARGET_FS),initramfs)
 imageinstall: $(FW_DIR)/$(INITRAMFS)
diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile
index c60545e56..5ab2345e7 100644
--- a/target/microblaze/Makefile
+++ b/target/microblaze/Makefile
@@ -62,8 +62,8 @@ imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)
 	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
 endif
 ifeq ($(ADK_TARGET_FS),initramfsarchive)
-imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)
+imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
-	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
+	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)"
 endif
diff --git a/target/mips/Makefile b/target/mips/Makefile
index 9fd479d5d..436b570e3 100644
--- a/target/mips/Makefile
+++ b/target/mips/Makefile
@@ -113,10 +113,10 @@ ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfsarchive)
-imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)
+imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
-	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
+	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)"
 endif
 ifeq ($(ADK_TARGET_FS),initramfs)
 imageinstall: $(FW_DIR)/$(INITRAMFS)
diff --git a/target/ppc/Makefile b/target/ppc/Makefile
index ceb31e5f5..aae63f1c0 100644
--- a/target/ppc/Makefile
+++ b/target/ppc/Makefile
@@ -23,10 +23,10 @@ ifeq ($(ADK_HARDWARE_QEMU),y)
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfsarchive)
-imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)
+imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
-	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
+	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)"
 endif
 ifeq ($(ADK_TARGET_FS),initramfs)
 imageinstall: $(FW_DIR)/$(INITRAMFS)
diff --git a/target/ppc64/Makefile b/target/ppc64/Makefile
index 0ad0843c0..6ee949a09 100644
--- a/target/ppc64/Makefile
+++ b/target/ppc64/Makefile
@@ -23,10 +23,10 @@ ifeq ($(ADK_HARDWARE_QEMU),y)
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfsarchive)
-imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)
+imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
-	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
+	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)"
 endif
 ifeq ($(ADK_TARGET_FS),initramfs)
 imageinstall: $(FW_DIR)/$(INITRAMFS)
diff --git a/target/sh/Makefile b/target/sh/Makefile
index 160ed6b74..0d5706eb3 100644
--- a/target/sh/Makefile
+++ b/target/sh/Makefile
@@ -23,10 +23,10 @@ ifneq ($(ADK_HARDWARE_QEMU),)
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfsarchive)
-imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)
+imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
-	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
+	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)"
 endif
 ifeq ($(ADK_TARGET_FS),initramfs)
 imageinstall: $(FW_DIR)/$(INITRAMFS)
diff --git a/target/sparc/Makefile b/target/sparc/Makefile
index abe521e66..1e15ee7f0 100644
--- a/target/sparc/Makefile
+++ b/target/sparc/Makefile
@@ -22,10 +22,10 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_SPARC),y)
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfsarchive)
-imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)
+imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
-	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
+	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)"
 endif
 ifeq ($(ADK_TARGET_FS),initramfs)
 imageinstall: $(FW_DIR)/$(INITRAMFS)
diff --git a/target/sparc64/Makefile b/target/sparc64/Makefile
index 0d3dc560b..882189284 100644
--- a/target/sparc64/Makefile
+++ b/target/sparc64/Makefile
@@ -33,10 +33,10 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_SPARC64),y)
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfsarchive)
-imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)
+imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
-	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
+	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)"
 endif
 ifeq ($(ADK_TARGET_FS),initramfs)
 imageinstall: $(FW_DIR)/$(INITRAMFS)
diff --git a/target/x86/Makefile b/target/x86/Makefile
index 489d4dd1d..15d980d7c 100644
--- a/target/x86/Makefile
+++ b/target/x86/Makefile
@@ -14,7 +14,6 @@ imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)
 	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
 	@echo "To install everything to CompactFlash use scripts/genext2.sh"
 endif
-
 ifeq ($(ADK_TARGET_FS),cf)
 imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)
 	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
@@ -43,10 +42,10 @@ ifeq ($(ADK_HARDWARE_VBOX),y)
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfsarchive)
-imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)
+imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
-	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
+	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)"
 endif
 ifeq ($(ADK_TARGET_FS),usb)
 imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)
diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile
index 7087c9ca1..c94c3a1a6 100644
--- a/target/x86_64/Makefile
+++ b/target/x86_64/Makefile
@@ -21,10 +21,10 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86_64),y)
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfsarchive)
-imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)
+imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
-	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
+	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)"
 endif
 ifeq ($(ADK_TARGET_FS),usb)
 imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)