All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH v5 0/3] board: at91sam9260ek/9g20ek: Convert to support DM and DT
@ 2017-04-18  7:18 Wenyou Yang
  2017-04-18  7:18 ` [U-Boot] [PATCH v5 1/3] configs: at91sam9260ek/9g20ek: Update for DT and DM Wenyou Yang
                   ` (2 more replies)
  0 siblings, 3 replies; 8+ messages in thread
From: Wenyou Yang @ 2017-04-18  7:18 UTC (permalink / raw)
  To: u-boot

The purpose of the patch set is to convert the boards 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 v5:
 - 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 v4:
 - Rebase on the master branch (22e10be45) of u-boot-dm git tree.
 - Update the cover-letter.

Changes in v3:
 - Add the support of Atmel uart device be used in the
   board_init_f stage.
 - Remove unused LED feature.
 - Improve the commit log.
 - Move out [PATCH 1/3] ARM: dts: at91: add dts file for at91sam9g20/at91sam9260.
 - Add [PATCH]: board: at91sam9260ek/9g20ek: Enable early debug UART.

Changes in v2:
 - Add missing conversion default config files for at91sam9xeek.
 - Improve the commit log.

Wenyou Yang (3):
  configs: at91sam9260ek/9g20ek: Update for DT and DM
  board: at91sam9260ek: Clean up code
  board: at91sam9260ek/9g20ek: Enable early debug UART

 board/atmel/at91sam9260ek/Makefile             |  2 +-
 board/atmel/at91sam9260ek/at91sam9260ek.c      | 79 +++-----------------------
 configs/at91sam9260ek_dataflash_cs0_defconfig  | 21 ++++++-
 configs/at91sam9260ek_dataflash_cs1_defconfig  | 21 ++++++-
 configs/at91sam9260ek_nandflash_defconfig      | 21 ++++++-
 configs/at91sam9g20ek_2mmc_defconfig           | 24 +++++++-
 configs/at91sam9g20ek_2mmc_nandflash_defconfig | 24 +++++++-
 configs/at91sam9g20ek_dataflash_cs0_defconfig  | 21 ++++++-
 configs/at91sam9g20ek_dataflash_cs1_defconfig  | 21 ++++++-
 configs/at91sam9g20ek_nandflash_defconfig      | 21 ++++++-
 configs/at91sam9xeek_dataflash_cs0_defconfig   | 21 ++++++-
 configs/at91sam9xeek_dataflash_cs1_defconfig   | 21 ++++++-
 configs/at91sam9xeek_nandflash_defconfig       | 21 ++++++-
 include/configs/at91sam9260ek.h                | 31 +---------
 14 files changed, 239 insertions(+), 110 deletions(-)

-- 
2.11.0

^ permalink raw reply	[flat|nested] 8+ messages in thread
* [U-Boot] [PATCH v5 1/3] configs: at91sam9260ek/9g20ek: Update for DT and DM
  2017-04-18  7:18 [U-Boot] [PATCH v5 0/3] board: at91sam9260ek/9g20ek: Convert to support DM and DT Wenyou Yang
@ 2017-04-18  7:18 ` Wenyou Yang
  2017-04-22  3:07   ` sjg at google.com
  2017-04-18  7:18 ` [U-Boot] [PATCH v5 2/3] board: at91sam9260ek: Clean up code Wenyou Yang
  2017-04-18  7:18 ` [U-Boot] [PATCH v5 3/3] board: at91sam9260ek/9g20ek: Enable early debug UART Wenyou Yang
  2 siblings, 1 reply; 8+ messages in thread
From: Wenyou Yang @ 2017-04-18  7:18 UTC (permalink / raw)
  To: u-boot

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 v5:
 - Adjust CONFIG_ENV_OFFSET for NAND to avoid the conflict caused
   by the increased binary size.

Changes in v4: None
Changes in v3:
 - Add the support of Atmel uart device be used in the
   board_init_f stage.
 - Remove unused LED feature.
 - Improve the commit log.

Changes in v2:
 - Add missing conversion default config files for at91sam9xeek.
 - Improve the commit log.

 board/atmel/at91sam9260ek/Makefile             |  2 +-
 configs/at91sam9260ek_dataflash_cs0_defconfig  | 15 ++++++++++++-
 configs/at91sam9260ek_dataflash_cs1_defconfig  | 15 ++++++++++++-
 configs/at91sam9260ek_nandflash_defconfig      | 15 ++++++++++++-
 configs/at91sam9g20ek_2mmc_defconfig           | 18 ++++++++++++++-
 configs/at91sam9g20ek_2mmc_nandflash_defconfig | 18 ++++++++++++++-
 configs/at91sam9g20ek_dataflash_cs0_defconfig  | 15 ++++++++++++-
 configs/at91sam9g20ek_dataflash_cs1_defconfig  | 15 ++++++++++++-
 configs/at91sam9g20ek_nandflash_defconfig      | 15 ++++++++++++-
 configs/at91sam9xeek_dataflash_cs0_defconfig   | 15 ++++++++++++-
 configs/at91sam9xeek_dataflash_cs1_defconfig   | 15 ++++++++++++-
 configs/at91sam9xeek_nandflash_defconfig       | 15 ++++++++++++-
 include/configs/at91sam9260ek.h                | 31 +++-----------------------
 13 files changed, 164 insertions(+), 40 deletions(-)

diff --git a/board/atmel/at91sam9260ek/Makefile b/board/atmel/at91sam9260ek/Makefile
index c6edbeee24..07c6184352 100644
--- a/board/atmel/at91sam9260ek/Makefile
+++ b/board/atmel/at91sam9260ek/Makefile
@@ -10,5 +10,5 @@
 #
 
 obj-y	+= at91sam9260ek.o
-obj-y	+= led.o
+obj-$(CONFIG_AT91_LED) += led.o
 obj-$(CONFIG_HAS_DATAFLASH) += partition.o
diff --git a/configs/at91sam9260ek_dataflash_cs0_defconfig b/configs/at91sam9260ek_dataflash_cs0_defconfig
index e00c4c4c1f..6d34e215ff 100644
--- a/configs/at91sam9260ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs0_defconfig
@@ -1,6 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek"
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS0"
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set
@@ -17,7 +19,18 @@ 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_MMC is not set
+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_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9260ek_dataflash_cs1_defconfig b/configs/at91sam9260ek_dataflash_cs1_defconfig
index 7b81775255..85f01f34d2 100644
--- a/configs/at91sam9260ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs1_defconfig
@@ -1,6 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek"
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS1"
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set
@@ -17,7 +19,18 @@ 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_MMC is not set
+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_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9260ek_nandflash_defconfig b/configs/at91sam9260ek_nandflash_defconfig
index ca71891f35..d9a7a48e88 100644
--- a/configs/at91sam9260ek_nandflash_defconfig
+++ b/configs/at91sam9260ek_nandflash_defconfig
@@ -1,6 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek"
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_NANDFLASH"
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set
@@ -17,7 +19,18 @@ 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_MMC is not set
+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_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9g20ek_2mmc_defconfig b/configs/at91sam9g20ek_2mmc_defconfig
index 67c82326a4..ef7bd402c7 100644
--- a/configs/at91sam9g20ek_2mmc_defconfig
+++ b/configs/at91sam9g20ek_2mmc_defconfig
@@ -1,6 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20ek_2mmc"
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_MMC"
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set
@@ -18,6 +20,20 @@ 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_OF_LIBFDT=y
diff --git a/configs/at91sam9g20ek_2mmc_nandflash_defconfig b/configs/at91sam9g20ek_2mmc_nandflash_defconfig
index 6d2bfa1d6b..398be7e60a 100644
--- a/configs/at91sam9g20ek_2mmc_nandflash_defconfig
+++ b/configs/at91sam9g20ek_2mmc_nandflash_defconfig
@@ -1,6 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20ek_2mmc"
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_NANDFLASH"
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set
@@ -18,6 +20,20 @@ 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_OF_LIBFDT=y
diff --git a/configs/at91sam9g20ek_dataflash_cs0_defconfig b/configs/at91sam9g20ek_dataflash_cs0_defconfig
index 5bb0cb210e..b8105738aa 100644
--- a/configs/at91sam9g20ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs0_defconfig
@@ -1,6 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20ek"
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS0"
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set
@@ -17,7 +19,18 @@ 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_MMC is not set
+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_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9g20ek_dataflash_cs1_defconfig b/configs/at91sam9g20ek_dataflash_cs1_defconfig
index fb6a0ac829..18e2a17664 100644
--- a/configs/at91sam9g20ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs1_defconfig
@@ -1,6 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20ek"
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS1"
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set
@@ -17,7 +19,18 @@ 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_MMC is not set
+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_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9g20ek_nandflash_defconfig b/configs/at91sam9g20ek_nandflash_defconfig
index 79ec2e446b..daa41dcba7 100644
--- a/configs/at91sam9g20ek_nandflash_defconfig
+++ b/configs/at91sam9g20ek_nandflash_defconfig
@@ -1,6 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20ek"
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_NANDFLASH"
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set
@@ -17,7 +19,18 @@ 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_MMC is not set
+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_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9xeek_dataflash_cs0_defconfig b/configs/at91sam9xeek_dataflash_cs0_defconfig
index e29b3cdfe5..e38b718129 100644
--- a/configs/at91sam9xeek_dataflash_cs0_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs0_defconfig
@@ -1,6 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek"
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS0"
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set
@@ -17,7 +19,18 @@ 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_MMC is not set
+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_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9xeek_dataflash_cs1_defconfig b/configs/at91sam9xeek_dataflash_cs1_defconfig
index 2e32ca8e17..bc7eb03f87 100644
--- a/configs/at91sam9xeek_dataflash_cs1_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs1_defconfig
@@ -1,6 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek"
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS1"
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set
@@ -17,7 +19,18 @@ 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_MMC is not set
+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_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/at91sam9xeek_nandflash_defconfig b/configs/at91sam9xeek_nandflash_defconfig
index 2ef459bb64..7e59335756 100644
--- a/configs/at91sam9xeek_nandflash_defconfig
+++ b/configs/at91sam9xeek_nandflash_defconfig
@@ -1,6 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek"
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_NANDFLASH"
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set
@@ -17,7 +19,18 @@ 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_MMC is not set
+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_USB_STORAGE=y
-CONFIG_OF_LIBFDT=y
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index 379f234463..48d7f6a5e6 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -45,19 +45,6 @@
 
 /* general purpose I/O */
 #define CONFIG_ATMEL_LEGACY		/* required until (g)pio is fixed */
-#define CONFIG_AT91_GPIO
-#define CONFIG_AT91_GPIO_PULLUP	1	/* keep pullups on peripheral pins */
-
-/* serial console */
-#define CONFIG_ATMEL_USART
-#define CONFIG_USART_BASE		ATMEL_BASE_DBGU
-#define	CONFIG_USART_ID			ATMEL_ID_SYS
-
-/* LED */
-#define CONFIG_AT91_LED
-#define	CONFIG_RED_LED		AT91_PIN_PA9	/* this is the power led */
-#define	CONFIG_GREEN_LED	AT91_PIN_PA6	/* this is the user led */
-
 
 /*
  * BOOTP options
@@ -87,10 +74,10 @@
  */
 #ifdef CONFIG_AT91SAM9XE
 # define CONFIG_SYS_INIT_SP_ADDR \
-	(ATMEL_BASE_SRAM + 0x1000 - GENERATED_GBL_DATA_SIZE)
+	(ATMEL_BASE_SRAM + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
 #else
 # define CONFIG_SYS_INIT_SP_ADDR \
-	(ATMEL_BASE_SRAM1 + 0x1000 - GENERATED_GBL_DATA_SIZE)
+	(ATMEL_BASE_SRAM1 + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
 #endif
 
 /*
@@ -142,18 +129,6 @@
 #define CONFIG_SYS_NAND_READY_PIN	AT91_PIN_PC13
 #endif
 
-/* MMC */
-#ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_ATMEL_MCI
-#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
-
 /* USB */
 #define CONFIG_USB_ATMEL
 #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
@@ -200,7 +175,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

^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [U-Boot] [PATCH v5 2/3] board: at91sam9260ek: Clean up code
  2017-04-18  7:18 [U-Boot] [PATCH v5 0/3] board: at91sam9260ek/9g20ek: Convert to support DM and DT Wenyou Yang
  2017-04-18  7:18 ` [U-Boot] [PATCH v5 1/3] configs: at91sam9260ek/9g20ek: Update for DT and DM Wenyou Yang
@ 2017-04-18  7:18 ` Wenyou Yang
  2017-04-22  3:07   ` sjg at google.com
  2017-04-18  7:18 ` [U-Boot] [PATCH v5 3/3] board: at91sam9260ek/9g20ek: Enable early debug UART Wenyou Yang
  2 siblings, 1 reply; 8+ messages in thread
From: Wenyou Yang @ 2017-04-18  7:18 UTC (permalink / raw)
  To: u-boot

Since 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 v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None

 board/atmel/at91sam9260ek/at91sam9260ek.c | 74 -------------------------------
 1 file changed, 74 deletions(-)

diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c b/board/atmel/at91sam9260ek/at91sam9260ek.c
index 98193bfdc6..e28242f034 100644
--- a/board/atmel/at91sam9260ek/at91sam9260ek.c
+++ b/board/atmel/at91sam9260ek/at91sam9260ek.c
@@ -13,12 +13,6 @@
 #include <asm/arch/at91_common.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
-#include <atmel_mci.h>
-
-#if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB)
-# include <net.h>
-#endif
-#include <netdev.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -67,63 +61,8 @@ static void at91sam9260ek_nand_hw_init(void)
 }
 #endif
 
-#ifdef CONFIG_MACB
-static void at91sam9260ek_macb_hw_init(void)
-{
-	struct at91_port *pioa = (struct at91_port *)ATMEL_BASE_PIOA;
-
-	at91_periph_clk_enable(ATMEL_ID_EMAC0);
-
-	/*
-	 * Disable pull-up on:
-	 *	RXDV (PA17) => PHY normal mode (not Test mode)
-	 *	ERX0 (PA14) => PHY ADDR0
-	 *	ERX1 (PA15) => PHY ADDR1
-	 *	ERX2 (PA25) => PHY ADDR2
-	 *	ERX3 (PA26) => PHY ADDR3
-	 *	ECRS (PA28) => PHY ADDR4  => PHYADDR = 0x0
-	 *
-	 * PHY has internal pull-down
-	 */
-	writel(pin_to_mask(AT91_PIN_PA14) |
-		pin_to_mask(AT91_PIN_PA15) |
-		pin_to_mask(AT91_PIN_PA17) |
-		pin_to_mask(AT91_PIN_PA25) |
-		pin_to_mask(AT91_PIN_PA26) |
-		pin_to_mask(AT91_PIN_PA28),
-		&pioa->pudr);
-
-	at91_phy_reset();
-
-	/* Re-enable pull-up */
-	writel(pin_to_mask(AT91_PIN_PA14) |
-		pin_to_mask(AT91_PIN_PA15) |
-		pin_to_mask(AT91_PIN_PA17) |
-		pin_to_mask(AT91_PIN_PA25) |
-		pin_to_mask(AT91_PIN_PA26) |
-		pin_to_mask(AT91_PIN_PA28),
-		&pioa->puer);
-
-	/* Initialize EMAC=MACB hardware */
-	at91_macb_hw_init();
-}
-#endif
-
-#ifdef CONFIG_GENERIC_ATMEL_MCI
-int board_mmc_init(bd_t *bd)
-{
-	at91_mci_hw_init();
-
-	return atmel_mci_init((void *)ATMEL_BASE_MCI);
-}
-#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_PIOC);
-
 	return 0;
 }
 
@@ -132,16 +71,12 @@ int board_init(void)
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
 
-	at91_seriald_hw_init();
 #ifdef CONFIG_CMD_NAND
 	at91sam9260ek_nand_hw_init();
 #endif
 #ifdef CONFIG_HAS_DATAFLASH
 	at91_spi0_hw_init((1 << 0) | (1 << 1));
 #endif
-#ifdef CONFIG_MACB
-	at91sam9260ek_macb_hw_init();
-#endif
 
 	return 0;
 }
@@ -159,12 +94,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_EMAC0, 0x00);
-#endif
-	return rc;
-}
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [U-Boot] [PATCH v5 3/3] board: at91sam9260ek/9g20ek: Enable early debug UART
  2017-04-18  7:18 [U-Boot] [PATCH v5 0/3] board: at91sam9260ek/9g20ek: Convert to support DM and DT Wenyou Yang
  2017-04-18  7:18 ` [U-Boot] [PATCH v5 1/3] configs: at91sam9260ek/9g20ek: Update for DT and DM Wenyou Yang
  2017-04-18  7:18 ` [U-Boot] [PATCH v5 2/3] board: at91sam9260ek: Clean up code Wenyou Yang
@ 2017-04-18  7:18 ` Wenyou Yang
  2017-04-18  8:04   ` Yang, Wenyou
  2 siblings, 1 reply; 8+ messages in thread
From: Wenyou Yang @ 2017-04-18  7:18 UTC (permalink / raw)
  To: u-boot

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 v5:
 - Rebase on the master branch(ad46af0e76) of u-boot-dm git tree.
 - Update the cover-letter.
 - Add Reviewed-by tag.

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

Changes in v3:
 - Move out [PATCH 1/3] ARM: dts: at91: add dts file for at91sam9g20/at91sam9260.
 - Add [PATCH]: board: at91sam9260ek/9g20ek: Enable early debug UART.

Changes in v2: None

 board/atmel/at91sam9260ek/at91sam9260ek.c      | 13 +++++++++++++
 configs/at91sam9260ek_dataflash_cs0_defconfig  |  6 ++++++
 configs/at91sam9260ek_dataflash_cs1_defconfig  |  6 ++++++
 configs/at91sam9260ek_nandflash_defconfig      |  6 ++++++
 configs/at91sam9g20ek_2mmc_defconfig           |  6 ++++++
 configs/at91sam9g20ek_2mmc_nandflash_defconfig |  6 ++++++
 configs/at91sam9g20ek_dataflash_cs0_defconfig  |  6 ++++++
 configs/at91sam9g20ek_dataflash_cs1_defconfig  |  6 ++++++
 configs/at91sam9g20ek_nandflash_defconfig      |  6 ++++++
 configs/at91sam9xeek_dataflash_cs0_defconfig   |  6 ++++++
 configs/at91sam9xeek_dataflash_cs1_defconfig   |  6 ++++++
 configs/at91sam9xeek_nandflash_defconfig       |  6 ++++++
 12 files changed, 79 insertions(+)

diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c b/board/atmel/at91sam9260ek/at91sam9260ek.c
index e28242f034..b087fce9b8 100644
--- a/board/atmel/at91sam9260ek/at91sam9260ek.c
+++ b/board/atmel/at91sam9260ek/at91sam9260ek.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <debug_uart.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9260_matrix.h>
 #include <asm/arch/at91sam9_smc.h>
@@ -61,10 +62,22 @@ static void at91sam9260ek_nand_hw_init(void)
 }
 #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/at91sam9260ek_dataflash_cs0_defconfig b/configs/at91sam9260ek_dataflash_cs0_defconfig
index 6d34e215ff..cc3f0a8b34 100644
--- a/configs/at91sam9260ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs0_defconfig
@@ -31,6 +31,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=0xfffff200
+CONFIG_DEBUG_UART_CLOCK=132000000
+CONFIG_DEBUG_UART_BOARD_INIT=y
+CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_ATMEL_USART=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/at91sam9260ek_dataflash_cs1_defconfig b/configs/at91sam9260ek_dataflash_cs1_defconfig
index 85f01f34d2..cb621dfb9f 100644
--- a/configs/at91sam9260ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs1_defconfig
@@ -31,6 +31,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=0xfffff200
+CONFIG_DEBUG_UART_CLOCK=132000000
+CONFIG_DEBUG_UART_BOARD_INIT=y
+CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_ATMEL_USART=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/at91sam9260ek_nandflash_defconfig b/configs/at91sam9260ek_nandflash_defconfig
index d9a7a48e88..20d3565377 100644
--- a/configs/at91sam9260ek_nandflash_defconfig
+++ b/configs/at91sam9260ek_nandflash_defconfig
@@ -31,6 +31,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=0xfffff200
+CONFIG_DEBUG_UART_CLOCK=132000000
+CONFIG_DEBUG_UART_BOARD_INIT=y
+CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_ATMEL_USART=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/at91sam9g20ek_2mmc_defconfig b/configs/at91sam9g20ek_2mmc_defconfig
index ef7bd402c7..18e88a7445 100644
--- a/configs/at91sam9g20ek_2mmc_defconfig
+++ b/configs/at91sam9g20ek_2mmc_defconfig
@@ -33,6 +33,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=0xfffff200
+CONFIG_DEBUG_UART_CLOCK=132000000
+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/at91sam9g20ek_2mmc_nandflash_defconfig b/configs/at91sam9g20ek_2mmc_nandflash_defconfig
index 398be7e60a..fb0d87ab4b 100644
--- a/configs/at91sam9g20ek_2mmc_nandflash_defconfig
+++ b/configs/at91sam9g20ek_2mmc_nandflash_defconfig
@@ -33,6 +33,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=0xfffff200
+CONFIG_DEBUG_UART_CLOCK=132000000
+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/at91sam9g20ek_dataflash_cs0_defconfig b/configs/at91sam9g20ek_dataflash_cs0_defconfig
index b8105738aa..27c1c10df1 100644
--- a/configs/at91sam9g20ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs0_defconfig
@@ -31,6 +31,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=0xfffff200
+CONFIG_DEBUG_UART_CLOCK=132000000
+CONFIG_DEBUG_UART_BOARD_INIT=y
+CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_ATMEL_USART=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/at91sam9g20ek_dataflash_cs1_defconfig b/configs/at91sam9g20ek_dataflash_cs1_defconfig
index 18e2a17664..1826e6ca98 100644
--- a/configs/at91sam9g20ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs1_defconfig
@@ -31,6 +31,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=0xfffff200
+CONFIG_DEBUG_UART_CLOCK=132000000
+CONFIG_DEBUG_UART_BOARD_INIT=y
+CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_ATMEL_USART=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/at91sam9g20ek_nandflash_defconfig b/configs/at91sam9g20ek_nandflash_defconfig
index daa41dcba7..1ac88631bc 100644
--- a/configs/at91sam9g20ek_nandflash_defconfig
+++ b/configs/at91sam9g20ek_nandflash_defconfig
@@ -31,6 +31,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=0xfffff200
+CONFIG_DEBUG_UART_CLOCK=132000000
+CONFIG_DEBUG_UART_BOARD_INIT=y
+CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_ATMEL_USART=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/at91sam9xeek_dataflash_cs0_defconfig b/configs/at91sam9xeek_dataflash_cs0_defconfig
index e38b718129..80673d2b63 100644
--- a/configs/at91sam9xeek_dataflash_cs0_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs0_defconfig
@@ -31,6 +31,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=0xfffff200
+CONFIG_DEBUG_UART_CLOCK=132000000
+CONFIG_DEBUG_UART_BOARD_INIT=y
+CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_ATMEL_USART=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/at91sam9xeek_dataflash_cs1_defconfig b/configs/at91sam9xeek_dataflash_cs1_defconfig
index bc7eb03f87..8922065d38 100644
--- a/configs/at91sam9xeek_dataflash_cs1_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs1_defconfig
@@ -31,6 +31,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=0xfffff200
+CONFIG_DEBUG_UART_CLOCK=132000000
+CONFIG_DEBUG_UART_BOARD_INIT=y
+CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_ATMEL_USART=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/at91sam9xeek_nandflash_defconfig b/configs/at91sam9xeek_nandflash_defconfig
index 7e59335756..9c28a59fe3 100644
--- a/configs/at91sam9xeek_nandflash_defconfig
+++ b/configs/at91sam9xeek_nandflash_defconfig
@@ -31,6 +31,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=0xfffff200
+CONFIG_DEBUG_UART_CLOCK=132000000
+CONFIG_DEBUG_UART_BOARD_INIT=y
+CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_ATMEL_USART=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [U-Boot] [PATCH v5 3/3] board: at91sam9260ek/9g20ek: Enable early debug UART
  2017-04-18  7:18 ` [U-Boot] [PATCH v5 3/3] board: at91sam9260ek/9g20ek: Enable early debug UART Wenyou Yang
@ 2017-04-18  8:04   ` Yang, Wenyou
  2017-04-22  3:07     ` sjg at google.com
  0 siblings, 1 reply; 8+ messages in thread
From: Yang, Wenyou @ 2017-04-18  8:04 UTC (permalink / raw)
  To: u-boot

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:18, 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 v5:
>   - Rebase on the master branch(ad46af0e76) of u-boot-dm git tree.
>   - Update the cover-letter.
>   - Add Reviewed-by tag.
>
> Changes in v4:
>   - Rebase on the master branch (22e10be45) of u-boot-dm git tree.
>   - Update the cover-letter.
>
> Changes in v3:
>   - Move out [PATCH 1/3] ARM: dts: at91: add dts file for at91sam9g20/at91sam9260.
>   - Add [PATCH]: board: at91sam9260ek/9g20ek: Enable early debug UART.
>
> Changes in v2: None
>
>   board/atmel/at91sam9260ek/at91sam9260ek.c      | 13 +++++++++++++
>   configs/at91sam9260ek_dataflash_cs0_defconfig  |  6 ++++++
>   configs/at91sam9260ek_dataflash_cs1_defconfig  |  6 ++++++
>   configs/at91sam9260ek_nandflash_defconfig      |  6 ++++++
>   configs/at91sam9g20ek_2mmc_defconfig           |  6 ++++++
>   configs/at91sam9g20ek_2mmc_nandflash_defconfig |  6 ++++++
>   configs/at91sam9g20ek_dataflash_cs0_defconfig  |  6 ++++++
>   configs/at91sam9g20ek_dataflash_cs1_defconfig  |  6 ++++++
>   configs/at91sam9g20ek_nandflash_defconfig      |  6 ++++++
>   configs/at91sam9xeek_dataflash_cs0_defconfig   |  6 ++++++
>   configs/at91sam9xeek_dataflash_cs1_defconfig   |  6 ++++++
>   configs/at91sam9xeek_nandflash_defconfig       |  6 ++++++
>   12 files changed, 79 insertions(+)
>
> diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c b/board/atmel/at91sam9260ek/at91sam9260ek.c
> index e28242f034..b087fce9b8 100644
> --- a/board/atmel/at91sam9260ek/at91sam9260ek.c
> +++ b/board/atmel/at91sam9260ek/at91sam9260ek.c
> @@ -7,6 +7,7 @@
>    */
>   
>   #include <common.h>
> +#include <debug_uart.h>
>   #include <asm/io.h>
>   #include <asm/arch/at91sam9260_matrix.h>
>   #include <asm/arch/at91sam9_smc.h>
> @@ -61,10 +62,22 @@ static void at91sam9260ek_nand_hw_init(void)
>   }
>   #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/at91sam9260ek_dataflash_cs0_defconfig b/configs/at91sam9260ek_dataflash_cs0_defconfig
> index 6d34e215ff..cc3f0a8b34 100644
> --- a/configs/at91sam9260ek_dataflash_cs0_defconfig
> +++ b/configs/at91sam9260ek_dataflash_cs0_defconfig
> @@ -31,6 +31,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=0xfffff200
> +CONFIG_DEBUG_UART_CLOCK=132000000
> +CONFIG_DEBUG_UART_BOARD_INIT=y
> +CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_USB=y
>   CONFIG_USB_STORAGE=y
> diff --git a/configs/at91sam9260ek_dataflash_cs1_defconfig b/configs/at91sam9260ek_dataflash_cs1_defconfig
> index 85f01f34d2..cb621dfb9f 100644
> --- a/configs/at91sam9260ek_dataflash_cs1_defconfig
> +++ b/configs/at91sam9260ek_dataflash_cs1_defconfig
> @@ -31,6 +31,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=0xfffff200
> +CONFIG_DEBUG_UART_CLOCK=132000000
> +CONFIG_DEBUG_UART_BOARD_INIT=y
> +CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_USB=y
>   CONFIG_USB_STORAGE=y
> diff --git a/configs/at91sam9260ek_nandflash_defconfig b/configs/at91sam9260ek_nandflash_defconfig
> index d9a7a48e88..20d3565377 100644
> --- a/configs/at91sam9260ek_nandflash_defconfig
> +++ b/configs/at91sam9260ek_nandflash_defconfig
> @@ -31,6 +31,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=0xfffff200
> +CONFIG_DEBUG_UART_CLOCK=132000000
> +CONFIG_DEBUG_UART_BOARD_INIT=y
> +CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_USB=y
>   CONFIG_USB_STORAGE=y
> diff --git a/configs/at91sam9g20ek_2mmc_defconfig b/configs/at91sam9g20ek_2mmc_defconfig
> index ef7bd402c7..18e88a7445 100644
> --- a/configs/at91sam9g20ek_2mmc_defconfig
> +++ b/configs/at91sam9g20ek_2mmc_defconfig
> @@ -33,6 +33,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=0xfffff200
> +CONFIG_DEBUG_UART_CLOCK=132000000
> +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/at91sam9g20ek_2mmc_nandflash_defconfig b/configs/at91sam9g20ek_2mmc_nandflash_defconfig
> index 398be7e60a..fb0d87ab4b 100644
> --- a/configs/at91sam9g20ek_2mmc_nandflash_defconfig
> +++ b/configs/at91sam9g20ek_2mmc_nandflash_defconfig
> @@ -33,6 +33,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=0xfffff200
> +CONFIG_DEBUG_UART_CLOCK=132000000
> +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/at91sam9g20ek_dataflash_cs0_defconfig b/configs/at91sam9g20ek_dataflash_cs0_defconfig
> index b8105738aa..27c1c10df1 100644
> --- a/configs/at91sam9g20ek_dataflash_cs0_defconfig
> +++ b/configs/at91sam9g20ek_dataflash_cs0_defconfig
> @@ -31,6 +31,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=0xfffff200
> +CONFIG_DEBUG_UART_CLOCK=132000000
> +CONFIG_DEBUG_UART_BOARD_INIT=y
> +CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_USB=y
>   CONFIG_USB_STORAGE=y
> diff --git a/configs/at91sam9g20ek_dataflash_cs1_defconfig b/configs/at91sam9g20ek_dataflash_cs1_defconfig
> index 18e2a17664..1826e6ca98 100644
> --- a/configs/at91sam9g20ek_dataflash_cs1_defconfig
> +++ b/configs/at91sam9g20ek_dataflash_cs1_defconfig
> @@ -31,6 +31,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=0xfffff200
> +CONFIG_DEBUG_UART_CLOCK=132000000
> +CONFIG_DEBUG_UART_BOARD_INIT=y
> +CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_USB=y
>   CONFIG_USB_STORAGE=y
> diff --git a/configs/at91sam9g20ek_nandflash_defconfig b/configs/at91sam9g20ek_nandflash_defconfig
> index daa41dcba7..1ac88631bc 100644
> --- a/configs/at91sam9g20ek_nandflash_defconfig
> +++ b/configs/at91sam9g20ek_nandflash_defconfig
> @@ -31,6 +31,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=0xfffff200
> +CONFIG_DEBUG_UART_CLOCK=132000000
> +CONFIG_DEBUG_UART_BOARD_INIT=y
> +CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_USB=y
>   CONFIG_USB_STORAGE=y
> diff --git a/configs/at91sam9xeek_dataflash_cs0_defconfig b/configs/at91sam9xeek_dataflash_cs0_defconfig
> index e38b718129..80673d2b63 100644
> --- a/configs/at91sam9xeek_dataflash_cs0_defconfig
> +++ b/configs/at91sam9xeek_dataflash_cs0_defconfig
> @@ -31,6 +31,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=0xfffff200
> +CONFIG_DEBUG_UART_CLOCK=132000000
> +CONFIG_DEBUG_UART_BOARD_INIT=y
> +CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_USB=y
>   CONFIG_USB_STORAGE=y
> diff --git a/configs/at91sam9xeek_dataflash_cs1_defconfig b/configs/at91sam9xeek_dataflash_cs1_defconfig
> index bc7eb03f87..8922065d38 100644
> --- a/configs/at91sam9xeek_dataflash_cs1_defconfig
> +++ b/configs/at91sam9xeek_dataflash_cs1_defconfig
> @@ -31,6 +31,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=0xfffff200
> +CONFIG_DEBUG_UART_CLOCK=132000000
> +CONFIG_DEBUG_UART_BOARD_INIT=y
> +CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_USB=y
>   CONFIG_USB_STORAGE=y
> diff --git a/configs/at91sam9xeek_nandflash_defconfig b/configs/at91sam9xeek_nandflash_defconfig
> index 7e59335756..9c28a59fe3 100644
> --- a/configs/at91sam9xeek_nandflash_defconfig
> +++ b/configs/at91sam9xeek_nandflash_defconfig
> @@ -31,6 +31,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=0xfffff200
> +CONFIG_DEBUG_UART_CLOCK=132000000
> +CONFIG_DEBUG_UART_BOARD_INIT=y
> +CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_USB=y
>   CONFIG_USB_STORAGE=y

^ permalink raw reply	[flat|nested] 8+ messages in thread
* [U-Boot] [PATCH v5 3/3] board: at91sam9260ek/9g20ek: Enable early debug UART
  2017-04-18  8:04   ` Yang, Wenyou
@ 2017-04-22  3:07     ` sjg at google.com
  0 siblings, 0 replies; 8+ messages in thread
From: sjg at google.com @ 2017-04-22  3:07 UTC (permalink / raw)
  To: u-boot

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:18, 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 v5:
>   - Rebase on the master branch(ad46af0e76) of u-boot-dm git tree.
>   - Update the cover-letter.
>   - Add Reviewed-by tag.
>
> Changes in v4:
>   - Rebase on the master branch (22e10be45) of u-boot-dm git tree.
>   - Update the cover-letter.
>
> Changes in v3:
>   - Move out [PATCH 1/3] ARM: dts: at91: add dts file for at91sam9g20/at91sam9260.
>   - Add [PATCH]: board: at91sam9260ek/9g20ek: Enable early debug UART.
>
> Changes in v2: None
>
>   board/atmel/at91sam9260ek/at91sam9260ek.c      | 13 +++++++++++++
>   configs/at91sam9260ek_dataflash_cs0_defconfig  |  6 ++++++
>   configs/at91sam9260ek_dataflash_cs1_defconfig  |  6 ++++++
>   configs/at91sam9260ek_nandflash_defconfig      |  6 ++++++
>   configs/at91sam9g20ek_2mmc_defconfig           |  6 ++++++
>   configs/at91sam9g20ek_2mmc_nandflash_defconfig |  6 ++++++
>   configs/at91sam9g20ek_dataflash_cs0_defconfig  |  6 ++++++
>   configs/at91sam9g20ek_dataflash_cs1_defconfig  |  6 ++++++
>   configs/at91sam9g20ek_nandflash_defconfig      |  6 ++++++
>   configs/at91sam9xeek_dataflash_cs0_defconfig   |  6 ++++++
>   configs/at91sam9xeek_dataflash_cs1_defconfig   |  6 ++++++
>   configs/at91sam9xeek_nandflash_defconfig       |  6 ++++++
>   12 files changed, 79 insertions(+)
>
Applied to u-boot-dm/next, thanks!

^ permalink raw reply	[flat|nested] 8+ messages in thread
* [U-Boot] [PATCH v5 2/3] board: at91sam9260ek: Clean up code
  2017-04-18  7:18 ` [U-Boot] [PATCH v5 2/3] board: at91sam9260ek: Clean up code Wenyou Yang
@ 2017-04-22  3:07   ` sjg at google.com
  0 siblings, 0 replies; 8+ messages in thread
From: sjg at google.com @ 2017-04-22  3:07 UTC (permalink / raw)
  To: u-boot

Since 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 v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None

 board/atmel/at91sam9260ek/at91sam9260ek.c | 74 -------------------------------
 1 file changed, 74 deletions(-)

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

^ permalink raw reply	[flat|nested] 8+ messages in thread
* [U-Boot] [PATCH v5 1/3] configs: at91sam9260ek/9g20ek: Update for DT and DM
  2017-04-18  7:18 ` [U-Boot] [PATCH v5 1/3] configs: at91sam9260ek/9g20ek: Update for DT and DM Wenyou Yang
@ 2017-04-22  3:07   ` sjg at google.com
  0 siblings, 0 replies; 8+ messages in thread
From: sjg at google.com @ 2017-04-22  3:07 UTC (permalink / raw)
  To: u-boot

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 v5:
 - Adjust CONFIG_ENV_OFFSET for NAND to avoid the conflict caused
   by the increased binary size.

Changes in v4: None
Changes in v3:
 - Add the support of Atmel uart device be used in the
   board_init_f stage.
 - Remove unused LED feature.
 - Improve the commit log.

Changes in v2:
 - Add missing conversion default config files for at91sam9xeek.
 - Improve the commit log.

 board/atmel/at91sam9260ek/Makefile             |  2 +-
 configs/at91sam9260ek_dataflash_cs0_defconfig  | 15 ++++++++++++-
 configs/at91sam9260ek_dataflash_cs1_defconfig  | 15 ++++++++++++-
 configs/at91sam9260ek_nandflash_defconfig      | 15 ++++++++++++-
 configs/at91sam9g20ek_2mmc_defconfig           | 18 ++++++++++++++-
 configs/at91sam9g20ek_2mmc_nandflash_defconfig | 18 ++++++++++++++-
 configs/at91sam9g20ek_dataflash_cs0_defconfig  | 15 ++++++++++++-
 configs/at91sam9g20ek_dataflash_cs1_defconfig  | 15 ++++++++++++-
 configs/at91sam9g20ek_nandflash_defconfig      | 15 ++++++++++++-
 configs/at91sam9xeek_dataflash_cs0_defconfig   | 15 ++++++++++++-
 configs/at91sam9xeek_dataflash_cs1_defconfig   | 15 ++++++++++++-
 configs/at91sam9xeek_nandflash_defconfig       | 15 ++++++++++++-
 include/configs/at91sam9260ek.h                | 31 +++-----------------------
 13 files changed, 164 insertions(+), 40 deletions(-)

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

^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-04-22  3:07 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-18  7:18 [U-Boot] [PATCH v5 0/3] board: at91sam9260ek/9g20ek: Convert to support DM and DT Wenyou Yang
2017-04-18  7:18 ` [U-Boot] [PATCH v5 1/3] configs: at91sam9260ek/9g20ek: Update for DT and DM Wenyou Yang
2017-04-22  3:07   ` sjg at google.com
2017-04-18  7:18 ` [U-Boot] [PATCH v5 2/3] board: at91sam9260ek: Clean up code Wenyou Yang
2017-04-22  3:07   ` sjg at google.com
2017-04-18  7:18 ` [U-Boot] [PATCH v5 3/3] board: at91sam9260ek/9g20ek: Enable early debug UART Wenyou Yang
2017-04-18  8:04   ` Yang, Wenyou
2017-04-22  3:07     ` sjg at google.com

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.