rename CFG_ macros to CONFIG_SYS

[people/ms/u-boot.git] / board / xilinx / xupv2p / xupv2p.c

diff --git a/board/xilinx/xupv2p/xupv2p.c b/board/xilinx/xupv2p/xupv2p.c
index b48103fdc028e522eba9f742b3026da2398e0e40..b1a76c0c514f122e90c7b148ada114e905ec8f6c 100644 (file)
--- a/board/xilinx/xupv2p/xupv2p.c
+++ b/board/xilinx/xupv2p/xupv2p.c
@@ -30,11 +30,11 @@
 
 void do_reset (void)
 {
-#ifdef CFG_GPIO_0
-       *((unsigned long *)(CFG_GPIO_0_ADDR)) =
-           ++(*((unsigned long *)(CFG_GPIO_0_ADDR)));
+#ifdef CONFIG_SYS_GPIO_0
+       *((unsigned long *)(CONFIG_SYS_GPIO_0_ADDR)) =
+           ++(*((unsigned long *)(CONFIG_SYS_GPIO_0_ADDR)));
 #endif
-#ifdef CFG_RESET_ADDRESS
+#ifdef CONFIG_SYS_RESET_ADDRESS
        puts ("Reseting board\n");
        asm ("bra r0");
 #endif
@@ -42,8 +42,8 @@ void do_reset (void)
 
 int gpio_init (void)
 {
-#ifdef CFG_GPIO_0
-       *((unsigned long *)(CFG_GPIO_0_ADDR)) = 0x0;
+#ifdef CONFIG_SYS_GPIO_0
+       *((unsigned long *)(CONFIG_SYS_GPIO_0_ADDR)) = 0x0;
 #endif
        return 0;
 }