Merge branch 'master' of /home/wd/git/u-boot/custodians

[karo-tx-uboot.git] / include / mpc106.h

diff --git a/include/mpc106.h b/include/mpc106.h
index 3926f8b36358b0d9797298804a47e9b65c553e1f..ef5a95f78df7bb78cd7d5f06afde30aee04fccb7 100644 (file)
--- a/include/mpc106.h
+++ b/include/mpc106.h
@@ -28,15 +28,15 @@
  * Defines for the MPC106 PCI Config address and data registers followed by
  * defines for the standard PCI device configuration header.
  */
-#define PCIDEVID_MPC106                0x0
+#define PCIDEVID_MPC106                        0x0
 
 /*
  * MPC106 Registers
  */
 #define        MPC106_REG                      0x80000000
 
-#ifdef CFG_ADDRESS_MAP_A
-#define MPC106_REG_ADDR                0x80000cf8
+#ifdef CONFIG_SYS_ADDRESS_MAP_A
+#define MPC106_REG_ADDR                        0x80000cf8
 #define        MPC106_REG_DATA                 0x80000cfc
 #define MPC106_ISA_IO_PHYS             0x80000000
 #define MPC106_ISA_IO_BUS              0x00000000
@@ -51,7 +51,7 @@
 #define        MPC106_PCI_MEMORY_BUS           0x80000000
 #define        MPC106_PCI_MEMORY_SIZE          0x80000000
 #else
-#define MPC106_REG_ADDR                0xfec00cf8
+#define MPC106_REG_ADDR                        0xfec00cf8
 #define        MPC106_REG_DATA                 0xfee00cfc
 #define MPC106_ISA_MEM_PHYS            0xfd000000
 #define MPC106_ISA_MEM_BUS             0x00000000
@@ -77,9 +77,9 @@
 
 #define PCI_STAT_NO_RSV_BITS           0xffff
 
-#define PCI_BUSNUM                     0x40
-#define PCI_SUBBUSNUM                  0x41
-#define PCI_DISCOUNT                   0x42
+#define PCI_BUSNUM                     0x40
+#define PCI_SUBBUSNUM                  0x41
+#define PCI_DISCOUNT                   0x42
 
 #define PCI_PICR1                      0xA8
 #define PICR1_CF_CBA(value)            ((value & 0xff) << 24)
@@ -155,4 +155,3 @@
 #define MBER_BANK3                     0x8
 
 #endif
-