X-Git-Url: https://git.kernelconcepts.de/?a=blobdiff_plain;f=include%2Fconfigs%2Fevb4510.h;h=0f415d9c8b9ade0268c900b305bba65c478cddcc;hb=4f197c30e5cb3005909402b7fc630cb092eef02f;hp=63ca2a5cb4e37c77ffd09647c1646fc298b0c371;hpb=afbc526336447a7357e9c82852df0377d09a8089;p=karo-tx-uboot.git

diff --git a/include/configs/evb4510.h b/include/configs/evb4510.h
index 63ca2a5cb4..0f415d9c8b 100644
--- a/include/configs/evb4510.h
+++ b/include/configs/evb4510.h
@@ -43,6 +43,7 @@
 #define CONFIG_ARM_THUMB	1	/* this is an ARM7TDMI	 */
 #define CONFIG_S3C4510B		1	/* it's a S3C4510B chip	 */
 #define CONFIG_EVB4510		1	/* on an EVB4510 Board	 */
+#define CONFIG_SYS_NO_CP15_CACHE
 
 #define CONFIG_USE_IRQ
 #define CONFIG_STACKSIZE_IRQ    (4*1024)
@@ -51,8 +52,8 @@
 /*
  * Size of malloc() pool
  */
-#define CFG_MALLOC_LEN		(CONFIG_ENV_SIZE + 128*1024)
-#define CFG_GBL_DATA_SIZE	128
+#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 128*1024)
+#define CONFIG_SYS_GBL_DATA_SIZE	128
 
 /*
  * Hardware drivers
@@ -108,29 +109,27 @@
 /*
  * Miscellaneous configurable options
  */
-#define CFG_LONGHELP				/* undef to save memory */
-#define CFG_PROMPT		"evb4510 # "	/* Monitor Command Prompt */
-#define CFG_CBSIZE		256		/* Console I/O Buffer Size */
-#define CFG_PBSIZE		(CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */
-#define CFG_MAXARGS		16		/* max number of command args */
-#define CFG_BARGSIZE		CFG_CBSIZE	/* Boot Argument Buffer Size */
+#define CONFIG_SYS_LONGHELP				/* undef to save memory */
+#define CONFIG_SYS_PROMPT		"evb4510 # "	/* Monitor Command Prompt */
+#define CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size */
+#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
+#define CONFIG_SYS_MAXARGS		16		/* max number of command args */
+#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size */
 
 #define CONFIG_CMDLINE_TAG                      /* allow passing of command line args to linux */
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
 
-#define CFG_MEMTEST_START	0x00000000	/* memtest works on	*/
-#define CFG_MEMTEST_END		0x00780000	/* 4 ... 8 MB in DRAM	*/
+#define CONFIG_SYS_MEMTEST_START	0x00000000	/* memtest works on	*/
+#define CONFIG_SYS_MEMTEST_END		0x00780000	/* 4 ... 8 MB in DRAM	*/
 
-#undef	CFG_CLKS_IN_HZ		/* everything, incl board info, in Hz */
+#define CONFIG_SYS_LOAD_ADDR		0x00000000	/* default load address */
 
-#define CFG_LOAD_ADDR		0x00000000	/* default load address */
-
-#define CFG_SYS_CLK_FREQ	50000000	/* CPU freq: 50 MHz */
-#define CFG_HZ			1000		/* decrementer freq: 1 KHz */
+#define CONFIG_SYS_SYS_CLK_FREQ	50000000	/* CPU freq: 50 MHz */
+#define CONFIG_SYS_HZ			1000		/* decrementer freq: 1 KHz */
 
 						/* valid baudrates */
-#define CFG_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
+#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*-----------------------------------------------------------------------
  * Stack sizes
@@ -156,25 +155,25 @@
 #define PHYS_FLASH_2		0x02000000 /* Flash Bank #2 */
 #define PHYS_FLASH_2_SIZE	0x00080000 /* 512KB (one chip, 8bit access) */
 
-#define CFG_FLASH_BASE		PHYS_FLASH_1
-#define CFG_FLASH_SIZE		PHYS_FLASH_1_SIZE
+#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
+#define CONFIG_SYS_FLASH_SIZE		PHYS_FLASH_1_SIZE
 
 /*-----------------------------------------------------------------------
  * FLASH and environment organization
  */
-#define CFG_MAX_FLASH_BANKS	1	/* max number of memory banks */
-#define CFG_MAX_FLASH_SECT	35	/* max number of sectors on one chip */
-#define CFG_MAIN_SECT_SIZE	0x00010000  /* main size of sectors on one chip */
+#define CONFIG_SYS_MAX_FLASH_BANKS	1	/* max number of memory banks */
+#define CONFIG_SYS_MAX_FLASH_SECT	35	/* max number of sectors on one chip */
+#define CONFIG_SYS_MAIN_SECT_SIZE	0x00010000  /* main size of sectors on one chip */
 
 /* timeout values are in ticks */
-#define CFG_FLASH_ERASE_TOUT	(4*CFG_HZ) /* Timeout for Flash Erase */
-#define CFG_FLASH_WRITE_TOUT	(2*CFG_HZ) /* Timeout for Flash Write */
+#define CONFIG_SYS_FLASH_ERASE_TOUT	(4*CONFIG_SYS_HZ) /* Timeout for Flash Erase */
+#define CONFIG_SYS_FLASH_WRITE_TOUT	(2*CONFIG_SYS_HZ) /* Timeout for Flash Write */
 
 /* environment settings */
 #define CONFIG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_NOWHERE
 
-#define CONFIG_ENV_ADDR		(CFG_FLASH_BASE + 0x20000) /* environment start address */
+#define CONFIG_ENV_ADDR		(CONFIG_SYS_FLASH_BASE + 0x20000) /* environment start address */
 #define CONFIG_ENV_SECT_SIZE	0x10000	   /* Total Size of Environment Sector */
 #define CONFIG_ENV_SIZE		0x1000	   /* max size for environment */