From: wdenk <wdenk>
Date: Tue, 25 Mar 2003 18:06:06 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: LABEL_2006_03_12_0025~924
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=10f670178cce29d7f078ca622f0eeafd6903748a;p=u-boot

*** empty log message ***
---

diff --git a/Makefile b/Makefile
index 6e6a44d334..e545ec0da2 100644
--- a/Makefile
+++ b/Makefile
@@ -525,6 +525,20 @@ MPC8260ADS_config:	unconfig
 MPC8266ADS_config:	unconfig
 	@./mkconfig $(@:_config=) ppc mpc8260 mpc8266ads
 
+PM825_config	\
+PM825_ROMBOOT_config: unconfig
+	@echo "#define CONFIG_PCI"	>include/config.h
+	@./mkconfig -a PM826 ppc mpc8260 pm826
+	@cd ./include ;				\
+	if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
+		echo "CONFIG_BOOT_ROM = y" >> config.mk ; \
+		echo "... booting from 8-bit flash" ; \
+	else \
+		echo "CONFIG_BOOT_ROM = n" >> config.mk ; \
+		echo "... booting from 64-bit flash" ; \
+	fi; \
+	echo "export CONFIG_BOOT_ROM" >> config.mk; \
+
 PM826_config	\
 PM826_ROMBOOT_config: unconfig
 	@./mkconfig $(call xtract_82xx,$@) ppc mpc8260 pm826
diff --git a/include/configs/PM826.h b/include/configs/PM826.h
index 05f7130b27..444b897264 100644
--- a/include/configs/PM826.h
+++ b/include/configs/PM826.h
@@ -303,9 +303,10 @@
 # define CFG_RAMBOOT
 #endif
 
-#define CONFIG_PCI
+#ifdef	CONFIG_PCI
 #define CONFIG_PCI_PNP
 #define CONFIG_EEPRO100
+#endif
 
 /*
  * Internal Definitions