global: Move remaining CONFIG_SYS_* to CFG_SYS_*

[pandora-u-boot.git] / include / configs / rpi.h

diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 2c24944..e354927 100644 (file)
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -17,14 +17,14 @@
 
 /* Use SoC timer for AArch32, but architected timer for AArch64 */
 #ifndef CONFIG_ARM64
-#define CONFIG_SYS_TIMER_RATE          1000000
-#define CONFIG_SYS_TIMER_COUNTER       \
+#define CFG_SYS_TIMER_RATE             1000000
+#define CFG_SYS_TIMER_COUNTER  \
        (&((struct bcm2835_timer_regs *)BCM2835_TIMER_PHYSADDR)->clo)
 #endif
 
 /* Memory layout */
 #define CFG_SYS_SDRAM_BASE             0x00000000
-#define CONFIG_SYS_UBOOT_BASE          CONFIG_TEXT_BASE
+#define CFG_SYS_UBOOT_BASE             CONFIG_TEXT_BASE
 /*
  * The board really has 256M. However, the VC (VideoCore co-processor) shares
  * the RAM, and uses a configurable portion at the top. We tell U-Boot that a