* Patch by Klaus Heydeck, 13 Mar 2003:

[people/ms/u-boot.git] / Makefile

diff --git a/Makefile b/Makefile
index 258e5998be1be31d0a592cffb9247a7d70d67891..09096a90e735e94383594eb58ec3a209f4da6192 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -99,7 +99,8 @@ LIBS  = lib_generic/libgeneric.a
 LIBS += board/$(BOARDDIR)/lib$(BOARD).a
 LIBS += cpu/$(CPU)/lib$(CPU).a
 LIBS += lib_$(ARCH)/lib$(ARCH).a
-LIBS += fs/cramfs/libcramfs.a fs/fat/libfat.a fs/fdos/libfdos.a fs/jffs2/libjffs2.a
+LIBS += fs/cramfs/libcramfs.a fs/fat/libfat.a fs/fdos/libfdos.a fs/jffs2/libjffs2.a \
+       fs/reiserfs/libreiserfs.a
 LIBS += net/libnet.a
 LIBS += disk/libdisk.a
 LIBS += rtc/librtc.a
@@ -244,6 +245,9 @@ TOP5200_config:     unconfig
        @ echo "#define CONFIG_$(@:_config=) 1" >include/config.h
        @./mkconfig -a TOP5200 ppc mpc5xxx top5200 emk
 
+PM520_config:  unconfig
+       @./mkconfig $(@:_config=) ppc mpc5xxx pm520
+
 #########################################################################
 ## MPC8xx Systems
 #########################################################################
@@ -354,7 +358,10 @@ IVMS8_config:      unconfig
        @./mkconfig -a IVMS8 ppc mpc8xx ivm
 
 KUP4K_config   :       unconfig
-       @./mkconfig $(@:_config=) ppc mpc8xx kup4k
+       @./mkconfig $(@:_config=) ppc mpc8xx kup4k kup
+
+KUP4X_config    :       unconfig
+       @./mkconfig $(@:_config=) ppc mpc8xx kup4x kup
 
 LANTEC_config  :       unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx lantec
@@ -652,7 +659,7 @@ XPEDITE1K_config:unconfig
 #########################################################################
 ## MPC824x Systems
 #########################################################################
-xtract_82xx = $(subst _ROMBOOT,,$(subst _L2,,$(subst _266MHz,,$(subst _300MHz,,$(subst _config,,$1)))))
+xtract_82xx = $(subst _BIGFLASH,,$(subst _ROMBOOT,,$(subst _L2,,$(subst _266MHz,,$(subst _300MHz,,$(subst _config,,$1))))))
 
 A3000_config: unconfig
        @./mkconfig $(@:_config=) ppc mpc824x a3000
@@ -747,32 +754,56 @@ MPC8260ADS_config:        unconfig
 MPC8266ADS_config:     unconfig
        @./mkconfig $(@:_config=) ppc mpc8260 mpc8266ads
 
+# PM825/PM826 default configuration:  small (= 8 MB) Flash / boot from 64-bit flash
 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 ; \
+PM825_ROMBOOT_config   \
+PM825_BIGFLASH_config  \
+PM825_ROMBOOT_BIGFLASH_config  \
+PM826_config   \
+PM826_ROMBOOT_config   \
+PM826_BIGFLASH_config  \
+PM826_ROMBOOT_BIGFLASH_config: unconfig
+       @if [ "$(findstring PM825_,$@)" ] ; then \
+               echo "#define CONFIG_PCI"       >include/config.h ; \
+       else \
+               >include/config.h ; \
+       fi
+       @if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
                echo "... booting from 8-bit flash" ; \
+               echo "#define CONFIG_BOOT_ROM" >>include/config.h ; \
+               echo "TEXT_BASE = 0xFF800000" >board/pm826/config.tmp ; \
+               if [ "$(findstring _BIGFLASH_,$@)" ] ; then \
+                       echo "... with 32 MB Flash" ; \
+                       echo "#define CONFIG_FLASH_32MB" >>include/config.h ; \
+               fi; \
        else \
-               echo "CONFIG_BOOT_ROM = n" >> config.mk ; \
                echo "... booting from 64-bit flash" ; \
-       fi; \
-       echo "export CONFIG_BOOT_ROM" >> config.mk; \
+               if [ "$(findstring _BIGFLASH_,$@)" ] ; then \
+                       echo "... with 32 MB Flash" ; \
+                       echo "#define CONFIG_FLASH_32MB" >>include/config.h ; \
+                       echo "TEXT_BASE = 0x40000000" >board/pm826/config.tmp ; \
+               else \
+                       echo "TEXT_BASE = 0xFF000000" >board/pm826/config.tmp ; \
+               fi; \
+       fi
+       @./mkconfig -a PM826 ppc mpc8260 pm826
 
-PM826_config   \
-PM826_ROMBOOT_config: unconfig
-       @./mkconfig $(call xtract_82xx,$@) ppc mpc8260 pm826
-       @cd ./include ;                         \
-       if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
-               echo "CONFIG_BOOT_ROM = y" >> config.mk ; \
-               echo "... booting from 8-bit flash" ; \
+PM828_config   \
+PM828_PCI_config       \
+PM828_ROMBOOT_config   \
+PM828_ROMBOOT_PCI_config:      unconfig
+       @if [ -z "$(findstring _PCI_,$@)" ] ; then \
+               echo "#define CONFIG_PCI"  >>include/config.h ; \
+               echo "... with PCI enabled" ; \
        else \
-               echo "CONFIG_BOOT_ROM = n" >> config.mk ; \
-               echo "... booting from 64-bit flash" ; \
-       fi; \
-       echo "export CONFIG_BOOT_ROM" >> config.mk; \
+               >include/config.h ; \
+       fi
+       @if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
+               echo "... booting from 8-bit flash" ; \
+               echo "#define CONFIG_BOOT_ROM" >>include/config.h ; \
+               echo "TEXT_BASE = 0xFF800000" >board/pm826/config.tmp ; \
+       fi
+       @./mkconfig -a PM828 ppc mpc8260 pm828
 
 ppmc8260_config:       unconfig
        @./mkconfig $(@:_config=) ppc mpc8260 ppmc8260
@@ -905,15 +936,15 @@ ZUMA_config:      unconfig
 ## StrongARM Systems
 #########################################################################
 
-at91rm9200dk_config    :       unconfig
-       @./mkconfig $(@:_config=) arm at91rm9200 at91rm9200dk
+dnp1110_config :       unconfig
+       @./mkconfig $(@:_config=) arm sa1100 dnp1110
+
+gcplus_config  :       unconfig
+       @./mkconfig $(@:_config=) arm sa1100 gcplus
 
 lart_config    :       unconfig
        @./mkconfig $(@:_config=) arm sa1100 lart
 
-dnp1110_config :       unconfig
-       @./mkconfig $(@:_config=) arm sa1100 dnp1110
-
 shannon_config :       unconfig
        @./mkconfig $(@:_config=) arm sa1100 shannon
 
@@ -948,10 +979,10 @@ omap1610h2_cs0boot_config \
 omap1610h2_cs3boot_config :    unconfig
        @if [ "$(findstring _cs0boot_, $@)" ] ; then \
                echo "#define CONFIG_CS0_BOOT" >> ./include/config.h ; \
-               echo "Configured for CS0 boot"; \
+               echo "... configured for CS0 boot"; \
        else \
                echo "#define CONFIG_CS3_BOOT" >> ./include/config.h ; \
-               echo "Configured for CS3 boot"; \
+               echo "... configured for CS3 boot"; \
        fi;
        @./mkconfig -a $(call xtract_omap1610xxx,$@) arm arm926ejs omap1610inn
 
@@ -1010,6 +1041,13 @@ ep7312_config    :       unconfig
 modnet50_config :      unconfig
        @./mkconfig $(@:_config=) arm arm720t modnet50
 
+#########################################################################
+## AT91RM9200 Systems
+#########################################################################
+
+at91rm9200dk_config    :       unconfig
+       @./mkconfig $(@:_config=) arm at91rm9200 at91rm9200dk
+
 #########################################################################
 ## XScale Systems
 #########################################################################
@@ -1035,6 +1073,9 @@ logodl_config     :       unconfig
 wepep250_config        :       unconfig
        @./mkconfig $(@:_config=) arm pxa wepep250
 
+xm250_config   :       unconfig
+       @./mkconfig $(@:_config=) arm pxa xm250
+
 #========================================================================
 # i386
 #========================================================================
@@ -1136,6 +1177,24 @@ DK1S10_config:   unconfig
                }
        @./mkconfig -a DK1S10 nios nios dk1s10 altera
 
+ADNPESC1_DNPEVA2_base_32_config        \
+ADNPESC1_base_32_config                \
+ADNPESC1_config: unconfig
+       @ >include/config.h
+       @[ -z "$(findstring _DNPEVA2,$@)" ] || \
+               { echo "#define CONFIG_DNPEVA2 1" >>include/config.h ; \
+                 echo "... DNP/EVA2 configuration" ; \
+               }
+       @[ -z "$(findstring _base_32,$@)" ] || \
+               { echo "#define CONFIG_NIOS_BASE_32 1" >>include/config.h ; \
+                 echo "... NIOS 'base_32' configuration" ; \
+               }
+       @[ -z "$(findstring ADNPESC1_config,$@)" ] || \
+               { echo "#define CONFIG_NIOS_BASE_32 1" >>include/config.h ; \
+                 echo "... NIOS 'base_32' configuration (DEFAULT)" ; \
+               }
+       @./mkconfig -a ADNPESC1 nios nios adnpesc1 ssv
+
 
 #########################################################################
 ## MIPS32 AU1X00