diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2020-11-04 18:00:38 +0300 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2020-11-20 12:42:53 +0300 |
| commit | 6c5828dc4bdae40697f162645b76fe815bf548b3 (patch) | |
| tree | 24f1f59272204c58f604699d644c2f1073c0a400 | |
| parent | 7556fa09e0ec52a27e05206ada4aa5685e01f3c1 (diff) | |
| download | u-boot-6c5828dc4bdae40697f162645b76fe815bf548b3.tar.xz | |
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 <michal.simek@xilinx.com>
| -rw-r--r-- | board/xilinx/microblaze-generic/xparameters.h | 18 | ||||
| -rw-r--r-- | include/configs/microblaze-generic.h | 7 |
2 files changed, 6 insertions, 19 deletions
diff --git a/board/xilinx/microblaze-generic/xparameters.h b/board/xilinx/microblaze-generic/xparameters.h deleted file mode 100644 index 5e0911faf6..0000000000 --- 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 <monstr@monstr.eu> - * - * 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 05ea64b163..2cfcace7b0 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 |