Merge with git://www.denx.de/git/u-boot.git
authorStefan Roese <sr@denx.de>
Wed, 15 Aug 2007 12:51:27 +0000 (14:51 +0200)
committerStefan Roese <sr@denx.de>
Wed, 15 Aug 2007 12:51:27 +0000 (14:51 +0200)
1  2 
CREDITS
MAKEALL
Makefile
README
common/cmd_bdinfo.c
common/cmd_mii.c
include/common.h
lib_m68k/board.c
net/eth.c

diff --combined CREDITS
+++ b/CREDITS
@@@ -160,6 -160,11 +160,11 @@@ N: Thomas Friede
  E: ThomasF@hyperion-entertainment.com
  D: Support for AmigaOne
  
+ N: Niklaus Giger
+ E: niklaus.giger@netstal.com
+ D: Support for HCU(x) boards
+ W: www.netstal.com
  N: Paul Gortmaker
  E: paul.gortmaker@windriver.com
  D: Support for WRS SBC8347/8349 boards
@@@ -252,6 -257,10 +257,10 @@@ E: Raghu.Krishnaprasad@fci.co
  D: Support for Adder-II MPC852T evaluation board
  W: http://www.forcecomputers.com
  
+ N: Sergey Kubushyn
+ E: ksi@koi8.net
+ D: Support for various TI DaVinci based boards.
  N: Bernhard Kuhn
  E: bkuhn@metrowerks.com
  D Support for Coldfire CPU; Support for Motorola M5272C3 and M5282EVB boards
@@@ -479,9 -488,3 +488,9 @@@ N: Michal Sime
  E: monstr@monstr.eu
  D: Support for Microblaze, ML401, XUPV2P board
  W: www.monstr.eu
 +
 +N: TsiChung Liew
 +E: Tsi-Chung.Liew@freescale.com
 +D: Support for ColdFire MCF532x
 +W: www.freescale.com
 +
diff --combined MAKEALL
+++ b/MAKEALL
@@@ -26,115 -26,285 +26,285 @@@ LIST="
  ## MPC5xx Systems
  #########################################################################
  
- LIST_5xx="    \
-       cmi_mpc5xx                                                      \
+ LIST_5xx="            \
+       cmi_mpc5xx      \
  "
  
  #########################################################################
  ## MPC5xxx Systems
  #########################################################################
  
- LIST_5xxx="   \
-       BC3450          cm1_qp1         cpci5200        EVAL5200        \
-       fo300           icecube_5100    icecube_5200    lite5200b       \
-       mcc200          mecp5200        motionpro       o2dnt           \
-       pf5200          PM520           TB5200          Total5100       \
-       Total5200       Total5200_Rev2  TQM5200         TQM5200_B       \
-       TQM5200S        v38b                                            \
+ LIST_5xxx="           \
+       BC3450          \
+       cm5200          \
+       cpci5200        \
+       EVAL5200        \
+       fo300           \
+       icecube_5100    \
+       icecube_5200    \
+       lite5200b       \
+       mcc200          \
+       mecp5200        \
+       motionpro       \
+       o2dnt           \
+       pf5200          \
+       PM520           \
+       TB5200          \
+       Total5100       \
+       Total5200       \
+       Total5200_Rev2  \
+       TQM5200         \
+       TQM5200_B       \
+       TQM5200S        \
+       v38b            \
+ "
+ #########################################################################
+ ## MPC512x Systems
+ #########################################################################
+ LIST_512x="           \
+       ads5121         \
  "
  
  #########################################################################
  ## MPC8xx Systems
  #########################################################################
- LIST_8xx="    \
-       Adder87x        GENIETV         MBX860T         R360MPI         \
-       AdderII         GTH             MHPC            RBC823          \
-       ADS860          hermes          MPC86xADS       rmu             \
-       AMX860          IAD210          MPC885ADS       RPXClassic      \
-       c2mon           ICU862_100MHz   MVS1            RPXlite         \
-       CCM             IP860           NETPHONE        RPXlite_DW      \
-       cogent_mpc8xx   IVML24          NETTA           RRvision        \
-       ELPT860         IVML24_128      NETTA2          SM850           \
-       EP88x           IVML24_256      NETTA_ISDN      spc1920         \
-       ESTEEM192E      IVMS8           NETVIA          SPD823TS        \
-       ETX094          IVMS8_128       NETVIA_V2       svm_sc8xx       \
-       FADS823         IVMS8_256       NX823           SXNI855T        \
-       FADS850SAR      KUP4K           pcu_e           TOP860          \
-       FADS860T        KUP4X           QS823           TQM823L         \
-       FLAGADM         LANTEC          QS850           TQM823L_LCD     \
-       FPS850L         lwmon           QS860T          TQM850L         \
-       GEN860T         MBX             quantum         TQM855L         \
-       GEN860T_SC                                      TQM860L         \
-                                                       TQM885D         \
-                                                       uc100           \
-                                                       v37             \
+ LIST_8xx="            \
+       Adder87x        \
+       AdderII         \
+       ADS860          \
+       AMX860          \
+       c2mon           \
+       CCM             \
+       cogent_mpc8xx   \
+       ELPT860         \
+       EP88x           \
+       ESTEEM192E      \
+       ETX094          \
+       FADS823         \
+       FADS850SAR      \
+       FADS860T        \
+       FLAGADM         \
+       FPS850L         \
+       GEN860T         \
+       GEN860T_SC      \
+       GENIETV         \
+       GTH             \
+       hermes          \
+       IAD210          \
+       ICU862_100MHz   \
+       IP860           \
+       IVML24          \
+       IVML24_128      \
+       IVML24_256      \
+       IVMS8           \
+       IVMS8_128       \
+       IVMS8_256       \
+       KUP4K           \
+       KUP4X           \
+       LANTEC          \
+       lwmon           \
+       MBX             \
+       MBX860T         \
+       MHPC            \
+       MPC86xADS       \
+       MPC885ADS       \
+       MVS1            \
+       NETPHONE        \
+       NETTA           \
+       NETTA2          \
+       NETTA_ISDN      \
+       NETVIA          \
+       NETVIA_V2       \
+       NX823           \
+       pcu_e           \
+       QS823           \
+       QS850           \
+       QS860T          \
+       quantum         \
+       R360MPI         \
+       RBC823          \
+       rmu             \
+       RPXClassic      \
+       RPXlite         \
+       RPXlite_DW      \
+       RRvision        \
+       SM850           \
+       spc1920         \
+       SPD823TS        \
+       svm_sc8xx       \
+       SXNI855T        \
+       TOP860          \
+       TQM823L         \
+       TQM823L_LCD     \
+       TQM850L         \
+       TQM855L         \
+       TQM860L         \
+       TQM885D         \
+       uc100           \
+       v37             \
  "
  
  #########################################################################
  ## PPC4xx Systems
  #########################################################################
  
- LIST_4xx="    \
-       acadia          acadia_nand     ADCIOP          alpr            \
-       AP1000          AR405           ASH405          bamboo          \
-       bamboo_nand     bubinga         CANBT           CMS700          \
-       CPCI2DP         CPCI405         CPCI4052        CPCI405AB       \
-       CPCI405DT       CPCI440         CPCIISER4       CRAYL1          \
-       csb272          csb472          DASA_SIM        DP405           \
-       DU405           ebony           ERIC            EXBITGEN        \
-       G2000           HH405           HUB405          JSE             \
-       KAREF           katmai          luan            lwmon5          \
-       METROBOX        MIP405          MIP405T         ML2             \
-       ml300           ocotea          OCRTC           ORSG            \
-       p3p440          PCI405          pcs440ep        PIP405          \
-       PLU405          PMC405          PPChameleonEVB  sbc405          \
-       sc3             sequoia         sequoia_nand    taishan         \
-       VOH405          VOM405          W7OLMC          W7OLMG          \
-       walnut          WUH405          XPEDITE1K       yellowstone     \
-       yosemite        yucca                                           \
+ LIST_4xx="            \
+       acadia          \
+       acadia_nand     \
+       ADCIOP          \
+       alpr            \
+       AP1000          \
+       AR405           \
+       ASH405          \
+       bamboo          \
+       bamboo_nand     \
+       bubinga         \
+       CANBT           \
+       CMS700          \
+       CPCI2DP         \
+       CPCI405         \
+       CPCI4052        \
+       CPCI405AB       \
+       CPCI405DT       \
+       CPCI440         \
+       CPCIISER4       \
+       CRAYL1          \
+       csb272          \
+       csb472          \
+       DASA_SIM        \
+       DP405           \
+       DU405           \
+       ebony           \
+       ERIC            \
+       EXBITGEN        \
+       G2000           \
+       hcu4            \
+       hcu5            \
+       HH405           \
+       HUB405          \
+       JSE             \
+       KAREF           \
+       katmai          \
+       luan            \
+       lwmon5          \
+       METROBOX        \
+       MIP405          \
+       MIP405T         \
+       ML2             \
+       ml300           \
+       ocotea          \
+       OCRTC           \
+       ORSG            \
+       p3p440          \
+       PCI405          \
+       pcs440ep        \
+       PIP405          \
+       PLU405          \
+       PMC405          \
+       PPChameleonEVB  \
+       sbc405          \
+       sc3             \
+       sequoia         \
+       sequoia_nand    \
+       taihu           \
+       taishan         \
+       VOH405          \
+       VOM405          \
+       W7OLMC          \
+       W7OLMG          \
+       walnut          \
+       WUH405          \
+       XPEDITE1K       \
+       yellowstone     \
+       yosemite        \
+       yucca           \
+       zeus            \
  "
  
  #########################################################################
  ## MPC8220 Systems
  #########################################################################
  
- LIST_8220="   \
-       Alaska8220      Yukon8220                                       \
+ LIST_8220="           \
+       Alaska8220      \
+       Yukon8220       \
  "
  
  #########################################################################
  ## MPC824x Systems
  #########################################################################
  
- LIST_824x="   \
-       A3000           barco           BMW             CPC45           \
-       CU824           debris          eXalion         HIDDEN_DRAGON   \
-                       MOUSSE          MUSENKI         MVBLUE          \
-       OXC             PN62            Sandpoint8240   Sandpoint8245   \
-       sbc8240         SL8245          utx8245                         \
+ LIST_824x="           \
+       A3000           \
+       barco           \
+       BMW             \
+       CPC45           \
+       CU824           \
+       debris          \
+       eXalion         \
+       HIDDEN_DRAGON   \
+       MOUSSE          \
+       MUSENKI         \
+       MVBLUE          \
+       OXC             \
+       PN62            \
+       Sandpoint8240   \
+       Sandpoint8245   \
+       sbc8240         \
+       SL8245          \
+       utx8245         \
  "
  
  #########################################################################
  ## MPC8260 Systems (includes 8250, 8255 etc.)
  #########################################################################
  
- LIST_8260="   \
-       atc             cogent_mpc8260  CPU86           CPU87           \
-       ep8248          ep8260          ep82xxm         gw8260          \
-       hymod           IPHASE4539      ISPAN           MPC8260ADS      \
-       MPC8266ADS      MPC8272ADS      PM826           PM828           \
-       ppmc8260        Rattler8248     RPXsuper        rsdproto        \
-       sacsng          sbc8260         SCM             TQM8260_AC      \
-       TQM8260_AD      TQM8260_AE      ZPC1900                         \
+ LIST_8260="           \
+       atc             \
+       cogent_mpc8260  \
+       CPU86           \
+       CPU87           \
+       ep8248          \
+       ep8260          \
+       ep82xxm         \
+       gw8260          \
+       hymod           \
+       IPHASE4539      \
+       ISPAN           \
+       MPC8260ADS      \
+       MPC8266ADS      \
+       MPC8272ADS      \
+       PM826           \
+       PM828           \
+       ppmc8260        \
+       Rattler8248     \
+       RPXsuper        \
+       rsdproto        \
+       sacsng          \
+       sbc8260         \
+       SCM             \
+       TQM8260_AC      \
+       TQM8260_AD      \
+       TQM8260_AE      \
+       ZPC1900         \
  "
  
  #########################################################################
  ## MPC83xx Systems (includes 8349, etc.)
  #########################################################################
  
- LIST_83xx="   \
-       MPC8313ERDB     MPC832XEMDS     MPC8349EMDS     MPC8349ITX      \
-       MPC8349ITXGP    MPC8360EMDS     sbc8349         TQM834x         \
+ LIST_83xx="           \
+       MPC8313ERDB_33  \
+       MPC8313ERDB_66  \
+       MPC832XEMDS     \
+       MPC8349EMDS     \
+       MPC8349ITX      \
+       MPC8349ITXGP    \
+       MPC8360EMDS     \
+       sbc8349         \
+       TQM834x         \
  "
  
  
  ## MPC85xx Systems (includes 8540, 8560 etc.)
  #########################################################################
  
- LIST_85xx="   \
-       MPC8540ADS      MPC8540EVAL     MPC8541CDS      MPC8544DS       \
-       MPC8548CDS      MPC8555CDS      MPC8560ADS      PM854           \
-       PM856           sbc8540         sbc8560         stxgp3          \
-       stxssa          TQM8540         TQM8541         TQM8555         \
-       TQM8560                                                         \
+ LIST_85xx="           \
+       MPC8540ADS      \
+       MPC8540EVAL     \
+       MPC8541CDS      \
+       MPC8544DS       \
+       MPC8548CDS      \
+       MPC8555CDS      \
+       MPC8560ADS      \
+       MPC8568MDS      \
+       PM854           \
+       PM856           \
+       sbc8540         \
+       sbc8560         \
+       stxgp3          \
+       stxssa          \
+       TQM8540         \
+       TQM8541         \
+       TQM8555         \
+       TQM8560         \
  "
  
  #########################################################################
  ## MPC86xx Systems
  #########################################################################
  
- LIST_86xx="   \
-     MPC8641HPCN       \
+ LIST_86xx="           \
+       MPC8641HPCN     \
+       SBC8641D        \
  "
  
  #########################################################################
  ## 74xx/7xx Systems
  #########################################################################
  
- LIST_74xx="   \
-       DB64360         DB64460         EVB64260        P3G4            \
-       p3m7448         PCIPPC2         PCIPPC6         ZUMA            \
-       mpc7448hpc2
+ LIST_74xx="           \
+       DB64360         \
+       DB64460         \
+       EVB64260        \
+       mpc7448hpc2     \
+       P3G4            \
+       p3m7448         \
+       PCIPPC2         \
+       PCIPPC6         \
+       ZUMA            \
  "
  
- LIST_7xx="    \
-       BAB7xx          CPCI750         ELPPC           p3m750          \
-       ppmc7xx                                                         \
+ LIST_7xx="            \
+       BAB7xx          \
+       CPCI750         \
+       ELPPC           \
+       p3m750          \
+       ppmc7xx         \
  "
  
- LIST_ppc="${LIST_5xx}  ${LIST_5xxx}           \
-         ${LIST_8xx}                           \
-         ${LIST_8220} ${LIST_824x} ${LIST_8260} \
-         ${LIST_83xx}                          \
-         ${LIST_85xx}                          \
-         ${LIST_86xx}                          \
-         ${LIST_4xx}                           \
-         ${LIST_74xx} ${LIST_7xx}"
+ LIST_ppc="            \
+       ${LIST_5xx}     \
+       ${LIST_5xxx}    \
+       ${LIST_8xx}     \
+       ${LIST_8220}    \
+       ${LIST_824x}    \
+       ${LIST_8260}    \
+       ${LIST_83xx}    \
+       ${LIST_85xx}    \
+       ${LIST_86xx}    \
+       ${LIST_4xx}     \
+       ${LIST_74xx}    \
+       ${LIST_7xx}     \
+ "
  
  #########################################################################
  ## StrongARM Systems
  #########################################################################
  
- LIST_SA="assabet dnp1110 gcplus lart shannon"
+ LIST_SA="             \
+       assabet         \
+       dnp1110         \
+       gcplus          \
+       lart            \
+       shannon         \
+ "
  
  #########################################################################
  ## ARM7 Systems
  #########################################################################
  
- LIST_ARM7="   \
-       armadillo       B2              ep7312          evb4510         \
-       impa7           integratorap    ap7             ap720t          \
-       lpc2292sodimm   modnet50        SMN42                           \
+ LIST_ARM7="           \
+       ap7             \
+       ap720t          \
+       armadillo       \
+       B2              \
+       ep7312          \
+       evb4510         \
+       impa7           \
+       integratorap    \
+       lpc2292sodimm   \
+       modnet50        \
+       SMN42           \
  "
  
  #########################################################################
  ## ARM9 Systems
  #########################################################################
  
- LIST_ARM9="   \
-       at91rm9200dk    cmc_pu2                                         \
-       ap920t          ap922_XA10      ap926ejs        ap946es         \
-       ap966           cp920t          cp922_XA10      cp926ejs        \
-       cp946es         cp966           lpd7a400        mp2usb          \
-       mx1ads          mx1fs2          netstar         omap1510inn     \
-       omap1610h2      omap1610inn     omap730p2       sbc2410x        \
-       scb9328         smdk2400        smdk2410        trab            \
-       VCMA9           versatile       versatileab     versatilepb     \
-       voiceblue                                                       \
+ LIST_ARM9="                   \
+       at91rm9200dk            \
+       cmc_pu2                 \
+       ap920t                  \
+       ap922_XA10              \
+       ap926ejs                \
+       ap946es                 \
+       ap966                   \
+       cp920t                  \
+       cp922_XA10              \
+       cp926ejs                \
+       cp946es                 \
+       cp966                   \
+       lpd7a400                \
+       mp2usb                  \
+       mx1ads                  \
+       mx1fs2                  \
+       netstar                 \
+       omap1510inn             \
+       omap1610h2              \
+       omap1610inn             \
+       omap730p2               \
+       sbc2410x                \
+       scb9328                 \
+       smdk2400                \
+       smdk2410                \
+       trab                    \
+       VCMA9                   \
+       versatile               \
+       versatileab             \
+       versatilepb             \
+       voiceblue               \
+       davinci_dvevm           \
+       davinci_schmoogie       \
+       davinci_sonata          \
  "
  
  #########################################################################
  ## ARM10 Systems
  #########################################################################
- LIST_ARM10="  \
-       integratorcp    cp1026                                          \
+ LIST_ARM10="          \
+       integratorcp    \
+       cp1026          \
  "
  
  #########################################################################
  ## ARM11 Systems
  #########################################################################
- LIST_ARM11="  \
-       cp1136          omap2420h4                                      \
+ LIST_ARM11="          \
+       cp1136          \
+       omap2420h4      \
  "
  
  #########################################################################
  ## Xscale Systems
  #########################################################################
  
- LIST_pxa="    \
-       adsvix          cerf250         cradle          csb226          \
-       delta           innokom         lubbock         pleb2           \
-       pxa255_idp      wepep250        xaeniax         xm250           \
-       xsengine        zylonite                                        \
+ LIST_pxa="            \
+       adsvix          \
+       cerf250         \
+       cradle          \
+       csb226          \
+       delta           \
+       innokom         \
+       lubbock         \
+       pleb2           \
+       pxa255_idp      \
+       wepep250        \
+       xaeniax         \
+       xm250           \
+       xsengine        \
+       zylonite        \
  "
  
- LIST_ixp="ixdp425     ixdpg425        pdnb3           scpu"
+ LIST_ixp="            \
+       ixdp425         \
+       ixdpg425        \
+       pdnb3           \
+       scpu            \
+ "
  
  
- LIST_arm="    \
-       ${LIST_SA}                                                      \
-       ${LIST_ARM7} ${LIST_ARM9} ${LIST_ARM10} ${LIST_ARM11}           \
-       ${LIST_pxa} ${LIST_ixp}                                         \
+ LIST_arm="            \
+       ${LIST_SA}      \
+       ${LIST_ARM7}    \
+       ${LIST_ARM9}    \
+       ${LIST_ARM10}   \
+       ${LIST_ARM11}   \
+       ${LIST_pxa}     \
+       ${LIST_ixp}     \
  "
  
  #########################################################################
  ## MIPS Systems               (default = big endian)
  #########################################################################
  
- LIST_mips4kc="incaip"
+ LIST_mips4kc="                \
+       incaip          \
+ "
  
- LIST_mips5kc="purple"
+ LIST_mips5kc="                \
+       purple          \
+ "
  
- LIST_au1xx0="dbau1000 dbau1100 dbau1500 dbau1550 dbau1550_el gth2"
+ LIST_au1xx0="         \
+       dbau1000        \
+       dbau1100        \
+       dbau1500        \
+       dbau1550        \
+       dbau1550_el     \
+       gth2            \
+ "
  
- LIST_mips="${LIST_mips4kc} ${LIST_mips5kc} ${LIST_au1xx0}"
+ LIST_mips="           \
+       ${LIST_mips4kc} \
+       ${LIST_mips5kc} \
+       ${LIST_au1xx0}  \
+ "
  
  #########################################################################
  ## MIPS Systems               (little endian)
@@@ -268,36 -542,55 +542,55 @@@ LIST_mips4kc_el="
  
  LIST_mips5kc_el=""
  
- LIST_au1xx0_el="dbau1550_el"
+ LIST_au1xx0_el="      \
+       dbau1550_el     \
+ "
  
- LIST_mips_el="${LIST_mips4kc_el} ${LIST_mips5kc_el} ${LIST_au1xx0_el}"
+ LIST_mips_el="                        \
+       ${LIST_mips4kc_el}      \
+       ${LIST_mips5kc_el}      \
+       ${LIST_au1xx0_el}       \
+ "
  
  #########################################################################
  ## i386 Systems
  #########################################################################
  
- LIST_I486="sc520_cdp sc520_spunk sc520_spunk_rel"
+ LIST_I486="           \
+       sc520_cdp       \
+       sc520_spunk     \
+       sc520_spunk_rel \
+ "
  
- LIST_x86="${LIST_I486}"
+ LIST_x86="            \
+       ${LIST_I486}    \
+ "
  
  #########################################################################
  ## NIOS Systems
  #########################################################################
  
- LIST_nios="   \
-       ADNPESC1                ADNPESC1_base_32                        \
-       ADNPESC1_DNPEVA2_base_32                                        \
-       DK1C20                  DK1C20_standard_32                      \
-       DK1S10                  DK1S10_standard_32 DK1S10_mtx_ldk_20    \
+ LIST_nios="                   \
+       ADNPESC1                \
+       ADNPESC1_base_32        \
+       ADNPESC1_DNPEVA2_base_32\
+       DK1C20                  \
+       DK1C20_standard_32      \
+       DK1S10                  \
+       DK1S10_standard_32      \
+       DK1S10_mtx_ldk_20       \
  "
  
  #########################################################################
  ## Nios-II Systems
  #########################################################################
  
- LIST_nios2="  \
-       EP1C20          EP1S10          EP1S40                          \
-       PCI5441         PK1C20                                          \
+ LIST_nios2="          \
+       EP1C20          \
+       EP1S10          \
+       EP1S40          \
+       PCI5441         \
+       PK1C20          \
  "
  
  #########################################################################
  #########################################################################
  
  LIST_microblaze="     \
-       suzaku          ml401           xupv2p
+       suzaku          \
+       ml401           \
+       xupv2p          \
  "
  
  #########################################################################
  ## ColdFire Systems
  #########################################################################
  
- LIST_coldfire="       \
-       cobra5272       EB+MCF-EV123    EB+MCF-EV123_internal           \
-       idmr            M5271EVB        M5272C3         M5282EVB        \
-       M5329EVB        r5200           TASREG                          \
+ LIST_coldfire="                       \
+       cobra5272               \
+       EB+MCF-EV123            \
+       EB+MCF-EV123_internal   \
+       idmr                    \
+       M5271EVB                \
+       M5272C3                 \
+       M5282EVB                \
 -      TASREG                  \
++      M5329EVB                \
+       r5200                   \
++      TASREG                  \
  "
  
  #########################################################################
  ## AVR32 Systems
  #########################################################################
  
- LIST_avr32="atstk1002"
+ LIST_avr32="          \
+       atstk1002       \
+ "
  
  #########################################################################
  ## Blackfin Systems
  #########################################################################
  
- LIST_blackfin=" \
-       bf533-ezkit     bf533-stamp     bf537-stamp     bf561-ezkit     \
+ LIST_blackfin="               \
+       bf533-ezkit     \
+       bf533-stamp     \
+       bf537-stamp     \
+       bf561-ezkit     \
  "
  
  #-----------------------------------------------------------------------
@@@ -365,7 -671,7 +672,7 @@@ d
        microblaze| \
        mips|mips_el| \
        nios|nios2| \
-       ppc|5xx|5xxx|8xx|8220|824x|8260|83xx|85xx|86xx|4xx|7xx|74xx| \
+       ppc|5xx|5xxx|512x|8xx|8220|824x|8260|83xx|85xx|86xx|4xx|7xx|74xx| \
        x86|I486)
                        for target in `eval echo '$LIST_'${arg}`
                        do
diff --combined Makefile
+++ b/Makefile
@@@ -34,6 -34,7 +34,7 @@@ HOSTARCH := $(shell uname -m | 
            -e s/arm.*/arm/ \
            -e s/sa110/arm/ \
            -e s/powerpc/ppc/ \
+           -e s/ppc64/ppc/ \
            -e s/macppc/ppc/)
  
  HOSTOS := $(shell uname -s | tr '[:upper:]' '[:lower:]' | \
@@@ -122,7 -123,7 +123,7 @@@ ifeq ($(HOSTARCH),$(ARCH)
  CROSS_COMPILE =
  else
  ifeq ($(ARCH),ppc)
- CROSS_COMPILE = powerpc-linux-
+ CROSS_COMPILE = ppc_8xx-
  endif
  ifeq ($(ARCH),arm)
  CROSS_COMPILE = arm-linux-
@@@ -205,13 -206,15 +206,17 @@@ LIBS += disk/libdisk.
  LIBS += rtc/librtc.a
  LIBS += dtt/libdtt.a
  LIBS += drivers/libdrivers.a
+ LIBS += drivers/bios_emulator/libatibiosemu.a
  LIBS += drivers/nand/libnand.a
  LIBS += drivers/nand_legacy/libnand_legacy.a
 +LIBS += drivers/net/libnet.a
  ifeq ($(CPU),mpc83xx)
  LIBS += drivers/qe/qe.a
  endif
+ ifeq ($(CPU),mpc85xx)
+ LIBS += drivers/qe/qe.a
+ endif
 +LIBS += drivers/serial/libserial.a
  LIBS += drivers/sk98lin/libsk98lin.a
  LIBS += post/libpost.a post/drivers/libpostdrivers.a
  LIBS += $(shell if [ -d post/lib_$(ARCH) ]; then echo \
@@@ -431,7 -434,7 +436,7 @@@ jupiter_config:         unconfi
        @$(MKCONFIG) jupiter ppc mpc5xxx jupiter
  
  v38b_config: unconfig
-       @./mkconfig -a v38b ppc mpc5xxx v38b
+       @$(MKCONFIG) -a v38b ppc mpc5xxx v38b
  
  inka4x0_config:       unconfig
        @$(MKCONFIG) inka4x0 ppc mpc5xxx inka4x0
@@@ -534,13 -537,8 +539,8 @@@ PM520_ROMBOOT_DDR_config: unconfi
  smmaco4_config: unconfig
        @$(MKCONFIG) -a smmaco4 ppc mpc5xxx tqm5200
  
- cm1_qp1_config:       unconfig
-       @ >include/config.h
-       @[ -z "$(findstring cm1_qp1,$@)" ] || \
-               {  echo "... with 64 MByte SDRAM" ; \
-                 echo "... with 32 MByte Flash" ; \
-               }
-       @./mkconfig -a cm1_qp1 ppc mpc5xxx cm1_qp1
+ cm5200_config:        unconfig
+       @./mkconfig -a cm5200 ppc mpc5xxx cm5200
  
  spieval_config:       unconfig
        @$(MKCONFIG) -a spieval ppc mpc5xxx tqm5200
@@@ -644,6 -642,13 +644,13 @@@ motionpro_config:         unconfi
  
  
  #########################################################################
+ ## MPC512x Systems
+ #########################################################################
+ ads5121_config: unconfig
+       @$(MKCONFIG) ads5121 ppc mpc512x ads5121
+ #########################################################################
  ## MPC8xx Systems
  #########################################################################
  
@@@ -656,6 -661,9 +663,9 @@@ AdderII_config  
        @echo "#define CONFIG_MPC852T" > $(obj)include/config.h)
        @$(MKCONFIG) -a Adder ppc mpc8xx adder
  
+ AdderUSB_config:      unconfig
+       @./mkconfig -a AdderUSB ppc mpc8xx adder
  ADS860_config     \
  FADS823_config    \
  FADS850SAR_config \
@@@ -1030,9 -1038,8 +1040,8 @@@ acadia_config:  unconfi
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx acadia amcc
  
  acadia_nand_config:   unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)nand_spl
-       @mkdir -p $(obj)board/amcc/acadia
+       @mkdir -p $(obj)include $(obj)board/amcc/acadia
+       @mkdir -p $(obj)nand_spl/board/amcc/acadia
        @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
        @$(MKCONFIG) -n $@ -a acadia ppc ppc4xx acadia amcc
        @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/acadia/config.tmp
@@@ -1042,7 -1049,7 +1051,7 @@@ ADCIOP_config:  unconfi
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx adciop esd
  
  alpr_config:  unconfig
-       @./mkconfig $(@:_config=) ppc ppc4xx alpr prodrive
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx alpr prodrive
  
  AP1000_config:unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx ap1000 amirix
@@@ -1060,9 -1067,8 +1069,8 @@@ bamboo_config:  unconfi
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx bamboo amcc
  
  bamboo_nand_config:   unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)nand_spl
-       @mkdir -p $(obj)board/amcc/bamboo
+       @mkdir -p $(obj)include $(obj)board/amcc/bamboo
+       @mkdir -p $(obj)nand_spl/board/amcc/bamboo
        @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
        @$(MKCONFIG) -n $@ -a bamboo ppc ppc4xx bamboo amcc
        @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/bamboo/config.tmp
@@@ -1136,6 -1142,12 +1144,12 @@@ EXBITGEN_config:      unconfi
  G2000_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx g2000
  
+ hcu4_config:  unconfig
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx hcu4 netstal
+ hcu5_config:  unconfig
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx hcu5 netstal
  HH405_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx hh405 esd
  
@@@ -1243,9 -1255,8 +1257,8 @@@ rainier_config: unconfi
  
  sequoia_nand_config \
  rainier_nand_config: unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)nand_spl
-       @mkdir -p $(obj)board/amcc/sequoia
+       @mkdir -p $(obj)include $(obj)board/amcc/sequoia
+       @mkdir -p $(obj)nand_spl/board/amcc/sequoia
        @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
        @echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \
                tr '[:lower:]' '[:upper:]')" >> $(obj)include/config.h
        @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
  
  sc3_config:unconfig
-       @./mkconfig $(@:_config=) ppc ppc4xx sc3
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx sc3
+ taihu_config: unconfig
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx taihu amcc
  
  taishan_config:       unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx taishan amcc
@@@ -1293,6 -1307,9 +1309,9 @@@ yellowstone_config: unconfi
  yucca_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx yucca amcc
  
+ zeus_config:  unconfig
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx zeus
  #########################################################################
  ## MPC8220 Systems
  #########################################################################
@@@ -1420,7 -1437,7 +1439,7 @@@ ep8260_config:  unconfi
        @$(MKCONFIG) $(@:_config=) ppc mpc8260 ep8260
  
  ep82xxm_config:       unconfig
-       @./mkconfig $(@:_config=) ppc mpc8260 ep82xxm
+       @$(MKCONFIG) $(@:_config=) ppc mpc8260 ep82xxm
  
  gw8260_config:        unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc8260 gw8260
@@@ -1655,56 -1672,49 +1674,61 @@@ TASREG_config :              unconfi
  r5200_config :                unconfig
        @$(MKCONFIG) $(@:_config=) m68k mcf52x2 r5200
  
 +M5329AFEE_config \
 +M5329BFEE_config :    unconfig
 +      @case "$@" in \
 +      M5329AFEE_config)       NAND=0;; \
 +      M5329BFEE_config)       NAND=16;; \
 +      esac; \
 +      >include/config.h ; \
 +      if [ "$${NAND}" != "0" ] ; then \
 +              echo "#define NANDFLASH_SIZE    $${NAND}" >> include/config.h ; \
 +      fi
 +      @$(MKCONFIG) -a M5329EVB m68k mcf532x m5329evb freescale
 +
  #########################################################################
  ## MPC83xx Systems
  #########################################################################
  
  MPC8313ERDB_33_config \
  MPC8313ERDB_66_config: unconfig
-       @echo "" >include/config.h ; \
+       @mkdir -p $(obj)include
+       @echo "" >$(obj)include/config.h ; \
        if [ "$(findstring _33_,$@)" ] ; then \
                echo -n "...33M ..." ; \
-               echo "#define CFG_33MHZ" >>include/config.h ; \
+               echo "#define CFG_33MHZ" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _66_,$@)" ] ; then \
                echo -n "...66M..." ; \
-               echo "#define CFG_66MHZ" >>include/config.h ; \
+               echo "#define CFG_66MHZ" >>$(obj)include/config.h ; \
        fi ;
        @$(MKCONFIG) -a MPC8313ERDB ppc mpc83xx mpc8313erdb
  
+ MPC8323ERDB_config:   unconfig
+       @$(MKCONFIG) -a MPC8323ERDB ppc mpc83xx mpc8323erdb freescale
  MPC832XEMDS_config \
  MPC832XEMDS_HOST_33_config \
  MPC832XEMDS_HOST_66_config \
  MPC832XEMDS_SLAVE_config:     unconfig
-       @echo "" >include/config.h ; \
+       @mkdir -p $(obj)include
+       @echo "" >$(obj)include/config.h ; \
        if [ "$(findstring _HOST_,$@)" ] ; then \
                echo -n "... PCI HOST " ; \
-               echo "#define CONFIG_PCI" >>include/config.h ; \
+               echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _SLAVE_,$@)" ] ; then \
                echo "...PCI SLAVE 66M"  ; \
-               echo "#define CONFIG_PCI" >>include/config.h ; \
-               echo "#define CONFIG_PCISLAVE" >>include/config.h ; \
+               echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
+               echo "#define CONFIG_PCISLAVE" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _33_,$@)" ] ; then \
                echo -n "...33M ..." ; \
-               echo "#define PCI_33M" >>include/config.h ; \
+               echo "#define PCI_33M" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _66_,$@)" ] ; then \
                echo -n "...66M..." ; \
-               echo "#define PCI_66M" >>include/config.h ; \
+               echo "#define PCI_66M" >>$(obj)include/config.h ; \
        fi ;
        @$(MKCONFIG) -a MPC832XEMDS ppc mpc83xx mpc832xemds
  
@@@ -1729,23 -1739,24 +1753,24 @@@ MPC8360EMDS_config 
  MPC8360EMDS_HOST_33_config \
  MPC8360EMDS_HOST_66_config \
  MPC8360EMDS_SLAVE_config:     unconfig
-       @echo "" >include/config.h ; \
+       @mkdir -p $(obj)include
+       @echo "" >$(obj)include/config.h ; \
        if [ "$(findstring _HOST_,$@)" ] ; then \
                echo -n "... PCI HOST " ; \
-               echo "#define CONFIG_PCI" >>include/config.h ; \
+               echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _SLAVE_,$@)" ] ; then \
                echo "...PCI SLAVE 66M"  ; \
-               echo "#define CONFIG_PCI" >>include/config.h ; \
-               echo "#define CONFIG_PCISLAVE" >>include/config.h ; \
+               echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
+               echo "#define CONFIG_PCISLAVE" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _33_,$@)" ] ; then \
                echo -n "...33M ..." ; \
-               echo "#define PCI_33M" >>include/config.h ; \
+               echo "#define PCI_33M" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _66_,$@)" ] ; then \
                echo -n "...66M..." ; \
-               echo "#define PCI_66M" >>include/config.h ; \
+               echo "#define PCI_66M" >>$(obj)include/config.h ; \
        fi ;
        @$(MKCONFIG) -a MPC8360EMDS ppc mpc83xx mpc8360emds
  
@@@ -1771,10 -1782,10 +1796,10 @@@ MPC8540EVAL_66_slave_config:      uncon
        @mkdir -p $(obj)include
        @echo "" >$(obj)include/config.h ; \
        if [ "$(findstring _33_,$@)" ] ; then \
-               echo -n "... 33 MHz PCI" ; \
+               echo "... 33 MHz PCI" ; \
        else \
                echo "#define CONFIG_SYSCLK_66M" >>$(obj)include/config.h ; \
-               echo -n "... 66 MHz PCI" ; \
+               echo "... 66 MHz PCI" ; \
        fi ; \
        if [ "$(findstring _slave_,$@)" ] ; then \
                echo "#define CONFIG_PCI_SLAVE" >>$(obj)include/config.h ; \
  MPC8560ADS_config:    unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8560ads
  
+ MPC8541CDS_legacy_config \
  MPC8541CDS_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8541cds cds
+       @mkdir -p $(obj)include
+       @echo "" >$(obj)include/config.h ; \
+       if [ "$(findstring _legacy_,$@)" ] ; then \
+               echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
+               echo "... legacy" ; \
+       fi
+       @$(MKCONFIG) -a MPC8541CDS ppc mpc85xx mpc8541cds cds
  
  MPC8544DS_config:     unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8544ds freescale
  
+ MPC8548CDS_legacy_config \
  MPC8548CDS_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8548cds cds
+       @mkdir -p $(obj)include
+       @echo "" >$(obj)include/config.h ; \
+       if [ "$(findstring _legacy_,$@)" ] ; then \
+               echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
+               echo "... legacy" ; \
+       fi
+       @$(MKCONFIG) -a MPC8548CDS ppc mpc85xx mpc8548cds cds
  
+ MPC8555CDS_legacy_config \
  MPC8555CDS_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8555cds cds
+       @mkdir -p $(obj)include
+       @echo "" >$(obj)include/config.h ; \
+       if [ "$(findstring _legacy_,$@)" ] ; then \
+               echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
+               echo "... legacy" ; \
+       fi
+       @$(MKCONFIG) -a MPC8555CDS ppc mpc85xx mpc8555cds cds
  
  MPC8568MDS_config:    unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8568mds
@@@ -1868,8 -1900,10 +1914,10 @@@ TQM8560_config:               unconfi
  #########################################################################
  
  MPC8641HPCN_config:    unconfig
-       @./mkconfig $(@:_config=) ppc mpc86xx mpc8641hpcn
+       @$(MKCONFIG) $(@:_config=) ppc mpc86xx mpc8641hpcn
  
+ sbc8641d_config:      unconfig
+       @./mkconfig $(@:_config=) ppc mpc86xx sbc8641d
  
  #########################################################################
  ## 74xx/7xx Systems
@@@ -2025,6 -2059,15 +2073,15 @@@ omap1510inn_config :  unconfi
  omap5912osk_config :  unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs omap5912osk NULL omap
  
+ davinci_dvevm_config :        unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs dv-evm davinci davinci
+ davinci_schmoogie_config :    unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs schmoogie davinci davinci
+ davinci_sonata_config :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs sonata davinci davinci
  omap1610inn_config \
  omap1610inn_cs0boot_config \
  omap1610inn_cs3boot_config \
@@@ -2035,13 -2078,13 +2092,13 @@@ omap1610h2_cs3boot_config 
  omap1610h2_cs_autoboot_config:        unconfig
        @mkdir -p $(obj)include
        @if [ "$(findstring _cs0boot_, $@)" ] ; then \
-               echo "#define CONFIG_CS0_BOOT" >> .$(obj)/include/config.h ; \
+               echo "#define CONFIG_CS0_BOOT" >> .$(obj)include/config.h ; \
                echo "... configured for CS0 boot"; \
        elif [ "$(findstring _cs_autoboot_, $@)" ] ; then \
-               echo "#define CONFIG_CS_AUTOBOOT" >> $(obj)./include/config.h ; \
+               echo "#define CONFIG_CS_AUTOBOOT" >> $(obj)include/config.h ; \
                echo "... configured for CS_AUTO boot"; \
        else \
-               echo "#define CONFIG_CS3_BOOT" >> $(obj)./include/config.h ; \
+               echo "#define CONFIG_CS3_BOOT" >> $(obj)include/config.h ; \
                echo "... configured for CS3 boot"; \
        fi;
        @$(MKCONFIG) -a $(call xtract_omap1610xxx,$@) arm arm926ejs omap1610inn NULL omap
@@@ -2210,11 -2253,12 +2267,12 @@@ logodl_config        :       unconfi
  
  pdnb3_config \
  scpu_config:    unconfig
+       @mkdir -p $(obj)include
        @if [ "$(findstring scpu_,$@)" ] ; then \
-               echo "#define CONFIG_SCPU"      >>include/config.h ; \
+               echo "#define CONFIG_SCPU"      >>$(obj)include/config.h ; \
                echo "... on SCPU board variant" ; \
        else \
-               >include/config.h ; \
+               >$(obj)include/config.h ; \
        fi
        @$(MKCONFIG) -a pdnb3 arm ixp pdnb3 prodrive
  
@@@ -2436,14 -2480,16 +2494,16 @@@ suzaku_config:       unconfi
        @$(MKCONFIG) -a $(@:_config=) microblaze microblaze suzaku AtmarkTechno
  
  ml401_config: unconfig
-       @ >include/config.h
-       @echo "#define CONFIG_ML401 1" >> include/config.h
-       @./mkconfig -a $(@:_config=) microblaze microblaze ml401 xilinx
+       @mkdir -p $(obj)include
+       @ >$(obj)include/config.h
+       @echo "#define CONFIG_ML401 1" >> $(obj)include/config.h
+       @$(MKCONFIG) -a $(@:_config=) microblaze microblaze ml401 xilinx
  
  xupv2p_config:        unconfig
-       @ >include/config.h
-       @echo "#define CONFIG_XUPV2P 1" >> include/config.h
-       @./mkconfig -a $(@:_config=) microblaze microblaze xupv2p xilinx
+       @mkdir -p $(obj)include
+       @ >$(obj)include/config.h
+       @echo "#define CONFIG_XUPV2P 1" >> $(obj)include/config.h
+       @$(MKCONFIG) -a $(@:_config=) microblaze microblaze xupv2p xilinx
  
  #########################################################################
  ## Blackfin
@@@ -2468,7 -2514,7 +2528,7 @@@ bf561-ezkit_config:     unconfi
  #########################################################################
  
  atstk1002_config      :       unconfig
-       @./mkconfig $(@:_config=) avr32 at32ap atstk1000 atmel at32ap7000
+       @$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap7000
  
  #########################################################################
  #########################################################################
diff --combined README
--- 1/README
--- 2/README
+++ b/README
@@@ -136,7 -136,6 +136,7 @@@ Directory Hierarchy
    - i386      Files specific to i386 CPUs
    - ixp               Files specific to Intel XScale IXP CPUs
    - mcf52x2   Files specific to Freescale ColdFire MCF52x2 CPUs
 +  - mcf532x   Files specific to Freescale ColdFire MCF5329 CPUs
    - mips      Files specific to MIPS CPUs
    - mpc5xx    Files specific to Freescale MPC5xx  CPUs
    - mpc5xxx   Files specific to Freescale MPC5xxx CPUs
@@@ -229,117 -228,9 +229,9 @@@ build a config tool - later
  
  The following options need to be configured:
  
- - CPU Type:   Define exactly one of
-               PowerPC based CPUs:
-               -------------------
-               CONFIG_MPC823,  CONFIG_MPC850,  CONFIG_MPC855,  CONFIG_MPC860
-       or      CONFIG_MPC5xx
-       or      CONFIG_MPC8220
-       or      CONFIG_MPC824X, CONFIG_MPC8260
-       or      CONFIG_MPC85xx
-       or      CONFIG_IOP480
-       or      CONFIG_405GP
-       or      CONFIG_405EP
-       or      CONFIG_440
-       or      CONFIG_MPC74xx
-       or      CONFIG_750FX
-               ARM based CPUs:
-               ---------------
-               CONFIG_SA1110
-               CONFIG_ARM7
-               CONFIG_PXA250
-               CONFIG_CPU_MONAHANS
-               ColdFire based CPUs:
-               --------------------
-               CONFIG_M5329
-               MicroBlaze based CPUs:
-               ----------------------
-               CONFIG_MICROBLAZE
-               Nios-2 based CPUs:
-               ----------------------
-               CONFIG_NIOS2
-               AVR32 based CPUs:
-               ----------------------
-               CONFIG_AT32AP
- - Board Type: Define exactly one of
-               PowerPC based boards:
-               ---------------------
-               CONFIG_ADCIOP           CONFIG_FPS860L          CONFIG_OXC
-               CONFIG_ADS860           CONFIG_GEN860T          CONFIG_PCI405
-               CONFIG_AMX860           CONFIG_GENIETV          CONFIG_PCIPPC2
-               CONFIG_AP1000           CONFIG_GTH              CONFIG_PCIPPC6
-               CONFIG_AR405            CONFIG_gw8260           CONFIG_pcu_e
-               CONFIG_BAB7xx           CONFIG_hermes           CONFIG_PIP405
-               CONFIG_BC3450           CONFIG_hymod            CONFIG_PM826
-               CONFIG_c2mon            CONFIG_IAD210           CONFIG_ppmc8260
-               CONFIG_CANBT            CONFIG_ICU862           CONFIG_QS823
-               CONFIG_CCM              CONFIG_IP860            CONFIG_QS850
-               CONFIG_CMI              CONFIG_IPHASE4539       CONFIG_QS860T
-               CONFIG_cogent_mpc8260   CONFIG_IVML24           CONFIG_RBC823
-               CONFIG_cogent_mpc8xx    CONFIG_IVML24_128       CONFIG_RPXClassic
-               CONFIG_CPCI405          CONFIG_IVML24_256       CONFIG_RPXlite
-               CONFIG_CPCI4052         CONFIG_IVMS8            CONFIG_RPXsuper
-               CONFIG_CPCIISER4        CONFIG_IVMS8_128        CONFIG_rsdproto
-               CONFIG_CPU86            CONFIG_IVMS8_256        CONFIG_sacsng
-               CONFIG_CRAYL1           CONFIG_JSE              CONFIG_Sandpoint8240
-               CONFIG_CSB272           CONFIG_LANTEC           CONFIG_Sandpoint8245
-               CONFIG_CU824            CONFIG_LITE5200B        CONFIG_sbc8260
-               CONFIG_DASA_SIM         CONFIG_lwmon            CONFIG_sbc8560
-               CONFIG_DB64360          CONFIG_MBX              CONFIG_SM850
-               CONFIG_DB64460          CONFIG_MBX860T          CONFIG_SPD823TS
-               CONFIG_DU405            CONFIG_MHPC             CONFIG_STXGP3
-               CONFIG_DUET_ADS         CONFIG_MIP405           CONFIG_SXNI855T
-               CONFIG_EBONY            CONFIG_MOUSSE           CONFIG_TQM823L
-               CONFIG_ELPPC            CONFIG_MPC8260ADS       CONFIG_TQM8260
-               CONFIG_ELPT860          CONFIG_MPC8540ADS       CONFIG_TQM850L
-               CONFIG_ep8260           CONFIG_MPC8540EVAL      CONFIG_TQM855L
-               CONFIG_ERIC             CONFIG_MPC8560ADS       CONFIG_TQM860L
-               CONFIG_ESTEEM192E       CONFIG_MUSENKI          CONFIG_TTTech
-               CONFIG_ETX094           CONFIG_MVS1             CONFIG_UTX8245
-               CONFIG_EVB64260         CONFIG_NETPHONE         CONFIG_V37
-               CONFIG_FADS823          CONFIG_NETTA            CONFIG_W7OLMC
-               CONFIG_FADS850SAR       CONFIG_NETVIA           CONFIG_W7OLMG
-               CONFIG_FADS860T         CONFIG_NX823            CONFIG_WALNUT
-               CONFIG_FLAGADM          CONFIG_OCRTC            CONFIG_ZPC1900
-               CONFIG_FPS850L          CONFIG_ORSG             CONFIG_ZUMA
-               ARM based boards:
-               -----------------
-               CONFIG_ARMADILLO,       CONFIG_AT91RM9200DK,    CONFIG_CERF250,
-               CONFIG_CSB637,          CONFIG_DELTA,           CONFIG_DNP1110,
-               CONFIG_EP7312,          CONFIG_H2_OMAP1610,     CONFIG_HHP_CRADLE,
-               CONFIG_IMPA7,       CONFIG_INNOVATOROMAP1510,   CONFIG_INNOVATOROMAP1610,
-               CONFIG_KB9202,          CONFIG_LART,            CONFIG_LPD7A400,
-               CONFIG_LUBBOCK,         CONFIG_OSK_OMAP5912,    CONFIG_OMAP2420H4,
-               CONFIG_PLEB2,           CONFIG_SHANNON,         CONFIG_P2_OMAP730,
-               CONFIG_SMDK2400,        CONFIG_SMDK2410,        CONFIG_TRAB,
-               CONFIG_VCMA9
-               MicroBlaze based boards:
-               ------------------------
-               CONFIG_SUZAKU
-               Nios-2 based boards:
-               ------------------------
-               CONFIG_PCI5441 CONFIG_PK1C20
-               CONFIG_EP1C20 CONFIG_EP1S10 CONFIG_EP1S40
-               AVR32 based boards:
-               -------------------
-               CONFIG_ATSTK1000
+ - CPU Type:   Define exactly one, e.g. CONFIG_MPC85XX.
+ - Board Type: Define exactly one, e.g. CONFIG_MPC8540ADS.
  
  - CPU Daughterboard Type: (if CONFIG_ATSTK1000 is defined)
                Define exactly one of
                        CFG_CONSOLE_BLINK_COUNT blink interval (cf. i8042.c)
                        CONFIG_CONSOLE_TIME     display time/date info in
                                                upper right corner
-                                               (requires CFG_CMD_DATE)
+                                               (requires CONFIG_CMD_DATE)
                        CONFIG_VIDEO_LOGO       display Linux logo in
                                                upper left corner
                        CONFIG_VIDEO_BMP_LOGO   use bmp_logo.h instead of
                time on others. This setting #define's the initial
                value of the "loads_echo" environment variable.
  
- - Kgdb Serial Baudrate: (if CFG_CMD_KGDB is defined)
+ - Kgdb Serial Baudrate: (if CONFIG_CMD_KGDB is defined)
                CONFIG_KGDB_BAUDRATE
                Select one of the baudrates listed in
                CFG_BAUDRATE_TABLE, see below.
  
  - Monitor Functions:
-               CONFIG_COMMANDS
-               Most monitor functions can be selected (or
-               de-selected) by adjusting the definition of
-               CONFIG_COMMANDS; to select individual functions,
-               #define CONFIG_COMMANDS by "OR"ing any of the
-               following values:
-               #define enables commands:
-               -------------------------
-               CFG_CMD_ASKENV  * ask for env variable
-               CFG_CMD_AUTOSCRIPT Autoscript Support
-               CFG_CMD_BDI       bdinfo
-               CFG_CMD_BEDBUG  * Include BedBug Debugger
-               CFG_CMD_BMP     * BMP support
-               CFG_CMD_BSP     * Board specific commands
-               CFG_CMD_BOOTD     bootd
-               CFG_CMD_CACHE   * icache, dcache
-               CFG_CMD_CONSOLE   coninfo
-               CFG_CMD_DATE    * support for RTC, date/time...
-               CFG_CMD_DHCP    * DHCP support
-               CFG_CMD_DIAG    * Diagnostics
-               CFG_CMD_DOC     * Disk-On-Chip Support
-               CFG_CMD_DTT     * Digital Therm and Thermostat
-               CFG_CMD_ECHO      echo arguments
-               CFG_CMD_EEPROM  * EEPROM read/write support
-               CFG_CMD_ELF     * bootelf, bootvx
-               CFG_CMD_ENV       saveenv
-               CFG_CMD_FDC     * Floppy Disk Support
-               CFG_CMD_FAT     * FAT partition support
-               CFG_CMD_FDOS    * Dos diskette Support
-               CFG_CMD_FLASH     flinfo, erase, protect
-               CFG_CMD_FPGA      FPGA device initialization support
-               CFG_CMD_HWFLOW  * RTS/CTS hw flow control
-               CFG_CMD_I2C     * I2C serial bus support
-               CFG_CMD_IDE     * IDE harddisk support
-               CFG_CMD_IMI       iminfo
-               CFG_CMD_IMLS      List all found images
-               CFG_CMD_IMMAP   * IMMR dump support
-               CFG_CMD_IRQ     * irqinfo
-               CFG_CMD_ITEST     Integer/string test of 2 values
-               CFG_CMD_JFFS2   * JFFS2 Support
-               CFG_CMD_KGDB    * kgdb
-               CFG_CMD_LOADB     loadb
-               CFG_CMD_LOADS     loads
-               CFG_CMD_MEMORY    md, mm, nm, mw, cp, cmp, crc, base,
-                                 loop, loopw, mtest
-               CFG_CMD_MISC      Misc functions like sleep etc
-               CFG_CMD_MMC     * MMC memory mapped support
-               CFG_CMD_MII     * MII utility commands
-               CFG_CMD_NAND    * NAND support
-               CFG_CMD_NET       bootp, tftpboot, rarpboot
-               CFG_CMD_PCI     * pciinfo
-               CFG_CMD_PCMCIA  * PCMCIA support
-               CFG_CMD_PING    * send ICMP ECHO_REQUEST to network host
-               CFG_CMD_PORTIO  * Port I/O
-               CFG_CMD_REGINFO * Register dump
-               CFG_CMD_RUN       run command in env variable
-               CFG_CMD_SAVES   * save S record dump
-               CFG_CMD_SCSI    * SCSI Support
-               CFG_CMD_SDRAM   * print SDRAM configuration information
-                                 (requires CFG_CMD_I2C)
-               CFG_CMD_SETGETDCR Support for DCR Register access (4xx only)
-               CFG_CMD_SPI     * SPI serial bus support
-               CFG_CMD_USB     * USB support
-               CFG_CMD_VFD     * VFD support (TRAB)
-               CFG_CMD_BSP     * Board SPecific functions
-               CFG_CMD_CDP     * Cisco Discover Protocol support
-               CFG_CMD_FSL     * Microblaze FSL support
-               -----------------------------------------------
-               CFG_CMD_ALL     all
-               CONFIG_CMD_DFL  Default configuration; at the moment
-                               this is includes all commands, except
-                               the ones marked with "*" in the list
-                               above.
-               If you don't define CONFIG_COMMANDS it defaults to
-               CONFIG_CMD_DFL in include/cmd_confdefs.h. A board can
-               override the default settings in the respective
-               include file.
+               Monitor commands can be included or excluded
+               from the build by using the #include files
+               "config_cmd_all.h" and #undef'ing unwanted
+               commands, or using "config_cmd_default.h"
+               and augmenting with additional #define's
+               for wanted commands.
+               The default command configuration includes all commands
+               except those marked below with a "*".
+               CONFIG_CMD_ASKENV       * ask for env variable
+               CONFIG_CMD_AUTOSCRIPT     Autoscript Support
+               CONFIG_CMD_BDI            bdinfo
+               CONFIG_CMD_BEDBUG       * Include BedBug Debugger
+               CONFIG_CMD_BMP          * BMP support
+               CONFIG_CMD_BSP          * Board specific commands
+               CONFIG_CMD_BOOTD          bootd
+               CONFIG_CMD_CACHE        * icache, dcache
+               CONFIG_CMD_CONSOLE        coninfo
+               CONFIG_CMD_DATE         * support for RTC, date/time...
+               CONFIG_CMD_DHCP         * DHCP support
+               CONFIG_CMD_DIAG         * Diagnostics
+               CONFIG_CMD_DOC          * Disk-On-Chip Support
+               CONFIG_CMD_DTT          * Digital Therm and Thermostat
+               CONFIG_CMD_ECHO           echo arguments
+               CONFIG_CMD_EEPROM       * EEPROM read/write support
+               CONFIG_CMD_ELF          * bootelf, bootvx
+               CONFIG_CMD_ENV            saveenv
+               CONFIG_CMD_FDC          * Floppy Disk Support
+               CONFIG_CMD_FAT          * FAT partition support
+               CONFIG_CMD_FDOS         * Dos diskette Support
+               CONFIG_CMD_FLASH          flinfo, erase, protect
+               CONFIG_CMD_FPGA           FPGA device initialization support
+               CONFIG_CMD_HWFLOW       * RTS/CTS hw flow control
+               CONFIG_CMD_I2C          * I2C serial bus support
+               CONFIG_CMD_IDE          * IDE harddisk support
+               CONFIG_CMD_IMI            iminfo
+               CONFIG_CMD_IMLS           List all found images
+               CONFIG_CMD_IMMAP        * IMMR dump support
+               CONFIG_CMD_IRQ          * irqinfo
+               CONFIG_CMD_ITEST          Integer/string test of 2 values
+               CONFIG_CMD_JFFS2        * JFFS2 Support
+               CONFIG_CMD_KGDB         * kgdb
+               CONFIG_CMD_LOADB          loadb
+               CONFIG_CMD_LOADS          loads
+               CONFIG_CMD_MEMORY         md, mm, nm, mw, cp, cmp, crc, base,
+                                         loop, loopw, mtest
+               CONFIG_CMD_MISC           Misc functions like sleep etc
+               CONFIG_CMD_MMC          * MMC memory mapped support
+               CONFIG_CMD_MII          * MII utility commands
+               CONFIG_CMD_NAND         * NAND support
+               CONFIG_CMD_NET            bootp, tftpboot, rarpboot
+               CONFIG_CMD_PCI          * pciinfo
+               CONFIG_CMD_PCMCIA               * PCMCIA support
+               CONFIG_CMD_PING         * send ICMP ECHO_REQUEST to network
+                                         host
+               CONFIG_CMD_PORTIO       * Port I/O
+               CONFIG_CMD_REGINFO      * Register dump
+               CONFIG_CMD_RUN            run command in env variable
+               CONFIG_CMD_SAVES        * save S record dump
+               CONFIG_CMD_SCSI         * SCSI Support
+               CONFIG_CMD_SDRAM        * print SDRAM configuration information
+                                         (requires CONFIG_CMD_I2C)
+               CONFIG_CMD_SETGETDCR      Support for DCR Register access
+                                         (4xx only)
+               CONFIG_CMD_SPI          * SPI serial bus support
+               CONFIG_CMD_USB          * USB support
+               CONFIG_CMD_VFD          * VFD support (TRAB)
+               CONFIG_CMD_BSP          * Board SPecific functions
+               CONFIG_CMD_CDP          * Cisco Discover Protocol support
+               CONFIG_CMD_FSL          * Microblaze FSL support
  
                EXAMPLE: If you want all functions except of network
                support you can write:
  
-               #define CONFIG_COMMANDS (CFG_CMD_ALL & ~CFG_CMD_NET)
+               #include "config_cmd_all.h"
+               #undef CONFIG_CMD_NET
  
        Other Commands:
                fdt (flattened device tree) command: CONFIG_OF_LIBFDT
  
        Note:   Don't enable the "icache" and "dcache" commands
-               (configuration option CFG_CMD_CACHE) unless you know
+               (configuration option CONFIG_CMD_CACHE) unless you know
                what you (and your U-Boot users) are doing. Data
                cache cannot be enabled on systems like the 8xx or
                8260 (where accesses to the IMMR region must be
  
  - Real-Time Clock:
  
-               When CFG_CMD_DATE is selected, the type of the RTC
+               When CONFIG_CMD_DATE is selected, the type of the RTC
                has to be selected, too. Define exactly one of the
                following options:
  
                When CONFIG_TIMESTAMP is selected, the timestamp
                (date and time) of an image is printed by image
                commands like bootm or iminfo. This option is
-               automatically enabled when you select CFG_CMD_DATE .
+               automatically enabled when you select CONFIG_CMD_DATE .
  
  - Partition Support:
                CONFIG_MAC_PARTITION and/or CONFIG_DOS_PARTITION
                and/or CONFIG_ISO_PARTITION
  
-               If IDE or SCSI support  is  enabled  (CFG_CMD_IDE  or
-               CFG_CMD_SCSI) you must configure support for at least
+               If IDE or SCSI support  is  enabled  (CONFIG_CMD_IDE or
+               CONFIG_CMD_SCSI) you must configure support for at least
                one partition type as well.
  
  - IDE Reset method:
                        CONFIG_USB_CONFIG
                                for differential drivers: 0x00001000
                                for single ended drivers: 0x00005000
+                       CFG_USB_EVENT_POLL
+                               May be defined to allow interrupt polling
+                               instead of using asynchronous interrupts
+ - USB Device:
+               Define the below if you wish to use the USB console.
+               Once firmware is rebuilt from a serial console issue the
+               command "setenv stdin usbtty; setenv stdout usbtty" and
+               attach your usb cable. The Unix command "dmesg" should print
+               it has found a new device. The environment variable usbtty
+               can be set to gserial or cdc_acm to enable your device to
+               appear to a USB host as a Linux gserial device or a
+               Common Device Class Abstract Control Model serial device.
+               If you select usbtty = gserial you should be able to enumerate
+               a Linux host by
+               # modprobe usbserial vendor=0xVendorID product=0xProductID
+               else if using cdc_acm, simply setting the environment
+               variable usbtty to be cdc_acm should suffice. The following
+               might be defined in YourBoardName.h
+                       CONFIG_USB_DEVICE
+                       Define this to build a UDC device
+                       CONFIG_USB_TTY
+                       Define this to have a tty type of device available to
+                       talk to the UDC device
+                       CFG_CONSOLE_IS_IN_ENV
+                       Define this if you want stdin, stdout &/or stderr to
+                       be set to usbtty.
+                       mpc8xx:
+                               CFG_USB_EXTC_CLK 0xBLAH
+                               Derive USB clock from external clock "blah"
+                               - CFG_USB_EXTC_CLK 0x02
+                               CFG_USB_BRG_CLK 0xBLAH
+                               Derive USB clock from brgclk
+                               - CFG_USB_BRG_CLK 0x04
+               If you have a USB-IF assigned VendorID then you may wish to
+               define your own vendor specific values either in BoardName.h
+               or directly in usbd_vendor_info.h. If you don't define
+               CONFIG_USBD_MANUFACTURER, CONFIG_USBD_PRODUCT_NAME,
+               CONFIG_USBD_VENDORID and CONFIG_USBD_PRODUCTID, then U-Boot
+               should pretend to be a Linux device to it's target host.
+                       CONFIG_USBD_MANUFACTURER
+                       Define this string as the name of your company for
+                       - CONFIG_USBD_MANUFACTURER "my company"
+                       CONFIG_USBD_PRODUCT_NAME
+                       Define this string as the name of your product
+                       - CONFIG_USBD_PRODUCT_NAME "acme usb device"
+                       CONFIG_USBD_VENDORID
+                       Define this as your assigned Vendor ID from the USB
+                       Implementors Forum. This *must* be a genuine Vendor ID
+                       to avoid polluting the USB namespace.
+                       - CONFIG_USBD_VENDORID 0xFFFF
+                       CONFIG_USBD_PRODUCTID
+                       Define this as the unique Product ID
+                       for your device
+                       - CONFIG_USBD_PRODUCTID 0xFFFF
  
  
  - MMC Support:
                enable this define CONFIG_MMC. The MMC can be
                accessed from the boot prompt by mapping the device
                to physical memory similar to flash. Command line is
-               enabled with CFG_CMD_MMC. The MMC driver also works with
-               the FAT fs. This is enabled with CFG_CMD_FAT.
+               enabled with CONFIG_CMD_MMC. The MMC driver also works with
+               the FAT fs. This is enabled with CONFIG_CMD_FAT.
  
  - Journaling Flash filesystem support:
                CONFIG_JFFS2_NAND, CONFIG_JFFS2_NAND_OFF, CONFIG_JFFS2_NAND_SIZE,
                Defines a default value for theIP address of a TFTP
                server to contact when using the "tftboot" command.
  
+ - Multicast TFTP Mode:
+               CONFIG_MCAST_TFTP
+               Defines whether you want to support multicast TFTP as per
+               rfc-2090; for example to work with atftp.  Lets lots of targets
+               tftp down the same boot image concurrently.  Note: the ethernet
+               driver in use must provide a function: mcast() to join/leave a
+               multicast group.
+               CONFIG_BOOTP_RANDOM_DELAY
  - BOOTP Recovery Mode:
                CONFIG_BOOTP_RANDOM_DELAY
  
                boot, thus flooding the BOOTP server. Defining
                CONFIG_BOOTP_RANDOM_DELAY causes a random delay to be
                inserted before sending out BOOTP requests. The
-               following delays are insterted then:
+               following delays are inserted then:
  
                1st BOOTP request:      delay 0 ... 1 sec
                2nd BOOTP request:      delay 0 ... 2 sec
                BOOTP requests:         delay 0 ... 8 sec
  
  - DHCP Advanced Options:
-               CONFIG_BOOTP_MASK
-               You can fine tune the DHCP functionality by adding
-               these flags to the CONFIG_BOOTP_MASK define:
+               You can fine tune the DHCP functionality by defining
+               CONFIG_BOOTP_* symbols:
+               CONFIG_BOOTP_SUBNETMASK
+               CONFIG_BOOTP_GATEWAY
+               CONFIG_BOOTP_HOSTNAME
+               CONFIG_BOOTP_NISDOMAIN
+               CONFIG_BOOTP_BOOTPATH
+               CONFIG_BOOTP_BOOTFILESIZE
+               CONFIG_BOOTP_DNS
+               CONFIG_BOOTP_DNS2
+               CONFIG_BOOTP_SEND_HOSTNAME
+               CONFIG_BOOTP_NTPSERVER
+               CONFIG_BOOTP_TIMEOFFSET
+               CONFIG_BOOTP_VENDOREX
+               CONFIG_BOOTP_SERVERIP - TFTP server will be the serverip
+               environment variable, not the BOOTP server.
  
                CONFIG_BOOTP_DNS2 - If a DHCP client requests the DNS
                serverip from a DHCP server, it is possible that more
                serverip will be stored in the additional environment
                variable "dnsip2". The first DNS serverip is always
                stored in the variable "dnsip", when CONFIG_BOOTP_DNS
-               is added to the CONFIG_BOOTP_MASK.
+               is defined.
  
                CONFIG_BOOTP_SEND_HOSTNAME - Some DHCP servers are capable
                to do a dynamic update of a DNS server. To do this, they
                need the hostname of the DHCP requester.
-               If CONFIG_BOOP_SEND_HOSTNAME is added to the
-               CONFIG_BOOTP_MASK, the content of the "hostname"
-               environment variable is passed as option 12 to
-               the DHCP server.
+               If CONFIG_BOOTP_SEND_HOSTNAME is defined, the content
+               of the "hostname" environment variable is passed as
+               option 12 to the DHCP server.
  
   - CDP Options:
                CONFIG_CDP_DEVICE_ID
                include the appropriate I2C driver for the selected cpu.
  
                This will allow you to use i2c commands at the u-boot
-               command line (as long as you set CFG_CMD_I2C in
+               command line (as long as you set CONFIG_CMD_I2C in
                CONFIG_COMMANDS) and communicate with i2c based realtime
                clock chips. See common/cmd_i2c.c for a description of the
                command line interface.
@@@ -2374,7 -2346,7 +2347,7 @@@ Low Level (hardware related) configurat
  
  - CONFIG_LOOPW
                Add the "loopw" memory command. This only takes effect if
-               the memory commands are activated globally (CFG_CMD_MEM).
+               the memory commands are activated globally (CONFIG_CMD_MEM).
  
  - CONFIG_MX_CYCLIC
                Add the "mdc" and "mwc" memory commands. These are cyclic
                This command will write 12345678 to address 100 all 10 ms.
  
                This only takes effect if the memory commands are activated
-               globally (CFG_CMD_MEM).
+               globally (CONFIG_CMD_MEM).
  
  - CONFIG_SKIP_LOWLEVEL_INIT
  - CONFIG_SKIP_RELOCATE_UBOOT
@@@ -2428,34 -2400,7 +2401,7 @@@ is done by typing
        make NAME_config
  
  where "NAME_config" is the name of one of the existing
- configurations; the following names are supported:
-       ADCIOP_config           FPS860L_config          omap730p2_config
-       ADS860_config           GEN860T_config          pcu_e_config
-       Alaska8220_config
-       AR405_config            GENIETV_config          PIP405_config
-       at91rm9200dk_config     GTH_config              QS823_config
-       CANBT_config            hermes_config           QS850_config
-       cmi_mpc5xx_config       hymod_config            QS860T_config
-       cogent_common_config    IP860_config            RPXlite_config
-       cogent_mpc8260_config   IVML24_config           RPXlite_DW_config
-       cogent_mpc8xx_config    IVMS8_config            RPXsuper_config
-       CPCI405_config          JSE_config              rsdproto_config
-       CPCIISER4_config        LANTEC_config           Sandpoint8240_config
-       csb272_config           lwmon_config            sbc8260_config
-       CU824_config            MBX860T_config          sbc8560_33_config
-       DUET_ADS_config         MBX_config              sbc8560_66_config
-       EBONY_config            mpc7448hpc2_config      SM850_config
-       ELPT860_config          MPC8260ADS_config       SPD823TS_config
-       ESTEEM192E_config       MPC8540ADS_config       stxgp3_config
-       ETX094_config           MPC8540EVAL_config      SXNI855T_config
-       FADS823_config          NMPC8560ADS_config      TQM823L_config
-       FADS850SAR_config       NETVIA_config           TQM850L_config
-       FADS860T_config         omap1510inn_config      TQM855L_config
-       FPS850L_config          omap1610h2_config       TQM860L_config
-                               omap1610inn_config      walnut_config
-                               omap5912osk_config      Yukon8220_config
-                               omap2420h4_config       ZPC1900_config
+ configurations; see the main Makefile for supported names.
  
  Note: for some board special configuration names may exist; check if
        additional information is available from the board vendor; for
diff --combined common/cmd_bdinfo.c
@@@ -30,7 -30,7 +30,7 @@@
  
  DECLARE_GLOBAL_DATA_PTR;
  
- #if (CONFIG_COMMANDS & CFG_CMD_BDI)
+ #if defined(CONFIG_CMD_BDI)
  static void print_num(const char *, ulong);
  
  #ifndef CONFIG_ARM    /* PowerPC and other */
@@@ -167,7 -167,7 +167,7 @@@ int do_bdinfo ( cmd_tbl_t *cmdtp, int f
        print_num ("sram size",         (ulong)bd->bi_sramsize);
  #endif
  
- #if defined(CFG_CMD_NET)
+ #if defined(CONFIG_CMD_NET)
        puts ("ethaddr     =");
        for (i=0; i<6; ++i) {
                printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
@@@ -195,7 -195,7 +195,7 @@@ int do_bdinfo ( cmd_tbl_t *cmdtp, int f
        print_num ("sram start     ",   (ulong)bd->bi_sramstart);
        print_num ("sram size      ",   (ulong)bd->bi_sramsize);
  #endif
- #if defined(CFG_CMD_NET)
+ #if defined(CONFIG_CMD_NET)
        puts ("ethaddr     =");
        for (i=0; i<6; ++i) {
                printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
        return 0;
  }
  
 +#elif defined(CONFIG_M68K) /* M68K */
 +
 +int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 +{
 +      int i;
 +      bd_t *bd = gd->bd;
 +      print_num ("memstart",          (ulong)bd->bi_memstart);
 +      print_num ("memsize",           (ulong)bd->bi_memsize);
 +      print_num ("flashstart",        (ulong)bd->bi_flashstart);
 +      print_num ("flashsize",         (ulong)bd->bi_flashsize);
 +      print_num ("flashoffset",       (ulong)bd->bi_flashoffset);
 +#if defined(CFG_INIT_RAM_ADDR)
 +      print_num ("sramstart",     (ulong)bd->bi_sramstart);
 +      print_num ("sramsize",      (ulong)bd->bi_sramsize);
 +#endif
 +#if defined(CFG_MBAR)
 +      print_num ("mbar",          bd->bi_mbar_base    );
 +#endif
 +#if defined(CFG_CMD_NET)
 +      puts ("ethaddr     =");
 +      for (i=0; i<6; ++i) {
 +              printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
 +      }
 +
 +#if defined(CONFIG_HAS_ETH1)
 +      puts ("\neth1addr    =");
 +      for (i=0; i<6; ++i) {
 +              printf ("%c%02X", i ? ':' : ' ', bd->bi_enet1addr[i]);
 +      }
 +#endif
 +
 +#if defined(CONFIG_HAS_ETH2)
 +       puts ("\neth2addr    =");
 +       for (i=0; i<6; ++i) {
 +              printf ("%c%02X", i ? ':' : ' ', bd->bi_enet2addr[i]);
 +      }
 +#endif
 +
 +#if defined(CONFIG_HAS_ETH3)
 +       puts ("\neth3addr    =");
 +       for (i=0; i<6; ++i) {
 +              printf ("%c%02X", i ? ':' : ' ', bd->bi_enet3addr[i]);
 +      }
 +#endif
 +
 +      puts ("\nip_addr     = ");
 +      print_IPaddr (bd->bi_ip_addr);
 +#endif        /* CFG_CMD_NET */
 +      printf ("\nbaudrate    = %d bps\n", bd->bi_baudrate);
 +
 +      return 0;
 +}
 +
  #else /* ! PPC, which leaves MIPS */
  
  int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@@ -338,4 -285,4 +338,4 @@@ U_BOOT_CMD
        "bdinfo  - print Board Info structure\n",
        NULL
  );
- #endif        /* CFG_CMD_BDI */
+ #endif
diff --combined common/cmd_mii.c
@@@ -28,7 -28,7 +28,7 @@@
  #include <common.h>
  #include <command.h>
  
- #if (CONFIG_COMMANDS & CFG_CMD_MII)
+ #if defined(CONFIG_CMD_MII)
  #include <miiphy.h>
  
  #ifdef CONFIG_TERSE_MII
@@@ -438,7 -438,7 +438,7 @@@ int do_mii (cmd_tbl_t * cmdtp, int flag
        int             rcode = 0;
        char            *devname;
  
 -#ifdef CONFIG_8xx
 +#if defined(CONFIG_8xx) || defined(CONFIG_MCF532x)
        mii_init ();
  #endif
  
@@@ -595,4 -595,4 +595,4 @@@ U_BOOT_CMD
  
  #endif /* CONFIG_TERSE_MII */
  
- #endif /* CFG_CMD_MII */
+ #endif
diff --combined include/common.h
@@@ -1,5 -1,5 +1,5 @@@
  /*
-  * (C) Copyright 2000-2004
+  * (C) Copyright 2000-2007
   * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
   *
   * See file CREDITS for list of people who contributed to this
@@@ -63,10 -63,19 +63,19 @@@ typedef volatile unsigned char     vu_char
  #endif
  #elif defined(CONFIG_5xx)
  #include <asm/5xx_immap.h>
+ #define CONFIG_RELOC_FIXUP_WORKS
  #elif defined(CONFIG_MPC5xxx)
  #include <mpc5xxx.h>
+ #define CONFIG_RELOC_FIXUP_WORKS
+ #elif defined(CONFIG_MPC512X)
+ #include <mpc512x.h>
+ #include <asm/immap_512x.h>
+ #define CONFIG_RELOC_FIXUP_WORKS
  #elif defined(CONFIG_MPC8220)
  #include <asm/immap_8220.h>
+ #define CONFIG_RELOC_FIXUP_WORKS
+ #elif defined(CONFIG_824X)
+ #define CONFIG_RELOC_FIXUP_WORKS
  #elif defined(CONFIG_8260)
  #if   defined(CONFIG_MPC8247) \
     || defined(CONFIG_MPC8248) \
@@@ -78,6 -87,7 +87,7 @@@
  #define CONFIG_MPC8260        1
  #endif
  #include <asm/immap_8260.h>
+ #define CONFIG_RELOC_FIXUP_WORKS
  #endif
  #ifdef CONFIG_MPC86xx
  #include <mpc86xx.h>
  #ifdef CONFIG_MPC83XX
  #include <mpc83xx.h>
  #include <asm/immap_83xx.h>
+ #define CONFIG_RELOC_FIXUP_WORKS
  #endif
  #ifdef        CONFIG_4xx
  #include <ppc4xx.h>
@@@ -230,6 -241,9 +241,9 @@@ int        saveenv      (void)
  void inline setenv   (char *, char *);
  #else
  void  setenv       (char *, char *);
+ #ifdef CONFIG_HAS_UID
+ void  forceenv     (char *, char *);
+ #endif
  #endif /* CONFIG_PPC */
  #ifdef CONFIG_ARM
  # include <asm/mach-types.h>
@@@ -448,6 -462,9 +462,9 @@@ int        prt_8260_clks (void)
  #elif defined(CONFIG_MPC5xxx)
  int   prt_mpc5xxx_clks (void);
  #endif
+ #if defined(CONFIG_MPC512x)
+ int   prt_mpc512xxx_clks (void);
+ #endif
  #if defined(CONFIG_MPC8220)
  int   prt_mpc8220_clks (void);
  #endif
@@@ -512,6 -529,8 +529,8 @@@ void       cpu_init_f    (void)
  int   cpu_init_r    (void);
  #if defined(CONFIG_8260)
  int   prt_8260_rsr  (void);
+ #elif defined(CONFIG_MPC83XX)
+ int   prt_83xx_rsr  (void);
  #endif
  
  /* $(CPU)/interrupts.c */
@@@ -539,7 -558,7 +558,7 @@@ ulong      bootcount_load (void)
  #define BOOTCOUNT_MAGIC               0xB001C041
  
  /* $(CPU)/.../<eth> */
 -void mii_init (void);
 +/*void mii_init (void);*/
  
  /* $(CPU)/.../lcd.c */
  ulong lcd_setmem (ulong);
diff --combined lib_m68k/board.c
  #include <asm/immap_5272.h>
  #endif
  
- #if (CONFIG_COMMANDS & CFG_CMD_IDE)
+ #if defined(CONFIG_CMD_IDE)
  #include <ide.h>
  #endif
- #if (CONFIG_COMMANDS & CFG_CMD_SCSI)
+ #if defined(CONFIG_CMD_SCSI)
  #include <scsi.h>
  #endif
- #if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+ #if defined(CONFIG_CMD_KGDB)
  #include <kgdb.h>
  #endif
  #ifdef CONFIG_STATUS_LED
  #include <status_led.h>
  #endif
  #include <net.h>
- #if (CONFIG_COMMANDS & CFG_CMD_BEDBUG)
+ #if defined(CONFIG_CMD_BEDBUG)
  #include <cmd_bedbug.h>
  #endif
  #ifdef CFG_ALLOC_DPRAM
@@@ -221,7 -221,6 +221,7 @@@ static int init_func_i2c (void
   */
  
  init_fnc_t *init_sequence[] = {
-     get_clocks,
++      get_clocks,
        env_init,
        init_baudrate,
        serial_init,
@@@ -372,10 -371,6 +372,10 @@@ board_init_f (ulong bootflag
         */
        bd->bi_memstart  = CFG_SDRAM_BASE;      /* start of  DRAM memory      */
        bd->bi_memsize   = gd->ram_size;        /* size  of  DRAM memory in bytes */
 +#ifdef CFG_INIT_RAM_ADDR
 +      bd->bi_sramstart = CFG_INIT_RAM_ADDR;   /* start of  SRAM memory        */
 +      bd->bi_sramsize  = CFG_INIT_RAM_END;    /* size  of  SRAM memory        */
 +#endif
        bd->bi_mbar_base = CFG_MBAR;            /* base of internal registers */
  
        bd->bi_bootflags = bootflag;            /* boot / reboot flag (for LynxOS)    */
@@@ -435,10 -430,6 +435,10 @@@ void board_init_r (gd_t *id, ulong dest
  
        gd->flags |= GD_FLG_RELOC;      /* tell others: relocation done */
  
 +#ifdef CONFIG_SERIAL_MULTI
 +      serial_initialize();
 +#endif
 +
        debug ("Now running in RAM - U-Boot at: %08lx\n", dest_addr);
  
        WATCHDOG_RESET ();
        /*
         * Setup trap handlers
         */
 -      trap_init (0);
 +      trap_init (CFG_SDRAM_BASE);
  
  #if !defined(CFG_NO_FLASH)
        puts ("FLASH: ");
                if (s)
                        s = (*e) ? e + 1 : e;
        }
 +#ifdef CONFIG_HAS_ETH1
 +      /* handle the 2nd ethernet address */
 +
 +      s = getenv ("eth1addr");
 +      for (i = 0; i < 6; ++i) {
 +              bd->bi_enet1addr[i] = s ? simple_strtoul (s, &e, 16) : 0;
 +              if (s)
 +                      s = (*e) ? e + 1 : e;
 +      }
 +#endif
 +#ifdef CONFIG_HAS_ETH2
 +      /* handle the 3rd ethernet address */
 +
 +      s = getenv ("eth2addr");
 +      for (i = 0; i < 6; ++i) {
 +              bd->bi_enet2addr[i] = s ? simple_strtoul (s, &e, 16) : 0;
 +              if (s)
 +                      s = (*e) ? e + 1 : e;
 +      }
 +#endif
 +
 +#ifdef CONFIG_HAS_ETH3
 +      /* handle 4th ethernet address */
 +      s = getenv("eth3addr");
 +      for (i = 0; i < 6; ++i) {
 +              bd->bi_enet3addr[i] = s ? simple_strtoul (s, &e, 16) : 0;
 +              if (s)
 +                      s = (*e) ? e + 1 : e;
 +      }
 +#endif
  
        /* IP Address */
        bd->bi_ip_addr = getenv_IPaddr ("ipaddr");
  
        WATCHDOG_RESET ();
  
 +#if defined(CONFIG_PCI)
 +      /*
 +       * Do pci configuration
 +       */
 +      pci_init ();
 +#endif
  
        /** leave this here (after malloc(), environment and PCI are working) **/
        /* Initialize devices */
        misc_init_r ();
  #endif
  
- #if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+ #if defined(CONFIG_CMD_KGDB)
        WATCHDOG_RESET ();
        puts ("KGDB:  ");
        kgdb_init ();
        if ((s = getenv ("loadaddr")) != NULL) {
                load_addr = simple_strtoul (s, NULL, 16);
        }
- #if (CONFIG_COMMANDS & CFG_CMD_NET)
+ #if defined(CONFIG_CMD_NET)
        if ((s = getenv ("bootfile")) != NULL) {
                copy_filename (BootFile, s, sizeof (BootFile));
        }
- #endif /* CFG_CMD_NET */
+ #endif
  
        WATCHDOG_RESET ();
  
- #if (CONFIG_COMMANDS & CFG_CMD_DOC)
+ #if defined(CONFIG_CMD_DOC)
        WATCHDOG_RESET ();
        puts ("DOC:   ");
        doc_init ();
  #endif
  
- #if (CONFIG_COMMANDS & CFG_CMD_NAND)
+ #if defined(CONFIG_CMD_NAND)
        WATCHDOG_RESET ();
        puts ("NAND:  ");
        nand_init();            /* go init the NAND */
  #endif
  
- #if (CONFIG_COMMANDS & CFG_CMD_NET)
 -#if defined(CONFIG_CMD_NET) && defined(FEC_ENET)
++#if defined(CONFIG_CMD_NET)
        WATCHDOG_RESET();
 +#if defined(FEC_ENET)
        eth_init(bd);
  #endif
-       eth_initialize (bd);
 +#if defined(CONFIG_NET_MULTI)
 +      puts ("Net:   ");
++        eth_initialize (bd);
 +#endif
 +#endif
  
  #ifdef CONFIG_POST
        post_run (NULL, POST_RAM | post_bootmode_get(0));
  #endif
  
- #if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) && !(CONFIG_COMMANDS & CFG_CMD_IDE)
++#if defined(CONFIG_CMD_PCMCIA) \
++    && !defined(CONFIG_CMD_IDE)
 +      WATCHDOG_RESET ();
 +      puts ("PCMCIA:");
 +      pcmcia_init ();
 +#endif
 +
- #if (CONFIG_COMMANDS & CFG_CMD_IDE)
++#if defined(CONFIG_CMD_IDE)
 +      WATCHDOG_RESET ();
 +      puts ("IDE:   ");
 +      ide_init ();
- #endif /* CFG_CMD_IDE */
++#endif
 +
  #ifdef CONFIG_LAST_STAGE_INIT
        WATCHDOG_RESET ();
        /*
        last_stage_init ();
  #endif
  
- #if (CONFIG_COMMANDS & CFG_CMD_BEDBUG)
+ #if defined(CONFIG_CMD_BEDBUG)
        WATCHDOG_RESET ();
        bedbug_init ();
  #endif
diff --combined net/eth.c
+++ b/net/eth.c
@@@ -26,7 -26,7 +26,7 @@@
  #include <net.h>
  #include <miiphy.h>
  
- #if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI)
+ #if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI)
  
  #ifdef CFG_GT_6426x
  extern int gt6426x_eth_initialize(bd_t *bis);
@@@ -40,6 -40,7 +40,7 @@@ extern int eth_3com_initialize(bd_t*)
  extern int fec_initialize(bd_t*);
  extern int inca_switch_initialize(bd_t*);
  extern int mpc5xxx_fec_initialize(bd_t*);
+ extern int mpc512x_fec_initialize(bd_t*);
  extern int mpc8220_fec_initialize(bd_t*);
  extern int mv6436x_eth_initialize(bd_t *);
  extern int mv6446x_eth_initialize(bd_t *);
@@@ -58,7 -59,6 +59,7 @@@ extern int npe_initialize(bd_t *)
  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*);
  
  static struct eth_device *eth_devices, *eth_current;
  
@@@ -144,7 -144,7 +145,7 @@@ int eth_initialize(bd_t *bis
        eth_current = NULL;
  
        show_boot_progress (64);
- #if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII)
+ #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
        miiphy_init();
  #endif
  
  #if defined(CONFIG_MPC5xxx_FEC)
        mpc5xxx_fec_initialize(bis);
  #endif
+ #if defined(CONFIG_MPC512x_FEC)
+       mpc512x_fec_initialize (bis);
+ #endif
  #if defined(CONFIG_MPC8220_FEC)
        mpc8220_fec_initialize(bis);
  #endif
  #if defined(CONFIG_ATSTK1000)
        atstk1000_eth_initialize(bis);
  #endif
 +#if defined(CONFIG_MCFFEC)
 +      mcffec_initialize(bis);
 +#endif
  
        if (!eth_devices) {
                puts ("No ethernet found.\n");
@@@ -353,6 -353,51 +357,51 @@@ void eth_set_enetaddr(int num, char *ad
  
        memcpy(dev->enetaddr, enetaddr, 6);
  }
+ #ifdef CONFIG_MCAST_TFTP
+ /* Multicast.
+  * mcast_addr: multicast ipaddr from which multicast Mac is made
+  * join: 1=join, 0=leave.
+  */
+ int eth_mcast_join( IPaddr_t mcast_ip, u8 join)
+ {
+  u8 mcast_mac[6];
+       if (!eth_current || !eth_current->mcast)
+               return -1;
+       mcast_mac[5] = htonl(mcast_ip) & 0xff;
+       mcast_mac[4] = (htonl(mcast_ip)>>8) & 0xff;
+       mcast_mac[3] = (htonl(mcast_ip)>>16) & 0x7f;
+       mcast_mac[2] = 0x5e;
+       mcast_mac[1] = 0x0;
+       mcast_mac[0] = 0x1;
+       return eth_current->mcast(eth_current, mcast_mac, join);
+ }
+ /* the 'way' for ethernet-CRC-32. Spliced in from Linux lib/crc32.c
+  * and this is the ethernet-crc method needed for TSEC -- and perhaps
+  * some other adapter -- hash tables
+  */
+ #define CRCPOLY_LE 0xedb88320
+ u32 ether_crc (size_t len, unsigned char const *p)
+ {
+       int i;
+       u32 crc;
+       crc = ~0;
+       while (len--) {
+               crc ^= *p++;
+               for (i = 0; i < 8; i++)
+                       crc = (crc >> 1) ^ ((crc & 1) ? CRCPOLY_LE : 0);
+       }
+       /* an reverse the bits, cuz of way they arrive -- last-first */
+       crc = (crc >> 16) | (crc << 16);
+       crc = (crc >> 8 & 0x00ff00ff) | (crc << 8 & 0xff00ff00);
+       crc = (crc >> 4 & 0x0f0f0f0f) | (crc << 4 & 0xf0f0f0f0);
+       crc = (crc >> 2 & 0x33333333) | (crc << 2 & 0xcccccccc);
+       crc = (crc >> 1 & 0x55555555) | (crc << 1 & 0xaaaaaaaa);
+       return crc;
+ }
+ #endif
  
  int eth_init(bd_t *bis)
  {
@@@ -458,16 -503,18 +507,18 @@@ char *eth_get_name (void
  {
        return (eth_current ? eth_current->name : "unknown");
  }
- #elif (CONFIG_COMMANDS & CFG_CMD_NET) && !defined(CONFIG_NET_MULTI)
+ #elif defined(CONFIG_CMD_NET) && !defined(CONFIG_NET_MULTI)
  
  extern int at91rm9200_miiphy_initialize(bd_t *bis);
  extern int emac4xx_miiphy_initialize(bd_t *bis);
  extern int mcf52x2_miiphy_initialize(bd_t *bis);
  extern int ns7520_miiphy_initialize(bd_t *bis);
+ extern int dm644x_eth_miiphy_initialize(bd_t *bis);
  
  int eth_initialize(bd_t *bis)
  {
- #if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII)
+ #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
        miiphy_init();
  #endif
  
  #if defined(CONFIG_NETARM)
        ns7520_miiphy_initialize(bis);
  #endif
+ #if defined(CONFIG_DRIVER_TI_EMAC)
+       dm644x_eth_miiphy_initialize(bis);
+ #endif
        return 0;
  }
  #endif