Patch from Stefan Roese.

[karo-tx-uboot.git] / Makefile

diff --git a/Makefile b/Makefile
index 3e66bf0b2af0abced768914666d96360d54c01bd..d9cc616d667f1b22b8e62950a84125e3ab8ee389 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,11 @@ ifeq ($(ARCH),arm)
 CROSS_COMPILE = arm-linux-
 endif
 ifeq ($(ARCH),i386)
-#CROSS_COMPILE = i386-elf-
+ifeq ($(HOSTARCH),i386)
+CROSS_COMPILE =
+else
+CROSS_COMPILE = i386-linux-
+endif
 endif
 ifeq ($(ARCH),mips)
 CROSS_COMPILE = mips_4KC-
@@ -102,7 +106,7 @@ endif
 LIBS  =        board/$(BOARDDIR)/lib$(BOARD).a
 LIBS += cpu/$(CPU)/lib$(CPU).a
 LIBS += lib_$(ARCH)/lib$(ARCH).a
-LIBS += fs/jffs2/libjffs2.a fs/fdos/libfdos.a
+LIBS += fs/jffs2/libjffs2.a fs/fdos/libfdos.a fs/fat/libfat.a
 LIBS += net/libnet.a
 LIBS += disk/libdisk.a
 LIBS += rtc/librtc.a
@@ -310,12 +314,18 @@ pcu_e_config:             unconfig
 R360MPI_config:        unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx r360mpi
 
+RBC823_config: unconfig
+       @./mkconfig $(@:_config=) ppc mpc8xx rbc823
+
 RPXClassic_config:     unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx RPXClassic
 
 RPXlite_config:                unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx RPXlite
 
+rmu_config:    unconfig
+       @./mkconfig $(@:_config=) ppc mpc8xx rmu
+
 RRvision_config:       unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx RRvision
 
@@ -342,10 +352,10 @@ TOP860_config:            unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx top860 emk
 
 # Play some tricks for configuration selection
-# All boards can come with 50 MHz (default), 66MHz or 80MHz clock,
+# All boards can come with 50 MHz (default), 66MHz, 80MHz or 100 MHz clock,
 # but only 855 and 860 boards may come with FEC
 # and 823 boards may have LCD support
-xtract_8xx = $(subst _66MHz,,$(subst _80MHz,,$(subst _LCD,,$(subst _config,,$1))))
+xtract_8xx = $(subst _66MHz,,$(subst _80MHz,,$(subst _100MHz,,$(subst _LCD,,$(subst _config,,$1)))))
 
 FPS850L_config         \
 FPS860L_config         \
@@ -366,7 +376,8 @@ TQM860L_66MHz_config        \
 TQM860L_80MHz_config   \
 TQM862L_config         \
 TQM862L_66MHz_config   \
-TQM862L_80MHz_config:  unconfig
+TQM862L_80MHz_config   \
+TQM862M_100MHz_config: unconfig
        @ >include/config.h
        @[ -z "$(findstring _66MHz,$@)" ] || \
                { echo "#define CONFIG_66MHz"           >>include/config.h ; \
@@ -376,6 +387,10 @@ TQM862L_80MHz_config:      unconfig
                { echo "#define CONFIG_80MHz"           >>include/config.h ; \
                  echo "... with 80MHz system clock" ; \
                }
+       @[ -z "$(findstring _100MHz,$@)" ] || \
+               { echo "#define CONFIG_100MHz"          >>include/config.h ; \
+                 echo "... with 100MHz system clock" ; \
+               }
        @[ -z "$(findstring _LCD,$@)" ] || \
                { echo "#define CONFIG_LCD"             >>include/config.h ; \
                  echo "#define CONFIG_NEC_NL6648BC20"  >>include/config.h ; \
@@ -442,6 +457,11 @@ ERIC_config:unconfig
 MIP405_config:unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx mip405 mpl
 
+MIP405T_config:unconfig
+       @echo "#define CONFIG_MIP405T" >include/config.h
+       @echo "Enable subset config for MIP405T"
+       @./mkconfig -a MIP405 ppc ppc4xx mip405 mpl
+
 ML2_config:unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx ml2
 
@@ -470,6 +490,9 @@ WALNUT405_config:unconfig
 #########################################################################
 xtract_82xx = $(subst _ROMBOOT,,$(subst _L2,,$(subst _266MHz,,$(subst _300MHz,,$(subst _config,,$1)))))
 
+A3000_config: unconfig
+       @./mkconfig $(@:_config=) ppc mpc824x a3000
+
 BMW_config: unconfig
        @./mkconfig $(@:_config=) ppc mpc824x bmw
 
@@ -706,19 +729,22 @@ ep7312_config     :       unconfig
 #########################################################################
 
 cradle_config  :       unconfig
-       @./mkconfig $(@:_config=) arm xscale cradle
+       @./mkconfig $(@:_config=) arm pxa cradle 
 
 csb226_config  :       unconfig
-       @./mkconfig $(@:_config=) arm xscale csb226
+       @./mkconfig $(@:_config=) arm pxa csb226
 
 innokom_config :       unconfig
-       @./mkconfig $(@:_config=) arm xscale innokom
+       @./mkconfig $(@:_config=) arm pxa innokom
 
 lubbock_config :       unconfig
-       @./mkconfig $(@:_config=) arm xscale lubbock
+       @./mkconfig $(@:_config=) arm pxa lubbock
+
+logodl_config  :       unconfig
+       @./mkconfig $(@:_config=) arm pxa logodl
 
 wepep250_config        :       unconfig
-       @./mkconfig $(@:_config=) arm xscale wepep250
+       @./mkconfig $(@:_config=) arm pxa wepep250
 
 #========================================================================
 # i386
@@ -729,6 +755,12 @@ wepep250_config    :       unconfig
 sc520_cdp_config       :       unconfig
        @./mkconfig $(@:_config=) i386 i386 sc520_cdp
 
+sc520_spunk_config     :       unconfig
+       @./mkconfig $(@:_config=) i386 i386 sc520_spunk
+
+sc520_spunk_rel_config :       unconfig
+       @./mkconfig $(@:_config=) i386 i386 sc520_spunk
+
 #========================================================================
 # MIPS
 #========================================================================
@@ -752,7 +784,8 @@ clean:
                | xargs rm -f
        rm -f examples/hello_world examples/timer \
              examples/eepro100_eeprom examples/sched \
-             examples/mem_to_mem_idma2intr
+             examples/mem_to_mem_idma2intr examples/82559_eeprom
+
        rm -f tools/img2srec tools/mkimage tools/envcrc tools/gen_eth_addr
        rm -f tools/easylogo/easylogo tools/bmp_logo
        rm -f tools/gdb/astest tools/gdb/gdbcont tools/gdb/gdbsend