From f05062edc4c9cbb47ef11aebbb72d1580695127f Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 18 Jun 2018 21:56:22 +0300 Subject: mvebu: turris_omnia: use u-boot-spl-dtb.bin u-boot-spl.bin and u-boot-spl-dtb.bin are identical when building the turris_omnia_defconfig. This commit makes Turris Omnia consistent with all other mvebu boards. Signed-off-by: Baruch Siach Signed-off-by: Stefan Roese --- board/CZ.NIC/turris_omnia/kwbimage.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'board/CZ.NIC/turris_omnia/kwbimage.cfg') diff --git a/board/CZ.NIC/turris_omnia/kwbimage.cfg b/board/CZ.NIC/turris_omnia/kwbimage.cfg index cc05792556..1f748db37c 100644 --- a/board/CZ.NIC/turris_omnia/kwbimage.cfg +++ b/board/CZ.NIC/turris_omnia/kwbimage.cfg @@ -9,4 +9,4 @@ VERSION 1 BOOT_FROM spi # Binary Header (bin_hdr) with DDR3 training code -BINARY spl/u-boot-spl.bin 0000005b 00000068 +BINARY spl/u-boot-spl-dtb.bin 0000005b 00000068 -- cgit From ca1a4c863232ddc6bc2463569dedfefe992ff418 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 18 Jun 2018 21:56:25 +0300 Subject: mvebu: select boot device at SoC level Move the gdsys Controlcenter DC specific build time kwbimage.cfg generation code into the mach-mvebu/ directory to be shared by all 32bit mvebu platforms. Remove board specific kwbimage.cfg files, and use the generated one instead. These files are all identical, with two exceptions. Clearfog and Helios4 use the sdio boot device, whereas all others use spi. Update the defconfigs for the exceptional boards to generate the same kwbimage.cfg as before. Signed-off-by: Baruch Siach Signed-off-by: Stefan Roese --- board/CZ.NIC/turris_omnia/kwbimage.cfg | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 board/CZ.NIC/turris_omnia/kwbimage.cfg (limited to 'board/CZ.NIC/turris_omnia/kwbimage.cfg') diff --git a/board/CZ.NIC/turris_omnia/kwbimage.cfg b/board/CZ.NIC/turris_omnia/kwbimage.cfg deleted file mode 100644 index 1f748db37c..0000000000 --- a/board/CZ.NIC/turris_omnia/kwbimage.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# -# Copyright (C) 2014 Stefan Roese -# - -# Armada XP uses version 1 image format -VERSION 1 - -# Boot Media configurations -BOOT_FROM spi - -# Binary Header (bin_hdr) with DDR3 training code -BINARY spl/u-boot-spl-dtb.bin 0000005b 00000068 -- cgit