From 7ad83fc8134d68f2ce48b241408b385bc7ab2fb7 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 20 Jun 2018 01:12:06 +0000
Subject: foxboard: bugfixes

---
 package/etrax-tools/Makefile       |  7 ++++++-
 target/config/Config.in.rootfs     |  1 -
 target/cris/Makefile               | 26 ++++++++++++++++++++++++--
 target/cris/systems/foxboard-lx832 |  2 +-
 4 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/package/etrax-tools/Makefile b/package/etrax-tools/Makefile
index 9e4b51227..00a37b4a6 100644
--- a/package/etrax-tools/Makefile
+++ b/package/etrax-tools/Makefile
@@ -24,7 +24,12 @@ host-build:
 	(cd ${WRKBUILD}/e100boot && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
 		${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET}) $(MAKE_TRACE)
 
-cmake-hostinstall:
+etrax-tools-hostinstall:
+	$(HOST_CC) -o $(STAGING_HOST_DIR)/usr/bin/mkfimage $(WRKBUILD)/mkfimage.c
+	$(CP) $(WRKBUILD)/boot_linux $(STAGING_HOST_DIR)/usr/bin
+	$(CP) $(WRKBUILD)/e100boot/sbl/e100boot.stripped \
+		$(STAGING_HOST_DIR)/usr/bin/e100boot
+
 
 include ${ADK_TOPDIR}/mk/host-bottom.mk
 include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/target/config/Config.in.rootfs b/target/config/Config.in.rootfs
index 9be04b6e5..b7ea73de3 100644
--- a/target/config/Config.in.rootfs
+++ b/target/config/Config.in.rootfs
@@ -113,7 +113,6 @@ config ADK_TARGET_ROOTFS_NFSROOT
 		   !ADK_TARGET_SIM && \
 	           !ADK_TARGET_VBOX && \
 		   !ADK_TARGET_SYSTEM_ARANYM_M68K && \
-		   !ADK_TARGET_SYSTEM_FOXBOARD_LX832 && \
 		   !ADK_TARGET_SYSTEM_LINKSYS_NSLU2 
 	help
 	  Root filesystem mounted via NFS. (DHCP)
diff --git a/target/cris/Makefile b/target/cris/Makefile
index 12b1789d8..e17e887b4 100644
--- a/target/cris/Makefile
+++ b/target/cris/Makefile
@@ -5,8 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 include $(ADK_TOPDIR)/mk/kernel-build.mk
 include $(ADK_TOPDIR)/mk/image.mk
 
-KERNEL:=$(LINUX_DIR)/vmlinux
-ZKERNEL:=$(LINUX_DIR)/arch/cris/boot/Image
+KERNEL:=$(LINUX_DIR)/arch/cris/boot/zImage
 QEMU_ARGS:=-M axis-dev88 -nographic -monitor none
 
 # target helper text
@@ -38,6 +37,23 @@ ifeq ($(ADK_TARGET_QEMU),y)
 	@echo 'qemu-system-${ADK_TARGET_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)'
 endif
 endif
+ifeq ($(ADK_TARGET_FS),nfsroot)
+targethelp:
+	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
+	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)"
+	@echo Use sudo ./boot_linux -F -i $(BIN_DIR)/${TARGET_KERNEL} to flash the kernel
+	@echo Do not forget to set network boot jumper, before you start the foxboard
+endif
+ifeq ($(ADK_TARGET_FS),squashfs)
+targethelp:
+	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
+	@echo "The RootFS image is: $(FW_DIR)/$(ROOTFSSQUASHFS)"
+endif
+ifeq ($(ADK_TARGET_FS),jffs2)
+targethelp:
+	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
+	@echo "The RootFS image is: $(FW_DIR)/$(ROOTFSJFFS2)"
+endif
 
 kernel-strip:
 	@cp $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
@@ -61,3 +77,9 @@ endif
 ifeq ($(ADK_TARGET_FS),nfsroot)
 imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp
 endif
+ifeq ($(ADK_TARGET_FS),squashfs)
+imageinstall: $(BUILD_DIR)/root.squashfs kernel-install targethelp
+endif
+ifeq ($(ADK_TARGET_FS),jffs2)
+imageinstall: kernel-install $(FW_DIR)/$(ROOTFSJFFS2) targethelp
+endif
diff --git a/target/cris/systems/foxboard-lx832 b/target/cris/systems/foxboard-lx832
index 057e0627d..82eaad093 100644
--- a/target/cris/systems/foxboard-lx832
+++ b/target/cris/systems/foxboard-lx832
@@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_FOXBOARD_LX832
 	bool "Foxboard LX832"
 	select ADK_TARGET_CPU_CRIS_CRISV10
 	select ADK_TARGET_WITH_MTD
-	select ADK_TARGET_KERNEL_IMAGE
+	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
 	help
 	  Foxboard LX832 support
-- 
cgit v1.2.3