From 88a37c351d4f04b8989e9c1e202e2e79fd53ccdb Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Fri, 23 Oct 2020 23:49:22 +0200
Subject: [PATCH] - hd6x: fix kernel image

---
 make/environment-linux.mk | 8 +++++++-
 make/images.mk            | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/make/environment-linux.mk b/make/environment-linux.mk
index a4b5610c..ddffaca9 100644
--- a/make/environment-linux.mk
+++ b/make/environment-linux.mk
@@ -200,7 +200,11 @@ KERNEL_NAME     = NI $(shell echo $(BOXFAMILY) | sed 's/.*/\u&/') Kernel
 
 KERNEL_MODULES_DIR  = $(BUILD_TMP)/$(KERNEL_MODULES)/lib/modules/$(KERNEL_VER)
 
-KERNEL_UIMAGE       = $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/Image
+ifeq ($(BOXMODEL), nevis)
+  KERNEL_UIMAGE     = $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/Image
+else
+  KERNEL_UIMAGE     = $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/uImage
+endif
 KERNEL_ZIMAGE       = $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/zImage
 KERNEL_ZIMAGE_DTB   = $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/zImage_dtb
 KERNEL_VMLINUX      = $(BUILD_TMP)/$(KERNEL_OBJ)/vmlinux
@@ -221,6 +225,8 @@ KERNEL_MAKEVARS += \
 
 ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuduo))
   KERNEL_IMAGE = vmlinux
+else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd60 hd61))
+  KERNEL_IMAGE = uImage
 else
   KERNEL_IMAGE = zImage
 endif
diff --git a/make/images.mk b/make/images.mk
index 7a3edb42..cd1aac1b 100644
--- a/make/images.mk
+++ b/make/images.mk
@@ -221,7 +221,7 @@ flash-image-hd6x: IMAGE_DATE=$(shell cat $(ROOTFS)/.version | grep "^version=" |
 flash-image-hd6x: | $(IMAGE_DIR)
 	rm -rf $(IMAGE_BUILD_TMP)
 	mkdir -p $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)
-	cp $(KERNEL_ZIMAGE_DTB) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/uImage
+	cp $(KERNEL_UIMAGE) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/uImage
 	$(CD) $(ROOTFS); \
 		tar -cvf $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \
 		bzip2 $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs.tar