]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - Makefile
Add ARM946E cpu and core module targets; remap memory to 0x00000000
[karo-tx-uboot.git] / Makefile
index f1961c78f7f97a11ecaae87d81cc10ad52fd32d7..26fc73d85dfaf5c0a896745dab67d03b97a87d5a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# (C) Copyright 2000-2004
+# (C) Copyright 2000-2005
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 #
 # See file CREDITS for list of people who contributed to this
@@ -29,10 +29,10 @@ HOSTARCH := $(shell uname -m | \
            -e s/powerpc/ppc/ \
            -e s/macppc/ppc/)
 
-HOSTOS := $(shell uname -s | tr A-Z a-z | \
+HOSTOS := $(shell uname -s | tr '[:upper:]' '[:lower:]' | \
            sed -e 's/\(cygwin\).*/cygwin/')
 
-export HOSTARCH
+export HOSTARCH HOSTOS
 
 # Deal with colliding definitions from tcsh etc.
 VENDOR=
@@ -54,7 +54,7 @@ ifeq ($(HOSTARCH),ppc)
 CROSS_COMPILE =
 else
 ifeq ($(ARCH),ppc)
-CROSS_COMPILE = ppc_8xx-
+CROSS_COMPILE = powerpc-linux-
 endif
 ifeq ($(ARCH),arm)
 CROSS_COMPILE = arm-linux-
@@ -97,6 +97,9 @@ endif
 ifeq ($(CPU),ppc4xx)
 OBJS += cpu/$(CPU)/resetvec.o
 endif
+ifeq ($(CPU),mpc83xx)
+OBJS += cpu/$(CPU)/resetvec.o
+endif
 ifeq ($(CPU),mpc85xx)
 OBJS += cpu/$(CPU)/resetvec.o
 endif
@@ -215,6 +218,9 @@ unconfig:
 ## MPC5xx Systems
 #########################################################################
 
+canmb_config:  unconfig
+       @./mkconfig -a canmb ppc mpc5xxx canmb
+
 cmi_mpc5xx_config:     unconfig
        @./mkconfig $(@:_config=) ppc mpc5xx cmi
 
@@ -224,6 +230,16 @@ PATI_config:               unconfig
 #########################################################################
 ## MPC5xxx Systems
 #########################################################################
+
+aev_config: unconfig
+       @./mkconfig -a aev ppc mpc5xxx tqm5200
+
+cpci5200_config:  unconfig
+       @./mkconfig -a cpci5200  ppc mpc5xxx cpci5200 esd
+
+hmi1001_config:         unconfig
+       @./mkconfig hmi1001 ppc mpc5xxx hmi1001
+
 Lite5200_config                                \
 Lite5200_LOWBOOT_config                        \
 Lite5200_LOWBOOT08_config              \
@@ -264,6 +280,12 @@ icecube_5100_config:                       unconfig
 inka4x0_config:                unconfig
        @./mkconfig inka4x0 ppc mpc5xxx inka4x0
 
+o2dnt_config:
+       @./mkconfig -a o2dnt ppc mpc5xxx o2dnt
+
+pf5200_config:  unconfig
+       @./mkconfig -a pf5200  ppc mpc5xxx pf5200 esd
+
 PM520_config \
 PM520_DDR_config \
 PM520_ROMBOOT_config \
@@ -313,7 +335,7 @@ Total5200_Rev2_lowboot_config:      unconfig
                }
        @./mkconfig -a Total5200 ppc mpc5xxx total5200
 
-TQM5200_auto_config            \
+TQM5200_auto_config    \
 TQM5200_AA_config      \
 TQM5200_AB_config      \
 TQM5200_AC_config      \
@@ -344,6 +366,11 @@ MiniFAP_config:    unconfig
                }
        @./mkconfig -a TQM5200 ppc mpc5xxx tqm5200
 
+spieval_config:        unconfig
+       echo "#define CONFIG_CS_AUTOCONF">>include/config.h
+       echo "... with automatic CS configuration"
+       @./mkconfig -a spieval ppc mpc5xxx tqm5200
+
 #########################################################################
 ## MPC8xx Systems
 #########################################################################
@@ -626,6 +653,9 @@ SM850_config        :       unconfig
 SPD823TS_config:       unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx spd8xx
 
+stxxtc_config: unconfig
+       @./mkconfig $(@:_config=) ppc mpc8xx stxxtc
+
 svm_sc8xx_config:      unconfig
        @ >include/config.h
        @./mkconfig $(@:_config=) ppc mpc8xx svm_sc8xx
@@ -700,8 +730,11 @@ AR405_config:      unconfig
 ASH405_config: unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx ash405 esd
 
-BUBINGA405EP_config:   unconfig
-       @./mkconfig $(@:_config=) ppc ppc4xx bubinga405ep
+bamboo_config: unconfig
+       @./mkconfig $(@:_config=) ppc ppc4xx bamboo amcc
+
+bubinga_config:        unconfig
+       @./mkconfig $(@:_config=) ppc ppc4xx bubinga amcc
 
 CANBT_config:  unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx canbt esd
@@ -721,6 +754,9 @@ CATcenter_33_config:        unconfig
                }
        @./mkconfig -a $(call xtract_4xx,$@) ppc ppc4xx PPChameleonEVB dave
 
+CPCI2DP_config:        unconfig
+       @./mkconfig $(@:_config=) ppc ppc4xx cpci2dp esd
+
 CPCI405_config \
 CPCI4052_config        \
 CPCI405DT_config       \
@@ -752,8 +788,8 @@ DP405_config:       unconfig
 DU405_config:  unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx du405 esd
 
-EBONY_config:  unconfig
-       @./mkconfig $(@:_config=) ppc ppc4xx ebony
+ebony_config:  unconfig
+       @./mkconfig $(@:_config=) ppc ppc4xx ebony amcc
 
 ERIC_config:   unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx eric
@@ -773,6 +809,12 @@ HUB405_config:     unconfig
 JSE_config:    unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx jse
 
+KAREF_config: unconfig
+       @./mkconfig $(@:_config=) ppc ppc4xx karef sandburst
+
+METROBOX_config: unconfig
+       @./mkconfig $(@:_config=) ppc ppc4xx metrobox sandburst
+
 MIP405_config: unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx mip405 mpl
 
@@ -787,8 +829,8 @@ ML2_config: unconfig
 ml300_config:  unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx ml300 xilinx
 
-OCOTEA_config: unconfig
-       @./mkconfig $(@:_config=) ppc ppc4xx ocotea
+ocotea_config: unconfig
+       @./mkconfig $(@:_config=) ppc ppc4xx ocotea amcc
 
 OCRTC_config           \
 ORSG_config:   unconfig
@@ -839,6 +881,10 @@ PPChameleonEVB_HI_33_config:       unconfig
 sbc405_config: unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx sbc405
 
+sycamore_config:       unconfig
+       @echo "Configuring for sycamore board as subset of walnut..."
+       @./mkconfig -a walnut ppc ppc4xx walnut amcc
+
 VOH405_config: unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx voh405 esd
 
@@ -849,8 +895,8 @@ W7OLMC_config       \
 W7OLMG_config: unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx w7o
 
-WALNUT405_config:      unconfig
-       @./mkconfig $(@:_config=) ppc ppc4xx walnut405
+walnut_config: unconfig
+       @./mkconfig $(@:_config=) ppc ppc4xx walnut amcc
 
 WUH405_config: unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx wuh405 esd
@@ -858,14 +904,22 @@ WUH405_config:    unconfig
 XPEDITE1K_config:      unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx xpedite1k
 
+yosemite_config:       unconfig
+       @./mkconfig $(@:_config=) ppc ppc4xx yosemite amcc
+
+yellowstone_config:    unconfig
+       @./mkconfig $(@:_config=) ppc ppc4xx yellowstone amcc
+
 #########################################################################
 ## MPC8220 Systems
 #########################################################################
-Alaska8220_config:     unconfig
-       @./mkconfig $(@:_config=) ppc mpc8220 alaska
 
+Alaska8220_config      \
 Yukon8220_config:      unconfig
-       @./mkconfig $(@:_config=) ppc mpc8220 yukon
+       @./mkconfig $(@:_config=) ppc mpc8220 alaska
+
+sorcery_config:                unconfig
+       @./mkconfig $(@:_config=) ppc mpc8220 sorcery
 
 #########################################################################
 ## MPC824x Systems
@@ -972,6 +1026,10 @@ CPU87_ROMBOOT_config: unconfig
        fi; \
        echo "export CONFIG_BOOT_ROM" >> config.mk;
 
+ep8248_config  \
+ep8248E_config :       unconfig
+       @./mkconfig ep8248 ppc mpc8260 ep8248
+
 ep8260_config: unconfig
        @./mkconfig $(@:_config=) ppc mpc8260 ep8260
 
@@ -981,6 +1039,9 @@ gw8260_config:     unconfig
 hymod_config:  unconfig
        @./mkconfig $(@:_config=) ppc mpc8260 hymod
 
+IDS8247_config:        unconfig
+       @./mkconfig $(@:_config=) ppc mpc8260 ids8247
+
 IPHASE4539_config:     unconfig
        @./mkconfig $(@:_config=) ppc mpc8260 iphase4539
 
@@ -1143,6 +1204,11 @@ TQM8265_AA_config:  unconfig
        fi
        @./mkconfig -a TQM8260 ppc mpc8260 tqm8260
 
+VoVPN-GW_66MHz_config  \
+VoVPN-GW_100MHz_config:                unconfig
+       @echo "#define CONFIG_CLKIN_$(word 2,$(subst _, ,$@))" > include/config.h
+       @./mkconfig -a VoVPN-GW ppc mpc8260 vovpn-gw funkwerk
+
 ZPC1900_config: unconfig
        @./mkconfig $(@:_config=) ppc mpc8260 zpc1900
 
@@ -1162,6 +1228,13 @@ M5282EVB_config :                unconfig
 TASREG_config :                unconfig
        @./mkconfig $(@:_config=) m68k mcf52x2 tasreg esd
 
+#########################################################################
+## MPC83xx Systems
+#########################################################################
+
+MPC8349ADS_config:     unconfig
+       @./mkconfig $(@:_config=) ppc mpc83xx mpc8349ads
+
 #########################################################################
 ## MPC85xx Systems
 #########################################################################
@@ -1169,18 +1242,44 @@ TASREG_config :         unconfig
 MPC8540ADS_config:     unconfig
        @./mkconfig $(@:_config=) ppc mpc85xx mpc8540ads
 
+MPC8540EVAL_config \
+MPC8540EVAL_33_config \
+MPC8540EVAL_66_config \
+MPC8540EVAL_33_slave_config \
+MPC8540EVAL_66_slave_config:      unconfig
+       @echo "" >include/config.h ; \
+       if [ "$(findstring _33_,$@)" ] ; then \
+               echo -n "... 33 MHz PCI" ; \
+       else \
+               echo "#define CONFIG_SYSCLK_66M" >>include/config.h ; \
+               echo -n "... 66 MHz PCI" ; \
+       fi ; \
+       if [ "$(findstring _slave_,$@)" ] ; then \
+               echo "#define CONFIG_PCI_SLAVE" >>include/config.h ; \
+               echo " slave" ; \
+       else \
+               echo " host" ; \
+       fi
+       @./mkconfig -a MPC8540EVAL ppc mpc85xx mpc8540eval
+
 MPC8560ADS_config:     unconfig
        @./mkconfig $(@:_config=) ppc mpc85xx mpc8560ads
 
 MPC8541CDS_config:     unconfig
        @./mkconfig $(@:_config=) ppc mpc85xx mpc8541cds cds
 
+MPC8548CDS_config:     unconfig
+       @./mkconfig $(@:_config=) ppc mpc85xx mpc8548cds cds
+
 MPC8555CDS_config:     unconfig
        @./mkconfig $(@:_config=) ppc mpc85xx mpc8555cds cds
 
 PM854_config:  unconfig
        @./mkconfig $(@:_config=) ppc mpc85xx pm854
 
+PM856_config:  unconfig
+       @./mkconfig $(@:_config=) ppc mpc85xx pm856
+
 sbc8540_config \
 sbc8540_33_config \
 sbc8540_66_config:     unconfig
@@ -1282,11 +1381,184 @@ xtract_omap1610xxx = $(subst _cs0boot,,$(subst _cs3boot,,$(subst _cs_autoboot,,$
 
 xtract_omap730p2 = $(subst _cs0boot,,$(subst _cs3boot,, $(subst _config,,$1)))
 
-integratorap_config :  unconfig
-       @./mkconfig $(@:_config=) arm arm926ejs integratorap
+at91rm9200dk_config    :       unconfig
+       @./mkconfig $(@:_config=) arm arm920t at91rm9200dk NULL at91rm9200
 
-integratorcp_config :  unconfig
-       @./mkconfig $(@:_config=) arm arm926ejs integratorcp
+cmc_pu2_config :       unconfig
+       @./mkconfig $(@:_config=) arm arm920t cmc_pu2 NULL at91rm9200
+
+########################################################################
+## ARM Integrator boards
+## There are two variants /AP && /CP
+## - many different core modules (CMs) can be used
+## - some share characteristics
+## Those without specific cpu support can still use U-Boot
+## provided the ARM boot monitor (or similar) runs before U-Boot
+## to set up the platform e.g. map writeable memory to 0x00000000
+## setup MMU, setup caches etc.
+## Ported cores are:-
+##     ARM926EJ-S
+##     ARM946E-S
+##
+########################################################################
+xtract_int_board = $(subst _$(subst integrator$1_,,$(subst _config,,$2)),,$(subst _config,,$2))
+xtract_int_cm    = $(subst integrator$1_,,$(subst _config,,$2))
+#########################################################################
+## Integrator/AP
+#########################################################################
+integratorap_config    :       unconfig
+       @echo -n "/* Integrator configuration implied " >  tmp.fil;     \
+        echo    " by Makefile target   */"             >> tmp.fil;     \
+        echo                                           >> tmp.fil 
+       @echo -n "#define CONFIG_INTEGRATOR     1"      >> tmp.fil;     \
+       echo     "      /* Integrator board     */"     >> tmp.fil;     \
+       echo  -n "#define CONFIG_ARCH_INTEGRATOR"       >> tmp.fil;     \
+       echo     "      1       /* Integrator/AP */"    >> tmp.fil;     \
+       echo "/* Core module not defined        */"     >> tmp.fil;     \
+       echo -n "#define CONFIG_ARM_INTCM       1"      >> tmp.fil;     \
+       echo -n "       /* Integrator core module "     >> tmp.fil;     \
+       echo    "with unknown core      */"             >> tmp.fil;     \
+       cpu=arm_intcm;                                                  \
+       mv tmp.fil ./include/config.h;                                  \
+       ubootlds=board/integratorap/u-boot.lds;                         \
+       sed -e 's/cpu\/.*\/st/cpu\/'$$cpu'\/st/'                        \
+                                          $$ubootlds > $$ubootlds.tmp; \
+       mv -f $$ubootlds.tmp $$ubootlds;                                \
+       ./mkconfig -a integratorap arm arm_intcm integratorap;
+
+integratorap_CM720T_config             integratorap_CM7TDMI_config     \
+integratorap_CM920T_config             integratorap_CM920T_ETM_config  \
+integratorap_CM922T_XA10_config                integratorap_CM926EJ_S_config   \
+integratorap_CM940T_config             integratorap_CM946E_S_config    \
+integratorap_CM966E_S_config           integratorap_CM10200E_config    \
+integratorap_CM10220E_config           integratorap_CM1026EJ_S_config  \
+integratorap_CM1136JF_S_config :       unconfig
+       @echo -n "/* Integrator configuration implied " >  tmp.fil;     \
+        echo    " by Makefile target   */"             >> tmp.fil;     \
+        echo                                           >> tmp.fil 
+       @echo -n "#define CONFIG_INTEGRATOR     1"      >>  tmp.fil;    \
+       echo     "      /* Integrator board     */"     >> tmp.fil;     \
+       echo  -n "#define CONFIG_ARCH_INTEGRATOR"       >> tmp.fil;     \
+       echo     "      1       /* Integrator/AP */"    >> tmp.fil;     \
+       cm=$(call xtract_int_cm,ap,$@);                                 \
+       echo  -n "#define CONFIG_$$cm           "       >> tmp.fil;     \
+       echo     "      /* core module */"              >> tmp.fil;     \
+       case $$cm in                                                    \
+       CM920T)                                                         \
+                       echo -n "#define CONFIG_ARM920" >> tmp.fil;     \
+                       echo -n "T      1       /* CPU" >> tmp.fil;     \
+                       echo -n " core is ARM920T"      >> tmp.fil;     \
+                       echo    "       */"             >> tmp.fil;     \
+                       cpu=arm920t;;                                   \
+       CM926EJ_S)      echo -n "#define CONFIG_ARM926" >> tmp.fil;     \
+                       echo -n "EJ_S   1       /* CPU" >> tmp.fil;     \
+                       echo -n " core is ARM926EJ-S"   >> tmp.fil;     \
+                       echo    "       */"             >> tmp.fil;     \
+                       cpu=arm926ejs;;                                 \
+       CM946E_S)       echo -n "#define CONFIG_ARM946" >> tmp.fil;     \
+                       echo -n "E_S    1       /* CPU" >> tmp.fil;     \
+                       echo -n " core is ARM946E-S"    >> tmp.fil;     \
+                       echo    "       */"             >> tmp.fil;     \
+                       cpu=arm946es;;                                  \
+       *)              echo -n "#define CONFIG_ARM_IN" >> tmp.fil;     \
+                       echo -n "TCM    1       /* Int" >> tmp.fil;     \
+                       echo -n "egrator core module w" >> tmp.fil;     \
+                       echo -n "ith unported core"     >> tmp.fil;     \
+                       echo    "       */"             >> tmp.fil;     \
+                       cpu=arm_intcm;;                                 \
+       esac;                                                           \
+       mv tmp.fil ./include/config.h;                                  \
+       ubootlds=board/$(call xtract_int_board,ap,$@)/u-boot.lds;       \
+       sed -e 's/cpu\/.*\/st/cpu\/'$$cpu'\/st/'                        \
+                                          $$ubootlds > $$ubootlds.tmp; \
+       mv -f $$ubootlds.tmp $$ubootlds;                                \
+       ./mkconfig -a $(call xtract_int_board,ap,$@) arm $$cpu          \
+                     $(call xtract_int_board,ap,$@);
+
+#########################################################################
+## Integrator/CP
+#########################################################################
+integratorcp_config    :       unconfig
+       @echo -n "/* Integrator configuration implied " >  tmp.fil;     \
+        echo    " by Makefile target   */"             >> tmp.fil;     \
+        echo                                           >> tmp.fil 
+       @echo -n "#define CONFIG_INTEGRATOR     1"      >> tmp.fil;     \
+       echo     "      /* Integrator board     */"     >> tmp.fil;     \
+       echo  -n "#define CONFIG_ARCH_CINTEGRATOR"      >> tmp.fil;     \
+       echo     "      1       /* Integrator/CP */"    >> tmp.fil;     \
+       echo     "/* Core module not defined    */"     >> tmp.fil;     \
+       echo -n "#define CONFIG_ARM_INTCM       1"      >> tmp.fil;     \
+       echo -n "       /* Integrator core module "     >> tmp.fil;     \
+       echo    "with unknown core      */"             >> tmp.fil;     \
+       cpu=arm_intcm;                                                  \
+       echo -n "#undef CONFIG_CM_MULTIPLE_SSRAM"       >> tmp.fil;     \
+       echo -n "               /* CM may not have "    >> tmp.fil;     \
+       echo    "multiple SSRAM mapping */"             >> tmp.fil;     \
+       echo -n "#undef CONFIG_CM_SPD_DETECT    "       >> tmp.fil;     \
+       echo -n "       /* CM may not support SPD "     >> tmp.fil;     \
+       echo    "query */"                              >> tmp.fil;     \
+       echo -n "#undef CONFIG_CM_REMAP         "       >> tmp.fil;     \
+       echo -n "       /* CM may not support "         >> tmp.fil;     \
+       echo    "remapping      */"                     >> tmp.fil;     \
+       echo -n "#undef CONFIG_CM_INIT          "       >> tmp.fil;     \
+       echo -n "       /* CM may not have  "           >> tmp.fil;     \
+       echo    "initialization reg     */"             >> tmp.fil;     \
+       echo -n "#undef CONFIG_CM_TCRAM         "       >> tmp.fil;     \
+       echo -n "       /* CM may not have TCRAM */"    >> tmp.fil;     \
+       mv tmp.fil ./include/config.h;                                  \
+       ubootlds=board/integratorcp/u-boot.lds;                         \
+       sed -e 's/cpu\/.*\/st/cpu\/'$$cpu'\/st/'                        \
+                                          $$ubootlds > $$ubootlds.tmp; \
+       mv -f $$ubootlds.tmp $$ubootlds;                                \
+       ./mkconfig -a integratorcp arm arm_intcm integratorcp;
+
+integratorcp_CM920T_config             integratorcp_CM920T_ETM_config  \
+integratorcp_CM922T_XA10_config                integratorcp_CM926EJ_S_config   \
+integratorcp_CM940T_config             integratorcp_CM946E_S_config    \
+integratorcp_CM966E_S_config           integratorcp_CM10200E_config    \
+integratorcp_CM10220E_config           integratorcp_CM1026EJ_S_config  \
+integratorcp_CM1136JF_S_config :       unconfig
+       @echo -n "/* Integrator configuration implied " >  tmp.fil;     \
+        echo    " by Makefile target   */"             >> tmp.fil;     \
+        echo                                           >> tmp.fil 
+       @echo -n "#define CONFIG_INTEGRATOR     1"      >> tmp.fil;     \
+       echo     "      /* Integrator board     */"     >> tmp.fil;     \
+       echo  -n "#define CONFIG_ARCH_CINTEGRATOR"      >> tmp.fil;     \
+       echo     "      1       /* Integrator/CP */"    >> tmp.fil;     \
+       cm=$(call xtract_int_cm,cp,$@);                                 \
+       echo  -n "#define CONFIG_$$cm           "       >> tmp.fil;     \
+       echo     "      /* core module */"              >> tmp.fil;     \
+       echo "/* $$cm core module       */"             >> tmp.fil;     \
+       case $$cm in                                                    \
+       CM920T)         echo -n "#define CONFIG_ARM920" >> tmp.fil;     \
+                       echo -n "T      1       /* CPU" >> tmp.fil;     \
+                       echo -n " core is ARM920T"      >> tmp.fil;     \
+                       echo    "       */"             >> tmp.fil;     \
+                       cpu=arm920t;;                                   \
+       CM946E_S)       echo -n "#define CONFIG_ARM946" >> tmp.fil;     \
+                       echo -n "E_S    1       /* CPU" >> tmp.fil;     \
+                       echo -n " core is ARM946E-S"    >> tmp.fil;     \
+                       echo    "       */"             >> tmp.fil;     \
+                       cpu=arm946es;;                                  \
+       CM926EJ_S)      echo -n "#define CONFIG_ARM926" >> tmp.fil;     \
+                       echo -n "EJ_S   1       /* CPU" >> tmp.fil;     \
+                       echo -n " core is ARM926EJ-S"   >> tmp.fil;     \
+                       echo    "       */"             >> tmp.fil;     \
+                       cpu=arm926ejs;;                                 \
+       *)              echo -n "#define CONFIG_ARM_IN" >> tmp.fil;     \
+                       echo -n "TCM    1       /* Int" >> tmp.fil;     \
+                       echo -n "egrator core module w" >> tmp.fil;     \
+                       echo -n "ith unported core"     >> tmp.fil;     \
+                       echo    "       */"             >> tmp.fil;     \
+                       cpu=arm_intcm;;                                 \
+       esac;                                                           \
+       mv tmp.fil ./include/config.h;                                  \
+       ubootlds=board/$(call xtract_int_board,cp,$@)/u-boot.lds;       \
+       sed -e 's/cpu\/.*\/st/cpu\/'$$cpu'\/st/'                        \
+                                          $$ubootlds > $$ubootlds.tmp; \
+       mv -f $$ubootlds.tmp $$ubootlds;                                \
+       ./mkconfig -a $(call xtract_int_board,cp,$@) arm $$cpu          \
+                     $(call xtract_int_board,cp,$@);
 
 lpd7a400_config \
 lpd7a404_config:       unconfig
@@ -1379,6 +1651,25 @@ VCMA9_config     :       unconfig
 versatile_config :     unconfig
        @./mkconfig $(@:_config=) arm arm926ejs versatile
 
+voiceblue_smallflash_config    \
+voiceblue_config:      unconfig
+       @if [ "$(findstring _smallflash_,$@)" ] ; then \
+               echo "... boot from lower flash bank" ; \
+               echo "#define VOICEBLUE_SMALL_FLASH" >>include/config.h ; \
+               echo "VOICEBLUE_SMALL_FLASH=y" >board/voiceblue/config.tmp ; \
+       else \
+               echo "... boot from upper flash bank" ; \
+               >include/config.h ; \
+               echo "VOICEBLUE_SMALL_FLASH=n" >board/voiceblue/config.tmp ; \
+       fi
+       @./mkconfig -a voiceblue arm arm925t voiceblue
+
+cm4008_config  :       unconfig
+       @./mkconfig $(@:_config=) arm arm920t cm4008 NULL ks8695
+
+cm41xx_config  :       unconfig
+       @./mkconfig $(@:_config=) arm arm920t cm41xx NULL ks8695
+
 #########################################################################
 ## S3C44B0 Systems
 #########################################################################
@@ -1402,20 +1693,13 @@ modnet50_config :       unconfig
 evb4510_config :       unconfig
        @./mkconfig $(@:_config=) arm arm720t evb4510
 
-#########################################################################
-## AT91RM9200 Systems
-#########################################################################
-
-at91rm9200dk_config    :       unconfig
-       @./mkconfig $(@:_config=) arm at91rm9200 at91rm9200dk
-
-cmc_pu2_config :       unconfig
-       @./mkconfig $(@:_config=) arm at91rm9200 cmc_pu2
-
 #########################################################################
 ## XScale Systems
 #########################################################################
 
+adsvix_config  :       unconfig
+       @./mkconfig $(@:_config=) arm pxa adsvix
+
 cerf250_config :       unconfig
        @./mkconfig $(@:_config=) arm pxa cerf250
 
@@ -1527,7 +1811,12 @@ dbau1550_config          :       unconfig
 dbau1550_el_config     :       unconfig
        @ >include/config.h
        @echo "#define CONFIG_DBAU1550 1" >>include/config.h
-       @./mkconfig -a dbau1x00 mips mips dbau1x00 "" little
+       @./mkconfig -a dbau1x00 mips mips dbau1x00
+
+pb1000_config          :       unconfig
+       @ >include/config.h
+       @echo "#define CONFIG_PB1000 1" >>include/config.h
+       @./mkconfig -a pb1x00 mips mips pb1x00
 
 #########################################################################
 ## MIPS64 5Kc
@@ -1633,14 +1922,15 @@ clean:
                | xargs rm -f
        rm -f examples/hello_world examples/timer \
              examples/eepro100_eeprom examples/sched \
-             examples/mem_to_mem_idma2intr examples/82559_eeprom
+             examples/mem_to_mem_idma2intr examples/82559_eeprom \
+             examples/test_burst
        rm -f tools/img2srec tools/mkimage tools/envcrc tools/gen_eth_addr
        rm -f tools/mpc86x_clk tools/ncb
        rm -f tools/easylogo/easylogo tools/bmp_logo
        rm -f tools/gdb/astest tools/gdb/gdbcont tools/gdb/gdbsend
        rm -f tools/env/fw_printenv tools/env/fw_setenv
        rm -f board/cray/L1/bootscript.c board/cray/L1/bootscript.image
-       rm -f board/trab/trab_fkt
+       rm -f board/trab/trab_fkt board/voiceblue/eeprom
 
 clobber:       clean
        find . -type f \( -name .depend \