]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'master' of git://www.denx.de/git/u-boot-coldfire
authorWolfgang Denk <wd@denx.de>
Wed, 23 Jan 2008 13:23:13 +0000 (14:23 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 23 Jan 2008 13:23:13 +0000 (14:23 +0100)
1  2 
MAINTAINERS
MAKEALL
Makefile
README
net/eth.c

diff --combined MAINTAINERS
index ef16d688d3cc0e27eb6faabf2e081efebeb73cf6,bd30f09f74917f9f75753f2e94a3160ba66cdb54..74cbaa91c92971f919377a75edb4d8ec9e5e1d3f
@@@ -154,7 -154,6 +154,7 @@@ Matthias Fuchs <matthias.fuchs@esd-elec
        DASA_SIM                IOP480 (PPC401)
        DP405                   PPC405EP
        DU405                   PPC405GP
 +      DU440                   PPC440EPx
        G2000                   PPC405EP
        HH405                   PPC405EP
        HUB405                  PPC405EP
@@@ -648,9 -647,13 +648,13 @@@ Zachary P. Landau <zachary.landau@labxt
  
  TsiChung Liew <Tsi-Chung.Liew@freescale.com>
  
+       M52277EVB               mcf5227x
        M5235EVB                mcf52x2
        M5329EVB                mcf532x
+       M5373EVB                mcf532x
        M54455EVB               mcf5445x
+       M5475EVB                mcf547x_8x
+       M5485EVB                mcf547x_8x
  
  Hayden Fraser <Hayden.Fraser@freescale.com>
  
diff --combined MAKEALL
index 5e37e73444111ee0a7da92b5fa333116502b92a0,5f1be83fbe0cf20ea39cb6c29219e2b75487075a..fabf31917c144a6d76fd97e99ef9796b26bdf428
+++ b/MAKEALL
@@@ -178,7 -178,6 +178,7 @@@ LIST_4xx="         
        DASA_SIM        \
        DP405           \
        DU405           \
 +      DU440           \
        ebony           \
        ERIC            \
        EXBITGEN        \
@@@ -644,14 -643,18 +644,18 @@@ LIST_coldfire="                 
        EB+MCF-EV123            \
        EB+MCF-EV123_internal   \
        idmr                    \
+       M52277EVB               \
        M5235EVB                \
        M5249EVB                \
        M5253EVB                \
        M5271EVB                \
        M5272C3                 \
        M5282EVB                \
-       M5329EVB                \
+       M5329AFEE               \
+       M5373EVB                \
        M54455EVB               \
+       M5475AFE                \
+       M5485AFE                \
        r5200                   \
        TASREG                  \
  "
diff --combined Makefile
index 86c2ba06142b72a5a98b5d0a2925e10bb654924e,953c6bbad04e4b1e57f5e2fd981a6cfbc0c26902..382eab63e7326e72f91553f45377f31b25d79164
+++ b/Makefile
@@@ -218,6 -218,7 +218,7 @@@ LIBS += net/libnet.
  LIBS += disk/libdisk.a
  LIBS += drivers/bios_emulator/libatibiosemu.a
  LIBS += drivers/block/libblock.a
+ LIBS += drivers/dma/libdma.a
  LIBS += drivers/hwmon/libhwmon.a
  LIBS += drivers/i2c/libi2c.a
  LIBS += drivers/input/libinput.a
@@@ -230,7 -231,6 +231,7 @@@ LIBS += drivers/net/libnet.
  LIBS += drivers/net/sk98lin/libsk98lin.a
  LIBS += drivers/pci/libpci.a
  LIBS += drivers/pcmcia/libpcmcia.a
 +LIBS += drivers/spi/libspi.a
  ifeq ($(CPU),mpc83xx)
  LIBS += drivers/qe/qe.a
  endif
@@@ -378,7 -378,6 +379,7 @@@ TAG_SUBDIRS += drivers/pcmci
  TAG_SUBDIRS += drivers/qe
  TAG_SUBDIRS += drivers/rtc
  TAG_SUBDIRS += drivers/serial
 +TAG_SUBDIRS += drivers/spi
  TAG_SUBDIRS += drivers/usb
  TAG_SUBDIRS += drivers/video
  
@@@ -1208,9 -1207,6 +1209,9 @@@ DP405_config:   unconfi
  DU405_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx du405 esd
  
 +DU440_config: unconfig
 +      @$(MKCONFIG) $(@:_config=) ppc ppc4xx du440 esd
 +
  ebony_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx ebony amcc
  
@@@ -1744,6 -1740,9 +1745,9 @@@ ZPC1900_config: unconfi
  ## Coldfire
  #########################################################################
  
+ M52277EVB_config:     unconfig
+       @$(MKCONFIG) -a M52277EVB m68k mcf5227x m52277evb freescale
  M5235EVB_config \
  M5235EVB_Flash16_config \
  M5235EVB_Flash32_config:      unconfig
@@@ -1816,6 -1815,16 +1820,16 @@@ M5329BFEE_config :    unconfi
        fi
        @$(MKCONFIG) -a M5329EVB m68k mcf532x m5329evb freescale
  
+ M5373EVB_config :     unconfig
+       @case "$@" in \
+       M5373EVB_config)        NAND=16;; \
+       esac; \
+       >include/config.h ; \
+       if [ "$${NAND}" != "0" ] ; then \
+               echo "#define NANDFLASH_SIZE    $${NAND}" > $(obj)include/config.h ; \
+       fi
+       @$(MKCONFIG) -a M5373EVB m68k mcf532x m5373evb freescale
  M54455EVB_config \
  M54455EVB_atmel_config \
  M54455EVB_intel_config \
@@@ -1848,6 -1857,76 +1862,76 @@@ M54455EVB_i66_config :        unconfi
        $(XECHO) "... with $${FREQ}Hz input clock"
        @$(MKCONFIG) -a M54455EVB m68k mcf5445x m54455evb freescale
  
+ M5475AFE_config \
+ M5475BFE_config \
+ M5475CFE_config \
+ M5475DFE_config \
+ M5475EFE_config \
+ M5475FFE_config \
+ M5475GFE_config :     unconfig
+       @case "$@" in \
+       M5475AFE_config)        BOOT=2;CODE=0;VID=0;USB=0;RAM=64;RAM1=0;; \
+       M5475BFE_config)        BOOT=2;CODE=16;VID=0;USB=0;RAM=64;RAM1=0;; \
+       M5475CFE_config)        BOOT=2;CODE=16;VID=1;USB=1;RAM=64;RAM1=0;; \
+       M5475DFE_config)        BOOT=2;CODE=0;VID=0;USB=1;RAM=64;RAM1=0;; \
+       M5475EFE_config)        BOOT=2;CODE=0;VID=1;USB=1;RAM=64;RAM1=0;; \
+       M5475FFE_config)        BOOT=2;CODE=32;VID=1;USB=1;RAM=64;RAM1=64;; \
+       M5475GFE_config)        BOOT=4;CODE=0;VID=0;USB=0;RAM=64;RAM1=0;; \
+       esac; \
+       >include/config.h ; \
+       echo "#define CFG_BUSCLK        133333333" > $(obj)include/config.h ; \
+       echo "#define CFG_BOOTSZ        $${BOOT}" >> $(obj)include/config.h ; \
+       echo "#define CFG_DRAMSZ        $${RAM}" >> $(obj)include/config.h ; \
+       if [ "$${RAM1}" != "0" ] ; then \
+               echo "#define CFG_DRAMSZ1       $${RAM1}" >> $(obj)include/config.h ; \
+       fi; \
+       if [ "$${CODE}" != "0" ] ; then \
+               echo "#define CFG_NOR1SZ        $${CODE}" >> $(obj)include/config.h ; \
+       fi; \
+       if [ "$${VID}" == "1" ] ; then \
+               echo "#define CFG_VIDEO" >> $(obj)include/config.h ; \
+       fi; \
+       if [ "$${USB}" == "1" ] ; then \
+               echo "#define CFG_USBCTRL" >> $(obj)include/config.h ; \
+       fi
+       @$(MKCONFIG) -a M5475EVB m68k mcf547x_8x m547xevb freescale
+ M5485AFE_config \
+ M5485BFE_config \
+ M5485CFE_config \
+ M5485DFE_config \
+ M5485EFE_config \
+ M5485FFE_config \
+ M5485GFE_config \
+ M5485HFE_config :     unconfig
+       @case "$@" in \
+       M5485AFE_config)        BOOT=2;CODE=0;VID=0;USB=0;RAM=64;RAM1=0;; \
+       M5485BFE_config)        BOOT=2;CODE=16;VID=0;USB=0;RAM=64;RAM1=0;; \
+       M5485CFE_config)        BOOT=2;CODE=16;VID=1;USB=1;RAM=64;RAM1=0;; \
+       M5485DFE_config)        BOOT=2;CODE=0;VID=0;USB=1;RAM=64;RAM1=0;; \
+       M5485EFE_config)        BOOT=2;CODE=0;VID=1;USB=1;RAM=64;RAM1=0;; \
+       M5485FFE_config)        BOOT=2;CODE=32;VID=1;USB=1;RAM=64;RAM1=64;; \
+       M5485GFE_config)        BOOT=4;CODE=0;VID=0;USB=0;RAM=64;RAM1=0;; \
+       M5485HFE_config)        BOOT=2;CODE=;VID=1;USB=0;RAM=64;RAM1=0;; \
+       esac; \
+       >include/config.h ; \
+       echo "#define CFG_BUSCLK        100000000" > $(obj)include/config.h ; \
+       echo "#define CFG_BOOTSZ        $${BOOT}" >> $(obj)include/config.h ; \
+       echo "#define CFG_DRAMSZ        $${RAM}" >> $(obj)include/config.h ; \
+       if [ "$${RAM1}" != "0" ] ; then \
+               echo "#define CFG_DRAMSZ1       $${RAM1}" >> $(obj)include/config.h ; \
+       fi; \
+       if [ "$${CODE}" != "0" ] ; then \
+               echo "#define CFG_NOR1SZ        $${CODE}" >> $(obj)include/config.h ; \
+       fi; \
+       if [ "$${VID}" == "1" ] ; then \
+               echo "#define CFG_VIDEO" >> $(obj)include/config.h ; \
+       fi; \
+       if [ "$${USB}" == "1" ] ; then \
+               echo "#define CFG_USBCTRL" >> $(obj)include/config.h ; \
+       fi
+       @$(MKCONFIG) -a M5485EVB m68k mcf547x_8x m548xevb freescale
  #########################################################################
  ## MPC83xx Systems
  #########################################################################
diff --combined README
index 1f920478da790e9e461b6b006461aa919a2ac333,fc404202a627f379e241788da40b610db1573129..463bbd0d57e6b0a9f401a4863a7ced822e85f7d7
--- 1/README
--- 2/README
+++ b/README
@@@ -136,8 -136,10 +136,10 @@@ Directory Hierarchy
    - i386      Files specific to i386 CPUs
    - ixp               Files specific to Intel XScale IXP CPUs
    - mcf52x2   Files specific to Freescale ColdFire MCF52x2 CPUs
+   - mcf5227x  Files specific to Freescale ColdFire MCF5227x CPUs
    - mcf532x   Files specific to Freescale ColdFire MCF5329 CPUs
    - mcf5445x  Files specific to Freescale ColdFire MCF5445x CPUs
+   - mcf547x_8x        Files specific to Freescale ColdFire MCF547x_8x CPUs
    - mips      Files specific to MIPS CPUs
    - mpc5xx    Files specific to Freescale MPC5xx  CPUs
    - mpc5xxx   Files specific to Freescale MPC5xxx CPUs
@@@ -1377,14 -1379,6 +1379,14 @@@ The following options need to be config
                SPI configuration items (port pins to use, etc). For
                an example, see include/configs/sacsng.h.
  
 +              CONFIG_HARD_SPI
 +
 +              Enables a hardware SPI driver for general-purpose reads
 +              and writes.  As with CONFIG_SOFT_SPI, the board configuration
 +              must define a list of chip-select function pointers.
 +              Currently supported on some MPC8xxx processors.  For an
 +              example, see include/configs/mpc8349emds.h.
 +
  - FPGA Support: CONFIG_FPGA
  
                Enables FPGA subsystem.
@@@ -2699,10 -2693,6 +2701,10 @@@ Some configuration options can be set u
                  => setenv ethact SCC ETHERNET
                  => ping 10.0.0.1 # traffic sent on SCC ETHERNET
  
 +  ethrotate   - When set to "no" U-Boot does not go through all
 +                available network interfaces.
 +                It just stays at the currently selected interface.
 +
     netretry   - When set to "no" each network operation will
                  either succeed or fail without retrying.
                  When set to "once" the network operation will
diff --combined net/eth.c
index 316e8177862d8c0d47a30395fd5ab57ef1ed11db,bcd7d42a3a70e1216d0b635ab36c8adb93db4c23..4a9e1e691b50b5c50238f2d750f9a3141998d4da
+++ b/net/eth.c
@@@ -61,6 -61,7 +61,7 @@@ extern int uec_initialize(int)
  extern int bfin_EMAC_initialize(bd_t *);
  extern int atstk1000_eth_initialize(bd_t *);
  extern int mcffec_initialize(bd_t*);
+ extern int mcdmafec_initialize(bd_t*);
  
  #ifdef CONFIG_API
  extern void (*push_packet)(volatile void *, int);
@@@ -217,9 -218,6 +218,9 @@@ int eth_initialize(bd_t *bis
  #if defined(CONFIG_UEC_ETH3)
        uec_initialize(2);
  #endif
 +#if defined(CONFIG_UEC_ETH4)
 +      uec_initialize(3);
 +#endif
  
  #if defined(FEC_ENET) || defined(CONFIG_ETHER_ON_FCC)
        fec_initialize(bis);
  #if defined(CONFIG_MCFFEC)
        mcffec_initialize(bis);
  #endif
+ #if defined(CONFIG_FSLDMAFEC)
+       mcdmafec_initialize(bis);
+ #endif
  
        if (!eth_devices) {
                puts ("No ethernet found.\n");
@@@ -525,15 -526,6 +529,15 @@@ int eth_receive(volatile void *packet, 
  void eth_try_another(int first_restart)
  {
        static struct eth_device *first_failed = NULL;
 +      char *ethrotate;
 +
 +      /*
 +       * Do not rotate between network interfaces when
 +       * 'ethrotate' variable is set to 'no'.
 +       */
 +      if (((ethrotate = getenv ("ethrotate")) != NULL) &&
 +          (strcmp(ethrotate, "no") == 0))
 +              return;
  
        if (!eth_current)
                return;