X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfigs%2Funiphier.h;h=1b4140de065a34de7c3b03eb446498583e1af7b9;hb=6f6b7cfa89e5aa3b643196a4ccc8b1ba5d6fa7a4;hp=453f3db9ebab058cee3d7bfc9b7cc2759b9fdbbd;hpb=a27bcbf81563880a1cfc805625dc57dbde658e1d;p=u-boot

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 453f3db9eb..1b4140de06 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -48,15 +48,10 @@
 
 /* serial console configuration */
 
-#define CONFIG_SYS_LONGHELP		/* undef to save memory */
-
-#define CONFIG_CMDLINE_EDITING		/* add command line history	*/
 #define CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size */
 /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE		(CONFIG_SYS_CBSIZE)
 
-#define CONFIG_CONS_INDEX		1
-
 #define CONFIG_ENV_OFFSET			0x100000
 #define CONFIG_ENV_SIZE				0x2000
 /* #define CONFIG_ENV_OFFSET_REDUND	(CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) */
@@ -90,12 +85,10 @@
 #define CONFIG_GATEWAYIP		192.168.11.1
 #define CONFIG_NETMASK			255.255.255.0
 
-#define CONFIG_LOADADDR			0x84000000
+#define CONFIG_LOADADDR			0x85000000
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR
 #define CONFIG_SYS_BOOTM_LEN		(32 << 20)
 
-#define CONFIG_CMDLINE_EDITING		/* add command line history	*/
-
 #if defined(CONFIG_ARM64)
 /* ARM Trusted Firmware */
 #define BOOT_IMAGES \
@@ -120,7 +113,7 @@
 #define CONFIG_BOOTFILE			"fitImage"
 #define LINUXBOOT_ENV_SETTINGS \
 	"fit_addr=0x00100000\0" \
-	"fit_addr_r=0x84100000\0" \
+	"fit_addr_r=0x85100000\0" \
 	"fit_size=0x00f00000\0" \
 	"norboot=setexpr fit_addr $nor_base + $fit_addr &&" \
 		"bootm $fit_addr\0" \
@@ -133,7 +126,7 @@
 #ifdef CONFIG_ARM64
 #define CONFIG_BOOTFILE			"Image.gz"
 #define LINUXBOOT_CMD			"booti"
-#define KERNEL_ADDR_LOAD		"kernel_addr_load=0x84200000\0"
+#define KERNEL_ADDR_LOAD		"kernel_addr_load=0x85200000\0"
 #define KERNEL_ADDR_R			"kernel_addr_r=0x82080000\0"
 #else
 #define CONFIG_BOOTFILE			"zImage"
@@ -143,15 +136,15 @@
 #endif
 #define LINUXBOOT_ENV_SETTINGS \
 	"fdt_addr=0x00100000\0" \
-	"fdt_addr_r=0x84100000\0" \
+	"fdt_addr_r=0x85100000\0" \
 	"fdt_size=0x00008000\0" \
 	"kernel_addr=0x00200000\0" \
 	KERNEL_ADDR_LOAD \
 	KERNEL_ADDR_R \
-	"kernel_size=0x00800000\0" \
-	"ramdisk_addr=0x00a00000\0" \
-	"ramdisk_addr_r=0x84a00000\0" \
-	"ramdisk_size=0x00600000\0" \
+	"kernel_size=0x00e00000\0" \
+	"ramdisk_addr=0x01000000\0" \
+	"ramdisk_addr_r=0x86000000\0" \
+	"ramdisk_size=0x00800000\0" \
 	"ramdisk_file=rootfs.cpio.uboot\0" \
 	"boot_common=setexpr bootm_low $kernel_addr_r '&' fe000000 && " \
 		"if test $kernel_addr_load = $kernel_addr_r; then " \
@@ -197,17 +190,17 @@
 		"tftpboot $second_image && " \
 		"mmc write $loadaddr 0 100 && " \
 		"tftpboot $third_image && " \
-		"mmc write $loadaddr 100 700\0" \
+		"mmc write $loadaddr 100 f00\0" \
 	"nandupdate=nand erase 0 0x00100000 &&"			\
 		"tftpboot $second_image && " \
 		"nand write $loadaddr 0 0x00020000 && " \
 		"tftpboot $third_image && " \
-		"nand write $loadaddr 0x00020000 0x000e0000\0" \
+		"nand write $loadaddr 0x00020000 0x001e0000\0" \
 	"usbupdate=usb start &&" \
 		"tftpboot $second_image && " \
 		"usb write $loadaddr 0 100 && " \
 		"tftpboot $third_image && " \
-		"usb write $loadaddr 100 700\0" \
+		"usb write $loadaddr 100 f00\0" \
 	BOOT_IMAGES \
 	LINUXBOOT_ENV_SETTINGS
 
@@ -215,10 +208,6 @@
 
 #define CONFIG_SYS_SDRAM_BASE		0x80000000
 #define CONFIG_NR_DRAM_BANKS		3
-/* for LD20; the last 64 byte is used for dynamic DDR PHY training */
-#define CONFIG_SYS_MEM_TOP_HIDE		64
-
-#define CONFIG_PANIC_HANG
 
 #define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_TEXT_BASE)
 
@@ -232,8 +221,6 @@
 
 #define CONFIG_SPL_STACK		(0x00100000)
 
-#define CONFIG_SPL_FRAMEWORK
-
 #define CONFIG_SYS_NAND_U_BOOT_OFFS		0x20000
 
 /* subtract sizeof(struct image_header) */