[U-Boot-Users] [PATCH 2/7] Simplify base address handling in bd_info

[Rafal Jaworowski <raj@semihalf.com>]

diff --git a/include/asm-ppc/u-boot.h b/include/asm-ppc/u-boot.h
index 464f6b5..cc9f013 100644
--- a/include/asm-ppc/u-boot.h
+++ b/include/asm-ppc/u-boot.h
@@ -36,6 +36,10 @@
 
 #ifndef __ASSEMBLY__
 
+#define bi_immr_base	bi_bar
+#define bi_mbar_base	bi_bar
+#define bi_immrbar	bi_bar
+
 typedef struct bd_info {
 	unsigned long	bi_memstart;	/* start of DRAM memory */
 	unsigned long	bi_memsize;	/* size	 of DRAM memory in bytes */
@@ -44,18 +48,9 @@ typedef struct bd_info {
 	unsigned long	bi_flashoffset; /* reserved area for startup monitor */
 	unsigned long	bi_sramstart;	/* start of SRAM memory */
 	unsigned long	bi_sramsize;	/* size	 of SRAM memory */
-#if defined(CONFIG_5xx) || defined(CONFIG_8xx) || defined(CONFIG_8260) \
-	|| defined(CONFIG_E500) || defined(CONFIG_MPC86xx)
-	unsigned long	bi_immr_base;	/* base of IMMR register */
-#endif
-#if defined(CONFIG_MPC5xxx)
-	unsigned long	bi_mbar_base;	/* base of internal registers */
-#endif
-#if defined(CONFIG_MPC83XX)
-	unsigned long	bi_immrbar;
-#endif
+	unsigned long	bi_bar;		/* base addr of internal registers */
+
 #if defined(CONFIG_MPC8220)
-	unsigned long	bi_mbar_base;	/* base of internal registers */
 	unsigned long   bi_inpfreq;     /* Input Freq, In MHz */
 	unsigned long   bi_pcifreq;     /* PCI Freq, in MHz */
 	unsigned long   bi_pevfreq;     /* PEV Freq, in MHz */