X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fconfigs%2Fmp2usb.h;h=ba1ed0dcad4236ab40aa1aa84ff8d8ad96aee533;hb=0e8d158664a913392cb01fb11a948d83f72e105e;hp=294221f941657ae14e4c2825dd2933f6bc2cc6fc;hpb=d075eec500acffed5fa404a45a3e12e158d0cb33;p=oweals%2Fu-boot.git

diff --git a/include/configs/mp2usb.h b/include/configs/mp2usb.h
index 294221f941..ba1ed0dcad 100644
--- a/include/configs/mp2usb.h
+++ b/include/configs/mp2usb.h
@@ -55,7 +55,7 @@
 #define MC_ASR_VAL	0x00000000
 #define MC_AASR_VAL	0x00000000
 #define EBI_CFGR_VAL	0x00000000
-#define SMC2_CSR_VAL	0x00003084 /* 16bit, 2 TDF, 4 WS */
+#define SMC_CSR0_VAL	0x00003084 /* 16bit, 2 TDF, 4 WS */
 
 /* clocks */
 #define PLLAR_VAL	0x20263E04 /* 180 MHz for PCK */
@@ -81,7 +81,7 @@
 /*
  * Size of malloc() pool
  */
-#define CFG_MALLOC_LEN	(CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN	(CONFIG_ENV_SIZE + 128*1024)
 #define CFG_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
 
 #define CONFIG_BAUDRATE		115200
@@ -199,10 +199,10 @@
 #define CFG_FLASH_UNLOCK_TOUT		(10*CFG_HZ)	/* Timeout for Flash Clear Lock Bits */
 #define CFG_FLASH_PROTECTION				/* "Real" (hardware) sectors protection */
 
-#define CFG_ENV_IS_IN_FLASH		1
-#define CFG_ENV_OFFSET			0x20000		/* after u-boot.bin */
-#define CFG_ENV_ADDR			(CFG_FLASH_BASE+CFG_ENV_OFFSET)
-#define CFG_ENV_SIZE			0x20000
+#define CONFIG_ENV_IS_IN_FLASH		1
+#define CONFIG_ENV_OFFSET			0x20000		/* after u-boot.bin */
+#define CONFIG_ENV_ADDR			(CFG_FLASH_BASE+CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_SIZE			0x20000
 
 #define CFG_LOAD_ADDR		0x21000000  /* default load address */
 
@@ -230,7 +230,8 @@
 #undef CONFIG_SILENT_CONSOLE		/* enable silent startup	*/
 
 #define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT "Press SPACE to abort autoboot in %d seconds\n"
+#define CONFIG_AUTOBOOT_PROMPT	\
+	"Press SPACE to abort autoboot in %d seconds\n", bootdelay
 #define CONFIG_AUTOBOOT_STOP_STR " "
 #define CONFIG_AUTOBOOT_DELAY_STR "d"