Merge branch 'master' of git://git.denx.de/u-boot-usb

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

diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index e2f070f..f8c793f 100644 (file)
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2015 Google, Inc
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 
 #ifndef __CONFIG_RK3288_COMMON_H
@@ -19,14 +18,8 @@
 #define        CONFIG_SYS_TIMER_BASE           0xff810020 /* TIMER7 */
 #define CONFIG_SYS_TIMER_COUNTER       (CONFIG_SYS_TIMER_BASE + 8)
 
-#define CONFIG_SPL_FRAMEWORK
-#define CONFIG_SYS_NS16550_MEM32
-
 #ifdef CONFIG_SPL_ROCKCHIP_BACK_TO_BROM
 /* Bootrom will load u-boot binary to 0x0 once return from SPL */
-#define CONFIG_SYS_TEXT_BASE           0x00000000
-#else
-#define CONFIG_SYS_TEXT_BASE           0x00100000
 #endif
 #define CONFIG_SYS_INIT_SP_ADDR                0x00100000
 #define CONFIG_SYS_LOAD_ADDR           0x00800800
@@ -53,15 +46,12 @@
 #define SDRAM_MAX_SIZE                 0xfe000000
 
 #define CONFIG_SPI_FLASH
-#define CONFIG_SPI
 #define CONFIG_SF_DEFAULT_SPEED 20000000
 
 #ifndef CONFIG_SPL_BUILD
 /* usb otg */
-#define CONFIG_ROCKCHIP_USB2_PHY
 
 /* usb mass storage */
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_CMD_USB_MASS_STORAGE
 
 /* usb host support */
@@ -79,6 +69,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "fdt_high=0x0fffffff\0" \
        "initrd_high=0x0fffffff\0" \
+       "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
        "partitions=" PARTS_DEFAULT \
        ENV_MEM_LAYOUT_SETTINGS \
        ROCKCHIP_DEVICE_SETTINGS \