[U-Boot] [PATCH 0/6] Various microblaze cleanups

[U-Boot] [PATCH 0/6] Various microblaze cleanups

[Michal Simek]

Hi,

This patch series depends on all previous series.
All these patches will be available in
git://git.denx.de/u-boot-microblaze.git
also with patches which I am going to send now.

Thanks,
Michal


Michal Simek (6):
  microblaze: Enable axi emac via Kconfig
  microblaze: Move eth configuration to Kconfig
  microblaze: Remove systemace from board file
  microblaze: Remove CONFIG_FIT from board file
  microblaze: Move CONFIG_NETCONSOLE to Kconfig
  microblaze: Remove empty file - cpu.c

 arch/microblaze/cpu/Makefile         |  2 +-
 arch/microblaze/cpu/cpu.c            |  9 ---------
 configs/microblaze-generic_defconfig |  7 +++++++
 include/configs/microblaze-generic.h | 35 -----------------------------------
 4 files changed, 8 insertions(+), 45 deletions(-)
 delete mode 100644 arch/microblaze/cpu/cpu.c

-- 
1.9.1

[U-Boot] [PATCH 1/6] microblaze: Enable axi emac via Kconfig

[Michal Simek]

Enable driver by default for all platforms.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 configs/microblaze-generic_defconfig | 1 +
 include/configs/microblaze-generic.h | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index 1a389615729f..438c2f15d507 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -10,6 +10,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_DM_ETH=y
+CONFIG_XILINX_AXIEMAC=y
 CONFIG_XILINX_EMACLITE=y
 CONFIG_SYS_NS16550=y
 CONFIG_XILINX_UARTLITE=y
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 4d8bf46e69f2..8b6ddcbc6ab6 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -42,11 +42,7 @@
 
 /* ethernet */
 #undef CONFIG_SYS_ENET
-#if defined(CONFIG_XILINX_EMACLITE)
-# define CONFIG_SYS_ENET
-#endif
-#if defined(XILINX_AXIEMAC_BASEADDR)
-# define CONFIG_XILINX_AXIEMAC	1
+#if defined(CONFIG_XILINX_EMACLITE) || defined(CONFIG_XILINX_AXIEMAC)
 # define CONFIG_SYS_ENET
 #endif
 
-- 
1.9.1

[U-Boot] [PATCH 2/6] microblaze: Move eth configuration to Kconfig

[Michal Simek]

Cleanup board specific file.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 configs/microblaze-generic_defconfig |  3 +++
 include/configs/microblaze-generic.h | 14 --------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index 438c2f15d507..b5aabe8ba4e6 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -7,6 +7,9 @@ CONFIG_SPL=y
 CONFIG_SYS_PROMPT="U-Boot-mONStR> "
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_TFTPPUT=y
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_PING=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_DM_ETH=y
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 8b6ddcbc6ab6..ed7e9941a668 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -40,14 +40,6 @@
 /* setting reset address */
 /*#define	CONFIG_SYS_RESET_ADDRESS	CONFIG_SYS_TEXT_BASE*/
 
-/* ethernet */
-#undef CONFIG_SYS_ENET
-#if defined(CONFIG_XILINX_EMACLITE) || defined(CONFIG_XILINX_AXIEMAC)
-# define CONFIG_SYS_ENET
-#endif
-
-#undef ET_DEBUG
-
 /* gpio */
 #ifdef XILINX_GPIO_BASEADDR
 # define CONFIG_XILINX_GPIO
@@ -218,12 +210,6 @@
 # undef CONFIG_CMD_CACHE
 #endif
 
-#ifdef CONFIG_SYS_ENET
-# define CONFIG_CMD_PING
-# define CONFIG_CMD_DHCP
-# define CONFIG_CMD_TFTPPUT
-#endif
-
 #if defined(CONFIG_SYSTEMACE)
 # define CONFIG_CMD_EXT2
 # define CONFIG_CMD_FAT
-- 
1.9.1

[U-Boot] [PATCH 3/6] microblaze: Remove systemace from board file

[Michal Simek]

Systemace is ancient IP which is not tested. Remove it from default
configuration.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 include/configs/microblaze-generic.h | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index ed7e9941a668..e88f5f852610 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -163,16 +163,6 @@
 #endif /* !SPIFLASH */
 #endif /* !FLASH */
 
-/* system ace */
-#ifdef XILINX_SYSACE_BASEADDR
-# define CONFIG_SYSTEMACE
-/* #define DEBUG_SYSTEMACE */
-# define SYSTEMACE_CONFIG_FPGA
-# define CONFIG_SYS_SYSTEMACE_BASE	XILINX_SYSACE_BASEADDR
-# define CONFIG_SYS_SYSTEMACE_WIDTH	XILINX_SYSACE_MEM_WIDTH
-# define CONFIG_DOS_PARTITION
-#endif
-
 #if defined(XILINX_USE_ICACHE)
 # define CONFIG_ICACHE
 #else
@@ -210,11 +200,6 @@
 # undef CONFIG_CMD_CACHE
 #endif
 
-#if defined(CONFIG_SYSTEMACE)
-# define CONFIG_CMD_EXT2
-# define CONFIG_CMD_FAT
-#endif
-
 #if defined(FLASH)
 # define CONFIG_CMD_JFFS2
 # define CONFIG_CMD_UBI
-- 
1.9.1

[U-Boot] [PATCH 4/6] microblaze: Remove CONFIG_FIT from board file

[Michal Simek]

And enable it via defconfig by default.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 configs/microblaze-generic_defconfig | 2 ++
 include/configs/microblaze-generic.h | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index b5aabe8ba4e6..29acb063ee8b 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -4,6 +4,8 @@ CONFIG_SPL_DM=y
 CONFIG_TARGET_MICROBLAZE_GENERIC=y
 CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic"
 CONFIG_SPL=y
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
 CONFIG_SYS_PROMPT="U-Boot-mONStR> "
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index e88f5f852610..8c36732a85a5 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -294,7 +294,6 @@
 
 /* Enable flat device tree support */
 #define CONFIG_LMB		1
-#define CONFIG_FIT		1
 #define CONFIG_OF_LIBFDT	1
 
 #if defined(CONFIG_XILINX_AXIEMAC)
-- 
1.9.1

[U-Boot] [PATCH 5/6] microblaze: Move CONFIG_NETCONSOLE to Kconfig

[Michal Simek]

Cleanup board file.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 configs/microblaze-generic_defconfig | 1 +
 include/configs/microblaze-generic.h | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index 29acb063ee8b..e0551f815334 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -14,6 +14,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
+CONFIG_NETCONSOLE=y
 CONFIG_DM_ETH=y
 CONFIG_XILINX_AXIEMAC=y
 CONFIG_XILINX_EMACLITE=y
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 8c36732a85a5..48edddae4d56 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -286,7 +286,6 @@
 
 #define CONFIG_CMDLINE_EDITING
 
-#define CONFIG_NETCONSOLE
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
 
 /* Use the HUSH parser */
-- 
1.9.1

[U-Boot] [PATCH 6/6] microblaze: Remove empty file - cpu.c

[Michal Simek]

No need to have empty unused file in architecture code.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 arch/microblaze/cpu/Makefile | 2 +-
 arch/microblaze/cpu/cpu.c    | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 arch/microblaze/cpu/cpu.c

diff --git a/arch/microblaze/cpu/Makefile b/arch/microblaze/cpu/Makefile
index 4955e812360b..069721033f08 100644
--- a/arch/microblaze/cpu/Makefile
+++ b/arch/microblaze/cpu/Makefile
@@ -7,5 +7,5 @@
 
 extra-y	= start.o
 obj-y	= irq.o
-obj-y	+= cpu.o interrupts.o cache.o exception.o timer.o
+obj-y	+= interrupts.o cache.o exception.o timer.o
 obj-$(CONFIG_SPL_BUILD)	+= spl.o
diff --git a/arch/microblaze/cpu/cpu.c b/arch/microblaze/cpu/cpu.c
deleted file mode 100644
index 8e459d807f92..000000000000
--- a/arch/microblaze/cpu/cpu.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * (C) Copyright 2004 Atmark Techno, Inc.
- *
- * Yasushi SHOJI <yashi@atmark-techno.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-/* EMPTY FILE */
-- 
1.9.1