diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2010-12-30 13:01:13 +0000 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2010-12-30 13:01:13 +0000 |
commit | eab47ad80e68d3576d026c386f194fe47ab21055 (patch) | |
tree | 969bde714aec191f89ab274a5f55f350781dbc3b /c/src/lib/libbsp/powerpc/shared/include | |
parent | 2010-12-30 Sebastian Huber <sebastian.huber@embedded-brains.de> (diff) | |
download | rtems-eab47ad80e68d3576d026c386f194fe47ab21055.tar.bz2 |
2010-12-30 Sebastian Huber <sebastian.huber@embedded-brains.de>
* shared/uboot_dump_bdinfo.c: Include <bsp/u-boot.h> if necessary.
* shared/include/u-boot-board-info.h: New file.
* shared/include/u-boot.h: Removed file.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/shared/include')
-rw-r--r-- | c/src/lib/libbsp/powerpc/shared/include/u-boot-board-info.h (renamed from c/src/lib/libbsp/powerpc/shared/include/u-boot.h) | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/c/src/lib/libbsp/powerpc/shared/include/u-boot.h b/c/src/lib/libbsp/powerpc/shared/include/u-boot-board-info.h index 786ba030ea..b377705687 100644 --- a/c/src/lib/libbsp/powerpc/shared/include/u-boot.h +++ b/c/src/lib/libbsp/powerpc/shared/include/u-boot-board-info.h @@ -38,7 +38,7 @@ typedef struct bd_info { unsigned long bi_memstart; /* start of DRAM memory */ - unsigned long bi_memsize; /* size of DRAM memory in bytes */ + phys_size_t 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 */ @@ -51,7 +51,7 @@ typedef struct bd_info { #if defined(CONFIG_MPC5xxx) unsigned long bi_mbar_base; /* base of internal registers */ #endif -#if defined(CONFIG_MPC83XX) +#if defined(CONFIG_MPC83xx) unsigned long bi_immrbar; #endif #if defined(CONFIG_MPC8220) @@ -62,9 +62,9 @@ typedef struct bd_info { unsigned long bi_flbfreq; /* Flexbus Freq, in MHz */ unsigned long bi_vcofreq; /* VCO Freq, in MHz */ #endif - unsigned long bi_bootflags; /* boot / reboot flag (for LynxOS) */ + unsigned long bi_bootflags; /* boot / reboot flag (Unused) */ unsigned long bi_ip_addr; /* IP Address */ - unsigned char bi_enetaddr[6]; /* Ethernet adress */ + unsigned char bi_enetaddr[6]; /* OLD: see README.enetaddr */ unsigned short bi_ethspeed; /* Ethernet speed in Mbps */ unsigned long bi_intfreq; /* Internal Freq, in MHz */ unsigned long bi_busfreq; /* Bus Freq, in MHz */ @@ -101,15 +101,19 @@ typedef struct bd_info { #endif #ifdef CONFIG_HAS_ETH1 - /* second onboard ethernet port */ - unsigned char bi_enet1addr[6]; + unsigned char bi_enet1addr[6]; /* OLD: see README.enetaddr */ #endif #ifdef CONFIG_HAS_ETH2 - /* third onboard ethernet port */ - unsigned char bi_enet2addr[6]; + unsigned char bi_enet2addr[6]; /* OLD: see README.enetaddr */ #endif #ifdef CONFIG_HAS_ETH3 - unsigned char bi_enet3addr[6]; + unsigned char bi_enet3addr[6]; /* OLD: see README.enetaddr */ +#endif +#ifdef CONFIG_HAS_ETH4 + unsigned char bi_enet4addr[6]; /* OLD: see README.enetaddr */ +#endif +#ifdef CONFIG_HAS_ETH5 + unsigned char bi_enet5addr[6]; /* OLD: see README.enetaddr */ #endif #if defined(CONFIG_405GP) || defined(CONFIG_405EP) || \ @@ -126,14 +130,14 @@ typedef struct bd_info { #if defined(CONFIG_4xx) #if defined(CONFIG_440GX) || \ defined(CONFIG_460EX) || defined(CONFIG_460GT) - int bi_phynum[4]; /* Determines phy mapping */ - int bi_phymode[4]; /* Determines phy mode */ + int bi_phynum[4]; /* Determines phy mapping */ + int bi_phymode[4]; /* Determines phy mode */ #elif defined(CONFIG_405EP) || defined(CONFIG_440) - int bi_phynum[2]; /* Determines phy mapping */ - int bi_phymode[2]; /* Determines phy mode */ + int bi_phynum[2]; /* Determines phy mapping */ + int bi_phymode[2]; /* Determines phy mode */ #else - int bi_phynum[1]; /* Determines phy mapping */ - int bi_phymode[1]; /* Determines phy mode */ + int bi_phynum[1]; /* Determines phy mapping */ + int bi_phymode[1]; /* Determines phy mode */ #endif #endif /* defined(CONFIG_4xx) */ } bd_t; |