Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master

Browse Source
master
Wolfgang Denk 17 years ago
parent a4475386ce 6bc113886d
commit 334fb53514
31 changed files with 26 additions and 106 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      board/atum8548/atum8548.c
  2. 5
      board/freescale/mpc8323erdb/mpc8323erdb.c
  3. 5
      board/freescale/mpc832xemds/mpc832xemds.c
  4. 4
      board/freescale/mpc8349emds/mpc8349emds.c
  5. 6
      board/freescale/mpc8349itx/mpc8349itx.c
  6. 4
      board/freescale/mpc8360emds/mpc8360emds.c
  7. 1
      board/freescale/mpc8360erdk/mpc8360erdk.c
  8. 3
      board/freescale/mpc837xemds/mpc837xemds.c
  9. 3
      board/freescale/mpc837xerdb/mpc837xerdb.c
  10. 5
      board/freescale/mpc8540ads/mpc8540ads.c
  11. 4
      board/freescale/mpc8541cds/mpc8541cds.c
  12. 4
      board/freescale/mpc8544ds/mpc8544ds.c
  13. 4
      board/freescale/mpc8548cds/mpc8548cds.c
  14. 4
      board/freescale/mpc8555cds/mpc8555cds.c
  15. 4
      board/freescale/mpc8560ads/mpc8560ads.c
  16. 4
      board/freescale/mpc8568mds/mpc8568mds.c
  17. 6
      board/freescale/mpc8610hpcd/mpc8610hpcd.c
  18. 6
      board/freescale/mpc8641hpcn/mpc8641hpcn.c
  19. 6
      board/mpc8540eval/mpc8540eval.c
  20. 5
      board/pm854/pm854.c
  21. 6
      board/pm856/pm856.c
  22. 5
      board/sbc8349/sbc8349.c
  23. 4
      board/sbc8548/sbc8548.c
  24. 6
      board/sbc8560/sbc8560.c
  25. 6
      board/sbc8641d/sbc8641d.c
  26. 5
      board/stxgp3/stxgp3.c
  27. 5
      board/stxssa/stxssa.c
  28. 2
      board/tqm834x/tqm834x.c
  29. 1
      board/tqm85xx/sdram.c
  30. 2
      board/tqm85xx/tqm85xx.c
  31. 4
      net/eth.c

3
board/atum8548/atum8548.c
Unescape View File

@ -30,7 +30,7 @@
#include <asm/immap_85xx.h>
#include <asm/immap_fsl_pci.h>
#include <asm/io.h>
#include <spd.h>
#include <spd_sdram.h>
#include <miiphy.h>
#include <libfdt.h>
#include <fdt_support.h>
@ -39,7 +39,6 @@
extern void ddr_enable_ecc(unsigned int dram_size);
#endif
extern long int spd_sdram(void);
long int fixed_sdram(void);
int board_early_init_f (void)

5
board/freescale/mpc8323erdb/mpc8323erdb.c
Unescape View File

@ -13,18 +13,13 @@
#include <ioports.h>
#include <mpc83xx.h>
#include <i2c.h>
#include <spd.h>
#include <miiphy.h>
#include <command.h>
#include <libfdt.h>
#if defined(CONFIG_PCI)
#include <pci.h>
#endif
#if defined(CONFIG_SPD_EEPROM)
#include <spd_sdram.h>
#else
#include <asm/mmu.h>
#endif
const qe_iop_conf_t qe_iop_conf_tab[] = {
/* UCC3 */

5
board/freescale/mpc832xemds/mpc832xemds.c
Unescape View File

@ -16,17 +16,12 @@
#include <ioports.h>
#include <mpc83xx.h>
#include <i2c.h>
#include <spd.h>
#include <miiphy.h>
#include <command.h>
#if defined(CONFIG_PCI)
#include <pci.h>
#endif
#if defined(CONFIG_SPD_EEPROM)
#include <spd_sdram.h>
#else
#include <asm/mmu.h>
#endif
#if defined(CONFIG_OF_LIBFDT)
#include <libfdt.h>
#endif

4
board/freescale/mpc8349emds/mpc8349emds.c
Unescape View File

@ -28,11 +28,9 @@
#include <asm/mpc8349_pci.h>
#include <i2c.h>
#include <spi.h>
#include <spd.h>
#include <miiphy.h>
#if defined(CONFIG_SPD_EEPROM)
#include <spd_sdram.h>
#endif
#if defined(CONFIG_OF_LIBFDT)
#include <libfdt.h>
#endif

6
board/freescale/mpc8349itx/mpc8349itx.c
Unescape View File

@ -24,19 +24,13 @@
#include <ioports.h>
#include <mpc83xx.h>
#include <i2c.h>
#include <spd.h>
#include <miiphy.h>
#ifdef CONFIG_PCI
#include <asm/mpc8349_pci.h>
#include <pci.h>
#endif
#ifdef CONFIG_SPD_EEPROM
#include <spd_sdram.h>
#else
#include <asm/mmu.h>
#endif
#if defined(CONFIG_OF_LIBFDT)
#include <libfdt.h>
#endif

4
board/freescale/mpc8360emds/mpc8360emds.c
Unescape View File

@ -15,16 +15,12 @@
#include <ioports.h>
#include <mpc83xx.h>
#include <i2c.h>
#include <spd.h>
#include <miiphy.h>
#if defined(CONFIG_PCI)
#include <pci.h>
#endif
#if defined(CONFIG_SPD_EEPROM)
#include <spd_sdram.h>
#else
#include <asm/mmu.h>
#endif
#if defined(CONFIG_OF_LIBFDT)
#include <libfdt.h>
#endif

1
board/freescale/mpc8360erdk/mpc8360erdk.c
Unescape View File

@ -18,7 +18,6 @@
#include <ioports.h>
#include <mpc83xx.h>
#include <i2c.h>
#include <spd.h>
#include <miiphy.h>
#include <asm/io.h>
#include <asm/mmu.h>

3
board/freescale/mpc837xemds/mpc837xemds.c
Unescape View File

@ -12,10 +12,7 @@
#include <common.h>
#include <i2c.h>
#include <spd.h>
#if defined(CONFIG_SPD_EEPROM)
#include <spd_sdram.h>
#endif
#if defined(CONFIG_OF_LIBFDT)
#include <libfdt.h>
#endif

3
board/freescale/mpc837xerdb/mpc837xerdb.c
Unescape View File

@ -14,11 +14,8 @@
#include <common.h>
#include <i2c.h>
#include <spd.h>
#include <asm/io.h>
#if defined(CONFIG_SPD_EEPROM)
#include <spd_sdram.h>
#endif
#if defined(CFG_DRAM_TEST)
int

5
board/freescale/mpc8540ads/mpc8540ads.c
Unescape View File

@ -29,7 +29,7 @@
#include <pci.h>
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <spd.h>
#include <spd_sdram.h>
#include <libfdt.h>
#include <fdt_support.h>
@ -37,8 +37,6 @@
extern void ddr_enable_ecc(unsigned int dram_size);
#endif
extern long int spd_sdram(void);
void local_bus_init(void);
void sdram_init(void);
long int fixed_sdram(void);
@ -73,7 +71,6 @@ long int
initdram(int board_type)
{
long dram_size = 0;
extern long spd_sdram (void);
puts("Initializing\n");

4
board/freescale/mpc8541cds/mpc8541cds.c
Unescape View File

@ -27,7 +27,7 @@
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <ioports.h>
#include <spd.h>
#include <spd_sdram.h>
#include <libfdt.h>
#include <fdt_support.h>
@ -39,8 +39,6 @@
extern void ddr_enable_ecc(unsigned int dram_size);
#endif
extern long int spd_sdram(void);
void local_bus_init(void);
void sdram_init(void);

4
board/freescale/mpc8544ds/mpc8544ds.c
Unescape View File

@ -27,7 +27,7 @@
#include <asm/immap_85xx.h>
#include <asm/immap_fsl_pci.h>
#include <asm/io.h>
#include <spd.h>
#include <spd_sdram.h>
#include <miiphy.h>
#include <libfdt.h>
#include <fdt_support.h>
@ -38,8 +38,6 @@
extern void ddr_enable_ecc(unsigned int dram_size);
#endif
extern long int spd_sdram(void);
void sdram_init(void);
int board_early_init_f (void)

4
board/freescale/mpc8548cds/mpc8548cds.c
Unescape View File

@ -27,7 +27,7 @@
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <asm/immap_fsl_pci.h>
#include <spd.h>
#include <spd_sdram.h>
#include <miiphy.h>
#include <libfdt.h>
#include <fdt_support.h>
@ -42,8 +42,6 @@ extern void ddr_enable_ecc(unsigned int dram_size);
DECLARE_GLOBAL_DATA_PTR;
extern long int spd_sdram(void);
void local_bus_init(void);
void sdram_init(void);

4
board/freescale/mpc8555cds/mpc8555cds.c
Unescape View File

@ -25,7 +25,7 @@
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <ioports.h>
#include <spd.h>
#include <spd_sdram.h>
#include <libfdt.h>
#include <fdt_support.h>
@ -37,8 +37,6 @@
extern void ddr_enable_ecc(unsigned int dram_size);
#endif
extern long int spd_sdram(void);
void local_bus_init(void);
void sdram_init(void);

4
board/freescale/mpc8560ads/mpc8560ads.c
Unescape View File

@ -30,7 +30,7 @@
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <ioports.h>
#include <spd.h>
#include <spd_sdram.h>
#include <miiphy.h>
#include <libfdt.h>
#include <fdt_support.h>
@ -39,7 +39,6 @@
extern void ddr_enable_ecc(unsigned int dram_size);
#endif
extern long int spd_sdram(void);
void local_bus_init(void);
void sdram_init(void);
@ -275,7 +274,6 @@ long int
initdram(int board_type)
{
long dram_size = 0;
extern long spd_sdram (void);
puts("Initializing\n");

4
board/freescale/mpc8568mds/mpc8568mds.c
Unescape View File

@ -27,7 +27,7 @@
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <asm/immap_fsl_pci.h>
#include <spd.h>
#include <spd_sdram.h>
#include <i2c.h>
#include <ioports.h>
#include <libfdt.h>
@ -102,8 +102,6 @@ const qe_iop_conf_t qe_iop_conf_tab[] = {
extern void ddr_enable_ecc(unsigned int dram_size);
#endif
extern long int spd_sdram(void);
void local_bus_init(void);
void sdram_init(void);

6
board/freescale/mpc8610hpcd/mpc8610hpcd.c
Unescape View File

@ -27,10 +27,10 @@
#include <asm/immap_86xx.h>
#include <asm/immap_fsl_pci.h>
#include <i2c.h>
#include <spd.h>
#include <asm/io.h>
#include <libfdt.h>
#include <fdt_support.h>
#include <spd_sdram.h>
#include "../common/pixis.h"
@ -38,10 +38,6 @@
extern void ddr_enable_ecc(unsigned int dram_size);
#endif
#if defined(CONFIG_SPD_EEPROM)
#include "spd_sdram.h"
#endif
void sdram_init(void);
long int fixed_sdram(void);
void mpc8610hpcd_diu_init(void);

6
board/freescale/mpc8641hpcn/mpc8641hpcn.c
Unescape View File

@ -25,7 +25,7 @@
#include <asm/processor.h>
#include <asm/immap_86xx.h>
#include <asm/immap_fsl_pci.h>
#include <spd.h>
#include <spd_sdram.h>
#include <asm/io.h>
#include <libfdt.h>
#include <fdt_support.h>
@ -36,10 +36,6 @@
extern void ddr_enable_ecc(unsigned int dram_size);
#endif
#if defined(CONFIG_SPD_EEPROM)
#include "spd_sdram.h"
#endif
void sdram_init(void);
long int fixed_sdram(void);

6
board/mpc8540eval/mpc8540eval.c
Unescape View File

@ -26,9 +26,7 @@
#include <common.h>
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <spd.h>
extern long int spd_sdram (void);
#include <spd_sdram.h>
long int fixed_sdram (void);
@ -66,7 +64,7 @@ int checkboard (void)
long int initdram (int board_type)
{
long dram_size = 0;
extern long spd_sdram (void);
#if !defined(CONFIG_RAM_AS_FLASH)
volatile ccsr_lbc_t *lbc = (void *)(CFG_MPC85xx_LBC_ADDR);
sys_info_t sysinfo;

5
board/pm854/pm854.c
Unescape View File

@ -29,14 +29,12 @@
#include <pci.h>
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <spd.h>
#include <spd_sdram.h>
#if defined(CONFIG_DDR_ECC)
extern void ddr_enable_ecc(unsigned int dram_size);
#endif
extern long int spd_sdram(void);
void local_bus_init(void);
void sdram_init(void);
long int fixed_sdram(void);
@ -77,7 +75,6 @@ long int
initdram(int board_type)
{
long dram_size = 0;
extern long spd_sdram (void);
puts("Initializing\n");

6
board/pm856/pm856.c
Unescape View File

@ -30,15 +30,13 @@
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <ioports.h>
#include <spd.h>
#include <spd_sdram.h>
#include <miiphy.h>
#if defined(CONFIG_DDR_ECC)
extern void ddr_enable_ecc(unsigned int dram_size);
#endif
extern long int spd_sdram(void);
void local_bus_init(void);
long int fixed_sdram(void);
@ -231,7 +229,7 @@ long int
initdram(int board_type)
{
long dram_size = 0;
extern long spd_sdram (void);
puts("Initializing\n");

5
board/sbc8349/sbc8349.c
Unescape View File

@ -30,11 +30,8 @@
#include <mpc83xx.h>
#include <asm/mpc8349_pci.h>
#include <i2c.h>
#include <spd.h>
#include <miiphy.h>
#if defined(CONFIG_SPD_EEPROM)
#include <spd_sdram.h>
#endif
#include <miiphy.h>
#if defined(CONFIG_OF_LIBFDT)
#include <libfdt.h>
#endif

4
board/sbc8548/sbc8548.c
Unescape View File

@ -30,7 +30,7 @@
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <asm/immap_fsl_pci.h>
#include <spd.h>
#include <spd_sdram.h>
#include <miiphy.h>
#include <libfdt.h>
#include <fdt_support.h>
@ -41,8 +41,6 @@ extern void ddr_enable_ecc(unsigned int dram_size);
DECLARE_GLOBAL_DATA_PTR;
extern long int spd_sdram(void);
void local_bus_init(void);
void sdram_init(void);
long int fixed_sdram (void);

6
board/sbc8560/sbc8560.c
Unescape View File

@ -27,13 +27,11 @@
*/
extern long int spd_sdram (void);
#include <common.h>
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <ioports.h>
#include <spd.h>
#include <spd_sdram.h>
#include <miiphy.h>
long int fixed_sdram (void);
@ -262,7 +260,7 @@ int checkboard (void)
long int initdram (int board_type)
{
long dram_size = 0;
extern long spd_sdram (void);
#if 0
#if !defined(CONFIG_RAM_AS_FLASH)
volatile ccsr_lbc_t *lbc = (void *)(CFG_MPC85xx_LBC_ADDR);

6
board/sbc8641d/sbc8641d.c
Unescape View File

@ -34,7 +34,7 @@
#include <asm/processor.h>
#include <asm/immap_86xx.h>
#include <asm/immap_fsl_pci.h>
#include <spd.h>
#include <spd_sdram.h>
#include <libfdt.h>
#include <fdt_support.h>
@ -42,10 +42,6 @@
extern void ddr_enable_ecc (unsigned int dram_size);
#endif
#if defined(CONFIG_SPD_EEPROM)
#include "spd_sdram.h"
#endif
void sdram_init (void);
long int fixed_sdram (void);

5
board/stxgp3/stxgp3.c
Unescape View File

@ -29,15 +29,13 @@
*/
extern long int spd_sdram (void);
#include <common.h>
#include <pci.h>
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <ioports.h>
#include <asm/io.h>
#include <spd.h>
#include <spd_sdram.h>
#include <miiphy.h>
long int fixed_sdram (void);
@ -281,7 +279,6 @@ long int
initdram (int board_type)
{
long dram_size = 0;
extern long spd_sdram (void);
#if defined(CONFIG_DDR_DLL)
{

5
board/stxssa/stxssa.c
Unescape View File

@ -29,15 +29,13 @@
*/
extern long int spd_sdram (void);
#include <common.h>
#include <pci.h>
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <ioports.h>
#include <asm/io.h>
#include <spd.h>
#include <spd_sdram.h>
#include <miiphy.h>
long int fixed_sdram (void);
@ -297,7 +295,6 @@ long int
initdram (int board_type)
{
long dram_size = 0;
extern long spd_sdram (void);
#if defined(CONFIG_DDR_DLL)
{

2
board/tqm834x/tqm834x.c
Unescape View File

@ -27,7 +27,6 @@
#include <mpc83xx.h>
#include <asm/mpc8349_pci.h>
#include <i2c.h>
#include <spd.h>
#include <miiphy.h>
#include <asm-ppc/mmu.h>
#include <pci.h>
@ -59,7 +58,6 @@ int tqm834x_num_flash_banks;
/* External definitions */
ulong flash_get_size (ulong base, int banknum);
extern flash_info_t flash_info[];
extern long spd_sdram (void);
/* Local functions */
static int detect_num_flash_banks(void);

1
board/tqm85xx/sdram.c
Unescape View File

@ -27,7 +27,6 @@
#include <asm/immap_85xx.h>
#include <asm/processor.h>
#include <asm/mmu.h>
#include <spd.h>
struct sdram_conf_s {
unsigned long size;

2
board/tqm85xx/tqm85xx.c
Unescape View File

@ -32,7 +32,6 @@
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <ioports.h>
#include <spd.h>
#include <flash.h>
DECLARE_GLOBAL_DATA_PTR;
@ -40,7 +39,6 @@ DECLARE_GLOBAL_DATA_PTR;
extern flash_info_t flash_info[]; /* FLASH chips info */
void local_bus_init (void);
long int fixed_sdram (void);
ulong flash_get_size (ulong base, int banknum);
#ifdef CONFIG_PS2MULT

4
net/eth.c
Unescape View File

@ -441,8 +441,10 @@ int eth_init(bd_t *bis)
{
struct eth_device* old_current;
if (!eth_current)
if (!eth_current) {
puts ("No ethernet found.\n");
return -1;
}
old_current = eth_current;
do {

Write Preview
Loading…
Cancel
Save