X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cpu%2Fppc4xx%2Fusbdev.h;h=ef6a2da649f738a17d95495f9c89ff496669fe6a;hb=045639397df535b7eac820b9dc3e4814ae16f19d;hp=3446d9893d36f3197313c85174c384d7bdad96a0;hpb=05b47540aae996908e48e10a5ff8b69862aadef3;p=oweals%2Fu-boot.git

diff --git a/cpu/ppc4xx/usbdev.h b/cpu/ppc4xx/usbdev.h
index 3446d9893d..ef6a2da649 100644
--- a/cpu/ppc4xx/usbdev.h
+++ b/cpu/ppc4xx/usbdev.h
@@ -1,31 +1,31 @@
 #include <config.h>
 
 /*Common Registers*/
-#define USB2D0_INTRIN_16   (CFG_USB_DEVICE | 0x100)
-#define USB2D0_POWER_8     (CFG_USB_DEVICE | 0x102)
-#define USB2D0_FADDR_8     (CFG_USB_DEVICE | 0x103)
-#define USB2D0_INTRINE_16  (CFG_USB_DEVICE | 0x104)
-#define USB2D0_INTROUT_16  (CFG_USB_DEVICE | 0x106)
-#define USB2D0_INTRUSBE_8  (CFG_USB_DEVICE | 0x108)
-#define USB2D0_INTRUSB_8   (CFG_USB_DEVICE | 0x109)
-#define USB2D0_INTROUTE_16 (CFG_USB_DEVICE | 0x10a)
-#define USB2D0_TSTMODE_8   (CFG_USB_DEVICE | 0x10c)
-#define USB2D0_INDEX_8     (CFG_USB_DEVICE | 0x10d)
-#define USB2D0_FRAME_16    (CFG_USB_DEVICE | 0x10e)
+#define USB2D0_INTRIN_16   (CONFIG_SYS_USB_DEVICE | 0x100)
+#define USB2D0_POWER_8     (CONFIG_SYS_USB_DEVICE | 0x102)
+#define USB2D0_FADDR_8     (CONFIG_SYS_USB_DEVICE | 0x103)
+#define USB2D0_INTRINE_16  (CONFIG_SYS_USB_DEVICE | 0x104)
+#define USB2D0_INTROUT_16  (CONFIG_SYS_USB_DEVICE | 0x106)
+#define USB2D0_INTRUSBE_8  (CONFIG_SYS_USB_DEVICE | 0x108)
+#define USB2D0_INTRUSB_8   (CONFIG_SYS_USB_DEVICE | 0x109)
+#define USB2D0_INTROUTE_16 (CONFIG_SYS_USB_DEVICE | 0x10a)
+#define USB2D0_TSTMODE_8   (CONFIG_SYS_USB_DEVICE | 0x10c)
+#define USB2D0_INDEX_8     (CONFIG_SYS_USB_DEVICE | 0x10d)
+#define USB2D0_FRAME_16    (CONFIG_SYS_USB_DEVICE | 0x10e)
 
 /*Indexed Registers*/
-#define USB2D0_INCSR0_8    (CFG_USB_DEVICE | 0x110)
-#define USB2D0_INCSR_16    (CFG_USB_DEVICE | 0x110)
-#define USB2D0_INMAXP_16   (CFG_USB_DEVICE | 0x112)
-#define USB2D0_OUTCSR_16   (CFG_USB_DEVICE | 0x114)
-#define USB2D0_OUTMAXP_16  (CFG_USB_DEVICE | 0x116)
-#define USB2D0_OUTCOUNT0_8 (CFG_USB_DEVICE | 0x11a)
-#define USB2D0_OUTCOUNT_16 (CFG_USB_DEVICE | 0x11a)
+#define USB2D0_INCSR0_8    (CONFIG_SYS_USB_DEVICE | 0x110)
+#define USB2D0_INCSR_16    (CONFIG_SYS_USB_DEVICE | 0x110)
+#define USB2D0_INMAXP_16   (CONFIG_SYS_USB_DEVICE | 0x112)
+#define USB2D0_OUTCSR_16   (CONFIG_SYS_USB_DEVICE | 0x114)
+#define USB2D0_OUTMAXP_16  (CONFIG_SYS_USB_DEVICE | 0x116)
+#define USB2D0_OUTCOUNT0_8 (CONFIG_SYS_USB_DEVICE | 0x11a)
+#define USB2D0_OUTCOUNT_16 (CONFIG_SYS_USB_DEVICE | 0x11a)
 
 /*FIFOs*/
-#define USB2D0_FIFO_0 (CFG_USB_DEVICE | 0x120)
-#define USB2D0_FIFO_1 (CFG_USB_DEVICE | 0x124)
-#define USB2D0_FIFO_2 (CFG_USB_DEVICE | 0x128)
-#define USB2D0_FIFO_3 (CFG_USB_DEVICE | 0x12c)
+#define USB2D0_FIFO_0 (CONFIG_SYS_USB_DEVICE | 0x120)
+#define USB2D0_FIFO_1 (CONFIG_SYS_USB_DEVICE | 0x124)
+#define USB2D0_FIFO_2 (CONFIG_SYS_USB_DEVICE | 0x128)
+#define USB2D0_FIFO_3 (CONFIG_SYS_USB_DEVICE | 0x12c)
 
 void usb_dev_init(void);