X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Funiphier.h;h=e45b506eba9217849aa8cd8e2e5c87b27b846121;hb=8d3a25685e4aac7070365a2b3c53c2c81b27930f;hp=b453d8fba8128144cb053d36832275c145ac0649;hpb=e9d33e73264c61c87a40946abe4d44a2d2e47292;p=platform%2Fkernel%2Fu-boot.git

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index b453d8f..e45b506 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -36,8 +36,6 @@
 
 #ifdef CONFIG_MICRO_SUPPORT_CARD
 #define CONFIG_SMC911X
-#else
-#define CONFIG_SYS_NO_FLASH
 #endif
 
 #define CONFIG_FLASH_CFI_DRIVER
@@ -59,7 +57,6 @@
 #define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1
 
 /* serial console configuration */
-#define CONFIG_BAUDRATE			115200
 
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 
@@ -119,7 +116,6 @@
 
 /* USB */
 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS	4
-#define CONFIG_FAT_WRITE
 
 /* SD/MMC */
 #define CONFIG_SUPPORT_EMMC_BOOT
@@ -144,7 +140,7 @@
 #if defined(CONFIG_ARM64) && !defined(CONFIG_ARMV8_MULTIENTRY)
 /* ARM Trusted Firmware */
 #define BOOT_IMAGES \
-	"second_image=bl1.bin\0" \
+	"second_image=unph_bl.bin\0" \
 	"third_image=fip.bin\0"
 #else
 #define BOOT_IMAGES \
@@ -179,7 +175,7 @@
 #define CONFIG_BOOTFILE			"Image.gz"
 #define LINUXBOOT_CMD			"booti"
 #define KERNEL_ADDR_LOAD		"kernel_addr_load=0x84200000\0"
-#define KERNEL_ADDR_R			"kernel_addr_r=0x80080000\0"
+#define KERNEL_ADDR_R			"kernel_addr_r=0x82080000\0"
 #else
 #define CONFIG_BOOTFILE			"zImage"
 #define LINUXBOOT_CMD			"bootz"
@@ -249,6 +245,11 @@
 		"nand write $loadaddr 0 0x00020000 && " \
 		"tftpboot $third_image && " \
 		"nand write $loadaddr 0x00020000 0x000e0000\0" \
+	"usbupdate=usb start &&" \
+		"tftpboot $second_image && " \
+		"usb write $loadaddr 0 100 && " \
+		"tftpboot $third_image && " \
+		"usb write $loadaddr 100 700\0" \
 	BOOT_IMAGES \
 	LINUXBOOT_ENV_SETTINGS
 
@@ -287,8 +288,6 @@
 #define CONFIG_SPL_BOARD_LOAD_IMAGE
 #endif
 
-#define CONFIG_SPL_BOARD_INIT
-
 #define CONFIG_SYS_NAND_U_BOOT_OFFS		0x20000
 
 /* subtract sizeof(struct image_header) */