Merge tag 'u-boot-amlogic-20230417' of https://source.denx.de/u-boot/custodians/u...

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

diff --git a/include/configs/rv1108_common.h b/include/configs/rv1108_common.h
index d8de9c2..050d37b 100644 (file)
--- a/include/configs/rv1108_common.h
+++ b/include/configs/rv1108_common.h
@@ -8,18 +8,14 @@
 #include <asm/arch-rockchip/hardware.h>
 #include "rockchip-common.h"
 
-#define CONFIG_IRAM_BASE               0x10080000
+#define CFG_IRAM_BASE          0x10080000
 
-#define CONFIG_SYS_TIMER_RATE          (24 * 1000 * 1000)
+#define CFG_SYS_TIMER_RATE             (24 * 1000 * 1000)
 /* TIMER1,initialized by ddr initialize code */
-#define CONFIG_SYS_TIMER_BASE          0x10350020
-#define CONFIG_SYS_TIMER_COUNTER       (CONFIG_SYS_TIMER_BASE + 8)
+#define CFG_SYS_TIMER_BASE             0x10350020
+#define CFG_SYS_TIMER_COUNTER  (CFG_SYS_TIMER_BASE + 8)
 
-#define CONFIG_SYS_SDRAM_BASE          0x60000000
-
-/* rockchip ohci host driver */
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     1
+#define CFG_SYS_SDRAM_BASE             0x60000000
 
 #define ENV_MEM_LAYOUT_SETTINGS \
        "scriptaddr=0x60000000\0" \
@@ -28,7 +24,7 @@
        "ramdisk_addr_r=0x64000000\0"
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        ENV_MEM_LAYOUT_SETTINGS \
        "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
        "partitions=" PARTS_DEFAULT \