X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Frk3036_common.h;h=ea6073f2944608a13290f76f2ad712ea0ebce5d6;hb=dd11fdc31fb82f63258c1970a6d8d22b8ffd3173;hp=5905518edf1990fb89563b1c78200f1f5cac969f;hpb=9acf3726b654d06c50c07c3f45da9eb1cbbadf34;p=platform%2Fkernel%2Fu-boot.git

diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h
index 5905518..ea6073f 100644
--- a/include/configs/rk3036_common.h
+++ b/include/configs/rk3036_common.h
@@ -8,23 +8,12 @@
 #include <asm/arch-rockchip/hardware.h>
 #include "rockchip-common.h"
 
-#define CONFIG_SYS_CBSIZE		1024
+#define CFG_SYS_HZ_CLOCK		24000000
 
-#define COUNTER_FREQUENCY		24000000
-#define CONFIG_SYS_HZ_CLOCK		24000000
-
-#define CONFIG_SYS_INIT_SP_ADDR		0x60100000
-#define CONFIG_SPL_STACK		0x10081fff
-
-#define CONFIG_ROCKCHIP_MAX_INIT_SIZE	(4 << 10)
-#define CONFIG_ROCKCHIP_CHIP_TAG	"RK30"
-
-#define CONFIG_SYS_SDRAM_BASE		0x60000000
+#define CFG_SYS_SDRAM_BASE		0x60000000
 #define SDRAM_BANK_SIZE			(512UL << 20UL)
 #define SDRAM_MAX_SIZE                  (CONFIG_NR_DRAM_BANKS * SDRAM_BANK_SIZE)
 
-#ifndef CONFIG_SPL_BUILD
-
 #define ENV_MEM_LAYOUT_SETTINGS \
 	"scriptaddr=0x60000000\0" \
 	"pxefile_addr_r=0x60100000\0" \
@@ -36,12 +25,11 @@
 
 /* Linux fails to load the fdt if it's loaded above 512M on a evb-rk3036 board,
  * so limit the fdt reallocation to that */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"fdt_high=0x7fffffff\0" \
 	"partitions=" PARTS_DEFAULT \
 	ENV_MEM_LAYOUT_SETTINGS \
 	BOOTENV
-#endif
 
 #endif