فهرست منبع

Fix problem with SM501 init on HH405 board.
Patch by Stefan Roese, 30 Sep 2005

Stefan Roese 19 سال پیش
والد
کامیت
2c7b2ab5a0
2فایلهای تغییر یافته به همراه12 افزوده شده و 4 حذف شده
  1. 4 1
      board/esd/hh405/hh405.c
  2. 8 3
      include/configs/HH405.h

+ 4 - 1
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);

+ 8 - 3
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	| \