diff --git a/conf/machine/chip.conf b/conf/machine/chip.conf
index 9a0bd5b5..3835ecfb 100644
--- a/conf/machine/chip.conf
+++ b/conf/machine/chip.conf
@@ -5,11 +5,18 @@
 #https://github.com/NextThingCo/CHIP-linux
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-chip"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-chip"
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-chip"
 PREFERRED_VERSION_linux-chip ?= "4.3.0"
 PREFFERED_VERSION_u-boot-chip ?= "v2015.10%"
+KERNEL_IMAGETYPE ?= "zImage"
 
 require conf/machine/include/sun5i.inc
 
-KERNEL_DEVICETREE = "sun5i-r8-chip.dtb"
-UBOOT_MACHINE_chip = "CHIP_config"
+IMAGE_INSTALL_append = " kernel-devicetree kernel-image kernel-modules"
+MKUBIFS_ARGS        = "-e 0x1f8000 -c 2000 -m 0x4000 -x lzo"
+UBINIZE_ARGS        = "-m 0x4000 -p 0x200000 -s 16384"
+IMAGE_CLASSES       = ""
+IMAGE_FSTYPES       = "ext4 tar.gz ubi ubifs"
+KERNEL_DEVICETREE   = "sun5i-r8-chip.dtb"
+UBOOT_MACHINE_chip  = "CHIP_config"
diff --git a/recipes-bsp/u-boot/files/uboot-env-chip b/recipes-bsp/u-boot/files/uboot-env-chip
index 33213047..a64b20a9 100644
--- a/recipes-bsp/u-boot/files/uboot-env-chip
+++ b/recipes-bsp/u-boot/files/uboot-env-chip
@@ -20,8 +20,8 @@ mtdids=nand0=sunxi-nand.0
 mtdparts=mtdparts=sunxi-nand.0:4m(spl),4m(spl-backup),4m(uboot),4m(env),-(UBI)
 
 # Default boot options
-bootargs=root=ubi0:rootfs rootfstype=ubifs rw ubi.mtd=4 consoleblank=0
-bootcmd=nand slc-mode on; mtdparts; ubi part UBI; ubifsmount ubi0:rootfs; ubifsload $fdt_addr_r /boot/sun5i-r8-chip.dtb; ubifsload $kernel_addr_r /boot/zImage; bootz $kernel_addr_r - $fdt_addr_r
+bootargs=root=ubi0:chip-rootfs rootfstype=ubifs rw ubi.mtd=4 consoleblank=0
+bootcmd=nand slc-mode on; mtdparts; ubi part UBI; ubifsmount ubi0:chip-rootfs; ubifsload $fdt_addr_r /boot/sun5i-r8-chip.dtb; ubifsload $kernel_addr_r /boot/zImage; bootz $kernel_addr_r - $fdt_addr_r
 
 # Ethernet options
 usbnet_devaddr=de:ad:be:af:00:01