Rename CONFIG_EHCI_IS_TDI to CONFIG_USB_EHCI_IS_TDI

[platform/kernel/u-boot.git] / include / configs / uniphier.h

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 740249a..dbd4a00 100644 (file)
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -7,8 +7,8 @@
 
 /* U-Boot - Common settings for UniPhier Family */
 
-#ifndef __CONFIG_UNIPHIER_COMMON_H__
-#define __CONFIG_UNIPHIER_COMMON_H__
+#ifndef __CONFIG_UNIPHIER_H__
+#define __CONFIG_UNIPHIER_H__
 
 #ifndef CONFIG_SPL_BUILD
 #include <config_distro_bootcmd.h>
@@ -39,8 +39,6 @@
 #define BOOTENV
 #endif
 
-#define CONFIG_SYS_MALLOC_LEN          (4 * 1024 * 1024)
-
 #define CONFIG_TIMESTAMP
 
 #define CONFIG_SYS_MONITOR_BASE                0
@@ -56,10 +54,8 @@
 #endif
 
 #define CONFIG_SYS_MAX_NAND_DEVICE                     1
-#define CONFIG_SYS_NAND_ONFI_DETECTION
 #define CONFIG_SYS_NAND_REGS_BASE                      0x68100000
 #define CONFIG_SYS_NAND_DATA_BASE                      0x68000000
-#define CONFIG_SYS_NAND_BAD_BLOCK_POS                  0
 
 /*
  * Network Configuration
@@ -69,7 +65,6 @@
 #define CONFIG_GATEWAYIP               192.168.11.1
 #define CONFIG_NETMASK                 255.255.255.0
 
-#define CONFIG_SYS_LOAD_ADDR           0x85000000
 #define CONFIG_SYS_BOOTM_LEN           (32 << 20)
 
 #if defined(CONFIG_ARM64)
@@ -84,7 +79,7 @@
 #endif
 
 #define CONFIG_ROOTPATH                        "/nfs/root/path"
-#define CONFIG_NFSBOOTCOMMAND                                          \
+#define NFSBOOTCOMMAND                                         \
        "setenv bootargs $bootargs root=/dev/nfs rw "                   \
        "nfsroot=$serverip:$rootpath "                                  \
        "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off;" \
@@ -198,8 +193,6 @@
 /* only for SPL */
 #define CONFIG_SPL_STACK               (0x00100000)
 
-#define CONFIG_SYS_NAND_U_BOOT_OFFS            0x20000
-
 /* subtract sizeof(struct image_header) */
 #define CONFIG_SYS_UBOOT_BASE                  (0x130000 - 0x40)
 
@@ -210,4 +203,6 @@
 
 #define CONFIG_SPL_PAD_TO                      0x20000
 
-#endif /* __CONFIG_UNIPHIER_COMMON_H__ */
+#define CONFIG_SYS_PCI_64BIT
+
+#endif /* __CONFIG_UNIPHIER_H__ */