X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Frk322x_common.h;h=39a40f4e2d1022d0b1411736638d1d92154bd0b9;hb=ac2587907b5473779c80e0eb8478b67997c14439;hp=42a49c5502d4bf9b1d450d771f7877008c08b505;hpb=db289a9d746c5f4ee36002a25303da111f6365e7;p=platform%2Fkernel%2Fu-boot.git

diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h
index 42a49c5..39a40f4 100644
--- a/include/configs/rk322x_common.h
+++ b/include/configs/rk322x_common.h
@@ -8,35 +8,13 @@
 #include <asm/arch-rockchip/hardware.h>
 #include "rockchip-common.h"
 
-#define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_SYS_MALLOC_LEN		(32 << 20)
-#define CONFIG_SYS_CBSIZE		1024
-#define CONFIG_SYS_BOOTM_LEN	(64 << 20)	/*  64M */
-
-#define CONFIG_ROCKCHIP_STIMER_BASE	0x110d0020
-#define COUNTER_FREQUENCY		24000000
-#define CONFIG_SYS_ARCH_TIMER
-#define CONFIG_SYS_HZ_CLOCK		24000000
-
-#define CONFIG_SYS_INIT_SP_ADDR		0x61100000
-#define CONFIG_SYS_LOAD_ADDR		0x61800800
-#define CONFIG_SPL_MAX_SIZE		0x100000
-
-#define CONFIG_ROCKCHIP_MAX_INIT_SIZE	(28 << 10)
-#define CONFIG_ROCKCHIP_CHIP_TAG	"RK32"
-#define CONFIG_IRAM_BASE		0x10080000
-
-#define CONFIG_SYS_SDRAM_BASE		0x60000000
-#define SDRAM_BANK_SIZE			(512UL << 20UL)
-#define SDRAM_MAX_SIZE			0x80000000
+#define CFG_SYS_HZ_CLOCK		24000000
 
-#ifndef CONFIG_SPL_BUILD
-/* usb otg */
+#define CFG_IRAM_BASE		0x10080000
 
-/* usb mass storage */
-#define CONFIG_CMD_USB_MASS_STORAGE
+#define CFG_SYS_SDRAM_BASE		0x60000000
+#define SDRAM_MAX_SIZE			0x80000000
 
-/* usb host */
 #define ENV_MEM_LAYOUT_SETTINGS \
 	"scriptaddr=0x60000000\0" \
 	"pxefile_addr_r=0x60100000\0" \
@@ -48,12 +26,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 \
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"fdt_high=0x7fffffff\0" \
 	"partitions=" PARTS_DEFAULT \
 	ENV_MEM_LAYOUT_SETTINGS \
 	BOOTENV
-#endif
 
 #endif