Merge branch 'master_sh/gen4/mmcfix' of https://source.denx.de/u-boot/custodians...

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

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 8cd81f1..0a14d04 100644 (file)
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -36,8 +36,7 @@
        BOOT_TARGET_DEVICE_USB(func)
 
 #if !defined(CONFIG_ARM64)
-/* Time clock 1MHz */
-#define CFG_SYS_TIMER_RATE                     1000000
+#define CFG_SYS_HZ_CLOCK                       50000000
 #endif
 
 #define CFG_SYS_NAND_REGS_BASE                 0x68100000
@@ -46,10 +45,6 @@
 /*
  * Network Configuration
  */
-#define CONFIG_SERVERIP                        192.168.11.1
-#define CONFIG_IPADDR                  192.168.11.10
-#define CONFIG_GATEWAYIP               192.168.11.1
-#define CONFIG_NETMASK                 255.255.255.0
 
 #if defined(CONFIG_ARM64)
 /* ARM Trusted Firmware */
@@ -62,8 +57,6 @@
        "third_image=u-boot.bin\0"
 #endif
 
-#define CONFIG_ROOTPATH                        "/nfs/root/path"
-
 #ifdef CONFIG_FIT
 #define KERNEL_ADDR_R_OFFSET           "0x05100000"
 #define LINUXBOOT_ENV_SETTINGS \
@@ -92,7 +85,7 @@
                "run boot_common\0"
 #endif
 
-#define        CONFIG_EXTRA_ENV_SETTINGS                               \
+#define        CFG_EXTRA_ENV_SETTINGS                          \
        "fdt_addr_r_offset=0x05100000\0" \
        "kernel_addr_r_offset=" KERNEL_ADDR_R_OFFSET "\0" \
        "ramdisk_addr_r_offset=0x06000000\0" \