diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2005-10-03 09:33:12 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-10-03 09:33:12 +0200 |
| commit | 5362385ec3c95d79234002de8ed970c653fd7a93 (patch) | |
| tree | 02fdd1c7d2c9ee926697d431f99ff1623b1d92d8 | |
| parent | d9631ecf528b0f89d2ffda693209b088411434d0 (diff) | |
| parent | 2c7b2ab5a072a2aa0b2c3e8c48b3302f5122f11e (diff) | |
| download | u-boot-5362385ec3c95d79234002de8ed970c653fd7a93.tar.gz u-boot-5362385ec3c95d79234002de8ed970c653fd7a93.tar.xz u-boot-5362385ec3c95d79234002de8ed970c653fd7a93.zip | |
Merge with /home/wd/git/u-boot/master
| -rw-r--r-- | board/esd/hh405/hh405.c | 5 | ||||
| -rw-r--r-- | include/configs/HH405.h | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/board/esd/hh405/hh405.c b/board/esd/hh405/hh405.c index 67a0c30e2c..5c0d070a7f 100644 --- a/board/esd/hh405/hh405.c +++ b/board/esd/hh405/hh405.c @@ -367,7 +367,6 @@ int misc_init_r (void) int i; char *str; unsigned long contrast0 = 0xffffffff; - pci_dev_t devbusfn; dst = malloc(CFG_FPGA_MAX_SIZE); if (gunzip (dst, CFG_FPGA_MAX_SIZE, (uchar *)fpgadata, &len) != 0) { @@ -554,7 +553,10 @@ int misc_init_r (void) regs_13704_320_240_4bpp, sizeof(regs_13704_320_240_4bpp)/sizeof(regs_13704_320_240_4bpp[0]), logo_bmp_320, sizeof(logo_bmp_320)); +#ifdef CONFIG_VIDEO_SM501 } else { + pci_dev_t devbusfn; + /* * Is SM501 connected (ppc221/ppc231)? */ @@ -573,6 +575,7 @@ int misc_init_r (void) printf("Unsupported bd_type defined (%s) -> No display configured!\n", str); return 0; } +#endif /* CONFIG_VIDEO_SM501 */ } return (0); diff --git a/include/configs/HH405.h b/include/configs/HH405.h index e41e3712a3..dd29be0e6a 100644 --- a/include/configs/HH405.h +++ b/include/configs/HH405.h @@ -55,6 +55,10 @@ #define CONFIG_PREBOOT "autoupd" +#define CONFIG_EXTRA_ENV_SETTINGS \ + "pciconfighost=1\0" \ + "" + #define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ #define CONFIG_MII 1 /* MII PHY management */ @@ -66,7 +70,9 @@ /* * Video console */ -#define CONFIG_VIDEO +#define CONFIG_VIDEO /* for sm501 video support */ + +#ifdef CONFIG_VIDEO #define CONFIG_VIDEO_SM501 #if 0 #define CONFIG_VIDEO_SM501_32BPP @@ -84,11 +90,10 @@ #define CONFIG_VIDEO_BMP_GZIP /* gzip compressed bmp images */ #define CFG_VIDEO_LOGO_MAX_SIZE (1024*1024) /* for decompressed img */ -#ifdef CONFIG_VIDEO #define ADD_BMP_CMD CFG_CMD_BMP #else #define ADD_BMP_CMD 0 -#endif +#endif /* CONFIG_VIDEO */ #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_DHCP | \ |