*** empty log message ***

diff --git a/Makefile b/Makefile
index 6e6a44d33471d4db55452def24b40d88871d4420..e545ec0da20558b13cd7a8c1927e6835872428d3 100644 (file)
--- 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 05f7130b2740f960d7e2496ad23ae9793ba0bded..444b897264f43fb003da7378a865289f5edb6f47 100644 (file)
--- 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