Merge git://git.denx.de/u-boot-socfpga

[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 d95254b..7c79ed6 100644 (file)
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -1,17 +1,15 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2015 Google, Inc
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 
 #ifndef __CONFIG_RK3288_COMMON_H
 #define __CONFIG_RK3288_COMMON_H
 
-#include <asm/arch/hardware.h>
+#include <asm/arch-rockchip/hardware.h>
 #include "rockchip-common.h"
 
 #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
-#define CONFIG_NR_DRAM_BANKS           1
 #define CONFIG_SYS_MALLOC_LEN          (32 << 20)
 #define CONFIG_SYS_CBSIZE              1024
 
@@ -25,14 +23,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR                0x00100000
 #define CONFIG_SYS_LOAD_ADDR           0x00800800
 #define CONFIG_SPL_STACK               0xff718000
-#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_TPL_BOOTROM_SUPPORT)
-# define CONFIG_SPL_TEXT_BASE          0x0
-#else
-# define CONFIG_SPL_TEXT_BASE          0xff704000
-#endif
-
-/* MMC/SD IP block */
-#define CONFIG_BOUNCE_BUFFER
 
 /* RAW SD card / eMMC locations. */
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     (128 << 10)
@@ -42,13 +32,9 @@
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot.img"
 
 #define CONFIG_SYS_SDRAM_BASE          0
-#define CONFIG_NR_DRAM_BANKS           1
 #define SDRAM_BANK_SIZE                        (2UL << 30)
 #define SDRAM_MAX_SIZE                 0xfe000000
 
-#define CONFIG_SPI_FLASH
-#define CONFIG_SF_DEFAULT_SPEED 20000000
-
 #ifndef CONFIG_SPL_BUILD
 /* usb otg */
 
@@ -70,7 +56,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "fdt_high=0x0fffffff\0" \
        "initrd_high=0x0fffffff\0" \
-       "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
+       "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
        "partitions=" PARTS_DEFAULT \
        ENV_MEM_LAYOUT_SETTINGS \
        ROCKCHIP_DEVICE_SETTINGS \