Merge tag 'efi-2020-07-rc2-4' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / include / configs / rk3188_common.h

diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h
index d1837d5c4e4b12ac829af14607430c0e77493e43..3bcc04808a3c00d070c0ffd089201627f15d0093 100644 (file)
--- a/include/configs/rk3188_common.h
+++ b/include/configs/rk3188_common.h
@@ -8,15 +8,12 @@
 
 #define CONFIG_SYS_CACHELINE_SIZE      64
 
-#include <asm/arch/hardware.h>
+#include <asm/arch-rockchip/hardware.h>
 #include "rockchip-common.h"
 
 #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
-#define CONFIG_SYS_MALLOC_LEN          (32 << 20)
 #define CONFIG_SYS_CBSIZE              1024
 
-#define CONFIG_SYS_NS16550_MEM32
-
 #ifdef CONFIG_SPL_ROCKCHIP_BACK_TO_BROM
 /* Bootrom will load u-boot binary to 0x60000000 once return from SPL */
 #endif
@@ -25,24 +22,18 @@
 
 #define CONFIG_ROCKCHIP_MAX_INIT_SIZE  (0x8000 - 0x800)
 #define CONFIG_ROCKCHIP_CHIP_TAG       "RK31"
+#define CONFIG_IRAM_BASE       0x10080000
 
-#define CONFIG_SPL_TEXT_BASE           0x10080800
 /* spl size 32kb sram - 2kb bootrom */
 #define CONFIG_SPL_MAX_SIZE            (0x8000 - 0x800)
 #define CONFIG_ROCKCHIP_SERIAL         1
 
 #define CONFIG_SPL_STACK               0x10087fff
 
-/* MMC/SD IP block */
-#define CONFIG_BOUNCE_BUFFER
-
 #define CONFIG_SYS_SDRAM_BASE          0x60000000
 #define SDRAM_BANK_SIZE                        (2UL << 30)
 #define SDRAM_MAX_SIZE                 0x80000000
 
-#define CONFIG_SPI_FLASH
-#define CONFIG_SF_DEFAULT_SPEED 20000000
-
 #ifndef CONFIG_SPL_BUILD
 /* usb otg */
 
@@ -69,6 +60,4 @@
 
 #endif /* CONFIG_SPL_BUILD */
 
-#define CONFIG_PREBOOT
-
 #endif