X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=board%2Fmcc200%2Fmcc200.c;h=65b818471a817bdb6e7358383ee0dec3e97da5ee;hb=225f0eaa745adfae05931848543d99942798756a;hp=af047e2a0772a281303f99590ddc79fe1739bc12;hpb=a195ff95ace5e74e50f54a469d1a160ff84a1089;p=platform%2Fkernel%2Fu-boot.git

diff --git a/board/mcc200/mcc200.c b/board/mcc200/mcc200.c
index af047e2..65b8184 100644
--- a/board/mcc200/mcc200.c
+++ b/board/mcc200/mcc200.c
@@ -96,7 +96,7 @@ static void sdram_start (int hi_addr)
  *	      is something else than 0x00000000.
  */
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
 	ulong dramsize = 0;
 	ulong dramsize2 = 0;
@@ -263,14 +263,14 @@ int misc_init_r (void)
 
 		/* Environment protection ON by default */
 		flash_protect (FLAG_PROTECT_SET,
-			       CFG_ENV_ADDR,
-			       CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+			       CONFIG_ENV_ADDR,
+			       CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
 			       &flash_info[CFG_MAX_FLASH_BANKS - 1]);
 
 		/* Redundant environment protection ON by default */
 		flash_protect (FLAG_PROTECT_SET,
-			       CFG_ENV_ADDR_REDUND,
-			       CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1,
+			       CONFIG_ENV_ADDR_REDUND,
+			       CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,
 			       &flash_info[CFG_MAX_FLASH_BANKS - 1]);
 	}
 
@@ -307,7 +307,7 @@ void pci_init_board(void)
 }
 #endif
 
-#if defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET)
+#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET)
 
 void init_ide_reset (void)
 {
@@ -320,10 +320,9 @@ void ide_set_reset (int idereset)
 	debug ("ide_reset(%d)\n", idereset);
 
 }
-#endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */
+#endif
 
-#if (CONFIG_COMMANDS & CFG_CMD_DOC)
-extern void doc_probe (ulong physadr);
+#if defined(CONFIG_CMD_DOC)
 void doc_init (void)
 {
 	doc_probe (CFG_DOC_BASE);