[U-Boot] [PATCH v4 0/3] board: at91sam9263ek: Convert to support DM and DT

[U-Boot] [PATCH v4 0/3] board: at91sam9263ek: Convert to support DM and DT

[Wenyou Yang]

The purpose of the patch set is to convert the board to support
the driver model and the device Tree.

The patch set is based on the patch set:
 1./ [PATCH v3 0/6] ARM: dts: at91: Add dts files for AT91 SoCs' boards
     https://lists.denx.de/pipermail/u-boot/2017-April/287845.html

Changes in v4:
 - Adjust CONFIG_ENV_OFFSET for NAND to avoid the conflict caused
   by the increased binary size.
 - Rebase on the master branch(ad46af0e76) of u-boot-dm git tree.
 - Update the cover-letter.
 - Add Reviewed-by tag.

Changes in v3:
 - Rebase on the master branch (22e10be45) of u-boot-dm git tree.
 - Update the cover-letter

Changes in v2:
 - Add converting UART to support DM_SERIAL and used in the
   board_init_f stage.
 - Remove unused LED feature.
 - Improve the commit log.
 - Add [PATCH]: board: at91sam9263ek: Enable early debug UART.
 - Move out [PATCH] ARM: dts: at91: add dts files for at91sam9263ek.

Wenyou Yang (3):
  configs: at91sam9263ek: Update for DT and DM support
  board: at91sam9263ek: Clean up code
  board: at91sam9263ek: Enable early debug UART

 board/atmel/at91sam9263ek/Makefile            |  2 +-
 board/atmel/at91sam9263ek/at91sam9263ek.c     | 64 ++++-----------------------
 configs/at91sam9263ek_dataflash_cs0_defconfig | 24 +++++++++-
 configs/at91sam9263ek_dataflash_defconfig     | 24 +++++++++-
 configs/at91sam9263ek_nandflash_defconfig     | 24 +++++++++-
 configs/at91sam9263ek_norflash_boot_defconfig | 24 +++++++++-
 configs/at91sam9263ek_norflash_defconfig      | 24 +++++++++-
 include/configs/at91sam9263ek.h               | 26 +----------
 8 files changed, 127 insertions(+), 85 deletions(-)

-- 
2.11.0

[U-Boot] [PATCH v4 1/3] configs: at91sam9263ek: Update for DT and DM support

[Wenyou Yang]

Update the configuration files to support the device tree and driver
model. The device clock and pins configuration are handled by the
clock and the pinctrl drivers respectively.

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

Changes in v4:
 - Adjust CONFIG_ENV_OFFSET for NAND to avoid the conflict caused
   by the increased binary size.

Changes in v3: None
Changes in v2:
 - Add converting UART to support DM_SERIAL and used in the
   board_init_f stage.
 - Remove unused LED feature.
 - Improve the commit log.

 board/atmel/at91sam9263ek/Makefile            |  2 +-
 configs/at91sam9263ek_dataflash_cs0_defconfig | 18 +++++++++++++++++-
 configs/at91sam9263ek_dataflash_defconfig     | 18 +++++++++++++++++-
 configs/at91sam9263ek_nandflash_defconfig     | 18 +++++++++++++++++-
 configs/at91sam9263ek_norflash_boot_defconfig | 18 +++++++++++++++++-
 configs/at91sam9263ek_norflash_defconfig      | 18 +++++++++++++++++-
 include/configs/at91sam9263ek.h               | 26 ++------------------------
 7 files changed, 88 insertions(+), 30 deletions(-)

diff --git a/board/atmel/at91sam9263ek/Makefile b/board/atmel/at91sam9263ek/Makefile
index 7b31f18e4f..f3cd9d556e 100644
--- a/board/atmel/at91sam9263ek/Makefile
+++ b/board/atmel/at91sam9263ek/Makefile
@@ -10,5 +10,5 @@
 #
 
 obj-y += at91sam9263ek.o
-obj-y += led.o
+obj-$(CONFIG_AT91_LED) += led.o
 obj-$(CONFIG_HAS_DATAFLASH) += partition.o
diff --git a/configs/at91sam9263ek_dataflash_cs0_defconfig b/configs/at91sam9263ek_dataflash_cs0_defconfig
index 6605a0ea58..701a49b115 100644
--- a/configs/at91sam9263ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9263ek_dataflash_cs0_defconfig
@@ -1,6 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9263EK=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek"
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
@@ -21,7 +23,21 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
+CONFIG_OF_CONTROL=y
+CONFIG_DM=y
+CONFIG_CLK=y
+CONFIG_CLK_AT91=y
+CONFIG_DM_GPIO=y
+CONFIG_AT91_GPIO=y
+CONFIG_DM_MMC=y
+CONFIG_GENERIC_ATMEL_MCI=y
+CONFIG_DM_ETH=y
+CONFIG_MACB=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_AT91=y
+CONFIG_DM_SERIAL=y
+CONFIG_ATMEL_USART=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_LCD=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9263ek_dataflash_defconfig b/configs/at91sam9263ek_dataflash_defconfig
index 6605a0ea58..701a49b115 100644
--- a/configs/at91sam9263ek_dataflash_defconfig
+++ b/configs/at91sam9263ek_dataflash_defconfig
@@ -1,6 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9263EK=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek"
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
@@ -21,7 +23,21 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
+CONFIG_OF_CONTROL=y
+CONFIG_DM=y
+CONFIG_CLK=y
+CONFIG_CLK_AT91=y
+CONFIG_DM_GPIO=y
+CONFIG_AT91_GPIO=y
+CONFIG_DM_MMC=y
+CONFIG_GENERIC_ATMEL_MCI=y
+CONFIG_DM_ETH=y
+CONFIG_MACB=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_AT91=y
+CONFIG_DM_SERIAL=y
+CONFIG_ATMEL_USART=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_LCD=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9263ek_nandflash_defconfig b/configs/at91sam9263ek_nandflash_defconfig
index 9c6bab9a37..951f08d662 100644
--- a/configs/at91sam9263ek_nandflash_defconfig
+++ b/configs/at91sam9263ek_nandflash_defconfig
@@ -1,6 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9263EK=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek"
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH"
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
@@ -21,7 +23,21 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
+CONFIG_OF_CONTROL=y
+CONFIG_DM=y
+CONFIG_CLK=y
+CONFIG_CLK_AT91=y
+CONFIG_DM_GPIO=y
+CONFIG_AT91_GPIO=y
+CONFIG_DM_MMC=y
+CONFIG_GENERIC_ATMEL_MCI=y
+CONFIG_DM_ETH=y
+CONFIG_MACB=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_AT91=y
+CONFIG_DM_SERIAL=y
+CONFIG_ATMEL_USART=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_LCD=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig
index 5a4324f238..4f8d19b9b1 100644
--- a/configs/at91sam9263ek_norflash_boot_defconfig
+++ b/configs/at91sam9263ek_norflash_boot_defconfig
@@ -1,6 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9263EK=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek"
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_BOOT_NORFLASH"
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
@@ -21,8 +23,22 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
+CONFIG_OF_CONTROL=y
+CONFIG_DM=y
+CONFIG_CLK=y
+CONFIG_CLK_AT91=y
+CONFIG_DM_GPIO=y
+CONFIG_AT91_GPIO=y
+CONFIG_DM_MMC=y
+CONFIG_GENERIC_ATMEL_MCI=y
+CONFIG_DM_ETH=y
+CONFIG_MACB=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_AT91=y
+CONFIG_DM_SERIAL=y
+CONFIG_ATMEL_USART=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_LCD=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig
index 78ce6bda3d..a39d096187 100644
--- a/configs/at91sam9263ek_norflash_defconfig
+++ b/configs/at91sam9263ek_norflash_defconfig
@@ -1,6 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9263EK=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek"
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NORFLASH"
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
@@ -21,8 +23,22 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
+CONFIG_OF_CONTROL=y
+CONFIG_DM=y
+CONFIG_CLK=y
+CONFIG_CLK_AT91=y
+CONFIG_DM_GPIO=y
+CONFIG_AT91_GPIO=y
+CONFIG_DM_MMC=y
+CONFIG_GENERIC_ATMEL_MCI=y
+CONFIG_DM_ETH=y
+CONFIG_MACB=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_AT91=y
+CONFIG_DM_SERIAL=y
+CONFIG_ATMEL_USART=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_LCD=y
-CONFIG_OF_LIBFDT=y
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index 5194131243..d68d93a63c 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -45,13 +45,6 @@
  * Hardware drivers
  */
 #define CONFIG_ATMEL_LEGACY
-#define CONFIG_AT91_GPIO		1
-#define CONFIG_AT91_GPIO_PULLUP		1
-
-/* serial console */
-#define CONFIG_ATMEL_USART
-#define CONFIG_USART_BASE		ATMEL_BASE_DBGU
-#define CONFIG_USART_ID			ATMEL_ID_SYS
 
 /* LCD */
 #define LCD_BPP				LCD_COLOR8
@@ -63,13 +56,6 @@
 #define CONFIG_ATMEL_LCD		1
 #define CONFIG_ATMEL_LCD_BGR555		1
 
-/* LED */
-#define CONFIG_AT91_LED
-#define	CONFIG_RED_LED		AT91_PIN_PB7	/* the power led */
-#define	CONFIG_GREEN_LED	AT91_PIN_PB8	/* the user1 led */
-#define	CONFIG_YELLOW_LED	AT91_PIN_PC29	/* the user2 led */
-
-
 /*
  * BOOTP options
  */
@@ -89,7 +75,7 @@
 #define CONFIG_SYS_SDRAM_SIZE		0x04000000
 
 #define CONFIG_SYS_INIT_SP_ADDR \
-	(ATMEL_BASE_SRAM1 + 0x1000 - GENERATED_GBL_DATA_SIZE)
+	(ATMEL_BASE_SRAM1 + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
 
 /* DataFlash */
 #define CONFIG_ATMEL_DATAFLASH_SPI
@@ -100,11 +86,6 @@
 #define DATAFLASH_TCSS			(0x1a << 16)
 #define DATAFLASH_TCHS			(0x1 << 24)
 
-/* MMC */
-#ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_ATMEL_MCI
-#endif
-
 /* NOR flash, if populated */
 #ifdef CONFIG_SYS_USE_NORFLASH
 #define CONFIG_SYS_FLASH_CFI			1
@@ -250,9 +231,6 @@
 #endif
 
 /* Ethernet */
-#define CONFIG_MACB			1
-#define CONFIG_RMII			1
-#define CONFIG_NET_RETRY_COUNT		20
 #define CONFIG_RESET_PHY_R		1
 #define CONFIG_AT91_WANTS_COMMON_PHY
 
@@ -288,7 +266,7 @@
 
 /* bootstrap + u-boot + env + linux in nandflash */
 #define CONFIG_ENV_IS_IN_NAND		1
-#define CONFIG_ENV_OFFSET		0xc0000
+#define CONFIG_ENV_OFFSET		0x120000
 #define CONFIG_ENV_OFFSET_REDUND	0x100000
 #define CONFIG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */
 #define CONFIG_BOOTCOMMAND	"nand read 0x22000000 0x200000 0x300000; bootm"
-- 
2.11.0

[U-Boot] [PATCH v4 2/3] board: at91sam9263ek: Clean up code

[Wenyou Yang]

Because the introduction of the pinctrl and clk drivers and the
device tree files, remove unneeded hard coded related code from
the board file.

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

Changes in v4: None
Changes in v3: None
Changes in v2: None

 board/atmel/at91sam9263ek/at91sam9263ek.c | 59 -------------------------------
 1 file changed, 59 deletions(-)

diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c
index e4e32f60ae..2aafafe35e 100644
--- a/board/atmel/at91sam9263ek/at91sam9263ek.c
+++ b/board/atmel/at91sam9263ek/at91sam9263ek.c
@@ -19,11 +19,6 @@
 #include <asm/arch/hardware.h>
 #include <lcd.h>
 #include <atmel_lcdc.h>
-#if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB)
-#include <net.h>
-#endif
-#include <netdev.h>
-#include <atmel_mci.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -77,34 +72,6 @@ static void at91sam9263ek_nand_hw_init(void)
 }
 #endif
 
-#ifdef CONFIG_MACB
-static void at91sam9263ek_macb_hw_init(void)
-{
-	at91_pio_t	*pio	= (at91_pio_t *) ATMEL_BASE_PIO;
-
-	at91_periph_clk_enable(ATMEL_ID_EMAC);
-
-	/*
-	 * Disable pull-up on:
-	 *	RXDV (PC25) => PHY normal mode (not Test mode)
-	 * 	ERX0 (PE25) => PHY ADDR0
-	 *	ERX1 (PE26) => PHY ADDR1 => PHYADDR = 0x0
-	 *
-	 * PHY has internal pull-down
-	 */
-	writel(1 << 25, &pio->pioc.pudr);
-	writel((1 << 25) | (1 <<26), &pio->pioe.pudr);
-
-	at91_phy_reset();
-
-	/* Re-enable pull-up */
-	writel(1 << 25, &pio->pioc.puer);
-	writel((1 << 25) | (1 <<26), &pio->pioe.puer);
-
-	at91_macb_hw_init();
-}
-#endif
-
 #ifdef CONFIG_LCD
 vidinfo_t panel_info = {
 	.vl_col =		240,
@@ -209,22 +176,8 @@ void lcd_show_board_info(void)
 #endif /* CONFIG_LCD_INFO */
 #endif
 
-#ifdef CONFIG_GENERIC_ATMEL_MCI
-int board_mmc_init(bd_t *bd)
-{
-	at91_mci_hw_init();
-
-	return atmel_mci_init((void *)ATMEL_BASE_MCI1);
-}
-#endif
-
 int board_early_init_f(void)
 {
-	at91_periph_clk_enable(ATMEL_ID_PIOA);
-	at91_periph_clk_enable(ATMEL_ID_PIOB);
-	at91_periph_clk_enable(ATMEL_ID_PIOCDE);
-
-	at91_seriald_hw_init();
 	return 0;
 }
 
@@ -242,9 +195,6 @@ int board_init(void)
 	at91_set_pio_output(AT91_PIO_PORTE, 20, 1);	/* select spi0 clock */
 	at91_spi0_hw_init(1 << 0);
 #endif
-#ifdef CONFIG_MACB
-	at91sam9263ek_macb_hw_init();
-#endif
 #ifdef CONFIG_USB_OHCI_NEW
 	at91_uhp_hw_init();
 #endif
@@ -267,12 +217,3 @@ void reset_phy(void)
 {
 }
 #endif
-
-int board_eth_init(bd_t *bis)
-{
-	int rc = 0;
-#ifdef CONFIG_MACB
-	rc = macb_eth_initialize(0, (void *) ATMEL_BASE_EMAC, 0x00);
-#endif
-	return rc;
-}
-- 
2.11.0

[U-Boot] [PATCH v4 3/3] board: at91sam9263ek: Enable early debug UART

[Wenyou Yang]

Enable the early debug UART to debug problems when an ICE or other
debug mechanism is not available.

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

Changes in v4:
 - Rebase on the master branch(ad46af0e76) of u-boot-dm git tree.
 - Update the cover-letter.
 - Add Reviewed-by tag.

Changes in v3:
 - Rebase on the master branch (22e10be45) of u-boot-dm git tree.
 - Update the cover-letter

Changes in v2:
 - Add [PATCH]: board: at91sam9263ek: Enable early debug UART.
 - Move out [PATCH] ARM: dts: at91: add dts files for at91sam9263ek.

 board/atmel/at91sam9263ek/at91sam9263ek.c     | 13 +++++++++++++
 configs/at91sam9263ek_dataflash_cs0_defconfig |  6 ++++++
 configs/at91sam9263ek_dataflash_defconfig     |  6 ++++++
 configs/at91sam9263ek_nandflash_defconfig     |  6 ++++++
 configs/at91sam9263ek_norflash_boot_defconfig |  6 ++++++
 configs/at91sam9263ek_norflash_defconfig      |  6 ++++++
 6 files changed, 43 insertions(+)

diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c
index 2aafafe35e..3de978311d 100644
--- a/board/atmel/at91sam9263ek/at91sam9263ek.c
+++ b/board/atmel/at91sam9263ek/at91sam9263ek.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <debug_uart.h>
 #include <linux/sizes.h>
 #include <asm/arch/at91sam9263.h>
 #include <asm/arch/at91sam9_smc.h>
@@ -176,10 +177,22 @@ void lcd_show_board_info(void)
 #endif /* CONFIG_LCD_INFO */
 #endif
 
+#ifdef CONFIG_DEBUG_UART_BOARD_INIT
+void board_debug_uart_init(void)
+{
+	at91_seriald_hw_init();
+}
+#endif
+
+#ifdef CONFIG_BOARD_EARLY_INIT_F
 int board_early_init_f(void)
 {
+#ifdef CONFIG_DEBUG_UART
+	debug_uart_init();
+#endif
 	return 0;
 }
+#endif
 
 int board_init(void)
 {
diff --git a/configs/at91sam9263ek_dataflash_cs0_defconfig b/configs/at91sam9263ek_dataflash_cs0_defconfig
index 701a49b115..02e91148ce 100644
--- a/configs/at91sam9263ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9263ek_dataflash_cs0_defconfig
@@ -36,6 +36,12 @@ CONFIG_MACB=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_AT91=y
 CONFIG_DM_SERIAL=y
+CONFIG_DEBUG_UART=y
+CONFIG_DEBUG_UART_ATMEL=y
+CONFIG_DEBUG_UART_BASE=0xffffee00
+CONFIG_DEBUG_UART_CLOCK=100000000
+CONFIG_DEBUG_UART_BOARD_INIT=y
+CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_ATMEL_USART=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/at91sam9263ek_dataflash_defconfig b/configs/at91sam9263ek_dataflash_defconfig
index 701a49b115..02e91148ce 100644
--- a/configs/at91sam9263ek_dataflash_defconfig
+++ b/configs/at91sam9263ek_dataflash_defconfig
@@ -36,6 +36,12 @@ CONFIG_MACB=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_AT91=y
 CONFIG_DM_SERIAL=y
+CONFIG_DEBUG_UART=y
+CONFIG_DEBUG_UART_ATMEL=y
+CONFIG_DEBUG_UART_BASE=0xffffee00
+CONFIG_DEBUG_UART_CLOCK=100000000
+CONFIG_DEBUG_UART_BOARD_INIT=y
+CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_ATMEL_USART=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/at91sam9263ek_nandflash_defconfig b/configs/at91sam9263ek_nandflash_defconfig
index 951f08d662..2ddcf2b714 100644
--- a/configs/at91sam9263ek_nandflash_defconfig
+++ b/configs/at91sam9263ek_nandflash_defconfig
@@ -36,6 +36,12 @@ CONFIG_MACB=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_AT91=y
 CONFIG_DM_SERIAL=y
+CONFIG_DEBUG_UART=y
+CONFIG_DEBUG_UART_ATMEL=y
+CONFIG_DEBUG_UART_BASE=0xffffee00
+CONFIG_DEBUG_UART_CLOCK=100000000
+CONFIG_DEBUG_UART_BOARD_INIT=y
+CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_ATMEL_USART=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig
index 4f8d19b9b1..21480c5d07 100644
--- a/configs/at91sam9263ek_norflash_boot_defconfig
+++ b/configs/at91sam9263ek_norflash_boot_defconfig
@@ -36,6 +36,12 @@ CONFIG_MACB=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_AT91=y
 CONFIG_DM_SERIAL=y
+CONFIG_DEBUG_UART=y
+CONFIG_DEBUG_UART_ATMEL=y
+CONFIG_DEBUG_UART_BASE=0xffffee00
+CONFIG_DEBUG_UART_CLOCK=100000000
+CONFIG_DEBUG_UART_BOARD_INIT=y
+CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_ATMEL_USART=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_USB=y
diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig
index a39d096187..824c366c44 100644
--- a/configs/at91sam9263ek_norflash_defconfig
+++ b/configs/at91sam9263ek_norflash_defconfig
@@ -36,6 +36,12 @@ CONFIG_MACB=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_AT91=y
 CONFIG_DM_SERIAL=y
+CONFIG_DEBUG_UART=y
+CONFIG_DEBUG_UART_ATMEL=y
+CONFIG_DEBUG_UART_BASE=0xffffee00
+CONFIG_DEBUG_UART_CLOCK=100000000
+CONFIG_DEBUG_UART_BOARD_INIT=y
+CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_ATMEL_USART=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_USB=y
-- 
2.11.0

[U-Boot] [PATCH v4 3/3] board: at91sam9263ek: Enable early debug UART

[Yang, Wenyou]

Hi Simon,

The patches has been rebased on the master branch of u-boot-dm git tree

Could you help take them?


Best Regards,

Wenyou Yang

On 2017/4/18 15:31, Wenyou Yang wrote:
> Enable the early debug UART to debug problems when an ICE or other
> debug mechanism is not available.
>
> Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> ---
>
> Changes in v4:
>   - Rebase on the master branch(ad46af0e76) of u-boot-dm git tree.
>   - Update the cover-letter.
>   - Add Reviewed-by tag.
>
> Changes in v3:
>   - Rebase on the master branch (22e10be45) of u-boot-dm git tree.
>   - Update the cover-letter
>
> Changes in v2:
>   - Add [PATCH]: board: at91sam9263ek: Enable early debug UART.
>   - Move out [PATCH] ARM: dts: at91: add dts files for at91sam9263ek.
>
>   board/atmel/at91sam9263ek/at91sam9263ek.c     | 13 +++++++++++++
>   configs/at91sam9263ek_dataflash_cs0_defconfig |  6 ++++++
>   configs/at91sam9263ek_dataflash_defconfig     |  6 ++++++
>   configs/at91sam9263ek_nandflash_defconfig     |  6 ++++++
>   configs/at91sam9263ek_norflash_boot_defconfig |  6 ++++++
>   configs/at91sam9263ek_norflash_defconfig      |  6 ++++++
>   6 files changed, 43 insertions(+)
>
> diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c
> index 2aafafe35e..3de978311d 100644
> --- a/board/atmel/at91sam9263ek/at91sam9263ek.c
> +++ b/board/atmel/at91sam9263ek/at91sam9263ek.c
> @@ -7,6 +7,7 @@
>    */
>   
>   #include <common.h>
> +#include <debug_uart.h>
>   #include <linux/sizes.h>
>   #include <asm/arch/at91sam9263.h>
>   #include <asm/arch/at91sam9_smc.h>
> @@ -176,10 +177,22 @@ void lcd_show_board_info(void)
>   #endif /* CONFIG_LCD_INFO */
>   #endif
>   
> +#ifdef CONFIG_DEBUG_UART_BOARD_INIT
> +void board_debug_uart_init(void)
> +{
> +	at91_seriald_hw_init();
> +}
> +#endif
> +
> +#ifdef CONFIG_BOARD_EARLY_INIT_F
>   int board_early_init_f(void)
>   {
> +#ifdef CONFIG_DEBUG_UART
> +	debug_uart_init();
> +#endif
>   	return 0;
>   }
> +#endif
>   
>   int board_init(void)
>   {
> diff --git a/configs/at91sam9263ek_dataflash_cs0_defconfig b/configs/at91sam9263ek_dataflash_cs0_defconfig
> index 701a49b115..02e91148ce 100644
> --- a/configs/at91sam9263ek_dataflash_cs0_defconfig
> +++ b/configs/at91sam9263ek_dataflash_cs0_defconfig
> @@ -36,6 +36,12 @@ CONFIG_MACB=y
>   CONFIG_PINCTRL=y
>   CONFIG_PINCTRL_AT91=y
>   CONFIG_DM_SERIAL=y
> +CONFIG_DEBUG_UART=y
> +CONFIG_DEBUG_UART_ATMEL=y
> +CONFIG_DEBUG_UART_BASE=0xffffee00
> +CONFIG_DEBUG_UART_CLOCK=100000000
> +CONFIG_DEBUG_UART_BOARD_INIT=y
> +CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_USB=y
>   CONFIG_DM_USB=y
> diff --git a/configs/at91sam9263ek_dataflash_defconfig b/configs/at91sam9263ek_dataflash_defconfig
> index 701a49b115..02e91148ce 100644
> --- a/configs/at91sam9263ek_dataflash_defconfig
> +++ b/configs/at91sam9263ek_dataflash_defconfig
> @@ -36,6 +36,12 @@ CONFIG_MACB=y
>   CONFIG_PINCTRL=y
>   CONFIG_PINCTRL_AT91=y
>   CONFIG_DM_SERIAL=y
> +CONFIG_DEBUG_UART=y
> +CONFIG_DEBUG_UART_ATMEL=y
> +CONFIG_DEBUG_UART_BASE=0xffffee00
> +CONFIG_DEBUG_UART_CLOCK=100000000
> +CONFIG_DEBUG_UART_BOARD_INIT=y
> +CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_USB=y
>   CONFIG_DM_USB=y
> diff --git a/configs/at91sam9263ek_nandflash_defconfig b/configs/at91sam9263ek_nandflash_defconfig
> index 951f08d662..2ddcf2b714 100644
> --- a/configs/at91sam9263ek_nandflash_defconfig
> +++ b/configs/at91sam9263ek_nandflash_defconfig
> @@ -36,6 +36,12 @@ CONFIG_MACB=y
>   CONFIG_PINCTRL=y
>   CONFIG_PINCTRL_AT91=y
>   CONFIG_DM_SERIAL=y
> +CONFIG_DEBUG_UART=y
> +CONFIG_DEBUG_UART_ATMEL=y
> +CONFIG_DEBUG_UART_BASE=0xffffee00
> +CONFIG_DEBUG_UART_CLOCK=100000000
> +CONFIG_DEBUG_UART_BOARD_INIT=y
> +CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_USB=y
>   CONFIG_DM_USB=y
> diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig
> index 4f8d19b9b1..21480c5d07 100644
> --- a/configs/at91sam9263ek_norflash_boot_defconfig
> +++ b/configs/at91sam9263ek_norflash_boot_defconfig
> @@ -36,6 +36,12 @@ CONFIG_MACB=y
>   CONFIG_PINCTRL=y
>   CONFIG_PINCTRL_AT91=y
>   CONFIG_DM_SERIAL=y
> +CONFIG_DEBUG_UART=y
> +CONFIG_DEBUG_UART_ATMEL=y
> +CONFIG_DEBUG_UART_BASE=0xffffee00
> +CONFIG_DEBUG_UART_CLOCK=100000000
> +CONFIG_DEBUG_UART_BOARD_INIT=y
> +CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_MTD_NOR_FLASH=y
>   CONFIG_USB=y
> diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig
> index a39d096187..824c366c44 100644
> --- a/configs/at91sam9263ek_norflash_defconfig
> +++ b/configs/at91sam9263ek_norflash_defconfig
> @@ -36,6 +36,12 @@ CONFIG_MACB=y
>   CONFIG_PINCTRL=y
>   CONFIG_PINCTRL_AT91=y
>   CONFIG_DM_SERIAL=y
> +CONFIG_DEBUG_UART=y
> +CONFIG_DEBUG_UART_ATMEL=y
> +CONFIG_DEBUG_UART_BASE=0xffffee00
> +CONFIG_DEBUG_UART_CLOCK=100000000
> +CONFIG_DEBUG_UART_BOARD_INIT=y
> +CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_MTD_NOR_FLASH=y
>   CONFIG_USB=y

[U-Boot] [PATCH v4 3/3] board: at91sam9263ek: Enable early debug UART

[sjg at google.com]

Hi Simon,

The patches has been rebased on the master branch of u-boot-dm git tree

Could you help take them?


Best Regards,

Wenyou Yang

On 2017/4/18 15:31, Wenyou Yang wrote:
> Enable the early debug UART to debug problems when an ICE or other
> debug mechanism is not available.
>
> Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> ---
>
> Changes in v4:
>   - Rebase on the master branch(ad46af0e76) of u-boot-dm git tree.
>   - Update the cover-letter.
>   - Add Reviewed-by tag.
>
> Changes in v3:
>   - Rebase on the master branch (22e10be45) of u-boot-dm git tree.
>   - Update the cover-letter
>
> Changes in v2:
>   - Add [PATCH]: board: at91sam9263ek: Enable early debug UART.
>   - Move out [PATCH] ARM: dts: at91: add dts files for at91sam9263ek.
>
>   board/atmel/at91sam9263ek/at91sam9263ek.c     | 13 +++++++++++++
>   configs/at91sam9263ek_dataflash_cs0_defconfig |  6 ++++++
>   configs/at91sam9263ek_dataflash_defconfig     |  6 ++++++
>   configs/at91sam9263ek_nandflash_defconfig     |  6 ++++++
>   configs/at91sam9263ek_norflash_boot_defconfig |  6 ++++++
>   configs/at91sam9263ek_norflash_defconfig      |  6 ++++++
>   6 files changed, 43 insertions(+)
>
Applied to u-boot-dm/next, thanks!

[U-Boot] [PATCH v4 2/3] board: at91sam9263ek: Clean up code

[sjg at google.com]

Because the introduction of the pinctrl and clk drivers and the
device tree files, remove unneeded hard coded related code from
the board file.

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

Changes in v4: None
Changes in v3: None
Changes in v2: None

 board/atmel/at91sam9263ek/at91sam9263ek.c | 59 -------------------------------
 1 file changed, 59 deletions(-)

Applied to u-boot-dm/next, thanks!

[U-Boot] [PATCH v4 1/3] configs: at91sam9263ek: Update for DT and DM support

[sjg at google.com]

Update the configuration files to support the device tree and driver
model. The device clock and pins configuration are handled by the
clock and the pinctrl drivers respectively.

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

Changes in v4:
 - Adjust CONFIG_ENV_OFFSET for NAND to avoid the conflict caused
   by the increased binary size.

Changes in v3: None
Changes in v2:
 - Add converting UART to support DM_SERIAL and used in the
   board_init_f stage.
 - Remove unused LED feature.
 - Improve the commit log.

 board/atmel/at91sam9263ek/Makefile            |  2 +-
 configs/at91sam9263ek_dataflash_cs0_defconfig | 18 +++++++++++++++++-
 configs/at91sam9263ek_dataflash_defconfig     | 18 +++++++++++++++++-
 configs/at91sam9263ek_nandflash_defconfig     | 18 +++++++++++++++++-
 configs/at91sam9263ek_norflash_boot_defconfig | 18 +++++++++++++++++-
 configs/at91sam9263ek_norflash_defconfig      | 18 +++++++++++++++++-
 include/configs/at91sam9263ek.h               | 26 ++------------------------
 7 files changed, 88 insertions(+), 30 deletions(-)

Applied to u-boot-dm/next, thanks!