diff options
| author | Konstantin Porotchkin <kostap@marvell.com> | 2017-08-24 13:57:28 +0300 |
|---|---|---|
| committer | Kostya Porotchkin <kostap@marvell.com> | 2017-08-24 14:36:11 +0300 |
| commit | a509885ffe353b90d7a267500970512f2f6adea7 (patch) | |
| tree | a9bf20a5fdd31d6427f1bccf262a381af9be226b /Makefile | |
| parent | a6dbbcb964ca225535aae0ea9d3600c409585b57 (diff) | |
fix: Remove garbadge from the main makefile
Clean the Makefile from rebase garbage remainings
Change-Id: I132dfbbc7f722ad2d188a102d876d65b04d9c8b4
Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
Reviewed-on: http://vgitil04.il.marvell.com:8080/43371
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -481,7 +481,6 @@ DDR_TOPOLOGY ?= 0 BOOTDEV ?= SPINOR PARTNUM ?= 0 ->>>>>>> makefile: mvebu: update makefile for a3700 build TIM_IMAGE := $$(grep "Image Filename:" -m 1 $(DOIMAGE_CFG) | cut -c 17-) TIMBLDARGS := $(MARVELL_SECURE_BOOT) $(BOOTDEV) $(IMAGESPATH) $(CLOCKSPATH) $(CLOCKSPRESET) \ |