X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Frk3188_common.h;h=ac9195672fb7f8103b54b6d5d46ca8a6b40d0615;hb=6786ce1ce14feb4d02854a0c04bc0cce505be46e;hp=ff6dfd5a446835bf6f030da107849ff7852d0a47;hpb=abeb9d7897510533ce3a0a9515cac16db5bed834;p=platform%2Fkernel%2Fu-boot.git

diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h
index ff6dfd5..ac91956 100644
--- a/include/configs/rk3188_common.h
+++ b/include/configs/rk3188_common.h
@@ -1,52 +1,22 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2015 Google, Inc
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 
 #ifndef __CONFIG_RK3188_COMMON_H
 #define __CONFIG_RK3188_COMMON_H
 
-#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_NR_DRAM_BANKS		1
-#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
-#define CONFIG_SYS_INIT_SP_ADDR		0x60100000
-#define CONFIG_SYS_LOAD_ADDR		0x60800800
-
-#define CONFIG_ROCKCHIP_MAX_INIT_SIZE	(0x8000 - 0x800)
-#define CONFIG_ROCKCHIP_CHIP_TAG	"RK31"
+#define CFG_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 CONFIG_NR_DRAM_BANKS		1
+#define CFG_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 */
 
 /* usb host support */
@@ -61,7 +31,8 @@
 
 /* Linux fails to load the fdt if it's loaded above 256M on a Rock board,
  * so limit the fdt reallocation to that */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
+	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"fdt_high=0x6fffffff\0" \
 	"initrd_high=0x6fffffff\0" \
 	"partitions=" PARTS_DEFAULT \
@@ -69,8 +40,4 @@
 	ROCKCHIP_DEVICE_SETTINGS \
 	BOOTENV
 
-#endif /* CONFIG_SPL_BUILD */
-
-#define CONFIG_PREBOOT
-
 #endif