4 files changed, 65 insertions, 13 deletions
diff --git a/target/mips/Makefile b/target/mips/Makefile
index 1c35e0b24..2255ffa42 100644
--- a/target/mips/Makefile
+++ b/target/mips/Makefile
@@ -9,6 +9,9 @@ KERNEL:=$(LINUX_DIR)/$(ADK_TARGET_KERNEL)
 ifeq ($(ADK_TARGET_KERNEL_UIMAGE),y)
 KERNEL:=$(LINUX_DIR)/arch/mips/boot/uImage
 endif
+ifeq ($(ADK_TARGET_KERNEL_UIMAGEGZ),y)
+KERNEL:=$(LINUX_DIR)/arch/mips/boot/uImage.gz
+endif
 
 OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id
 
@@ -38,6 +41,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:
@@ -72,12 +79,12 @@ targethelp:
 endif
 ifeq ($(ADK_TARGET_FS),genimage)
 targethelp:
-	@echo "The disk image is: $(FW_DIR)/disk.img"
+	@echo "The disk image is: $(FW_DIR)/sdcard.img"
 ifeq ($(ADK_TARGET_QEMU),y)
 	@echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} $(FW_DIR)/disk.img'
 else
 	@echo "Use following command to install it on SD card:"
-	@echo 'sudo dd if=$(FW_DIR)/disk.img of=/dev/sdX bs=2048k'
+	@echo 'sudo dd if=$(FW_DIR)/sdcard.img of=/dev/sdX bs=2048k'
 endif
 endif
 ifeq ($(ADK_TARGET_FS),ubifs)
@@ -86,13 +93,9 @@ targethelp:
 	@echo 'The UBI image is: ${FW_DIR}/${ROOTFSUBIFS}'
 endif
 
-# image creation and kernel install
+# dummy
 kernel-strip:
-ifeq ($(ADK_TARGET_KERNEL_UIMAGE),)
-	$(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
-else
 	@cp $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
-endif
 
 kernel-install: kernel-strip
 	@cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL}
diff --git a/target/mips/imgtec-ci20/genimage.cfg b/target/mips/imgtec-ci20/genimage.cfg
new file mode 100644
index 000000000..8b55766ec
--- /dev/null
+++ b/target/mips/imgtec-ci20/genimage.cfg
@@ -0,0 +1,33 @@
+image sdcard.img {
+	hdimage {
+	}
+
+	partition uboot-spl {
+		in-partition-table = "no"
+		image = "u-boot-spl.bin"
+		offset = 512
+	}
+
+	partition uboot {
+		in-partition-table = "no"
+		image = "u-boot-dtb.img"
+		offset = 14K
+	}
+
+	partition uboot-env {
+		in-partition-table = "no"
+		image = "uboot-env.bin"
+		offset = 526K
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext"
+		offset = 2M
+	}
+
+	partition cfgfs {
+		partition-type = 0x88
+		image = "cfgfs.img"
+	}
+}
diff --git a/target/mips/systems/imgtec-ci20 b/target/mips/systems/imgtec-ci20
index 3a91f03f6..bd2f750d1 100644
--- a/target/mips/systems/imgtec-ci20
+++ b/target/mips/systems/imgtec-ci20
@@ -10,7 +10,8 @@ config ADK_TARGET_SYSTEM_IMGTEC_CI20
 	select ADK_TARGET_WITH_NETDEVICE
 	select ADK_TARGET_WITH_BLOCK
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
-	select ADK_TARGET_KERNEL_UIMAGE
+	select ADK_TARGET_KERNEL_UIMAGEGZ
+	select ADK_PACKAGE_U_BOOT
 	select ADK_HOST_BUILD_U_BOOT
 	help
 	  Support for Imagination Creator CI20.
diff --git a/target/mips/uclibc-ng.config b/target/mips/uclibc-ng.config
index 605390055..64c805f03 100644
--- a/target/mips/uclibc-ng.config
+++ b/target/mips/uclibc-ng.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# uClibc-ng 1.0.25 C Library Configuration
+# uClibc-ng 1.0.51 C Library Configuration
 #
 # TARGET_aarch64 is not set
 # TARGET_alpha is not set
@@ -10,11 +10,13 @@
 # TARGET_bfin is not set
 # TARGET_c6x is not set
 # TARGET_cris is not set
+# TARGET_csky is not set
 # TARGET_frv is not set
 # TARGET_h8300 is not set
 # TARGET_hppa is not set
 # TARGET_i386 is not set
 # TARGET_ia64 is not set
+# TARGET_kvx is not set
 # TARGET_lm32 is not set
 # TARGET_m68k is not set
 # TARGET_metag is not set
@@ -24,11 +26,16 @@ TARGET_mips=y
 # TARGET_nios2 is not set
 # TARGET_or1k is not set
 # TARGET_powerpc is not set
+# TARGET_riscv64 is not set
+# TARGET_riscv32 is not set
 # TARGET_sh is not set
 # TARGET_sparc is not set
 # TARGET_sparc64 is not set
+# TARGET_tile is not set
 # TARGET_x86_64 is not set
 # TARGET_xtensa is not set
+TARGET_LDSO_NAME="ld-uClibc"
+TARGET_ARCH_BITS=32
 
 #
 # Target Architecture Features and Options
@@ -57,7 +64,7 @@ UCLIBC_HAS_FLOATS=y
 UCLIBC_HAS_FPU=y
 DO_C99_MATH=y
 DO_XSI_MATH=y
-# UCLIBC_HAS_FENV is not set
+UCLIBC_HAS_FENV=y
 UCLIBC_HAS_LONG_DOUBLE_MATH=y
 KERNEL_HEADERS=""
 HAVE_DOT_CONFIG=y
@@ -66,7 +73,9 @@ HAVE_DOT_CONFIG=y
 # General Library Settings
 #
 DOPIC=y
+# STATIC_PIE is not set
 ARCH_HAS_UCONTEXT=y
+HAVE_LDSO=y
 HAVE_SHARED=y
 # FORCE_SHAREABLE_TEXT_SEGMENTS is not set
 LDSO_LDD_SUPPORT=y
@@ -76,21 +85,22 @@ LDSO_CACHE_SUPPORT=y
 LDSO_BASE_FILENAME="ld.so"
 # LDSO_STANDALONE_SUPPORT is not set
 # LDSO_PRELINK_SUPPORT is not set
+ARCH_VDSO_SUPPORT=y
+VDSO_SUPPORT=y
 # UCLIBC_STATIC_LDCONFIG is not set
 LDSO_RUNPATH=y
 LDSO_RUNPATH_OF_EXECUTABLE=y
 LDSO_SAFE_RUNPATH=y
 LDSO_SEARCH_INTERP_PATH=y
 LDSO_LD_LIBRARY_PATH=y
-LDSO_NO_CLEANUP=y
 UCLIBC_CTOR_DTOR=y
-# LDSO_GNU_HASH_SUPPORT is not set
 # HAS_NO_THREADS is not set
 # UCLIBC_HAS_LINUXTHREADS is not set
 UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y
 PTHREADS_DEBUG_SUPPORT=y
+PTHREADS_STACK_DEFAULT_SIZE=2097152
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
 # MALLOC is not set
@@ -120,6 +130,7 @@ UCLIBC_HAS_TZ_FILE=y
 UCLIBC_HAS_TZ_FILE_READ_MANY=y
 UCLIBC_TZ_FILE_PATH="/etc/TZ"
 UCLIBC_FALLBACK_TO_ETC_LOCALTIME=y
+UCLIBC_USE_TIME64=y
 
 #
 # Advanced Library Settings
@@ -135,6 +146,7 @@ UCLIBC_HAS_GNU_ERROR=y
 UCLIBC_BSD_SPECIFIC=y
 UCLIBC_HAS_BSD_ERR=y
 UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y
+# UCLIBC_HAS_BSD_B64_NTOP_B64_PTON is not set
 # UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
 # UCLIBC_NTP_LEGACY is not set
 UCLIBC_SV4_DEPRECATED=y
@@ -157,6 +169,10 @@ UCLIBC_HAS_BSD_RES_CLOSE=y
 UCLIBC_HAS_COMPAT_RES_STATE=y
 # UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
 UCLIBC_HAS_RESOLVER_SUPPORT=y
+# UCLIBC_DNSRAND_MODE_URANDOM is not set
+# UCLIBC_DNSRAND_MODE_CLOCK is not set
+UCLIBC_DNSRAND_MODE_PRNGPLUS=y
+# UCLIBC_DNSRAND_MODE_SIMPLECOUNTER is not set
 
 #
 # String and Stdio Support
@@ -227,7 +243,6 @@ HARDWIRED_ABSPATH=y
 # Security options
 #
 # UCLIBC_BUILD_PIE is not set
-# UCLIBC_HAS_ARC4RANDOM is not set
 # UCLIBC_HAS_SSP is not set
 # UCLIBC_BUILD_RELRO is not set
 # UCLIBC_BUILD_NOW is not set