Merge tag 'u-boot-at91-2022.07-a' of https://source.denx.de/u-boot/custodians/u-boot...

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

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index cc6b96f..f813f88 100644 (file)
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -39,9 +39,6 @@
 #define BOOTENV
 #endif
 
-#define CONFIG_TIMESTAMP
-
-#define CONFIG_SYS_MONITOR_BASE                0
 #define CONFIG_SYS_MONITOR_LEN         0x00200000      /* 2MB */
 
 #define CONFIG_SYS_CBSIZE              1024    /* Console I/O Buffer Size */
@@ -79,14 +76,8 @@
 #endif
 
 #define CONFIG_ROOTPATH                        "/nfs/root/path"
-#define NFSBOOTCOMMAND                                         \
-       "setenv bootargs $bootargs root=/dev/nfs rw "                   \
-       "nfsroot=$serverip:$rootpath "                                  \
-       "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off;" \
-               "run __nfsboot"
 
 #ifdef CONFIG_FIT
-#define CONFIG_BOOTFILE                        "fitImage"
 #define KERNEL_ADDR_R_OFFSET           "0x05100000"
 #define LINUXBOOT_ENV_SETTINGS \
        "tftpboot=tftpboot $kernel_addr_r $bootfile &&" \
@@ -94,11 +85,9 @@
        "__nfsboot=run tftpboot\0"
 #else
 #ifdef CONFIG_ARM64
-#define CONFIG_BOOTFILE                        "Image"
 #define LINUXBOOT_CMD                  "booti"
 #define KERNEL_ADDR_R_OFFSET           "0x02080000"
 #else
-#define CONFIG_BOOTFILE                        "zImage"
 #define LINUXBOOT_CMD                  "bootz"
 #define KERNEL_ADDR_R_OFFSET           "0x00208000"
 #endif
@@ -193,8 +182,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)
 
@@ -205,6 +192,4 @@
 
 #define CONFIG_SPL_PAD_TO                      0x20000
 
-#define CONFIG_SYS_PCI_64BIT
-
 #endif /* __CONFIG_UNIPHIER_H__ */