]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - Makefile
projects / karo-tx-uboot.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'master' of git://git.denx.de/u-boot-at91
[karo-tx-uboot.git] / Makefile
diff --git a/Makefile b/Makefile
index 116d9e7df75ecd31c47b3366f14576c7497a3dfc..e4a184fdc089c71588f01b2f98de82d4f0933a5b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 VERSION = 2008
 PATCHLEVEL = 10
 SUBLEVEL =
-EXTRAVERSION = -rc1
+EXTRAVERSION =
 ifneq "$(SUBLEVEL)" ""
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 else
@@ -203,6 +203,7 @@ endif
 OBJS := $(addprefix $(obj),$(OBJS))
 
 LIBS  = lib_generic/libgeneric.a
+LIBS += lib_generic/lzma/liblzma.a
 LIBS += $(shell if [ -f board/$(VENDOR)/common/Makefile ]; then echo \
        "board/$(VENDOR)/common/lib$(VENDOR).a"; fi)
 LIBS += cpu/$(CPU)/lib$(CPU).a
@@ -242,9 +243,11 @@ endif
 ifeq ($(CPU),mpc85xx)
 LIBS += drivers/qe/qe.a
 LIBS += cpu/mpc8xxx/ddr/libddr.a
+TAG_SUBDIRS += cpu/mpc8xxx
 endif
 ifeq ($(CPU),mpc86xx)
 LIBS += cpu/mpc8xxx/ddr/libddr.a
+TAG_SUBDIRS += cpu/mpc8xxx
 endif
 LIBS += drivers/rtc/librtc.a
 LIBS += drivers/serial/libserial.a
@@ -921,7 +924,7 @@ MBX860T_config:     unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc8xx mbx8xx
 
 mgsuvd_config:         unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx mgsuvd
+       @$(MKCONFIG) $(@:_config=) ppc mpc8xx mgsuvd keymile
 
 MHPC_config:           unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc8xx mhpc eltec
@@ -1063,7 +1066,7 @@ RPXlite_DW_config:        unconfig
                  $(XECHO) "... with LCD display ..."; \
                }
        @[ -z "$(findstring _NVRAM,$@)" ] || \
-               { echo "#define  CFG_ENV_IS_IN_NVRAM"   >>$(obj)include/config.h ; \
+               { echo "#define  CONFIG_ENV_IS_IN_NVRAM"        >>$(obj)include/config.h ; \
                  $(XECHO) "... with ENV in NVRAM ..."; \
                }
        @$(MKCONFIG) -a RPXlite_DW ppc mpc8xx RPXlite_dw
@@ -1205,7 +1208,8 @@ bubinga_config:   unconfig
 CANBT_config:  unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx canbt esd
 
-# Canyonlands & Glacier use different U-Boot images
+# Arches, Canyonlands & Glacier use different U-Boot images
+arches_config \
 canyonlands_config \
 glacier_config:        unconfig
        @mkdir -p $(obj)include
@@ -1289,6 +1293,24 @@ ERIC_config:     unconfig
 EXBITGEN_config:       unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx exbitgen
 
+fx12mm_flash_config: unconfig
+       @mkdir -p $(obj)include $(obj)board/xilinx/ppc405-generic
+       @mkdir -p $(obj)include $(obj)board/avnet/fx12mm
+       @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-rom.lds"\
+               > $(obj)board/avnet/fx12mm/config.tmp
+       @echo "TEXT_BASE := 0xFFCB0000" \
+               >> $(obj)board/avnet/fx12mm/config.tmp
+       @$(MKCONFIG) fx12mm ppc ppc4xx fx12mm avnet
+
+fx12mm_config: unconfig
+       @mkdir -p $(obj)include $(obj)board/xilinx/ppc405-generic
+       @mkdir -p $(obj)include $(obj)board/avnet/fx12mm
+       @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-ram.lds"\
+               > $(obj)board/avnet/fx12mm/config.tmp
+       @echo "TEXT_BASE := 0x03000000" \
+               >> $(obj)board/avnet/fx12mm/config.tmp
+       @$(MKCONFIG) fx12mm ppc ppc4xx fx12mm avnet
+
 G2000_config:  unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx g2000
 
@@ -1381,6 +1403,9 @@ ml507_config: unconfig
                >> $(obj)board/xilinx/ml507/config.tmp
        @$(MKCONFIG) ml507 ppc ppc4xx ml507 xilinx
 
+neo_config:    unconfig
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx neo gdsys
+
 ocotea_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx ocotea amcc
 
@@ -1511,6 +1536,22 @@ sycamore_config: unconfig
 WUH405_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx wuh405 esd
 
+xilinx-ppc405-generic_flash_config: unconfig
+       @mkdir -p $(obj)include $(obj)board/xilinx/ppc405-generic
+       @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-rom.lds"\
+               > $(obj)board/xilinx/ppc405-generic/config.tmp
+       @echo "TEXT_BASE := 0xFE360000" \
+               >> $(obj)board/xilinx/ppc405-generic/config.tmp
+       @$(MKCONFIG) xilinx-ppc405-generic ppc ppc4xx ppc405-generic xilinx
+
+xilinx-ppc405-generic_config: unconfig
+       @mkdir -p $(obj)include $(obj)board/xilinx/ppc405-generic
+       @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-ram.lds"\
+               > $(obj)board/xilinx/ppc405-generic/config.tmp
+       @echo "TEXT_BASE := 0x04000000" \
+               >> $(obj)board/xilinx/ppc405-generic/config.tmp
+       @$(MKCONFIG) xilinx-ppc405-generic ppc ppc4xx ppc405-generic xilinx
+
 xilinx-ppc440-generic_flash_config: unconfig
        @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
        @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds"\
@@ -1700,12 +1741,12 @@ ISPAN_config            \
 ISPAN_REVB_config:     unconfig
        @mkdir -p $(obj)include
        @if [ "$(findstring _REVB_,$@)" ] ; then \
-               echo "#define CFG_REV_B" > $(obj)include/config.h ; \
+               echo "#define CONFIG_SYS_REV_B" > $(obj)include/config.h ; \
        fi
        @$(MKCONFIG) -a ISPAN ppc mpc8260 ispan
 
 mgcoge_config  :       unconfig
-       @$(MKCONFIG) mgcoge ppc mpc8260 mgcoge
+       @$(MKCONFIG) mgcoge ppc mpc8260 mgcoge keymile
 
 MPC8260ADS_config      \
 MPC8260ADS_lowboot_config      \
@@ -1727,8 +1768,8 @@ PQ2FADS-ZU_66MHz_lowboot_config   \
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/freescale/mpc8260ads
        $(if $(findstring PQ2FADS,$@), \
-       @echo "#define CONFIG_ADSTYPE CFG_PQ2FADS" > $(obj)include/config.h, \
-       @echo "#define CONFIG_ADSTYPE CFG_"$(subst MPC,,$(word 1,$(subst _, ,$@))) > $(obj)include/config.h)
+       @echo "#define CONFIG_ADSTYPE CONFIG_SYS_PQ2FADS" > $(obj)include/config.h, \
+       @echo "#define CONFIG_ADSTYPE CONFIG_SYS_"$(subst MPC,,$(word 1,$(subst _, ,$@))) > $(obj)include/config.h)
        $(if $(findstring MHz,$@), \
        @echo "#define CONFIG_8260_CLKIN" $(subst MHz,,$(word 2,$(subst _, ,$@)))"000000" >> $(obj)include/config.h, \
        $(if $(findstring VR,$@), \
@@ -1891,7 +1932,27 @@ ZPC1900_config: unconfig
 ## Coldfire
 #########################################################################
 
-M52277EVB_config:      unconfig
+M52277EVB_config \
+M52277EVB_spansion_config \
+M52277EVB_stmicro_config :     unconfig
+       @case "$@" in \
+       M52277EVB_config)               FLASH=SPANSION;; \
+       M52277EVB_spansion_config)      FLASH=SPANSION;; \
+       M52277EVB_stmicro_config)       FLASH=STMICRO;; \
+       esac; \
+       if [ "$${FLASH}" = "SPANSION" ] ; then \
+               echo "#define CONFIG_SYS_SPANSION_BOOT" >> $(obj)include/config.h ; \
+               echo "TEXT_BASE = 0x00000000" > $(obj)board/freescale/m52277evb/config.tmp ; \
+               cp $(obj)board/freescale/m52277evb/u-boot.spa $(obj)board/freescale/m52277evb/u-boot.lds ; \
+               $(XECHO) "... with SPANSION boot..." ; \
+       fi; \
+       if [ "$${FLASH}" = "STMICRO" ] ; then \
+               echo "#define CONFIG_CF_SBF"    >> $(obj)include/config.h ; \
+               echo "#define CONFIG_SYS_STMICRO_BOOT"  >> $(obj)include/config.h ; \
+               echo "TEXT_BASE = 0x43E00000" > $(obj)board/freescale/m52277evb/config.tmp ; \
+               cp $(obj)board/freescale/m52277evb/u-boot.stm $(obj)board/freescale/m52277evb/u-boot.lds ; \
+               $(XECHO) "... with ST Micro boot..." ; \
+       fi
        @$(MKCONFIG) -a M52277EVB m68k mcf5227x m52277evb freescale
 
 M5235EVB_config \
@@ -1951,6 +2012,9 @@ M5275EVB_config :         unconfig
 M5282EVB_config :              unconfig
        @$(MKCONFIG) $(@:_config=) m68k mcf52x2 m5282evb freescale
 
+M53017EVB_config :             unconfig
+       @$(MKCONFIG) $(@:_config=) m68k mcf532x m53017evb freescale
+
 M5329AFEE_config \
 M5329BFEE_config :     unconfig
        @case "$@" in \
@@ -1980,19 +2044,19 @@ M54451EVB_stmicro_config :      unconfig
        M54451EVB_stmicro_config)       FLASH=STMICRO;; \
        esac; \
        if [ "$${FLASH}" = "SPANSION" ] ; then \
-               echo "#define CFG_SPANSION_BOOT"        >> $(obj)include/config.h ; \
+               echo "#define CONFIG_SYS_SPANSION_BOOT" >> $(obj)include/config.h ; \
                echo "TEXT_BASE = 0x00000000" > $(obj)board/freescale/m54451evb/config.tmp ; \
                cp $(obj)board/freescale/m54451evb/u-boot.spa $(obj)board/freescale/m54451evb/u-boot.lds ; \
                $(XECHO) "... with SPANSION boot..." ; \
        fi; \
        if [ "$${FLASH}" = "STMICRO" ] ; then \
                echo "#define CONFIG_CF_SBF"    >> $(obj)include/config.h ; \
-               echo "#define CFG_STMICRO_BOOT" >> $(obj)include/config.h ; \
+               echo "#define CONFIG_SYS_STMICRO_BOOT"  >> $(obj)include/config.h ; \
                echo "TEXT_BASE = 0x47E00000" > $(obj)board/freescale/m54451evb/config.tmp ; \
                cp $(obj)board/freescale/m54451evb/u-boot.stm $(obj)board/freescale/m54451evb/u-boot.lds ; \
                $(XECHO) "... with ST Micro boot..." ; \
        fi; \
-       echo "#define CFG_INPUT_CLKSRC 24000000" >> $(obj)include/config.h ;
+       echo "#define CONFIG_SYS_INPUT_CLKSRC 24000000" >> $(obj)include/config.h ;
        @$(MKCONFIG) -a M54451EVB m68k mcf5445x m54451evb freescale
 
 M54455EVB_config \
@@ -2014,25 +2078,25 @@ M54455EVB_stm33_config :        unconfig
        M54455EVB_stm33_config)         FLASH=STMICRO; FREQ=33333333;; \
        esac; \
        if [ "$${FLASH}" = "INTEL" ] ; then \
-               echo "#define CFG_INTEL_BOOT" >> $(obj)include/config.h ; \
+               echo "#define CONFIG_SYS_INTEL_BOOT" >> $(obj)include/config.h ; \
                echo "TEXT_BASE = 0x00000000" > $(obj)board/freescale/m54455evb/config.tmp ; \
                cp $(obj)board/freescale/m54455evb/u-boot.int $(obj)board/freescale/m54455evb/u-boot.lds ; \
                $(XECHO) "... with INTEL boot..." ; \
        fi; \
        if [ "$${FLASH}" = "ATMEL" ] ; then \
-               echo "#define CFG_ATMEL_BOOT"   >> $(obj)include/config.h ; \
+               echo "#define CONFIG_SYS_ATMEL_BOOT"    >> $(obj)include/config.h ; \
                echo "TEXT_BASE = 0x04000000" > $(obj)board/freescale/m54455evb/config.tmp ; \
                cp $(obj)board/freescale/m54455evb/u-boot.atm $(obj)board/freescale/m54455evb/u-boot.lds ; \
                $(XECHO) "... with ATMEL boot..." ; \
        fi; \
        if [ "$${FLASH}" = "STMICRO" ] ; then \
                echo "#define CONFIG_CF_SBF"    >> $(obj)include/config.h ; \
-               echo "#define CFG_STMICRO_BOOT" >> $(obj)include/config.h ; \
+               echo "#define CONFIG_SYS_STMICRO_BOOT"  >> $(obj)include/config.h ; \
                echo "TEXT_BASE = 0x4FE00000" > $(obj)board/freescale/m54455evb/config.tmp ; \
                cp $(obj)board/freescale/m54455evb/u-boot.stm $(obj)board/freescale/m54455evb/u-boot.lds ; \
                $(XECHO) "... with ST Micro boot..." ; \
        fi; \
-       echo "#define CFG_INPUT_CLKSRC $${FREQ}" >> $(obj)include/config.h ; \
+       echo "#define CONFIG_SYS_INPUT_CLKSRC $${FREQ}" >> $(obj)include/config.h ; \
        $(XECHO) "... with $${FREQ}Hz input clock"
        @$(MKCONFIG) -a M54455EVB m68k mcf5445x m54455evb freescale
 
@@ -2052,20 +2116,20 @@ 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; \
-       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 ; \
+       echo "#define CONFIG_SYS_BUSCLK 133333333" > $(obj)include/config.h ; \
+       echo "#define CONFIG_SYS_BOOTSZ $${BOOT}" >> $(obj)include/config.h ; \
+       echo "#define CONFIG_SYS_DRAMSZ $${RAM}" >> $(obj)include/config.h ; \
        if [ "$${RAM1}" != "0" ] ; then \
-               echo "#define CFG_DRAMSZ1       $${RAM1}" >> $(obj)include/config.h ; \
+               echo "#define CONFIG_SYS_DRAMSZ1        $${RAM1}" >> $(obj)include/config.h ; \
        fi; \
        if [ "$${CODE}" != "0" ] ; then \
-               echo "#define CFG_NOR1SZ        $${CODE}" >> $(obj)include/config.h ; \
+               echo "#define CONFIG_SYS_NOR1SZ $${CODE}" >> $(obj)include/config.h ; \
        fi; \
        if [ "$${VID}" == "1" ] ; then \
-               echo "#define CFG_VIDEO" >> $(obj)include/config.h ; \
+               echo "#define CONFIG_SYS_VIDEO" >> $(obj)include/config.h ; \
        fi; \
        if [ "$${USB}" == "1" ] ; then \
-               echo "#define CFG_USBCTRL" >> $(obj)include/config.h ; \
+               echo "#define CONFIG_SYS_USBCTRL" >> $(obj)include/config.h ; \
        fi
        @$(MKCONFIG) -a M5475EVB m68k mcf547x_8x m547xevb freescale
 
@@ -2087,20 +2151,20 @@ 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; \
-       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 ; \
+       echo "#define CONFIG_SYS_BUSCLK 100000000" > $(obj)include/config.h ; \
+       echo "#define CONFIG_SYS_BOOTSZ $${BOOT}" >> $(obj)include/config.h ; \
+       echo "#define CONFIG_SYS_DRAMSZ $${RAM}" >> $(obj)include/config.h ; \
        if [ "$${RAM1}" != "0" ] ; then \
-               echo "#define CFG_DRAMSZ1       $${RAM1}" >> $(obj)include/config.h ; \
+               echo "#define CONFIG_SYS_DRAMSZ1        $${RAM1}" >> $(obj)include/config.h ; \
        fi; \
        if [ "$${CODE}" != "0" ] ; then \
-               echo "#define CFG_NOR1SZ        $${CODE}" >> $(obj)include/config.h ; \
+               echo "#define CONFIG_SYS_NOR1SZ $${CODE}" >> $(obj)include/config.h ; \
        fi; \
        if [ "$${VID}" == "1" ] ; then \
-               echo "#define CFG_VIDEO" >> $(obj)include/config.h ; \
+               echo "#define CONFIG_SYS_VIDEO" >> $(obj)include/config.h ; \
        fi; \
        if [ "$${USB}" == "1" ] ; then \
-               echo "#define CFG_USBCTRL" >> $(obj)include/config.h ; \
+               echo "#define CONFIG_SYS_USBCTRL" >> $(obj)include/config.h ; \
        fi
        @$(MKCONFIG) -a M5485EVB m68k mcf547x_8x m548xevb freescale
 
@@ -2119,11 +2183,11 @@ MPC8313ERDB_NAND_66_config: unconfig
        @mkdir -p $(obj)board/freescale/mpc8313erdb
        @if [ "$(findstring _33_,$@)" ] ; then \
                $(XECHO) -n "...33M ..." ; \
-               echo "#define CFG_33MHZ" >>$(obj)include/config.h ; \
+               echo "#define CONFIG_SYS_33MHZ" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _66_,$@)" ] ; then \
                $(XECHO) -n "...66M..." ; \
-               echo "#define CFG_66MHZ" >>$(obj)include/config.h ; \
+               echo "#define CONFIG_SYS_66MHZ" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _NAND_,$@)" ] ; then \
                $(XECHO) -n "...NAND..." ; \
@@ -2486,15 +2550,6 @@ shannon_config   :       unconfig
 at91rm9200dk_config    :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200
 
-at91sam9261ek_config   :       unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9261ek atmel at91
-
-at91sam9263ek_config   :       unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9263ek atmel at91
-
-at91sam9rlek_config    :       unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9rlek atmel at91
-
 cmc_pu2_config :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t cmc_pu2 NULL at91rm9200
 
@@ -2514,12 +2569,24 @@ mp2usb_config   :       unconfig
 ## Atmel ARM926EJ-S Systems
 #########################################################################
 
+afeb9260_config:       unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs afeb9260 NULL at91
+
 at91cap9adk_config     :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk atmel at91
 
 at91sam9260ek_config   :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9260ek atmel at91
 
+at91sam9261ek_config   :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9261ek atmel at91
+
+at91sam9263ek_config   :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9263ek atmel at91
+
+at91sam9rlek_config    :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9rlek atmel at91
+
 ########################################################################
 ## ARM Integrator boards - see doc/README-integrator for more info.
 integratorap_config    \
@@ -3080,7 +3147,7 @@ mimc200_config            :       unconfig
 rsk7203_config: unconfig
        @ >include/config.h
        @echo "#define CONFIG_RSK7203 1" >> include/config.h
-       @./mkconfig -a $(@:_config=) sh sh2 rsk7203
+       @./mkconfig -a $(@:_config=) sh sh2 rsk7203 renesas
 
 #########################################################################
 ## sh3 (Renesas SuperH)
@@ -3103,7 +3170,7 @@ ms7720se_config: unconfig
 MigoR_config :       unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_MIGO_R 1" > $(obj)include/config.h
-       @./mkconfig -a $(@:_config=) sh sh4 MigoR
+       @./mkconfig -a $(@:_config=) sh sh4 MigoR renesas
 
 ms7750se_config: unconfig
        @mkdir -p $(obj)include
@@ -3118,27 +3185,27 @@ ms7722se_config :       unconfig
 r2dplus_config  :   unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_R2DPLUS 1" > $(obj)include/config.h
-       @$(MKCONFIG) -a $(@:_config=) sh sh4 r2dplus
+       @$(MKCONFIG) -a $(@:_config=) sh sh4 r2dplus renesas
 
 r7780mp_config: unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_R7780MP 1" > $(obj)include/config.h
-       @$(MKCONFIG) -a $(@:_config=) sh sh4 r7780mp
+       @$(MKCONFIG) -a $(@:_config=) sh sh4 r7780mp renesas
 
 sh7763rdp_config  :   unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_SH7763RDP 1" > $(obj)include/config.h
-       @$(MKCONFIG) -a $(@:_config=) sh sh4 sh7763rdp
+       @$(MKCONFIG) -a $(@:_config=) sh sh4 sh7763rdp renesas
 
 sh7785lcr_config  :   unconfig
        @ >include/config.h
        @echo "#define CONFIG_SH7785LCR 1" >> include/config.h
-       @$(MKCONFIG) -a $(@:_config=) sh sh4 sh7785lcr
+       @$(MKCONFIG) -a $(@:_config=) sh sh4 sh7785lcr renesas
 
 ap325rxa_config  :   unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_AP325RXA 1" > $(obj)include/config.h
-       @$(MKCONFIG) -a $(@:_config=) sh sh4 ap325rxa
+       @$(MKCONFIG) -a $(@:_config=) sh sh4 ap325rxa renesas
 
 #========================================================================
 # SPARC
@@ -3213,7 +3280,7 @@ clobber:  clean
        @rm -f $(OBJS) $(obj)*.bak $(obj)ctags $(obj)etags $(obj)TAGS \
                $(obj)cscope.* $(obj)*.*~
        @rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL)
-       @rm -f $(obj)tools/{crc32.c,environment.c,env/crc32.c,md5.c,sha1.c,inca-swap-bytes}
+       @rm -f $(obj)tools/{crc32.c,env_embedded.c,env/crc32.c,md5.c,sha1.c,inca-swap-bytes}
        @rm -f $(obj)tools/{image.c,fdt.c,fdt_ro.c,fdt_rw.c,fdt_strerror.c,zlib.h}
        @rm -f $(obj)tools/{fdt_wip.c,libfdt_internal.h}
        @rm -f $(obj)cpu/mpc824x/bedbug_603e.c
UBoot for KaRo TX COM modules