Fix SDRAM initialization

[karo-tx-uboot.git] / Makefile

diff --git a/Makefile b/Makefile
index 6732a093ff2574807270f8a3c57cc8f9c54210e5..cf8abd6c21926873e5330dd62f096c2770c06ffe 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -53,26 +53,17 @@ ifndef CROSS_COMPILE
 ifeq ($(HOSTARCH),ppc)
 CROSS_COMPILE =
 else
-##  #ifeq ($(CPU),mpc8xx)
-##  CROSS_COMPILE = ppc_8xx-
-##  #endif
-##  #ifeq ($(CPU),ppc4xx)
-##  #CROSS_COMPILE = ppc_4xx-
-##  #endif
-##  #ifeq ($(CPU),mpc824x)
-##  #CROSS_COMPILE = ppc_82xx-
-##  #endif
-##  #ifeq ($(CPU),mpc8260)
-##  #CROSS_COMPILE = ppc_82xx-
-##  #endif
-##  #ifeq ($(CPU),74xx_7xx)
-##  #CROSS_COMPILE = ppc_74xx-)
-##  #endif
 ifeq ($(ARCH),ppc)
 CROSS_COMPILE = ppc_8xx-
 endif
 ifeq ($(ARCH),arm)
-CROSS_COMPILE = arm_920TDI-
+CROSS_COMPILE = arm-linux-
+endif
+ifeq ($(ARCH),i386)
+#CROSS_COMPILE = i386-elf-
+endif
+ifeq ($(ARCH),mips)
+CROSS_COMPILE = mips_4KC-
 endif
 endif
 endif
@@ -100,7 +91,10 @@ SUBDIRS     = tools \
 # U-Boot objects....order is important (i.e. start must be first)
 
 OBJS  =        cpu/$(CPU)/start.o
-
+ifeq ($(CPU),i386)
+OBJS +=        cpu/$(CPU)/start16.o
+OBJS +=        cpu/$(CPU)/reset.o
+endif
 ifeq ($(CPU),ppc4xx)
 OBJS +=        cpu/$(CPU)/resetvec.o
 endif
@@ -108,7 +102,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
+LIBS += fs/jffs2/libjffs2.a fs/fdos/libfdos.a
 LIBS += net/libnet.a
 LIBS += disk/libdisk.a
 LIBS += rtc/librtc.a
@@ -123,8 +117,8 @@ LIBS += lib_generic/libgeneric.a
 all:           u-boot.srec u-boot.bin System.map
 
 install:       all
-               cp u-boot.bin /tftpboot/u-boot.bin
-               cp u-boot.bin /net/sam/tftpboot/u-boot.bin
+               -cp u-boot.bin /tftpboot/u-boot.bin
+               -cp u-boot.bin /net/denx/tftpboot/u-boot.bin
 
 u-boot.srec:   u-boot
                $(OBJCOPY) ${OBJCFLAGS} -O srec $< $@
@@ -136,7 +130,9 @@ u-boot.dis: u-boot
                $(OBJDUMP) -d $< > $@
 
 u-boot:                depend subdirs $(OBJS) $(LIBS) $(LDSCRIPT)
-               $(LD) $(LDFLAGS) $(OBJS) $(LIBS) $(LIBS) -Map u-boot.map -o u-boot
+               $(LD) $(LDFLAGS) $(OBJS) \
+                       --start-group $(LIBS) --end-group \
+                       -Map u-boot.map -o u-boot
 
 subdirs:
                @for dir in $(SUBDIRS) ; do $(MAKE) -C $$dir || exit 1 ; done
@@ -172,6 +168,14 @@ unconfig:
 #========================================================================
 # PowerPC
 #========================================================================
+
+#########################################################################
+## MPC5xx Systems
+#########################################################################
+
+cmi_mpc5xx_config:     unconfig
+       @./mkconfig $(@:_config=) ppc mpc5xx cmi
+
 #########################################################################
 ## MPC8xx Systems
 #########################################################################
@@ -191,6 +195,9 @@ CCM_config:         unconfig
 cogent_mpc8xx_config:  unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx cogent
 
+ELPT860_config:                unconfig
+       @./mkconfig $(@:_config=) ppc mpc8xx elpt860 LEOX
+
 ESTEEM192E_config:     unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx esteem192e
 
@@ -205,8 +212,16 @@ FADS860T_config:   unconfig
 FLAGADM_config:        unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx flagadm
 
+xtract_GEN860T = $(subst _SC,,$(subst _config,,$1))
+
+GEN860T_SC_config      \
 GEN860T_config: unconfig
-       @./mkconfig $(@:_config=) ppc mpc8xx gen860t
+       @ >include/config.h
+       @[ -z "$(findstring _SC,$@)" ] || \
+               { echo "#define CONFIG_SC" >>include/config.h ; \
+                 echo "With reduced H/W feature set (SC)..." ; \
+               }
+       @./mkconfig -a $(call xtract_GEN860T,$@) ppc mpc8xx gen860t
 
 GENIETV_config:        unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx genietv
@@ -315,14 +330,22 @@ SM850_config      :       unconfig
 SPD823TS_config:       unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx spd8xx
 
+svm_sc8xx_config:      unconfig
+       @ >include/config.h
+       @./mkconfig $(@:_config=) ppc mpc8xx svm_sc8xx
+
 SXNI855T_config:       unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx sixnet
 
+# EMK MPC8xx based modules
+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,
 # 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 _FEC,,$(subst _config,,$1)))))
+xtract_8xx = $(subst _66MHz,,$(subst _80MHz,,$(subst _LCD,,$(subst _config,,$1))))
 
 FPS850L_config         \
 FPS860L_config         \
@@ -338,20 +361,13 @@ TQM850L_80MHz_config      \
 TQM855L_config         \
 TQM855L_66MHz_config   \
 TQM855L_80MHz_config   \
-TQM855L_FEC_config     \
-TQM855L_FEC_66MHz_config \
-TQM855L_FEC_80MHz_config \
 TQM860L_config         \
 TQM860L_66MHz_config   \
 TQM860L_80MHz_config   \
-TQM860L_FEC_config     \
-TQM860L_FEC_66MHz_config       \
-TQM860L_FEC_80MHz_config:      unconfig
+TQM862L_config         \
+TQM862L_66MHz_config   \
+TQM862L_80MHz_config:  unconfig
        @ >include/config.h
-       @[ -z "$(findstring _FEC,$@)" ] || \
-               { echo "#define CONFIG_FEC_ENET"        >>include/config.h ; \
-                 echo "... with FEC support" ; \
-               }
        @[ -z "$(findstring _66MHz,$@)" ] || \
                { echo "#define CONFIG_66MHz"           >>include/config.h ; \
                  echo "... with 66MHz system clock" ; \
@@ -372,6 +388,11 @@ TTTech_config:     unconfig
        @echo "#define CONFIG_SHARP_LQ104V7DS01" >>include/config.h
        @./mkconfig -a TQM823L ppc mpc8xx tqm8xx
 
+v37_config:    unconfig
+       @echo "#define CONFIG_LCD" >include/config.h
+       @echo "#define CONFIG_SHARP_LQ084V1DG21" >>include/config.h
+       @./mkconfig $(@:_config=) ppc mpc8xx v37
+
 #########################################################################
 ## PPC4xx Systems
 #########################################################################
@@ -437,9 +458,24 @@ WALNUT405_config:unconfig
 #########################################################################
 ## MPC824x Systems
 #########################################################################
+xtract_82xx = $(subst _ROMBOOT,,$(subst _L2,,$(subst _266MHz,,$(subst _300MHz,,$(subst _config,,$1)))))
+
 BMW_config: unconfig
        @./mkconfig $(@:_config=) ppc mpc824x bmw
 
+CPC45_config   \
+CPC45_ROMBOOT_config:  unconfig
+       @./mkconfig $(call xtract_82xx,$@) ppc mpc824x cpc45
+       @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;
+
 CU824_config: unconfig
        @./mkconfig $(@:_config=) ppc mpc824x cu824
 
@@ -467,7 +503,6 @@ utx8245_config: unconfig
 #########################################################################
 ## MPC8260 Systems
 #########################################################################
-xtract_82xx = $(subst _ROMBOOT,,$(subst _L2,,$(subst _266MHz,,$(subst _300MHz,,$(subst _config,,$1)))))
 
 cogent_mpc8260_config: unconfig
        @./mkconfig $(@:_config=) ppc mpc8260 cogent
@@ -500,6 +535,23 @@ IPHASE4539_config: unconfig
 MPC8260ADS_config:     unconfig
        @./mkconfig $(@:_config=) ppc mpc8260 mpc8260ads
 
+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
@@ -531,10 +583,13 @@ sbc8260_config:   unconfig
 SCM_config:            unconfig
        @./mkconfig $(@:_config=) ppc mpc8260 SCM siemens
 
+TQM8255_config \
 TQM8260_config \
 TQM8260_L2_config      \
+TQM8255_266MHz_config  \
 TQM8260_266MHz_config  \
 TQM8260_L2_266MHz_config \
+TQM8255_300MHz_config  \
 TQM8260_300MHz_config: unconfig
        @ >include/config.h
        @if [ "$(findstring _L2_,$@)" ] ; then \
@@ -552,12 +607,20 @@ TQM8260_300MHz_config:    unconfig
                { echo "#define CONFIG_300MHz"  >>include/config.h ; \
                  echo "... with 300MHz system clock" ; \
                }
-       @./mkconfig -a $(call xtract_82xx,$@) ppc mpc8260 tqm8260
+       @[ -z "$(findstring TQM8255_,$@)" ] || \
+               { echo "#define CONFIG_MPC8255" >>include/config.h ; }
+       @./mkconfig -a TQM8260 ppc mpc8260 tqm8260
+
+atc_config:    unconfig
+       @./mkconfig $(@:_config=) ppc mpc8260 atc
 
 #########################################################################
 ## 74xx/7xx Systems
 #########################################################################
 
+AmigaOneG3SE_config:   unconfig
+       @./mkconfig $(@:_config=) ppc 74xx_7xx AmigaOneG3SE MAI
+
 EVB64260_config        \
 EVB64260_750CX_config: unconfig
        @./mkconfig EVB64260 ppc 74xx_7xx evb64260
@@ -582,6 +645,9 @@ ELPPC_config: unconfig
 ## StrongARM Systems
 #########################################################################
 
+at91rm9200dk_config    :       unconfig
+       @./mkconfig $(@:_config=) arm at91rm9200 at91rm9200dk
+
 lart_config    :       unconfig
        @./mkconfig $(@:_config=) arm sa1100 lart
 
@@ -595,14 +661,25 @@ shannon_config    :       unconfig
 ## ARM920T Systems
 #########################################################################
 
+xtract_trab = $(subst _big_flash,,$(subst _config,,$1))
+
 smdk2400_config        :       unconfig
        @./mkconfig $(@:_config=) arm arm920t smdk2400
 
 smdk2410_config        :       unconfig
        @./mkconfig $(@:_config=) arm arm920t smdk2410
 
-trab_config :          unconfig
-       @./mkconfig $(@:_config=) arm arm920t trab
+trab_config \
+trab_big_flash_config: unconfig
+       @ >include/config.h
+       @[ -z "$(findstring _big_flash,$@)" ] || \
+               { echo "#define CONFIG_BIG_FLASH" >>include/config.h ; \
+                 echo "... with big flash support" ; \
+               }
+       @./mkconfig -a $(call xtract_trab,$@) arm arm920t trab
+
+VCMA9_config   :       unconfig
+       @./mkconfig $(@:_config=) arm arm920t vcma9 mpl
 
 #########################################################################
 ## ARM720T Systems
@@ -615,18 +692,47 @@ ep7312_config     :       unconfig
        @./mkconfig $(@:_config=) arm arm720t ep7312
 
 #########################################################################
-## Xscale Systems
+## XScale Systems
 #########################################################################
 
-lubbock_config :       unconfig
-       @./mkconfig $(@:_config=) arm xscale lubbock
-
 cradle_config  :       unconfig
        @./mkconfig $(@:_config=) arm xscale cradle
 
 csb226_config  :       unconfig
        @./mkconfig $(@:_config=) arm xscale csb226
 
+innokom_config :       unconfig
+       @./mkconfig $(@:_config=) arm xscale innokom
+
+lubbock_config :       unconfig
+       @./mkconfig $(@:_config=) arm xscale lubbock
+
+wepep250_config        :       unconfig
+       @./mkconfig $(@:_config=) arm xscale wepep250
+
+#========================================================================
+# i386
+#========================================================================
+#########################################################################
+## AMD SC520 CDP
+#########################################################################
+sc520_cdp_config       :       unconfig
+       @./mkconfig $(@:_config=) i386 i386 sc520_cdp
+
+#========================================================================
+# MIPS
+#========================================================================
+#########################################################################
+## MIPS32 4Kc
+#########################################################################
+
+incaip_config :                unconfig
+       @./mkconfig $(@:_config=) mips mips incaip
+
+purple_config :                unconfig
+       @./mkconfig $(@:_config=) mips mips purple
+
+#########################################################################
 #########################################################################
 
 clean:
@@ -634,10 +740,13 @@ clean:
                \( -name 'core' -o -name '*.bak' -o -name '*~' \
                -o -name '*.o'  -o -name '*.a'  \) -print \
                | xargs rm -f
-       rm -f examples/hello_world examples/timer examples/eepro100_eeprom
+       rm -f examples/hello_world examples/timer \
+             examples/eepro100_eeprom examples/sched \
+             examples/mem_to_mem_idma2intr
        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
+       rm -f tools/env/fw_printenv tools/env/fw_setenv
 
 clobber:       clean
        find . -type f \
@@ -646,8 +755,9 @@ clobber:    clean
                | xargs rm -f
        rm -f $(OBJS) *.bak tags TAGS
        rm -fr *.*~
-       rm -f u-boot u-boot.bin u-boot.elf u-boot.srec u-boot.map System.map
-       rm -f tools/crc32.c tools/environment.c
+       rm -f u-boot u-boot.bin u-boot.srec u-boot.map System.map
+       rm -f tools/crc32.c tools/environment.c tools/env/crc32.c
+       rm -f tools/inca-swap-bytes cpu/mpc824x/bedbug_603e.c
        rm -f include/asm/arch include/asm
 
 mrproper \