On Sat, 31 Jan 2015 11:52:38 +0100, Albert ARIBAUD albert.u.boot@aribaud.net wrote:

Signed-off-by: Albert ARIBAUD albert.u.boot@aribaud.net

board/LaCie/edminiv2/config.mk | 12 ------------ include/configs/edminiv2.h | 4 ++++ 2 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 board/LaCie/edminiv2/config.mk

diff --git a/board/LaCie/edminiv2/config.mk b/board/LaCie/edminiv2/config.mk deleted file mode 100644 index dfa84f0..0000000 --- a/board/LaCie/edminiv2/config.mk +++ /dev/null @@ -1,12 +0,0 @@ -# -# Copyright (C) 2010 Albert ARIBAUD albert.u.boot@aribaud.net -# -# (C) Copyright 2009 -# Marvell Semiconductor <www.marvell.com> -# Written-by: Prafulla Wadaskar prafulla@marvell.com -# -# SPDX-License-Identifier: GPL-2.0+ -#

-# TEXT_BASE must equal the intended FLASH location of u-boot. -CONFIG_SYS_TEXT_BASE = 0xfff90000 diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index 70a698a..47da4a9 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -12,6 +12,10 @@ #ifndef _CONFIG_EDMINIV2_H #define _CONFIG_EDMINIV2_H

+/* general settings */ +#define CONFIG_SYS_TEXT_BASE 0xfff90000 +#define CONFIG_SYS_GENERIC_BOARD

/*

• Version number information

*/

2.1.0

Applied to u-boot-arm/master.

Amicalement,