]> 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 'sr@denx.de' of git://git.denx.de/u-boot-staging
[karo-tx-uboot.git] / Makefile
diff --git a/Makefile b/Makefile
index 571c3eb2d1a82a58d448e3a5dcd689d5f627b507..7afd35b98cd7efc471b53bee2d1927a7ea6eff79 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -290,16 +290,9 @@ LIBS += lib/libfdt/libfdt.o
 LIBS += api/libapi.o
 LIBS += post/libpost.o
 
-ifeq ($(SOC),am33xx)
+ifneq ($(CONFIG_AM335X)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),)
 LIBS += $(CPUDIR)/omap-common/libomap-common.o
 endif
-ifeq ($(SOC),omap3)
-LIBS += $(CPUDIR)/omap-common/libomap-common.o
-endif
-ifeq ($(SOC),omap4)
-LIBS += $(CPUDIR)/omap-common/libomap-common.o
-endif
-
 ifeq ($(SOC),s5pc1xx)
 LIBS += $(CPUDIR)/s5p-common/libs5p-common.o
 endif
@@ -424,6 +417,10 @@ $(obj)u-boot.ubl:       $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
                rm $(obj)u-boot-ubl.bin
                rm $(obj)spl/u-boot-spl-pad.bin
 
+$(obj)u-boot.sb:       $(obj)u-boot.bin $(obj)spl/u-boot-spl.bin
+               elftosb -zdf imx28 -c $(TOPDIR)/board/$(BOARDDIR)/u-boot.bd \
+                       -o $(obj)u-boot.sb
+
 ifeq ($(CONFIG_SANDBOX),y)
 GEN_UBOOT = \
                cd $(LNDIR) && $(CC) $(SYMS) -T $(obj)u-boot.lds \
@@ -486,7 +483,7 @@ mmc_spl:    $(TIMESTAMP_FILE) $(VERSION_FILE) depend
 
 $(obj)mmc_spl/u-boot-mmc-spl.bin:      mmc_spl
 
-$(obj)spl/u-boot-spl.bin:              depend
+$(obj)spl/u-boot-spl.bin:      $(SUBDIR_TOOLS) depend
                $(MAKE) -C spl all
 
 updater:
@@ -642,114 +639,6 @@ $(obj).boards.depend:     boards.cfg
 lcname = $(shell echo $(1) | sed -e 's/\(.*\)_config/\L\1/')
 ucname = $(shell echo $(1) | sed -e 's/\(.*\)_config/\U\1/')
 
-#########################################################################
-## Coldfire
-#########################################################################
-M52277EVB_config \
-M52277EVB_spansion_config \
-M52277EVB_stmicro_config :     unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)board/freescale/m52277evb
-       @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 "CONFIG_SYS_TEXT_BASE = 0x00000000" > $(obj)board/freescale/m52277evb/config.tmp ; \
-       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 "CONFIG_SYS_TEXT_BASE = 0x43E00000" > $(obj)board/freescale/m52277evb/config.tmp ; \
-       fi
-       @$(MKCONFIG) -n $@ -a M52277EVB m68k mcf5227x m52277evb freescale
-
-M5235EVB_config \
-M5235EVB_Flash16_config \
-M5235EVB_Flash32_config:       unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)board/freescale/m5235evb
-       @case "$@" in \
-       M5235EVB_config)                FLASH=16;; \
-       M5235EVB_Flash16_config)        FLASH=16;; \
-       M5235EVB_Flash32_config)        FLASH=32;; \
-       esac; \
-       if [ "$${FLASH}" != "16" ] ; then \
-               echo "#define NORFLASH_PS32BIT  1" >> $(obj)include/config.h ; \
-               echo "CONFIG_SYS_TEXT_BASE = 0xFFC00000" > $(obj)board/freescale/m5235evb/config.tmp ; \
-       else \
-               echo "CONFIG_SYS_TEXT_BASE = 0xFFE00000" > $(obj)board/freescale/m5235evb/config.tmp ; \
-       fi
-       @$(MKCONFIG) -n $@ -a M5235EVB m68k mcf523x m5235evb freescale
-
-EB+MCF-EV123_config :          unconfig
-       @mkdir -p $(obj)board/BuS/EB+MCF-EV123
-       @echo "CONFIG_SYS_TEXT_BASE = 0xFFE00000"|tee $(obj)board/BuS/EB+MCF-EV123/textbase.mk
-       @$(MKCONFIG) -n $@ EB+MCF-EV123 m68k mcf52x2 EB+MCF-EV123 BuS
-
-EB+MCF-EV123_internal_config : unconfig
-       @mkdir -p $(obj)board/BuS/EB+MCF-EV123
-       @echo "CONFIG_SYS_TEXT_BASE = 0xF0000000"|tee $(obj)board/BuS/EB+MCF-EV123/textbase.mk
-       @$(MKCONFIG) -n $@ EB+MCF-EV123 m68k mcf52x2 EB+MCF-EV123 BuS
-
-M54451EVB_config \
-M54451EVB_stmicro_config :     unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)board/freescale/m54451evb
-       @case "$@" in \
-       M54451EVB_config)               FLASH=NOR;; \
-       M54451EVB_stmicro_config)       FLASH=STMICRO;; \
-       esac; \
-       if [ "$${FLASH}" = "NOR" ] ; then \
-               echo "CONFIG_SYS_TEXT_BASE = 0x00000000" > $(obj)board/freescale/m54451evb/config.tmp ; \
-       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 "CONFIG_SYS_TEXT_BASE = 0x47E00000" > $(obj)board/freescale/m54451evb/config.tmp ; \
-       fi; \
-       echo "#define CONFIG_SYS_INPUT_CLKSRC 24000000" >> $(obj)include/config.h ;
-       @$(MKCONFIG) -n $@ -a M54451EVB m68k mcf5445x m54451evb freescale
-
-M54455EVB_config \
-M54455EVB_atmel_config \
-M54455EVB_intel_config \
-M54455EVB_a33_config \
-M54455EVB_a66_config \
-M54455EVB_i33_config \
-M54455EVB_i66_config \
-M54455EVB_stm33_config :       unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)board/freescale/m54455evb
-       @case "$@" in \
-       M54455EVB_config)               FLASH=ATMEL; FREQ=33333333;; \
-       M54455EVB_atmel_config)         FLASH=ATMEL; FREQ=33333333;; \
-       M54455EVB_intel_config)         FLASH=INTEL; FREQ=33333333;; \
-       M54455EVB_a33_config)           FLASH=ATMEL; FREQ=33333333;; \
-       M54455EVB_a66_config)           FLASH=ATMEL; FREQ=66666666;; \
-       M54455EVB_i33_config)           FLASH=INTEL; FREQ=33333333;; \
-       M54455EVB_i66_config)           FLASH=INTEL; FREQ=66666666;; \
-       M54455EVB_stm33_config)         FLASH=STMICRO; FREQ=33333333;; \
-       esac; \
-       if [ "$${FLASH}" = "INTEL" ] ; then \
-               echo "#define CONFIG_SYS_INTEL_BOOT" >> $(obj)include/config.h ; \
-               echo "CONFIG_SYS_TEXT_BASE = 0x00000000" > $(obj)board/freescale/m54455evb/config.tmp ; \
-       fi; \
-       if [ "$${FLASH}" = "ATMEL" ] ; then \
-               echo "#define CONFIG_SYS_ATMEL_BOOT"    >> $(obj)include/config.h ; \
-               echo "CONFIG_SYS_TEXT_BASE = 0x04000000" > $(obj)board/freescale/m54455evb/config.tmp ; \
-       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 "CONFIG_SYS_TEXT_BASE = 0x4FE00000" > $(obj)board/freescale/m54455evb/config.tmp ; \
-       fi; \
-       echo "#define CONFIG_SYS_INPUT_CLKSRC $${FREQ}" >> $(obj)include/config.h ; \
-       $(XECHO) "... with $${FREQ}Hz input clock"
-       @$(MKCONFIG) -n $@ -a M54455EVB m68k mcf5445x m54455evb freescale
-
 #========================================================================
 # ARM
 #========================================================================
@@ -871,6 +760,7 @@ clean:
               $(obj)arch/blackfin/cpu/bootrom-asm-offsets.[chs]          \
               $(obj)arch/blackfin/cpu/init.{lds,elf}
        @rm -f $(obj)include/bmp_logo.h
+       @rm -f $(obj)include/bmp_logo_data.h
        @rm -f $(obj)lib/asm-offsets.s
        @rm -f $(obj)include/generated/asm-offsets.h
        @rm -f $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s
@@ -899,6 +789,7 @@ clobber:    clean
        @rm -f $(obj)u-boot.imx
        @rm -f $(obj)u-boot.ubl
        @rm -f $(obj)u-boot.dtb
+       @rm -f $(obj)u-boot.sb
        @rm -f $(obj)tools/{env/crc32.c,inca-swap-bytes}
        @rm -f $(obj)arch/powerpc/cpu/mpc824x/bedbug_603e.c
        @rm -fr $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
UBoot for KaRo TX COM modules