From: Michal Simek <michal.simek@xilinx.com>
To: u-boot@lists.denx.de
Subject: [PATCH v2 3/6] microblaze: Get rid of xparameters.h
Date: Mon, 16 Nov 2020 16:02:16 +0100 [thread overview]
Message-ID: <8075f8815340f3a16280032875b72a9e28c6c69d.1605538936.git.michal.simek@xilinx.com> (raw)
In-Reply-To: <cover.1605538936.git.michal.simek@xilinx.com>
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>
---
(no changes since v1)
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 5e0911faf633..000000000000
--- 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 05ea64b16312..2cfcace7b066 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.29.2
next prev parent reply other threads:[~2020-11-16 15:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-16 15:02 [PATCH v2 0/6] microblaze: Cleanup series Michal Simek
2020-11-16 15:02 ` [PATCH v2 1/6] microblaze: Clean config file from ifdef mess Michal Simek
2020-11-16 15:02 ` [PATCH v2 2/6] microblaze: Simplify cache handling Michal Simek
2020-11-16 15:02 ` Michal Simek [this message]
2020-11-16 15:02 ` [PATCH v2 4/6] microblaze: Remove CONFIG_SYS_FDT_SIZE Michal Simek
2020-11-16 15:02 ` [PATCH v2 5/6] microblaze: Unify of setting for SPL_NOR/XIP support Michal Simek
2020-11-16 15:02 ` [PATCH v2 6/6] microblaze: Detect NOR flash based on DT Michal Simek
2020-11-20 9:47 ` [PATCH v2 0/6] microblaze: Cleanup series Michal Simek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8075f8815340f3a16280032875b72a9e28c6c69d.1605538936.git.michal.simek@xilinx.com \
--to=michal.simek@xilinx.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.