[U-Boot] [PATCH 0/5] Microblaze uart changes + misc

[U-Boot] [PATCH 0/5] Microblaze uart changes + misc

[Michal Simek]

Hi,

This patch series depends on microblaze cleanup 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.

Moving all serial drivers to DM.
This series also have some MB cleanups.

Thanks,
Michal


Michal Simek (5):
  microblaze: Enable uart16550 DM by default
  microblaze: Do not print eth device when DM_ETH is enabled
  microblaze: Enable PHYLIB via Kconfig
  microblaze: Remove unused I2C macros
  microblaze: Wire-up debug_uart in asm

 arch/microblaze/cpu/start.S                   |  4 ++++
 board/xilinx/microblaze-generic/xparameters.h |  5 -----
 common/cmd_bdinfo.c                           |  2 +-
 configs/microblaze-generic_defconfig          |  2 ++
 include/configs/microblaze-generic.h          | 15 ---------------
 5 files changed, 7 insertions(+), 21 deletions(-)

-- 
1.9.1

[U-Boot] [PATCH 1/5] microblaze: Enable uart16550 DM by default

[Michal Simek]

Microblaze is uses uartlite or uart16550 as console drivers.

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

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

diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index 9a7bb915466f..499848f9eca0 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -9,4 +9,5 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
+CONFIG_SYS_NS16550=y
 CONFIG_XILINX_UARTLITE=y
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 6e3c80b14350..19d5506f4e1f 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -37,19 +37,6 @@
 # define CONFIG_SYS_BAUDRATE_TABLE \
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
-#if XILINX_UART16550_BASEADDR
-# define CONFIG_SYS_NS16550_SERIAL
-# if defined(__MICROBLAZEEL__)
-#  define CONFIG_SYS_NS16550_REG_SIZE	-4
-# else
-#  define CONFIG_SYS_NS16550_REG_SIZE	4
-# endif
-# define CONFIG_CONS_INDEX		1
-# define CONFIG_SYS_NS16550_COM1 \
-		((XILINX_UART16550_BASEADDR & ~0xF) + 0x1000)
-# define CONFIG_SYS_NS16550_CLK	XILINX_UART16550_CLOCK_HZ
-#endif
-
 /* setting reset address */
 /*#define	CONFIG_SYS_RESET_ADDRESS	CONFIG_SYS_TEXT_BASE*/
 
-- 
1.9.1

[U-Boot] [PATCH 2/5] microblaze: Do not print eth device when DM_ETH is enabled

[Michal Simek]

Doing the same fix as is done for ARM by:
"Avoid calling print_eths() with driver model"
(sha1: ff97380015b6b5d7d6267417a1cd6fc0e67b81bc)

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

 common/cmd_bdinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c
index adda55a26307..175220b2c845 100644
--- a/common/cmd_bdinfo.c
+++ b/common/cmd_bdinfo.c
@@ -205,7 +205,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	print_num("sram start     ",	(ulong)bd->bi_sramstart);
 	print_num("sram size      ",	(ulong)bd->bi_sramsize);
 #endif
-#if defined(CONFIG_CMD_NET)
+#if defined(CONFIG_CMD_NET) && !defined(CONFIG_DM_ETH)
 	print_eths();
 #endif
 	printf("baudrate    = %u bps\n", gd->baudrate);
-- 
1.9.1

[U-Boot] [PATCH 3/5] microblaze: Enable PHYLIB via Kconfig

[Michal Simek]

Cleanup board configuration.

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

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

diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index 499848f9eca0..dad05410be50 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -9,5 +9,6 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
+CONFIG_PHYLIB=y
 CONFIG_SYS_NS16550=y
 CONFIG_XILINX_UARTLITE=y
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 19d5506f4e1f..f1525f506a7d 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -336,7 +336,6 @@
 # define CONFIG_CMD_MII		1
 # define CONFIG_PHY_GIGE	1
 # define CONFIG_SYS_FAULT_ECHO_LINK_DOWN	1
-# define CONFIG_PHYLIB		1
 # define CONFIG_PHY_ATHEROS	1
 # define CONFIG_PHY_BROADCOM	1
 # define CONFIG_PHY_DAVICOM	1
@@ -349,7 +348,6 @@
 #else
 # undef CONFIG_MII
 # undef CONFIG_CMD_MII
-# undef CONFIG_PHYLIB
 #endif
 
 /* SPL part */
-- 
1.9.1

[U-Boot] [PATCH 4/5] microblaze: Remove unused I2C macros

[Michal Simek]

There is no i2c driver in the current u-boot.

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

 board/xilinx/microblaze-generic/xparameters.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/board/xilinx/microblaze-generic/xparameters.h b/board/xilinx/microblaze-generic/xparameters.h
index 11b3c9a4846e..79c87fb61803 100644
--- a/board/xilinx/microblaze-generic/xparameters.h
+++ b/board/xilinx/microblaze-generic/xparameters.h
@@ -28,11 +28,6 @@
 #define XILINX_TIMER_BASEADDR	0x41c00000
 #define XILINX_TIMER_IRQ	0
 
-/* IIC pheriphery is IIC_EEPROM */
-#define XILINX_IIC_0_BASEADDR	0x40800000
-#define XILINX_IIC_0_FREQ	100000
-#define XILINX_IIC_0_BIT	0
-
 /* GPIO is LEDs_4Bit*/
 #define XILINX_GPIO_BASEADDR	0x40000000
 
-- 
1.9.1

[U-Boot] [PATCH 5/5] microblaze: Wire-up debug_uart in asm

[Michal Simek]

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

 arch/microblaze/cpu/start.S | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/microblaze/cpu/start.S b/arch/microblaze/cpu/start.S
index 14f46a8f0464..157bf1e91663 100644
--- a/arch/microblaze/cpu/start.S
+++ b/arch/microblaze/cpu/start.S
@@ -155,6 +155,10 @@ clear_bss:
 	cmp     r6, r5, r4 /* check if we have reach the end */
 	bnei    r6, 2b
 3:	/* jumping to board_init */
+#ifdef CONFIG_DEBUG_UART
+	bralid	r15, debug_uart_init
+	nop
+#endif
 #ifndef CONFIG_SPL_BUILD
 	or	r5, r0, r0	/* flags - empty */
 	addi    r31, r0, _gd
-- 
1.9.1

[U-Boot] [PATCH 2/5] microblaze: Do not print eth device when DM_ETH is enabled

[Joe Hershberger]

On Fri, Dec 11, 2015 at 5:56 AM, Michal Simek <michal.simek@xilinx.com> wrote:
> Doing the same fix as is done for ARM by:
> "Avoid calling print_eths() with driver model"
> (sha1: ff97380015b6b5d7d6267417a1cd6fc0e67b81bc)
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>

Acked-by: Joe Hershberger <joe.hershberger@ni.com>