From: "Andreas Bießmann" <andreas@biessmann.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [U-Boot, v2, 2/8] board: sama5d4_xplained: move config options to defconfig
Date: Sat, 4 Feb 2017 23:33:13 +0100 [thread overview]
Message-ID: <20170204223313.advprna6p7leyr6h@mba.int.er.biessmann.org> (raw)
In-Reply-To: <1477639009-10675-3-git-send-email-wenyou.yang@atmel.com>
On Fri, Oct 28, 2016 at 03:16:43PM +0800, Wenyou Yang wrote:
> Enable CONFIG_CLK and CONFIG_PINCTRL to support at91 clock
> driver and at91 pinctrl driver.
>
> Move some config options to configs/sama5d4_xplained_*_defconfig
> files.
>
> Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Reviewed-by: Andreas Bie?mann <andreas@biessmann.org>
> ---
>
> 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 | 24 ++++++++++++++++++++++-
> configs/sama5d4_xplained_nandflash_defconfig | 26 ++++++++++++++++++++++++-
> configs/sama5d4_xplained_spiflash_defconfig | 24 ++++++++++++++++++++++-
> include/configs/sama5d4_xplained.h | 25 ------------------------
> 5 files changed, 73 insertions(+), 28 deletions(-)
>
> diff --git a/board/atmel/sama5d4_xplained/sama5d4_xplained.c b/board/atmel/sama5d4_xplained/sama5d4_xplained.c
> index 47f0bae..6684276 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;
>
> #ifdef CONFIG_ATMEL_SPI
> +#ifndef CONFIG_DM_SPI
> int spi_cs_is_valid(unsigned int bus, unsigned int cs)
> {
> return bus == 0 && cs == 0;
> }
> +#endif
>
> void spi_cs_activate(struct spi_slave *slave)
> {
> diff --git a/configs/sama5d4_xplained_mmc_defconfig b/configs/sama5d4_xplained_mmc_defconfig
> index 5ff4688..e25b26a 100644
> --- a/configs/sama5d4_xplained_mmc_defconfig
> +++ b/configs/sama5d4_xplained_mmc_defconfig
> @@ -8,6 +8,7 @@ CONFIG_SPL_FAT_SUPPORT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> +CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d4_xplained"
> CONFIG_FIT=y
> CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC"
> CONFIG_BOOTDELAY=3
> @@ -26,10 +27,31 @@ CONFIG_CMD_USB=y
> CONFIG_CMD_DHCP=y
> CONFIG_CMD_PING=y
> CONFIG_CMD_FAT=y
> +CONFIG_OF_CONTROL=y
> +CONFIG_SPL_OF_CONTROL=y
> +CONFIG_DM=y
> +CONFIG_SPL_DM=y
> +CONFIG_CLK=y
> +CONFIG_SPL_CLK=y
> +CONFIG_CLK_AT91=y
> +CONFIG_AT91_UTMI=y
> +CONFIG_AT91_H32MX=y
> +CONFIG_DM_GPIO=y
> +CONFIG_AT91_GPIO=y
> +CONFIG_DM_MMC=y
> +CONFIG_GENERIC_ATMEL_MCI=y
> +CONFIG_DM_SPI_FLASH=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_ATMEL=y
> +CONFIG_PINCTRL=y
> +CONFIG_PINCTRL_AT91=y
> +CONFIG_DM_SERIAL=y
> +CONFIG_ATMEL_USART=y
> +CONFIG_DM_SPI=y
> +CONFIG_ATMEL_SPI=y
> CONFIG_USB=y
> +CONFIG_DM_USB=y
> +CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_ATMEL_USBA=y
> -CONFIG_OF_LIBFDT=y
> diff --git a/configs/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4_xplained_nandflash_defconfig
> index 800a8b2..53dfdd6 100644
> --- a/configs/sama5d4_xplained_nandflash_defconfig
> +++ b/configs/sama5d4_xplained_nandflash_defconfig
> @@ -6,6 +6,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
> CONFIG_SPL_LIBGENERIC_SUPPORT=y
> CONFIG_SPL_NAND_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> +CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d4_xplained"
> CONFIG_FIT=y
> CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH"
> CONFIG_BOOTDELAY=3
> @@ -21,13 +22,36 @@ CONFIG_CMD_MMC=y
> CONFIG_CMD_SF=y
> CONFIG_CMD_USB=y
> # CONFIG_CMD_FPGA is not set
> +CONFIG_CMD_GPIO=y
> CONFIG_CMD_DHCP=y
> CONFIG_CMD_PING=y
> CONFIG_CMD_FAT=y
> +CONFIG_OF_CONTROL=y
> +CONFIG_SPL_OF_CONTROL=y
> +CONFIG_DM=y
> +CONFIG_SPL_DM=y
> +CONFIG_CLK=y
> +CONFIG_SPL_CLK=y
> +CONFIG_CLK_AT91=y
> +CONFIG_AT91_UTMI=y
> +CONFIG_AT91_H32MX=y
> +CONFIG_DM_GPIO=y
> +CONFIG_AT91_GPIO=y
> +CONFIG_DM_MMC=y
> +CONFIG_GENERIC_ATMEL_MCI=y
> +CONFIG_DM_SPI_FLASH=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_ATMEL=y
> +CONFIG_PINCTRL=y
> +CONFIG_PINCTRL_AT91=y
> +CONFIG_DM_SERIAL=y
> +CONFIG_ATMEL_USART=y
> +CONFIG_DM_SPI=y
> +CONFIG_ATMEL_SPI=y
> CONFIG_USB=y
> +CONFIG_DM_USB=y
> +CONFIG_USB_EHCI_HCD=y
> +CONFIG_USB_OHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_ATMEL_USBA=y
> -CONFIG_OF_LIBFDT=y
> diff --git a/configs/sama5d4_xplained_spiflash_defconfig b/configs/sama5d4_xplained_spiflash_defconfig
> index e5d2f54..17fd9a2 100644
> --- a/configs/sama5d4_xplained_spiflash_defconfig
> +++ b/configs/sama5d4_xplained_spiflash_defconfig
> @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL_SPI_FLASH_SUPPORT=y
> CONFIG_SPL_SPI_SUPPORT=y
> +CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d4_xplained"
> CONFIG_FIT=y
> CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH"
> CONFIG_BOOTDELAY=3
> @@ -25,10 +26,31 @@ CONFIG_CMD_USB=y
> CONFIG_CMD_DHCP=y
> CONFIG_CMD_PING=y
> CONFIG_CMD_FAT=y
> +CONFIG_OF_CONTROL=y
> +CONFIG_SPL_OF_CONTROL=y
> +CONFIG_DM=y
> +CONFIG_SPL_DM=y
> +CONFIG_CLK=y
> +CONFIG_SPL_CLK=y
> +CONFIG_CLK_AT91=y
> +CONFIG_AT91_UTMI=y
> +CONFIG_AT91_H32MX=y
> +CONFIG_DM_GPIO=y
> +CONFIG_AT91_GPIO=y
> +CONFIG_DM_MMC=y
> +CONFIG_GENERIC_ATMEL_MCI=y
> +CONFIG_DM_SPI_FLASH=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_ATMEL=y
> +CONFIG_PINCTRL=y
> +CONFIG_PINCTRL_AT91=y
> +CONFIG_DM_SERIAL=y
> +CONFIG_ATMEL_USART=y
> +CONFIG_DM_SPI=y
> +CONFIG_ATMEL_SPI=y
> CONFIG_USB=y
> +CONFIG_DM_USB=y
> +CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_ATMEL_USBA=y
> -CONFIG_OF_LIBFDT=y
> diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h
> index 249e661..1173583 100644
> --- a/include/configs/sama5d4_xplained.h
> +++ b/include/configs/sama5d4_xplained.h
> @@ -15,11 +15,6 @@
>
> #include "at91-sama5_common.h"
>
> -/* 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
> @@ -34,16 +29,6 @@
>
> #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */
>
> -/* 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
> -
> /* NAND flash */
> #define CONFIG_CMD_NAND
>
> @@ -66,16 +51,6 @@
> #ifdef CONFIG_CMD_MMC
> #define CONFIG_MMC
> #define CONFIG_GENERIC_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 */
next prev parent reply other threads:[~2017-02-04 22:33 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-28 7:16 [U-Boot] [PATCH v2 0/8] board: sama5d4: convert boards to support DM/DT Wenyou Yang
2016-10-28 7:16 ` [U-Boot] [PATCH v2 1/8] configs: at91-sama5_common: fix for CONFIG_AT91_GPIO Wenyou Yang
2017-02-04 22:11 ` [U-Boot] [U-Boot, v2, " Andreas Bießmann
2016-10-28 7:16 ` [U-Boot] [PATCH v2 2/8] board: sama5d4_xplained: move config options to defconfig Wenyou Yang
2017-02-04 22:20 ` [U-Boot] [U-Boot, v2, " Andreas Bießmann
2017-02-04 22:33 ` Andreas Bießmann [this message]
2017-02-04 22:44 ` Andreas Bießmann
2016-10-28 7:16 ` [U-Boot] [PATCH v2 3/8] board: sama5d4_xplained: clean up code Wenyou Yang
2017-02-04 22:47 ` [U-Boot] [U-Boot, v2, " Andreas Bießmann
2016-10-28 7:16 ` [U-Boot] [PATCH v2 4/8] board: sama5d4_xplained: enable early debug UART Wenyou Yang
2017-02-04 22:49 ` [U-Boot] [U-Boot, v2, " Andreas Bießmann
2016-10-28 7:16 ` [U-Boot] [PATCH v2 5/8] board: sama5d4ek: move config options to defconfig Wenyou Yang
2017-02-04 22:56 ` [U-Boot] [U-Boot, v2, " Andreas Bießmann
2016-10-28 7:16 ` [U-Boot] [PATCH v2 6/8] board: sama5d4ek: clean up code Wenyou Yang
2017-02-06 9:11 ` Andreas Bießmann
2016-10-28 7:16 ` [U-Boot] [PATCH v2 7/8] board: sama5d4ek: enable early debug UART Wenyou Yang
2017-02-06 9:11 ` Andreas Bießmann
2016-10-28 7:16 ` [U-Boot] [PATCH v2 8/8] configs: sama5d4: move CONFIG_SYS_NO_FLASH to *defconfig Wenyou Yang
2017-02-06 9:12 ` Andreas Bießmann
2017-02-06 19:52 ` [U-Boot] [PATCH v2 0/8] board: sama5d4: convert boards to support DM/DT Andreas Bießmann
2017-02-07 6:15 ` Wenyou.Yang at microchip.com
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170204223313.advprna6p7leyr6h@mba.int.er.biessmann.org \
--to=andreas@biessmann.org \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.