patch-2.4.14 linux/include/asm-ppc/ppcboot.h

• Lines: 96
• Date: Fri Nov 2 17:43:54 2001
• Orig file: v2.4.13/linux/include/asm-ppc/ppcboot.h
• Orig date: Tue Oct 23 22:48:53 2001

diff -u --recursive --new-file v2.4.13/linux/include/asm-ppc/ppcboot.h linux/include/asm-ppc/ppcboot.h
@@ -18,8 +18,8 @@
  * MA 02111-1307 USA
  */
 
-#ifndef _PPCBOOT_H_
-#define _PPCBOOT_H_	1
+#ifndef __ASM_PPCBOOT_H__
+#define __ASM_PPCBOOT_H__
 
 /*
  * Board information passed to kernel from PPCBoot
@@ -28,7 +28,6 @@
  */
 
 #ifndef __ASSEMBLY__
-
 #include <linux/types.h>
 
 typedef void (interrupt_handler_t)(void *);
@@ -46,48 +45,47 @@
 } mon_fnc_t;
 
 typedef struct bd_info {
-	unsigned long	bi_memstart;	/* start of  DRAM memory		*/
-	unsigned long	bi_memsize;	/* size	 of  DRAM memory in bytes	*/
-	unsigned long	bi_flashstart;	/* start of FLASH memory		*/
-	unsigned long	bi_flashsize;	/* size	 of FLASH memory		*/
-	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		*/
+	unsigned long	bi_memstart;	/* start of DRAM memory */
+	unsigned long	bi_memsize;	/* size	 of DRAM memory in bytes */
+	unsigned long	bi_flashstart;	/* start of FLASH memory */
+	unsigned long	bi_flashsize;	/* size	 of FLASH memory */
+	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_8xx) || defined(CONFIG_8260)
-	unsigned long	bi_immr_base;	/* base of IMMR register		*/
+	unsigned long	bi_immr_base;	/* base of IMMR register */
 #endif
-	unsigned long	bi_bootflags;	/* boot / reboot flag (for LynxOS)	*/
-	unsigned long	bi_ip_addr;	/* IP Address				*/
-	unsigned char	bi_enetaddr[6]; /* Ethernet adress			*/
-	unsigned short	bi_ethspeed;	/* Ethernet speed in Mbps		*/
-	unsigned long	bi_intfreq;	/* Internal Freq, in MHz		*/
-	unsigned long	bi_busfreq;	/* Bus Freq, in MHz			*/
+	unsigned long	bi_bootflags;	/* boot / reboot flag (for LynxOS) */
+	unsigned long	bi_ip_addr;	/* IP Address */
+	unsigned char	bi_enetaddr[6];	/* Ethernet adress */
+	unsigned short	bi_ethspeed;	/* Ethernet speed in Mbps */
+	unsigned long	bi_intfreq;	/* Internal Freq, in MHz */
+	unsigned long	bi_busfreq;	/* Bus Freq, in MHz */
 #if defined(CONFIG_8260)
-	unsigned long	bi_cpmfreq;	/* CPM_CLK Freq, in MHz			*/
-	unsigned long	bi_brgfreq;	/* BRG_CLK Freq, in MHz			*/
-	unsigned long	bi_sccfreq;	/* SCC_CLK Freq, in MHz			*/
-	unsigned long	bi_vco;		/* VCO Out from PLL, in MHz		*/
+	unsigned long	bi_cpmfreq;	/* CPM_CLK Freq, in MHz */
+	unsigned long	bi_brgfreq;	/* BRG_CLK Freq, in MHz */
+	unsigned long	bi_sccfreq;	/* SCC_CLK Freq, in MHz */
+	unsigned long	bi_vco;		/* VCO Out from PLL, in MHz */
 #endif
-	unsigned long	bi_baudrate;	/* Console Baudrate			*/
+	unsigned long	bi_baudrate;	/* Console Baudrate */
 #if defined(CONFIG_405GP)
-	unsigned char	bi_s_version[4];  /* Version of this structure		*/
-	unsigned char	bi_r_version[32]; /* Version of the ROM (IBM)		*/
-	unsigned int	bi_procfreq;	/* CPU (Internal) Freq, in Hz		*/
+	unsigned char	bi_s_version[4];	/* Version of this structure */
+	unsigned char	bi_r_version[32];	/* Version of the ROM (IBM) */
+	unsigned int	bi_procfreq;	/* CPU (Internal) Freq, in Hz */
 	unsigned int	bi_plb_busfreq;	/* PLB Bus speed, in Hz */
 	unsigned int	bi_pci_busfreq;	/* PCI Bus speed, in Hz */
-	unsigned char	bi_pci_enetaddr[6];	/* PCI Ethernet MAC address     */
+	unsigned char	bi_pci_enetaddr[6];	/* PCI Ethernet MAC address */
 #endif
 #if defined(CONFIG_HYMOD)
-	hymod_conf_t	bi_hymod_conf;	/* hymod configuration information	*/
+	hymod_conf_t	bi_hymod_conf;	/* hymod configuration information */
 #endif
 #if defined(CONFIG_EVB64260)
 	/* the board has three onboard ethernet ports */
-	unsigned char   bi_enet1addr[6];
-	unsigned char   bi_enet2addr[6];
+	unsigned char	bi_enet1addr[6];
+	unsigned char	bi_enet2addr[6];
 #endif
-	mon_fnc_t	*bi_mon_fnc;	/* Pointer to monitor functions		*/
+	mon_fnc_t	*bi_mon_fnc;	/* Pointer to monitor functions	*/
 } bd_t;
 
 #endif /* __ASSEMBLY__ */
-
-#endif	/* _PPCBOOT_H_ */
+#endif	/* __ASM_PPCBOOT_H__ */