Merge branch 'master' into next

[platform/kernel/u-boot.git] / include / configs / gardena-smart-gateway-at91sam.h

diff --git a/include/configs/gardena-smart-gateway-at91sam.h b/include/configs/gardena-smart-gateway-at91sam.h
index ba09831..89e5316 100644 (file)
--- a/include/configs/gardena-smart-gateway-at91sam.h
+++ b/include/configs/gardena-smart-gateway-at91sam.h
@@ -14,12 +14,12 @@
 #endif
 
 /* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_SLOW_CLOCK     32768
-#define CONFIG_SYS_AT91_MAIN_CLOCK     12000000        /* 12 MHz crystal */
+#define CFG_SYS_AT91_SLOW_CLOCK        32768
+#define CFG_SYS_AT91_MAIN_CLOCK        12000000        /* 12 MHz crystal */
 
 /* SDRAM */
-#define CONFIG_SYS_SDRAM_BASE          0x20000000
-#define CONFIG_SYS_SDRAM_SIZE          0x08000000      /* 128 megs */
+#define CFG_SYS_SDRAM_BASE             0x20000000
+#define CFG_SYS_SDRAM_SIZE             0x08000000      /* 128 megs */
 
 /* NAND flash */
 #define CFG_SYS_NAND_BASE              0x40000000
@@ -32,10 +32,10 @@
 
 /* SPL */
 
-#define CONFIG_SYS_MASTER_CLOCK                132096000
-#define CONFIG_SYS_AT91_PLLA           0x20c73f03
-#define CONFIG_SYS_MCKR                        0x1301
-#define CONFIG_SYS_MCKR_CSS            0x1302
+#define CFG_SYS_MASTER_CLOCK           132096000
+#define CFG_SYS_AT91_PLLA              0x20c73f03
+#define CFG_SYS_MCKR                   0x1301
+#define CFG_SYS_MCKR_CSS               0x1302
 
 #define CFG_SYS_NAND_U_BOOT_SIZE       0xa0000
 #define        CFG_SYS_NAND_U_BOOT_START       CONFIG_TEXT_BASE