Fixed compilation for ARM when using a (standard) hard-FP toolchain

[karo-tx-uboot.git] / Makefile

diff --git a/Makefile b/Makefile
index e6b42ab14f933c3b4e8f3366d92ab7677adf69e3..86cb6a805271df892c80fae5b076d70a438f3b49 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -234,6 +234,9 @@ PATI_config:                unconfig
 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
 
@@ -274,11 +277,14 @@ icecube_5100_config:                      unconfig
                }
        @./mkconfig -a IceCube ppc mpc5xxx icecube
 
+inka4x0_config:                unconfig
+       @./mkconfig inka4x0 ppc mpc5xxx inka4x0
+
 o2dnt_config:
        @./mkconfig -a o2dnt ppc mpc5xxx o2dnt
 
-inka4x0_config:                unconfig
-       @./mkconfig inka4x0 ppc mpc5xxx inka4x0
+pf5200_config:  unconfig
+       @./mkconfig -a pf5200  ppc mpc5xxx pf5200 esd
 
 PM520_config \
 PM520_DDR_config \
@@ -329,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      \
@@ -748,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       \
@@ -920,6 +929,9 @@ xtract_82xx = $(subst _BIGFLASH,,$(subst _ROMBOOT,,$(subst _L2,,$(subst _266MHz,
 A3000_config: unconfig
        @./mkconfig $(@:_config=) ppc mpc824x a3000
 
+barco_config: unconfig
+       @./mkconfig $(@:_config=) ppc mpc824x barco
+
 BMW_config: unconfig
        @./mkconfig $(@:_config=) ppc mpc824x bmw
 
@@ -1378,11 +1390,41 @@ at91rm9200dk_config     :       unconfig
 cmc_pu2_config :       unconfig
        @./mkconfig $(@:_config=) arm arm920t cmc_pu2 NULL at91rm9200
 
-integratorap_config :  unconfig
-       @./mkconfig $(@:_config=) arm arm926ejs integratorap
-
-integratorcp_config :  unconfig
-       @./mkconfig $(@:_config=) arm arm926ejs integratorcp
+csb637_config  :       unconfig
+       @./mkconfig $(@:_config=) arm arm920t csb637 NULL at91rm9200
+
+mp2usb_config  :       unconfig
+       @./mkconfig $(@:_config=) arm arm920t mp2usb NULL at91rm9200
+
+
+########################################################################
+## ARM Integrator boards - see doc/README-integrator for more info.
+integratorap_config    \
+ap_config              \
+ap966_config           \
+ap922_config           \
+ap922_XA10_config      \
+ap7_config             \
+ap720t_config                  \
+ap920t_config          \
+ap926ejs_config                \
+ap946es_config: unconfig
+       @board/integratorap/split_by_variant.sh $@
+
+integratorcp_config    \
+cp_config              \
+cp920t_config          \
+cp926ejs_config                \
+cp946es_config         \
+cp1136_config          \
+cp966_config           \
+cp922_config           \
+cp922_XA10_config      \
+cp1026_config: unconfig
+       @board/integratorcp/split_by_variant.sh $@
+
+kb9202_config  :       unconfig
+       @./mkconfig $(@:_config=) arm arm920t kb9202 NULL at91rm9200
 
 lpd7a400_config \
 lpd7a404_config:       unconfig
@@ -1472,8 +1514,13 @@ trab_old_config: unconfig
 VCMA9_config   :       unconfig
        @./mkconfig $(@:_config=) arm arm920t vcma9 mpl s3c24x0
 
-versatile_config :     unconfig
-       @./mkconfig $(@:_config=) arm arm926ejs versatile
+#========================================================================
+# ARM supplied Versatile development boards
+#========================================================================
+versatile_config       \
+versatileab_config     \
+versatilepb_config :   unconfig
+       @board/versatile/split_by_variant.sh $@
 
 voiceblue_smallflash_config    \
 voiceblue_config:      unconfig
@@ -1505,6 +1552,9 @@ B2_config :       unconfig
 ## ARM720T Systems
 #########################################################################
 
+armadillo_config:      unconfig
+       @./mkconfig $(@:_config=) arm arm720t armadillo
+
 ep7312_config  :       unconfig
        @./mkconfig $(@:_config=) arm arm720t ep7312
 
@@ -1637,6 +1687,11 @@ dbau1550_el_config       :       unconfig
        @echo "#define CONFIG_DBAU1550 1" >>include/config.h
        @./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
 #########################################################################
@@ -1750,6 +1805,7 @@ clean:
        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 board/voiceblue/eeprom
+       rm -f board/integratorap/u-boot.lds board/integratorcp/u-boot.lds
 
 clobber:       clean
        find . -type f \( -name .depend \