Merge branch 'u-boot/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / arch / arm / cpu / arm926ejs / mxs / Makefile

diff --git a/arch/arm/cpu/arm926ejs/mxs/Makefile b/arch/arm/cpu/arm926ejs/mxs/Makefile
index eeecf89f8b84bf5332dea4dd5f986de7d7470950..6c594945582bbdd3a6a1538f7b2492f3d6a857a2 100644 (file)
--- a/arch/arm/cpu/arm926ejs/mxs/Makefile
+++ b/arch/arm/cpu/arm926ejs/mxs/Makefile
@@ -2,49 +2,84 @@
 # (C) Copyright 2000-2006
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 #
-# See file CREDITS for list of people who contributed to this
-# project.
+# SPDX-License-Identifier:     GPL-2.0+
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+
+extra-$(CONFIG_SPL_BUILD) := start.o
+
+obj-y  = clock.o mxs.o iomux.o timer.o
+
+ifdef  CONFIG_SPL_BUILD
+obj-y  += spl_boot.o spl_lradc_init.o spl_mem_init.o spl_power_init.o
+endif
+
+# Specify the target for use in elftosb call
+MKIMAGE_TARGET-$(CONFIG_MX23) = mxsimage.mx23.cfg
+MKIMAGE_TARGET-$(CONFIG_MX28) = mxsimage.mx28.cfg
+
+# Generate HAB-capable IVT
 #
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
+# Note on computing the post-IVT size field value for the U-Boot binary.
+# The value is the result of adding the following:
+#  -> The size of U-Boot binary aligned to 64B (u-boot.bin)
+#  -> The size of IVT block aligned to 64B (u-boot.ivt)
+#  -> The size of U-Boot signature (u-boot.sig), 3904 B
+#  -> The 64B hole in front of U-Boot binary for 'struct mxs_spl_data' passing
 #
+quiet_cmd_mkivt_mxs = MXSIVT  $@
+cmd_mkivt_mxs =                                                                \
+       sz=`expr \`stat -c "%s" $^\` + 64 + 3904 + 128` ;               \
+       echo -n "0x402000d1 $2 0 0 0 $3 $4 0 $$sz 0 0 0 0 0 0 0" |      \
+       tr -s " " | xargs -d " " -i printf "%08x\n" "{}" | rev |        \
+       sed "s/\(.\)\(.\)/\\\\\\\\x\2\1\n/g" | xargs -i printf "{}" >$@
 
-include $(TOPDIR)/config.mk
+# Align binary to 64B
+quiet_cmd_mkalign_mxs = MXSALGN $@
+cmd_mkalign_mxs =                                                      \
+       dd if=$^ of=$@ ibs=64 conv=sync 2>/dev/null &&                  \
+       mv $@ $^
 
-LIB    = $(obj)lib$(SOC).o
+# Assemble the CSF file
+quiet_cmd_mkcsfreq_mxs = MXSCSFR $@
+cmd_mkcsfreq_mxs =                                                     \
+       ivt=$(word 1,$^) ;                                              \
+       bin=$(word 2,$^) ;                                              \
+       csf=$(word 3,$^) ;                                              \
+       sed "s@VENDOR@$(VENDOR)@g;s@BOARD@$(BOARD)@g" "$$csf" |         \
+               sed '/^\#\#Blocks/ d' > $@ ;                            \
+       echo "  Blocks = $2 0x0 `stat -c '%s' $$bin` \"$$bin\" , \\" >> $@ ; \
+       echo "           $3 0x0 0x40 \"$$ivt\"" >> $@
 
-COBJS  = clock.o mxs.o iomux.o timer.o
+# Sign files
+quiet_cmd_mkcst_mxs = MXSCST  $@
+cmd_mkcst_mxs = cst -o $@ < $^                                         \
+       $(if $(KBUILD_VERBOSE:1=), >/dev/null)
 
-ifdef  CONFIG_SPL_BUILD
-COBJS  += spl_boot.o spl_lradc_init.o spl_mem_init.o spl_power_init.o
-endif
+spl/u-boot-spl.ivt: spl/u-boot-spl.bin
+       $(call if_changed,mkalign_mxs)
+       $(call if_changed,mkivt_mxs,$(CONFIG_SPL_TEXT_BASE),\
+               0x00008000,0x00008040)
 
-SRCS   := $(START:.o=.S) $(COBJS:.o=.c)
-OBJS   := $(addprefix $(obj),$(COBJS))
-START  := $(addprefix $(obj),$(START))
+u-boot.ivt: u-boot.bin
+       $(call if_changed,mkalign_mxs)
+       $(call if_changed,mkivt_mxs,$(CONFIG_SYS_TEXT_BASE),\
+               0x40001000,0x40001040)
 
-all:   $(obj).depend $(LIB)
+spl/u-boot-spl.csf: spl/u-boot-spl.ivt spl/u-boot-spl.bin board/$(VENDOR)/$(BOARD)/sign/u-boot-spl.csf
+       $(call if_changed,mkcsfreq_mxs,$(CONFIG_SPL_TEXT_BASE),0x8000)
 
-$(LIB):        $(OBJS)
-       $(call cmd_link_o_target, $(OBJS))
+u-boot.csf: u-boot.ivt u-boot.bin board/$(VENDOR)/$(BOARD)/sign/u-boot.csf
+       $(call if_changed,mkcsfreq_mxs,$(CONFIG_SYS_TEXT_BASE),0x40001000)
 
-#########################################################################
+%.sig: %.csf
+       $(call if_changed,mkcst_mxs)
 
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
+quiet_cmd_mkimage_mxs = MKIMAGE $@
+cmd_mkimage_mxs = $(objtree)/tools/mkimage -n $< -T mxsimage $@ \
+       $(if $(KBUILD_VERBOSE:1=), >/dev/null)
 
-sinclude $(obj).depend
+u-boot.sb: $(src)/$(MKIMAGE_TARGET-y) u-boot.bin spl/u-boot-spl.bin FORCE
+       $(call if_changed,mkimage_mxs)
 
-#########################################################################
+u-boot-signed.sb: $(src)/mxsimage-signed.cfg u-boot.ivt u-boot.sig spl/u-boot-spl.ivt spl/u-boot-spl.sig FORCE
+       $(call if_changed,mkimage_mxs)