From cf8884dcb90ba0906380a21f14b60220678d8e52 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Fri, 16 Dec 2016 12:40:16 +0100 Subject: [PATCH] ARM: zynq: Remove unused cc108 config file cc108 is handled via zynq-common.h config. The only missing piece is different ENV_OFFSET setting for qspi boot mode but this depends on user configuration. This board is tested via jtag boot mode only that's why if qspi mode is required we can fix it later. Comment was added to zynq-common.h not to be lost. Signed-off-by: Michal Simek --- include/configs/zynq-common.h | 2 ++ include/configs/zynq_cc108.h | 35 ----------------------------------- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 include/configs/zynq_cc108.h diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 7228820c14b..7803ff64073 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -187,6 +187,8 @@ # endif # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE + +/* cc108 requires to be 0xF00000 to have boot.bin with bitstream included */ # ifndef CONFIG_ENV_OFFSET # define CONFIG_ENV_OFFSET 0xE0000 # endif diff --git a/include/configs/zynq_cc108.h b/include/configs/zynq_cc108.h deleted file mode 100644 index 2d0de05fccb..00000000000 --- a/include/configs/zynq_cc108.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * (C) Copyright 2013 Xilinx - * - * Configuration settings for the Xilinx Zynq CC108 boards - * See zynq-common.h for Zynq common configs - * - * 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. - * - * 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 - */ - -#ifndef __CONFIG_ZYNQ_CC108_H -#define __CONFIG_ZYNQ_CC108_H - -/* - * UART is connected to EMIO, making it very likely that this board uses a - * boot.bin which includes a bitstream, whose file size exceeds the default - * env offset. Hence the env offset is moved to the last MB of the QSPI. - */ -#define CONFIG_ENV_OFFSET 0xF00000 - -#define CONFIG_ZYNQ_SDHCI1 - -#include - -/* SERIAL in SPL is unused */ -/* #undef CONFIG_SPL_SERIAL_SUPPORT */ - -#endif /* __CONFIG_ZYNQ_CC108_H */ -- 2.47.3