X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fconfigs%2Fat91cap9adk.h;h=fd06245f4cd9b93a250e1742e9f7ab8a8a792b3c;hb=7fd0bea2e4a78eab7e6693140940f9f9a0009bc2;hp=acf452bbe3667745c0cd3c2708cdf16cb8c14b92;hpb=057c849c45b9ee19df8ff3acdeee66be52819962;p=oweals%2Fu-boot.git

diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h
index acf452bbe3..fd06245f4c 100644
--- a/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@ -150,9 +150,9 @@
 /* bootstrap + u-boot + env + linux in dataflash */
 #define CONFIG_ENV_IS_IN_DATAFLASH	1
 #define CFG_MONITOR_BASE	(CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
-#define CFG_ENV_OFFSET		0x4200
-#define CFG_ENV_ADDR		(CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
-#define CFG_ENV_SIZE		0x4200
+#define CONFIG_ENV_OFFSET		0x4200
+#define CONFIG_ENV_ADDR		(CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_SIZE		0x4200
 #define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x72000000 0x210000; bootm"
 #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
 				"root=/dev/mtdblock1 "			\
@@ -163,11 +163,11 @@
 #else
 
 /* bootstrap + u-boot + env + linux in norflash */
-#define CFG_ENV_IS_IN_FLASH	1
+#define CONFIG_ENV_IS_IN_FLASH	1
 #define CFG_MONITOR_BASE	(PHYS_FLASH_1 + 0x8000)
-#define CFG_ENV_OFFSET		0x4000
-#define CFG_ENV_ADDR		(PHYS_FLASH_1 + CFG_ENV_OFFSET)
-#define CFG_ENV_SIZE		0x4000
+#define CONFIG_ENV_OFFSET		0x4000
+#define CONFIG_ENV_ADDR		(PHYS_FLASH_1 + CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_SIZE		0x4000
 #define CONFIG_BOOTCOMMAND	"cp.b 0x10040000 0x72000000 0x200000; bootm"
 #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
 				"root=/dev/mtdblock4 "			\
@@ -192,7 +192,7 @@
 /*
  * Size of malloc() pool
  */
-#define CFG_MALLOC_LEN		ROUND(CFG_ENV_SIZE + 128*1024, 0x1000)
+#define CFG_MALLOC_LEN		ROUND(CONFIG_ENV_SIZE + 128*1024, 0x1000)
 #define CFG_GBL_DATA_SIZE	128	/* 128 bytes for initial data */
 
 #define CONFIG_STACKSIZE	(32*1024)	/* regular stack */