some changes for img-tec and various things

7 files changed, 22 insertions, 3 deletions

diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk
index ca77b2f76..1e19a593c 100644
--- a/mk/kernel-build.mk
+++ b/mk/kernel-build.mk
@@ -125,7 +125,7 @@ ifeq ($(ADK_RUNTIME_DEV_UDEV),)
 	$(END_TRACE)
 endif
 	$(START_TRACE) "target/${ADK_TARGET_ARCH}-kernel-modules-install-packages.. "
-	for pkg in $(PACKAGE_DIR)/kmod-*; do \
+	-for pkg in $(PACKAGE_DIR)/kmod-*; do \
 		[[ -e "$$pkg" ]] && $(PKG_INSTALL) $$pkg; \
 	done
 	$(CMD_TRACE) " done"
diff --git a/package/fmt/Makefile b/package/fmt/Makefile
index 4aa6aab5b..82d25c0cf 100644
--- a/package/fmt/Makefile
+++ b/package/fmt/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_HASH:=		3d794d3cf67633b34b2771eb9f073bde87e846e0d395d254df7b211ef1ec7346
 PKG_DESCR:=		modern formatting library
 PKG_SECTION:=		libs/misc
+PKG_BUILDDEP:=		cmake-host
 PKG_URL:=		http://fmtlib.net/latest/index.html
 PKG_SITES:=		https://github.com/fmtlib/fmt/archive/
 PKG_LIBNAME:=		libfmt
diff --git a/package/libcdio/Makefile b/package/libcdio/Makefile
index fca3550aa..955f44359 100644
--- a/package/libcdio/Makefile
+++ b/package/libcdio/Makefile
@@ -9,6 +9,8 @@ PKG_RELEASE:=		1
 PKG_HASH:=		8550e9589dbd594bfac93b81ecf129b1dc9d0d51e90f9696f1b2f9b2af32712b
 PKG_DESCR:=		library for cd-rom and cd image access
 PKG_SECTION:=		libs/misc
+PKG_DEPENDS:=		ncurses
+PKG_BUILDDEP:=		ncurses
 PKG_URL:=		http://www.gnu.org/software/libcdio
 PKG_SITES:=		http://ftp.gnu.org/gnu/libcdio/
 PKG_OPTS:=		dev
diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile
index da6389972..03bc50d76 100644
--- a/package/u-boot/Makefile
+++ b/package/u-boot/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:=		ftp://ftp.denx.de/pub/u-boot/
 
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
-PKG_SYSTEM_DEPENDS:=	beaglebone-black orange-pi0 raspberry-pi raspberry-pi2 raspberry-pi3 banana-pro solidrun-imx6 solidrun-clearfog raspberry-pi3-64 raspberry-pi3p raspberry-pi3p-64 phytec-imx6 pcduino-3b
+PKG_SYSTEM_DEPENDS:=	beaglebone-black orange-pi0 raspberry-pi raspberry-pi2 raspberry-pi3 banana-pro solidrun-imx6 solidrun-clearfog raspberry-pi3-64 raspberry-pi3p raspberry-pi3p-64 phytec-imx6 pcduino-3b imgtec-ci20
 
 include $(ADK_TOPDIR)/mk/host.mk
 include $(ADK_TOPDIR)/mk/package.mk
@@ -70,6 +70,10 @@ ifeq ($(ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK),y)
 CONFIG:=		am335x_evm_defconfig
 UBOOT:=			u-boot.img
 endif
+ifeq ($(ADK_TARGET_SYSTEM_IMGTEC_CI20),y)
+CONFIG:=		ci20_mmc_defconfig
+UBOOT:=			u-boot-dtb.img
+endif
 
 HOST_MAKE_FLAGS+=	HOSTCFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" \
 			HOSTLDFLAGS="$(HOST_LDFLAGS) -ldl"
@@ -105,6 +109,9 @@ endif
 
 u-boot-install:
 	$(CP) $(WRKBUILD)/$(UBOOT) $(FW_DIR)
+ifeq ($(ADK_TARGET_SYSTEM_IMGTEC_CI20),y)
+	$(CP) $(WRKBUILD)/spl/u-boot-spl.bin $(FW_DIR)
+endif
 	$(INSTALL_DIR) $(IDIR_U_BOOT)/etc
 	$(CP) ./files/fw_env.config $(IDIR_U_BOOT)/etc
 ifneq ($(OS_FOR_BUILD),Darwin)
diff --git a/scripts/install.sh b/scripts/install.sh
index 60c2475a2..0305ef8e4 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -155,7 +155,7 @@ tgt=$2
 src=$3
 
 case $target {
-(banana-pro|orange-pi0|pcengines-apu|phytec-imx6|phytec-wega|raspberry-pi|raspberry-pi0|raspberry-pi2|raspberry-pi3|raspberry-pi3-64|raspberry-pi4|raspberry-pi4-64|solidrun-imx6|solidrun-clearfog|default) ;;
+(banana-pro|orange-pi0|pcengines-apu|phytec-imx6|phytec-wega|raspberry-pi|raspberry-pi0|raspberry-pi2|raspberry-pi3|raspberry-pi3-64|raspberry-pi4|raspberry-pi4-64|solidrun-imx6|solidrun-clearfog|imgtec-ci20|default) ;;
 (*)
 	print -u2 "Unknown target '$target', exiting"
 	exit 1 ;;
@@ -545,6 +545,10 @@ fi
 fwdir=$(dirname "$src")
 
 case $target {
+(imgtec-ci20)
+	dd if="$fwdir/u-boot-spl.bin" of="$tgt" obs=512 seek=1 > /dev/null 2>&1
+	dd if="$fwdir/u-boot-dtb.img" of="$tgt" obs=1k seek=14 > /dev/null 2>&1
+	;;
 (banana-pro|orange-pi0)
 	dd if="$fwdir/u-boot-sunxi-with-spl.bin" of="$tgt" bs=1024 seek=8 > /dev/null 2>&1
 	;;
diff --git a/target/mips/Makefile b/target/mips/Makefile
index 1c35e0b24..db66205bd 100644
--- a/target/mips/Makefile
+++ b/target/mips/Makefile
@@ -38,6 +38,10 @@ ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y)
 	@echo 'then install kernel and filesystem via:'
 	@echo 'adkinstall -c -a ${ROOTFSTARBALL}'
 endif
+ifeq ($(ADK_TARGET_SYSTEM_IMGTEC_CI20),y)
+	@echo "Use following command to install it on SD card:"
+	@echo "sudo ./scripts/install.sh $(ADK_TARGET_SYSTEM) /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL)"
+endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs)
 targethelp:
diff --git a/target/mips/systems/imgtec-ci20 b/target/mips/systems/imgtec-ci20
index 3a91f03f6..82ea79683 100644
--- a/target/mips/systems/imgtec-ci20
+++ b/target/mips/systems/imgtec-ci20
@@ -11,6 +11,7 @@ config ADK_TARGET_SYSTEM_IMGTEC_CI20
 	select ADK_TARGET_WITH_BLOCK
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
 	select ADK_TARGET_KERNEL_UIMAGE
+	select ADK_PACKAGE_U_BOOT
 	select ADK_HOST_BUILD_U_BOOT
 	help
 	  Support for Imagination Creator CI20.