From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wenyou Yang Date: Thu, 13 Apr 2017 10:31:16 +0800 Subject: [U-Boot] [PATCH v5 2/7] board: sama5d4_xplained: update to support DM/DT In-Reply-To: <20170413023122.23222-1-wenyou.yang@atmel.com> References: <20170413023122.23222-1-wenyou.yang@atmel.com> Message-ID: <20170413023122.23222-3-wenyou.yang@atmel.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: quoted-printable To: u-boot@lists.denx.de Update the configuration files to support the device tree and driver model, so do SPL. The device clock and pins configuration are handled by the clock and the pinctrl drivers respectively. Signed-off-by: Wenyou Yang Reviewed-by: Andreas Bie=C3=9Fmann --- Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: - Restore the wrong removal #define CONFIG_USB_ETHER. - Update the commit log. board/atmel/sama5d4_xplained/sama5d4_xplained.c | 2 ++ configs/sama5d4_xplained_mmc_defconfig | 31 ++++++++++++++++- configs/sama5d4_xplained_nandflash_defconfig | 30 ++++++++++++++++- configs/sama5d4_xplained_spiflash_defconfig | 31 ++++++++++++++++- include/configs/sama5d4_xplained.h | 45 +++------------------= ---- 5 files changed, 95 insertions(+), 44 deletions(-) diff --git a/board/atmel/sama5d4_xplained/sama5d4_xplained.c b/board/atmel/= sama5d4_xplained/sama5d4_xplained.c index 47f0bae8c1..6684276e05 100644 --- a/board/atmel/sama5d4_xplained/sama5d4_xplained.c +++ b/board/atmel/sama5d4_xplained/sama5d4_xplained.c @@ -28,10 +28,12 @@ DECLARE_GLOBAL_DATA_PTR; =20 #ifdef CONFIG_ATMEL_SPI +#ifndef CONFIG_DM_SPI int spi_cs_is_valid(unsigned int bus, unsigned int cs) { return bus =3D=3D 0 && cs =3D=3D 0; } +#endif =20 void spi_cs_activate(struct spi_slave *slave) { diff --git a/configs/sama5d4_xplained_mmc_defconfig b/configs/sama5d4_xplai= ned_mmc_defconfig index 3e5849510e..72c239a0f8 100644 --- a/configs/sama5d4_xplained_mmc_defconfig +++ b/configs/sama5d4_xplained_mmc_defconfig @@ -8,11 +8,15 @@ CONFIG_SPL_MMC_SUPPORT=3Dy CONFIG_SPL_SERIAL_SUPPORT=3Dy CONFIG_SPL_LIBDISK_SUPPORT=3Dy CONFIG_SPL_FAT_SUPPORT=3Dy +CONFIG_SYS_MALLOC_F_LEN=3D0x2000 CONFIG_FIT=3Dy +CONFIG_SPL_DRIVERS_MISC_SUPPORT=3Dy +CONFIG_DEFAULT_DEVICE_TREE=3D"at91-sama5d4_xplained" CONFIG_SYS_EXTRA_OPTIONS=3D"SAMA5D4,SYS_USE_MMC" CONFIG_BOOTDELAY=3D3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL=3Dy +CONFIG_SPL_SEPARATE_BSS=3Dy CONFIG_HUSH_PARSER=3Dy CONFIG_CMD_BOOTZ=3Dy # CONFIG_CMD_IMI is not set @@ -26,10 +30,35 @@ CONFIG_CMD_USB=3Dy CONFIG_CMD_DHCP=3Dy CONFIG_CMD_PING=3Dy CONFIG_CMD_FAT=3Dy +CONFIG_OF_CONTROL=3Dy +CONFIG_SPL_OF_CONTROL=3Dy +CONFIG_OF_SPL_REMOVE_PROPS=3D"interrupts interrupt-parent dma-names dmas" +CONFIG_DM=3Dy +CONFIG_SPL_DM=3Dy +CONFIG_CLK=3Dy +CONFIG_SPL_CLK=3Dy +CONFIG_CLK_AT91=3Dy +CONFIG_AT91_UTMI=3Dy +CONFIG_AT91_H32MX=3Dy +CONFIG_DM_GPIO=3Dy +CONFIG_AT91_GPIO=3Dy +CONFIG_DM_MMC=3Dy +CONFIG_GENERIC_ATMEL_MCI=3Dy +CONFIG_DM_SPI_FLASH=3Dy CONFIG_SPI_FLASH=3Dy CONFIG_SPI_FLASH_ATMEL=3Dy +CONFIG_DM_ETH=3Dy +CONFIG_MACB=3Dy +CONFIG_PINCTRL=3Dy +CONFIG_SPL_PINCTRL=3Dy +CONFIG_PINCTRL_AT91=3Dy +CONFIG_DM_SERIAL=3Dy +CONFIG_ATMEL_USART=3Dy +CONFIG_DM_SPI=3Dy +CONFIG_ATMEL_SPI=3Dy CONFIG_USB=3Dy +CONFIG_DM_USB=3Dy +CONFIG_USB_EHCI_HCD=3Dy CONFIG_USB_STORAGE=3Dy CONFIG_USB_GADGET=3Dy CONFIG_USB_GADGET_ATMEL_USBA=3Dy -CONFIG_OF_LIBFDT=3Dy diff --git a/configs/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4= _xplained_nandflash_defconfig index 0c47883ddc..0f6c2f4964 100644 --- a/configs/sama5d4_xplained_nandflash_defconfig +++ b/configs/sama5d4_xplained_nandflash_defconfig @@ -6,7 +6,10 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=3Dy CONFIG_SPL_LIBGENERIC_SUPPORT=3Dy CONFIG_SPL_SERIAL_SUPPORT=3Dy CONFIG_SPL_NAND_SUPPORT=3Dy +CONFIG_SYS_MALLOC_F_LEN=3D0x2000 CONFIG_FIT=3Dy +CONFIG_SPL_DRIVERS_MISC_SUPPORT=3Dy +CONFIG_DEFAULT_DEVICE_TREE=3D"at91-sama5d4_xplained" CONFIG_SYS_EXTRA_OPTIONS=3D"SAMA5D4,SYS_USE_NANDFLASH" CONFIG_BOOTDELAY=3D3 # CONFIG_DISPLAY_BOARDINFO is not set @@ -24,10 +27,35 @@ CONFIG_CMD_USB=3Dy CONFIG_CMD_DHCP=3Dy CONFIG_CMD_PING=3Dy CONFIG_CMD_FAT=3Dy +CONFIG_OF_CONTROL=3Dy +CONFIG_SPL_OF_CONTROL=3Dy +CONFIG_OF_SPL_REMOVE_PROPS=3D"interrupts interrupt-parent dma-names dmas" +CONFIG_DM=3Dy +CONFIG_SPL_DM=3Dy +CONFIG_CLK=3Dy +CONFIG_SPL_CLK=3Dy +CONFIG_CLK_AT91=3Dy +CONFIG_AT91_UTMI=3Dy +CONFIG_AT91_H32MX=3Dy +CONFIG_DM_GPIO=3Dy +CONFIG_AT91_GPIO=3Dy +CONFIG_DM_MMC=3Dy +CONFIG_GENERIC_ATMEL_MCI=3Dy +CONFIG_DM_SPI_FLASH=3Dy CONFIG_SPI_FLASH=3Dy CONFIG_SPI_FLASH_ATMEL=3Dy +CONFIG_DM_ETH=3Dy +CONFIG_MACB=3Dy +CONFIG_PINCTRL=3Dy +CONFIG_SPL_PINCTRL=3Dy +CONFIG_PINCTRL_AT91=3Dy +CONFIG_DM_SERIAL=3Dy +CONFIG_ATMEL_USART=3Dy +CONFIG_DM_SPI=3Dy +CONFIG_ATMEL_SPI=3Dy CONFIG_USB=3Dy +CONFIG_DM_USB=3Dy +CONFIG_USB_EHCI_HCD=3Dy CONFIG_USB_STORAGE=3Dy CONFIG_USB_GADGET=3Dy CONFIG_USB_GADGET_ATMEL_USBA=3Dy -CONFIG_OF_LIBFDT=3Dy diff --git a/configs/sama5d4_xplained_spiflash_defconfig b/configs/sama5d4_= xplained_spiflash_defconfig index e5d2f54458..96816d4472 100644 --- a/configs/sama5d4_xplained_spiflash_defconfig +++ b/configs/sama5d4_xplained_spiflash_defconfig @@ -4,9 +4,12 @@ CONFIG_TARGET_SAMA5D4_XPLAINED=3Dy CONFIG_SPL_GPIO_SUPPORT=3Dy CONFIG_SPL_LIBCOMMON_SUPPORT=3Dy CONFIG_SPL_LIBGENERIC_SUPPORT=3Dy +CONFIG_SYS_MALLOC_F_LEN=3D0x2000 CONFIG_SPL_SERIAL_SUPPORT=3Dy +CONFIG_SPL_DRIVERS_MISC_SUPPORT=3Dy CONFIG_SPL_SPI_FLASH_SUPPORT=3Dy CONFIG_SPL_SPI_SUPPORT=3Dy +CONFIG_DEFAULT_DEVICE_TREE=3D"at91-sama5d4_xplained" CONFIG_FIT=3Dy CONFIG_SYS_EXTRA_OPTIONS=3D"SAMA5D4,SYS_USE_SERIALFLASH" CONFIG_BOOTDELAY=3D3 @@ -25,10 +28,36 @@ CONFIG_CMD_USB=3Dy CONFIG_CMD_DHCP=3Dy CONFIG_CMD_PING=3Dy CONFIG_CMD_FAT=3Dy +CONFIG_OF_CONTROL=3Dy +CONFIG_SPL_OF_CONTROL=3Dy +CONFIG_OF_SPL_REMOVE_PROPS=3D"interrupts interrupt-parent dma-names dmas" +CONFIG_DM=3Dy +CONFIG_SPL_DM=3Dy +CONFIG_SPL_DM_SEQ_ALIAS=3Dy +CONFIG_CLK=3Dy +CONFIG_SPL_CLK=3Dy +CONFIG_CLK_AT91=3Dy +CONFIG_AT91_UTMI=3Dy +CONFIG_AT91_H32MX=3Dy +CONFIG_DM_GPIO=3Dy +CONFIG_AT91_GPIO=3Dy +CONFIG_DM_MMC=3Dy +CONFIG_GENERIC_ATMEL_MCI=3Dy +CONFIG_DM_SPI_FLASH=3Dy CONFIG_SPI_FLASH=3Dy CONFIG_SPI_FLASH_ATMEL=3Dy +CONFIG_DM_ETH=3Dy +CONFIG_MACB=3Dy +CONFIG_PINCTRL=3Dy +CONFIG_SPL_PINCTRL=3Dy +CONFIG_PINCTRL_AT91=3Dy +CONFIG_DM_SERIAL=3Dy +CONFIG_ATMEL_USART=3Dy +CONFIG_DM_SPI=3Dy +CONFIG_ATMEL_SPI=3Dy CONFIG_USB=3Dy +CONFIG_DM_USB=3Dy +CONFIG_USB_EHCI_HCD=3Dy CONFIG_USB_STORAGE=3Dy CONFIG_USB_GADGET=3Dy CONFIG_USB_GADGET_ATMEL_USBA=3Dy -CONFIG_OF_LIBFDT=3Dy diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_x= plained.h index 55f10ad1f0..aced293fa8 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -12,32 +12,21 @@ =20 #include "at91-sama5_common.h" =20 -/* serial console */ -#define CONFIG_ATMEL_USART -#define CONFIG_USART_BASE ATMEL_BASE_USART3 -#define CONFIG_USART_ID ATMEL_ID_USART3 - /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_DDRCS #define CONFIG_SYS_SDRAM_SIZE 0x20000000 =20 #ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_INIT_SP_ADDR 0x210000 +#define CONFIG_SYS_INIT_SP_ADDR 0x218000 #else #define CONFIG_SYS_INIT_SP_ADDR \ - (CONFIG_SYS_SDRAM_BASE + 4 * 1024 - GENERATED_GBL_DATA_SIZE) + (CONFIG_SYS_SDRAM_BASE + 16 * 1024 - GENERATED_GBL_DATA_SIZE) #endif =20 #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ =20 -/* SerialFlash */ - #ifdef CONFIG_CMD_SF -#define CONFIG_ATMEL_SPI -#define CONFIG_ATMEL_SPI0 -#define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 30000000 #endif =20 @@ -58,32 +47,6 @@ #define CONFIG_ATMEL_NAND_HW_PMECC #endif =20 -/* MMC */ - -#ifdef CONFIG_CMD_MMC -#define CONFIG_GENERIC_ATMEL_MCI -#define ATMEL_BASE_MMCI ATMEL_BASE_MCI1 -#endif - -/* USB */ - -#ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI -#define CONFIG_USB_EHCI_ATMEL -#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 -#endif - -/* USB device */ -#define CONFIG_USB_ETHER -#define CONFIG_USB_ETH_RNDIS -#define CONFIG_USBNET_MANUFACTURER "Atmel SAMA5D4EK" - -/* Ethernet Hardware */ -#define CONFIG_MACB -#define CONFIG_RMII -#define CONFIG_NET_RETRY_COUNT 20 -#define CONFIG_MACB_SEARCH_PHY - /* LCD */ #ifdef CONFIG_LCD #define LCD_BPP LCD_COLOR16 @@ -107,7 +70,7 @@ /* SPL */ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x200000 -#define CONFIG_SPL_MAX_SIZE 0x10000 +#define CONFIG_SPL_MAX_SIZE 0x18000 #define CONFIG_SPL_BSS_START_ADDR 0x20000000 #define CONFIG_SPL_BSS_MAX_SIZE 0x80000 #define CONFIG_SYS_SPL_MALLOC_START 0x20080000 @@ -137,7 +100,7 @@ =20 #elif CONFIG_SYS_USE_SERIALFLASH #define CONFIG_SPL_SPI_LOAD -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8000 +#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 =20 #endif #endif --=20 2.11.0