From 6c5828dc4bdae40697f162645b76fe815bf548b3 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 4 Nov 2020 16:00:38 +0100 Subject: [PATCH] microblaze: Get rid of xparameters.h There is no need to use this file anymore. Include it in main config file and simplify logic based on it. Signed-off-by: Michal Simek --- board/xilinx/microblaze-generic/xparameters.h | 18 ------------------ include/configs/microblaze-generic.h | 7 ++++++- 2 files changed, 6 insertions(+), 19 deletions(-) delete mode 100644 board/xilinx/microblaze-generic/xparameters.h diff --git a/board/xilinx/microblaze-generic/xparameters.h b/board/xilinx/microblaze-generic/xparameters.h deleted file mode 100644 index 5e0911f..0000000 --- a/board/xilinx/microblaze-generic/xparameters.h +++ /dev/null @@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C) Copyright 2007 Michal Simek - * - * Michal SIMEK - * - * CAUTION: This file is a faked configuration !!! - * There is no real target for the microblaze-generic - * configuration. You have to replace this file with - * the generated file from your Xilinx design flow. - */ - -/* Microblaze is microblaze_0 */ -#define XILINX_FSL_NUMBER 3 - -/* Flash Memory is FLASH_2Mx32 */ -#define XILINX_FLASH_START 0x2c000000 -#define XILINX_FLASH_SIZE 0x00800000 diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 05ea64b..2cfcace 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -8,7 +8,12 @@ #ifndef __CONFIG_H #define __CONFIG_H -#include "../board/xilinx/microblaze-generic/xparameters.h" +/* Microblaze is microblaze_0 */ +#define XILINX_FSL_NUMBER 3 + +/* Flash Memory is FLASH_2Mx32 */ +#define XILINX_FLASH_START 0x2c000000 +#define XILINX_FLASH_SIZE 0x00800000 /* MicroBlaze CPU */ #define MICROBLAZE_V5 1 -- 2.7.4