lwmon5 POST: remove unreachable code

[u-boot] / Makefile

diff --git a/Makefile b/Makefile
index 5198e12275f05de8550d3ffa6d8f349d98178d5d..4fde69967aa9de194399dcbf70216b2f13559cb0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 VERSION = 1
 PATCHLEVEL = 3
 SUBLEVEL = 2
-EXTRAVERSION = -rc3
+EXTRAVERSION =
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 VERSION_FILE = $(obj)include/version_autogenerated.h
 
@@ -496,7 +496,6 @@ icecube_5200_DDR_LOWBOOT08_config   \
 icecube_5100_config:                   unconfig
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/icecube
-       @ >$(obj)include/config.h
        @[ -z "$(findstring LOWBOOT_,$@)" ] || \
                { if [ "$(findstring DDR,$@)" ] ; \
                        then echo "TEXT_BASE = 0xFF800000" >$(obj)board/icecube/config.tmp ; \
@@ -537,7 +536,6 @@ lite5200b_PM_config \
 lite5200b_LOWBOOT_config:      unconfig
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/icecube
-       @ >$(obj)include/config.h
        @ echo "#define CONFIG_MPC5200_DDR"     >>$(obj)include/config.h
        @ $(XECHO) "... DDR memory revision"
        @ echo "#define CONFIG_MPC5200"         >>$(obj)include/config.h
@@ -567,7 +565,6 @@ prs200_highboot_config      \
 prs200_highboot_DDR_config:    unconfig
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/mcc200
-       @ >$(obj)include/config.h
        @[ -n "$(findstring highboot,$@)" ] || \
                { $(XECHO) "... with lowboot configuration" ; \
                }
@@ -619,7 +616,6 @@ PM520_DDR_config \
 PM520_ROMBOOT_config \
 PM520_ROMBOOT_DDR_config:      unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring DDR,$@)" ] || \
                { echo "#define CONFIG_MPC5200_DDR"     >>$(obj)include/config.h ; \
                  $(XECHO) "... DDR memory revision" ; \
@@ -662,7 +658,6 @@ Total5200_Rev2_config               \
 Total5200_Rev2_lowboot_config: unconfig
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/total5200
-       @ >$(obj)include/config.h
        @[ -z "$(findstring 5100,$@)" ] || \
                { echo "#define CONFIG_MGT5100"         >>$(obj)include/config.h ; \
                  $(XECHO) "... with MGT5100 processor" ; \
@@ -697,7 +692,6 @@ TQM5200_config      \
 TQM5200_STK100_config: unconfig
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/tqm5200
-       @ >$(obj)include/config.h
        @[ -z "$(findstring cam5200,$@)" ] || \
                { echo "#define CONFIG_CAM5200" >>$(obj)include/config.h ; \
                  echo "#define CONFIG_TQM5200S"        >>$(obj)include/config.h ; \
@@ -743,7 +737,7 @@ motionpro_config:   unconfig
 ads5121_config \
 ads5121_PCI_config \
        :                unconfig
-       @echo "" >$(obj)include/config.h
+       @mkdir -p $(obj)include
        @if [ "$(findstring _PCI_,$@)" ] ; then \
                echo "#define CONFIG_PCI"  >>$(obj)include/config.h ; \
                $(XECHO) "... with PCI enabled" ; \
@@ -807,7 +801,6 @@ xtract_GEN860T = $(subst _SC,,$(subst _config,,$1))
 GEN860T_SC_config      \
 GEN860T_config: unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring _SC,$@)" ] || \
                { echo "#define CONFIG_SC" >>$(obj)include/config.h ; \
                  $(XECHO) "With reduced H/W feature set (SC)..." ; \
@@ -834,7 +827,6 @@ xtract_ICU862 = $(subst _100MHz,,$(subst _config,,$1))
 ICU862_100MHz_config   \
 ICU862_config: unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring _100MHz,$@)" ] || \
                { echo "#define CONFIG_100MHz"  >>$(obj)include/config.h ; \
                  $(XECHO) "... with 100MHz system clock" ; \
@@ -848,7 +840,6 @@ IVML24_256_config \
 IVML24_128_config \
 IVML24_config: unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring IVML24_config,$@)" ] || \
                 { echo "#define CONFIG_IVML24_16M"     >>$(obj)include/config.h ; \
                 }
@@ -864,7 +855,6 @@ IVMS8_256_config \
 IVMS8_128_config \
 IVMS8_config:  unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring IVMS8_config,$@)" ] || \
                 { echo "#define CONFIG_IVMS8_16M"      >>$(obj)include/config.h ; \
                 }
@@ -906,7 +896,6 @@ xtract_NETVIA = $(subst _V2,,$(subst _config,,$1))
 NETVIA_V2_config \
 NETVIA_config:         unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring NETVIA_config,$@)" ] || \
                 { echo "#define CONFIG_NETVIA_VERSION 1" >>$(obj)include/config.h ; \
                  $(XECHO) "... Version 1" ; \
@@ -922,7 +911,6 @@ xtract_NETPHONE = $(subst _V2,,$(subst _config,,$1))
 NETPHONE_V2_config \
 NETPHONE_config:       unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring NETPHONE_config,$@)" ] || \
                 { echo "#define CONFIG_NETPHONE_VERSION 1" >>$(obj)include/config.h ; \
                 }
@@ -942,7 +930,6 @@ NETTA_ISDN_config \
 NETTA_6412_config \
 NETTA_config:          unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring ISDN_,$@)" ] || \
                 { echo "#define CONFIG_NETTA_ISDN 1" >>$(obj)include/config.h ; \
                 }
@@ -968,7 +955,6 @@ xtract_NETTA2 = $(subst _V2,,$(subst _config,,$1))
 NETTA2_V2_config \
 NETTA2_config:         unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring NETTA2_config,$@)" ] || \
                 { echo "#define CONFIG_NETTA2_VERSION 1" >>$(obj)include/config.h ; \
                 }
@@ -981,7 +967,6 @@ NC650_Rev1_config \
 NC650_Rev2_config \
 CP850_config:  unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring CP850,$@)" ] || \
                 { echo "#define CONFIG_CP850 1" >>$(obj)include/config.h ; \
                   echo "#define CONFIG_IDS852_REV2 1" >>$(obj)include/config.h ; \
@@ -1033,7 +1018,6 @@ RPXlite_DW_NVRAM_LCD_config       \
 RPXlite_DW_NVRAM_64_LCD_config \
 RPXlite_DW_config:     unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring _64,$@)" ] || \
                { echo "#define RPXlite_64MHz"          >>$(obj)include/config.h ; \
                  $(XECHO) "... with 64MHz system clock ..."; \
@@ -1107,7 +1091,6 @@ TQM885D_config            \
 TK885D_config          \
 virtlab2_config:       unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring _LCD,$@)" ] || \
                { echo "#define CONFIG_LCD"             >>$(obj)include/config.h ; \
                  echo "#define CONFIG_NEC_NL6448BC20"  >>$(obj)include/config.h ; \
@@ -1187,6 +1170,17 @@ bubinga_config:  unconfig
 CANBT_config:  unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx canbt esd
 
+canyonlands_config:    unconfig
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx canyonlands amcc
+
+canyonlands_nand_config:       unconfig
+       @mkdir -p $(obj)include $(obj)board/amcc/canyonlands
+       @mkdir -p $(obj)nand_spl/board/amcc/canyonlands
+       @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
+       @$(MKCONFIG) -n $@ -a canyonlands ppc ppc4xx canyonlands amcc
+       @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/canyonlands/config.tmp
+       @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
+
 CATcenter_config       \
 CATcenter_25_config    \
 CATcenter_33_config:   unconfig
@@ -1298,6 +1292,10 @@ lwmon5_config:   unconfig
 makalu_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx makalu amcc
 
+mcu25_config:  unconfig
+       @mkdir -p $(obj)board/netstal/common
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx mcu25 netstal
+
 METROBOX_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx metrobox sandburst
 
@@ -1352,7 +1350,6 @@ PPChameleonEVB_BA_33_config       \
 PPChameleonEVB_ME_33_config    \
 PPChameleonEVB_HI_33_config:   unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring EVB_BA,$@)" ] || \
                { echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 0" >>$(obj)include/config.h ; \
                  $(XECHO) "... BASIC model" ; \
@@ -1674,8 +1671,6 @@ PM828_ROMBOOT_PCI_config: unconfig
        @if [ "$(findstring _PCI_,$@)" ] ; then \
                echo "#define CONFIG_PCI"  >>$(obj)include/config.h ; \
                $(XECHO) "... with PCI enabled" ; \
-       else \
-               >$(obj)include/config.h ; \
        fi
        @if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
                $(XECHO) "... booting from 8-bit flash" ; \
@@ -1734,7 +1729,6 @@ TQM8265_AA_config:  unconfig
        TQM8260_AI_config) CTYPE=MPC8260; CFREQ=300; CACHE=no;  BMODE=60x;;  \
        TQM8265_AA_config) CTYPE=MPC8265; CFREQ=300; CACHE=no;  BMODE=60x;;  \
        esac; \
-       >$(obj)include/config.h ; \
        if [ "$${CTYPE}" != "MPC8260" ] ; then \
                echo "#define CONFIG_$${CTYPE}" >>$(obj)include/config.h ; \
        fi; \
@@ -1757,7 +1751,7 @@ TQM8265_AA_config:  unconfig
        @$(MKCONFIG) -a TQM8260 ppc mpc8260 tqm8260
 
 TQM8272_config: unconfig
-       @$(MKCONFIG) -a TQM8272 ppc mpc8260 tqm8272
+       @$(MKCONFIG) TQM8272 ppc mpc8260 tqm8272
 
 VoVPN-GW_66MHz_config  \
 VoVPN-GW_100MHz_config:                unconfig
@@ -1783,7 +1777,6 @@ M5235EVB_Flash32_config:  unconfig
        M5235EVB_Flash16_config)        FLASH=16;; \
        M5235EVB_Flash32_config)        FLASH=32;; \
        esac; \
-       >$(obj)include/config.h ; \
        if [ "$${FLASH}" != "16" ] ; then \
                echo "#define NORFLASH_PS32BIT  1" >> $(obj)include/config.h ; \
                echo "TEXT_BASE = 0xFFC00000" > $(obj)board/freescale/m5235evb/config.tmp ; \
@@ -1806,14 +1799,12 @@ cobra5272_config :              unconfig
 EB+MCF-EV123_config :          unconfig
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/BuS/EB+MCF-EV123
-       @ >$(obj)include/config.h
        @echo "TEXT_BASE = 0xFFE00000"|tee $(obj)board/BuS/EB+MCF-EV123/textbase.mk
        @$(MKCONFIG) EB+MCF-EV123 m68k mcf52x2 EB+MCF-EV123 BuS
 
 EB+MCF-EV123_internal_config : unconfig
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/BuS/EB+MCF-EV123
-       @ >$(obj)include/config.h
        @echo "TEXT_BASE = 0xF0000000"|tee $(obj)board/BuS/EB+MCF-EV123/textbase.mk
        @$(MKCONFIG) EB+MCF-EV123 m68k mcf52x2 EB+MCF-EV123 BuS
 
@@ -1841,7 +1832,6 @@ M5329BFEE_config :        unconfig
        M5329AFEE_config)       NAND=0;; \
        M5329BFEE_config)       NAND=16;; \
        esac; \
-       >$(obj)include/config.h ; \
        if [ "$${NAND}" != "0" ] ; then \
                echo "#define NANDFLASH_SIZE    $${NAND}" > $(obj)include/config.h ; \
        fi
@@ -1851,7 +1841,6 @@ M5373EVB_config : unconfig
        @case "$@" in \
        M5373EVB_config)        NAND=16;; \
        esac; \
-       >include/config.h ; \
        if [ "$${NAND}" != "0" ] ; then \
                echo "#define NANDFLASH_SIZE    $${NAND}" > $(obj)include/config.h ; \
        fi
@@ -1873,7 +1862,6 @@ M54455EVB_i66_config :    unconfig
        M54455EVB_i33_config)           FLASH=INTEL; FREQ=33333333;; \
        M54455EVB_i66_config)           FLASH=INTEL; FREQ=66666666;; \
        esac; \
-       >$(obj)include/config.h ; \
        if [ "$${FLASH}" = "INTEL" ] ; then \
                echo "#undef CFG_ATMEL_BOOT" >> $(obj)include/config.h ; \
                echo "TEXT_BASE = 0x00000000" > $(obj)board/freescale/m54455evb/config.tmp ; \
@@ -1905,7 +1893,6 @@ M5475GFE_config : unconfig
        M5475FFE_config)        BOOT=2;CODE=32;VID=1;USB=1;RAM=64;RAM1=64;; \
        M5475GFE_config)        BOOT=4;CODE=0;VID=0;USB=0;RAM=64;RAM1=0;; \
        esac; \
-       >include/config.h ; \
        echo "#define CFG_BUSCLK        133333333" > $(obj)include/config.h ; \
        echo "#define CFG_BOOTSZ        $${BOOT}" >> $(obj)include/config.h ; \
        echo "#define CFG_DRAMSZ        $${RAM}" >> $(obj)include/config.h ; \
@@ -1941,7 +1928,6 @@ M5485HFE_config : unconfig
        M5485GFE_config)        BOOT=4;CODE=0;VID=0;USB=0;RAM=64;RAM1=0;; \
        M5485HFE_config)        BOOT=2;CODE=16;VID=1;USB=0;RAM=64;RAM1=0;; \
        esac; \
-       >include/config.h ; \
        echo "#define CFG_BUSCLK        100000000" > $(obj)include/config.h ; \
        echo "#define CFG_BOOTSZ        $${BOOT}" >> $(obj)include/config.h ; \
        echo "#define CFG_DRAMSZ        $${RAM}" >> $(obj)include/config.h ; \
@@ -1966,8 +1952,7 @@ M5485HFE_config : unconfig
 MPC8313ERDB_33_config \
 MPC8313ERDB_66_config: unconfig
        @mkdir -p $(obj)include
-       @echo "" >$(obj)include/config.h ; \
-       if [ "$(findstring _33_,$@)" ] ; then \
+       @if [ "$(findstring _33_,$@)" ] ; then \
                $(XECHO) -n "...33M ..." ; \
                echo "#define CFG_33MHZ" >>$(obj)include/config.h ; \
        fi ; \
@@ -1989,8 +1974,7 @@ MPC832XEMDS_HOST_66_config \
 MPC832XEMDS_SLAVE_config \
 MPC832XEMDS_ATM_config:        unconfig
        @mkdir -p $(obj)include
-       @echo "" >$(obj)include/config.h ; \
-       if [ "$(findstring _HOST_,$@)" ] ; then \
+       @if [ "$(findstring _HOST_,$@)" ] ; then \
                $(XECHO) -n "... PCI HOST " ; \
                echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
        fi ; \
@@ -2039,8 +2023,7 @@ MPC8360EMDS_HOST_66_config \
 MPC8360EMDS_SLAVE_config \
 MPC8360EMDS_ATM_config: unconfig
        @mkdir -p $(obj)include
-       @echo "" >$(obj)include/config.h ; \
-       if [ "$(findstring _HOST_,$@)" ] ; then \
+       @if [ "$(findstring _HOST_,$@)" ] ; then \
                $(XECHO) -n "... PCI HOST " ; \
                echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
        fi ; \
@@ -2070,8 +2053,7 @@ MPC8360ERDK_33_config \
 MPC8360ERDK_66_config \
 MPC8360ERDK_config:    unconfig
        @mkdir -p $(obj)include
-       @echo "" >$(obj)include/config.h ; \
-       if [ "$(findstring _33_,$@)" ] ; then \
+       @if [ "$(findstring _33_,$@)" ] ; then \
                $(XECHO) -n "... CLKIN 33MHz " ; \
                echo "#define CONFIG_CLKIN_33MHZ" >>$(obj)include/config.h ;\
        fi ;
@@ -2080,8 +2062,7 @@ MPC8360ERDK_config:       unconfig
 MPC837XEMDS_config \
 MPC837XEMDS_HOST_config:       unconfig
        @mkdir -p $(obj)include
-       @echo "" >$(obj)include/config.h ; \
-       if [ "$(findstring _HOST_,$@)" ] ; then \
+       @if [ "$(findstring _HOST_,$@)" ] ; then \
                $(XECHO) -n "... PCI HOST " ; \
                echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
        fi ;
@@ -2113,8 +2094,7 @@ MPC8540EVAL_66_config \
 MPC8540EVAL_33_slave_config \
 MPC8540EVAL_66_slave_config:     unconfig
        @mkdir -p $(obj)include
-       @echo "" >$(obj)include/config.h ; \
-       if [ "$(findstring _33_,$@)" ] ; then \
+       @if [ "$(findstring _33_,$@)" ] ; then \
                $(XECHO) "... 33 MHz PCI" ; \
        else \
                echo "#define CONFIG_SYSCLK_66M" >>$(obj)include/config.h ; \
@@ -2134,8 +2114,7 @@ MPC8560ADS_config:        unconfig
 MPC8541CDS_legacy_config \
 MPC8541CDS_config:     unconfig
        @mkdir -p $(obj)include
-       @echo "" >$(obj)include/config.h ; \
-       if [ "$(findstring _legacy_,$@)" ] ; then \
+       @if [ "$(findstring _legacy_,$@)" ] ; then \
                echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
                $(XECHO) "... legacy" ; \
        fi
@@ -2147,8 +2126,7 @@ MPC8544DS_config: unconfig
 MPC8548CDS_legacy_config \
 MPC8548CDS_config:     unconfig
        @mkdir -p $(obj)include
-       @echo "" >$(obj)include/config.h ; \
-       if [ "$(findstring _legacy_,$@)" ] ; then \
+       @if [ "$(findstring _legacy_,$@)" ] ; then \
                echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
                $(XECHO) "... legacy" ; \
        fi
@@ -2157,8 +2135,7 @@ MPC8548CDS_config:        unconfig
 MPC8555CDS_legacy_config \
 MPC8555CDS_config:     unconfig
        @mkdir -p $(obj)include
-       @echo "" >$(obj)include/config.h ; \
-       if [ "$(findstring _legacy_,$@)" ] ; then \
+       @if [ "$(findstring _legacy_,$@)" ] ; then \
                echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
                $(XECHO) "... legacy" ; \
        fi
@@ -2181,7 +2158,6 @@ sbc8540_66_config:        unconfig
                echo "#define CONFIG_PCI_66"    >>$(obj)include/config.h ; \
                $(XECHO) "... 66 MHz PCI" ; \
        else \
-               >$(obj)include/config.h ; \
                $(XECHO) "... 33 MHz PCI" ; \
        fi
        @$(MKCONFIG) -a SBC8540 ppc mpc85xx sbc8560
@@ -2197,7 +2173,6 @@ sbc8560_66_config:        unconfig
                echo "#define CONFIG_PCI_66"    >>$(obj)include/config.h ; \
                $(XECHO) "... 66 MHz PCI" ; \
        else \
-               >$(obj)include/config.h ; \
                $(XECHO) "... 33 MHz PCI" ; \
        fi
        @$(MKCONFIG) -a sbc8560 ppc mpc85xx sbc8560
@@ -2211,8 +2186,6 @@ stxssa_4M_config: unconfig
        @if [ "$(findstring _4M_,$@)" ] ; then \
                echo "#define CONFIG_STXSSA_4M" >>$(obj)include/config.h ; \
                $(XECHO) "... with 4 MiB flash memory" ; \
-       else \
-               >$(obj)include/config.h ; \
        fi
        @$(MKCONFIG) -a stxssa ppc mpc85xx stxssa
 
@@ -2222,7 +2195,6 @@ TQM8555_config            \
 TQM8560_config:                unconfig
        @mkdir -p $(obj)include
        @CTYPE=$(subst TQM,,$(@:_config=)); \
-       >$(obj)include/config.h ; \
        $(XECHO) "... TQM"$${CTYPE}; \
        echo "#define CONFIG_MPC$${CTYPE}">>$(obj)include/config.h; \
        echo "#define CONFIG_TQM$${CTYPE}">>$(obj)include/config.h; \
@@ -2459,7 +2431,6 @@ trab_bigflash_config \
 trab_old_config:       unconfig
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/trab
-       @ >$(obj)include/config.h
        @[ -z "$(findstring _bigram,$@)" ] || \
                { echo "#define CONFIG_FLASH_8MB"  >>$(obj)include/config.h ; \
                  echo "#define CONFIG_RAM_32MB"   >>$(obj)include/config.h ; \
@@ -2501,8 +2472,7 @@ cm41xx_config     :       unconfig
 
 gth2_config            :       unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
-       @echo "#define CONFIG_GTH2 1" >>$(obj)include/config.h
+       @echo "#define CONFIG_GTH2 1" >$(obj)include/config.h
        @$(MKCONFIG) -a gth2 mips mips gth2
 
 #########################################################################
@@ -2592,8 +2562,6 @@ scpu_config:      unconfig
        @if [ "$(findstring scpu_,$@)" ] ; then \
                echo "#define CONFIG_SCPU"      >>$(obj)include/config.h ; \
                $(XECHO) "... on SCPU board variant" ; \
-       else \
-               >$(obj)include/config.h ; \
        fi
        @$(MKCONFIG) -a pdnb3 arm ixp pdnb3 prodrive
 
@@ -2625,6 +2593,7 @@ omap2420h4_config : unconfig
        @$(MKCONFIG) $(@:_config=) arm arm1136 omap2420h4
 
 apollon_config         : unconfig
+       @mkdir -p $(obj)include
        @echo "#define CONFIG_ONENAND_U_BOOT" > $(obj)include/config.h
        @$(MKCONFIG) $(@:_config=) arm arm1136 apollon
        @echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk
@@ -2658,7 +2627,6 @@ incaip_133MHz_config      \
 incaip_150MHz_config   \
 incaip_config: unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring _100MHz,$@)" ] || \
                { echo "#define CPU_CLOCK_RATE 100000000" >>$(obj)include/config.h ; \
                  $(XECHO) "... with 100MHz system clock" ; \
@@ -2681,44 +2649,37 @@ tb0229_config: unconfig
 #########################################################################
 dbau1000_config                :       unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
-       @echo "#define CONFIG_DBAU1000 1" >>$(obj)include/config.h
+       @echo "#define CONFIG_DBAU1000 1" >$(obj)include/config.h
        @$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
 
 dbau1100_config                :       unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
-       @echo "#define CONFIG_DBAU1100 1" >>$(obj)include/config.h
+       @echo "#define CONFIG_DBAU1100 1" >$(obj)include/config.h
        @$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
 
 dbau1500_config                :       unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
-       @echo "#define CONFIG_DBAU1500 1" >>$(obj)include/config.h
+       @echo "#define CONFIG_DBAU1500 1" >$(obj)include/config.h
        @$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
 
 dbau1550_config                :       unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
-       @echo "#define CONFIG_DBAU1550 1" >>$(obj)include/config.h
+       @echo "#define CONFIG_DBAU1550 1" >$(obj)include/config.h
        @$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
 
 dbau1550_el_config     :       unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
-       @echo "#define CONFIG_DBAU1550 1" >>$(obj)include/config.h
+       @echo "#define CONFIG_DBAU1550 1" >$(obj)include/config.h
        @$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
 
 pb1000_config          :       unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
-       @echo "#define CONFIG_PB1000 1" >>$(obj)include/config.h
+       @echo "#define CONFIG_PB1000 1" >$(obj)include/config.h
        @$(MKCONFIG) -a pb1x00 mips mips pb1x00
 
 qemu_mips_config: unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
-       @echo "#define CONFIG_QEMU_MIPS 1" >>$(obj)include/config.h
+       @echo "#define CONFIG_QEMU_MIPS 1" >$(obj)include/config.h
        @$(MKCONFIG) -a qemu-mips mips mips qemu-mips
 
 #########################################################################
@@ -2739,7 +2700,6 @@ DK1C20_safe_32_config             \
 DK1C20_standard_32_config      \
 DK1C20_config: unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring _safe_32,$@)" ] || \
                { echo "#define CONFIG_NIOS_SAFE_32 1" >>$(obj)include/config.h ; \
                  $(XECHO) "... NIOS 'safe_32' configuration" ; \
@@ -2759,7 +2719,6 @@ DK1S10_standard_32_config \
 DK1S10_mtx_ldk_20_config       \
 DK1S10_config: unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring _safe_32,$@)" ] || \
                { echo "#define CONFIG_NIOS_SAFE_32 1" >>$(obj)include/config.h ; \
                  $(XECHO) "... NIOS 'safe_32' configuration" ; \
@@ -2782,7 +2741,6 @@ ADNPESC1_DNPEVA2_base_32_config   \
 ADNPESC1_base_32_config                \
 ADNPESC1_config: unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring _DNPEVA2,$@)" ] || \
                { echo "#define CONFIG_DNPEVA2 1" >>$(obj)include/config.h ; \
                  $(XECHO) "... DNP/EVA2 configuration" ; \
@@ -2824,20 +2782,17 @@ PCI5441_config : unconfig
 #########################################################################
 suzaku_config: unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
-       @echo "#define CONFIG_SUZAKU 1" >> $(obj)include/config.h
+       @echo "#define CONFIG_SUZAKU 1" > $(obj)include/config.h
        @$(MKCONFIG) -a $(@:_config=) microblaze microblaze suzaku AtmarkTechno
 
 ml401_config:  unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
-       @echo "#define CONFIG_ML401 1" >> $(obj)include/config.h
+       @echo "#define CONFIG_ML401 1" > $(obj)include/config.h
        @$(MKCONFIG) -a $(@:_config=) microblaze microblaze ml401 xilinx
 
 xupv2p_config: unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
-       @echo "#define CONFIG_XUPV2P 1" >> $(obj)include/config.h
+       @echo "#define CONFIG_XUPV2P 1" > $(obj)include/config.h
        @$(MKCONFIG) -a $(@:_config=) microblaze microblaze xupv2p xilinx
 
 #========================================================================
@@ -2881,21 +2836,18 @@ atngw100_config :       unconfig
 ## sh3 (Renesas SuperH)
 #########################################################################
 ms7720se_config: unconfig
-       @ >include/config.h
-       @echo "#define CONFIG_MS7720SE 1" >> include/config.h
+       @echo "#define CONFIG_MS7720SE 1" > include/config.h
        @$(MKCONFIG) -a $(@:_config=) sh sh3 ms7720se
 
 #########################################################################
 ## sh4 (Renesas SuperH)
 #########################################################################
 ms7750se_config: unconfig
-       @ >$(obj)include/config.h
-       @echo "#define CONFIG_MS7750SE 1" >> $(obj)include/config.h
+       @echo "#define CONFIG_MS7750SE 1" > $(obj)include/config.h
        @$(MKCONFIG) -a $(@:_config=) sh sh4 ms7750se
 
 ms7722se_config :      unconfig
-       @ >$(obj)include/config.h
-       @echo "#define CONFIG_MS7722SE 1" >> $(obj)include/config.h
+       @echo "#define CONFIG_MS7722SE 1" > $(obj)include/config.h
        @$(MKCONFIG) -a $(@:_config=) sh sh4 ms7722se
 
 #########################################################################