diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index b1106deef0..463c6871c0 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -188,13 +188,14 @@
 	"tftpboot=tftpboot $fit_addr_r $bootfile &&" \
 		"bootm $fit_addr_r\0"
 #else
-#define CONFIG_BOOTFILE			"uImage"
+#define CONFIG_CMD_BOOTZ
+#define CONFIG_BOOTFILE			"zImage"
 #define LINUXBOOT_ENV_SETTINGS \
 	"fdt_addr=0x00100000\0" \
 	"fdt_addr_r=0x84100000\0" \
 	"fdt_size=0x00008000\0" \
 	"kernel_addr=0x00200000\0" \
-	"kernel_addr_r=0x84200000\0" \
+	"kernel_addr_r=0x80208000\0" \
 	"kernel_size=0x00800000\0" \
 	"ramdisk_addr=0x00a00000\0" \
 	"ramdisk_addr_r=0x84a00000\0" \
@@ -203,15 +204,15 @@
 	"norboot=setexpr kernel_addr $nor_base + $kernel_addr &&" \
 		"setexpr ramdisk_addr $nor_base + $ramdisk_addr &&" \
 		"setexpr fdt_addr $nor_base + $fdt_addr &&" \
-		"bootm $kernel_addr $ramdisk_addr $fdt_addr\0" \
+		"bootz $kernel_addr $ramdisk_addr $fdt_addr\0" \
 	"nandboot=nand read $kernel_addr_r $kernel_addr $kernel_size &&" \
 		"nand read $ramdisk_addr_r $ramdisk_addr $ramdisk_size &&" \
 		"nand read $fdt_addr_r $fdt_addr $fdt_size &&" \
-		"bootm $kernel_addr_r $ramdisk_addr_r $fdt_addr_r\0" \
+		"bootz $kernel_addr_r $ramdisk_addr_r $fdt_addr_r\0" \
 	"tftpboot=tftpboot $kernel_addr_r $bootfile &&" \
 		"tftpboot $ramdisk_addr_r $ramdisk_file &&" \
 		"tftpboot $fdt_addr_r $fdt_file &&" \
-		"bootm $kernel_addr_r $ramdisk_addr_r $fdt_addr_r\0"
+		"bootz $kernel_addr_r $ramdisk_addr_r $fdt_addr_r\0"
 #endif
 
 #define	CONFIG_EXTRA_ENV_SETTINGS				\