From: "Andreas Bießmann" <andreas@biessmann.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [U-Boot, v2, 1/4] board: sama5d2_xplained: Move config options to defconfigs
Date: Sun, 16 Oct 2016 22:11:08 +0200 [thread overview]
Message-ID: <20161016201108.GA3852@mba.int.er.biessmann.org> (raw)
In-Reply-To: <1473734945-23975-2-git-send-email-wenyou.yang@atmel.com>
On Tue, Sep 13, 2016 at 10:49:02AM +0800, Wenyou Yang wrote:
> Move the config options from the include/configs/sama5d2_xplained.h
> to configs/sama5d2_xplained_*_defconfig.
>
> Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Reviewed-by: Andreas Bie?mann <andreas@biessmann.org>
> ---
>
> Changes in v2: None
>
> board/atmel/sama5d2_xplained/sama5d2_xplained.c | 2 ++
> configs/sama5d2_xplained_mmc_defconfig | 31 +++++++++++++++++++++++-
> configs/sama5d2_xplained_spiflash_defconfig | 32 ++++++++++++++++++++++++-
> include/configs/sama5d2_xplained.h | 26 --------------------
> 4 files changed, 63 insertions(+), 28 deletions(-)
>
> diff --git a/board/atmel/sama5d2_xplained/sama5d2_xplained.c b/board/atmel/sama5d2_xplained/sama5d2_xplained.c
> index 93df7ba..413a000 100644
> --- a/board/atmel/sama5d2_xplained/sama5d2_xplained.c
> +++ b/board/atmel/sama5d2_xplained/sama5d2_xplained.c
> @@ -25,10 +25,12 @@
>
> DECLARE_GLOBAL_DATA_PTR;
>
> +#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/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig
> index 9ca2a9c..ab1b58b 100644
> --- a/configs/sama5d2_xplained_mmc_defconfig
> +++ b/configs/sama5d2_xplained_mmc_defconfig
> @@ -1,6 +1,9 @@
> CONFIG_ARM=y
> CONFIG_ARCH_AT91=y
> CONFIG_TARGET_SAMA5D2_XPLAINED=y
> +CONFIG_DM_GPIO=y
> +CONFIG_DM_SERIAL=y
> +CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d2_xplained"
> CONFIG_SPL=y
> CONFIG_FIT=y
> CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_MMC"
> @@ -13,13 +16,39 @@ CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_FLASH is not set
> CONFIG_CMD_MMC=y
> CONFIG_CMD_SF=y
> +CONFIG_CMD_I2C=y
> CONFIG_CMD_USB=y
> # CONFIG_CMD_FPGA is not set
> 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_BLK=y
> +CONFIG_CLK=y
> +CONFIG_SPL_CLK=y
> +CONFIG_CLK_AT91=y
> +CONFIG_AT91_UTMI=y
> +CONFIG_AT91_H32MX=y
> +CONFIG_AT91_GENERIC_CLK=y
> +CONFIG_ATMEL_PIO4=y
> +CONFIG_DM_I2C=y
> +CONFIG_SYS_I2C_AT91=y
> +CONFIG_DM_MMC=y
> +CONFIG_DM_MMC_OPS=y
> +CONFIG_ATMEL_SDHCI=y
> +CONFIG_DM_SPI_FLASH=y
> CONFIG_SPI_FLASH=y
> +CONFIG_SPI_FLASH_ATMEL=y
> +CONFIG_PINCTRL=y
> +CONFIG_PINCTRL_AT91PIO4=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_GADGET=y
> CONFIG_USB_GADGET_ATMEL_USBA=y
> -CONFIG_OF_LIBFDT=y
> diff --git a/configs/sama5d2_xplained_spiflash_defconfig b/configs/sama5d2_xplained_spiflash_defconfig
> index 617d73a..ecba5ef 100644
> --- a/configs/sama5d2_xplained_spiflash_defconfig
> +++ b/configs/sama5d2_xplained_spiflash_defconfig
> @@ -1,6 +1,9 @@
> CONFIG_ARM=y
> CONFIG_ARCH_AT91=y
> CONFIG_TARGET_SAMA5D2_XPLAINED=y
> +CONFIG_DM_GPIO=y
> +CONFIG_DM_SERIAL=y
> +CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d2_xplained"
> CONFIG_SPL=y
> CONFIG_FIT=y
> CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_SERIALFLASH"
> @@ -13,13 +16,40 @@ CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_FLASH is not set
> CONFIG_CMD_MMC=y
> CONFIG_CMD_SF=y
> +CONFIG_CMD_I2C=y
> CONFIG_CMD_USB=y
> # CONFIG_CMD_FPGA is not set
> 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_BLK=y
> +CONFIG_CLK=y
> +CONFIG_SPL_CLK=y
> +CONFIG_CLK_AT91=y
> +CONFIG_AT91_UTMI=y
> +CONFIG_AT91_H32MX=y
> +CONFIG_AT91_GENERIC_CLK=y
> +CONFIG_ATMEL_PIO4=y
> +CONFIG_DM_I2C=y
> +CONFIG_SYS_I2C_AT91=y
> +CONFIG_DM_MMC=y
> +CONFIG_DM_MMC_OPS=y
> +CONFIG_ATMEL_SDHCI=y
> +CONFIG_DM_SPI_FLASH=y
> CONFIG_SPI_FLASH=y
> +CONFIG_SPI_FLASH_ATMEL=y
> +CONFIG_PINCTRL=y
> +CONFIG_PINCTRL_AT91PIO4=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/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h
> index f9a8f6f..77757a3 100644
> --- a/include/configs/sama5d2_xplained.h
> +++ b/include/configs/sama5d2_xplained.h
> @@ -15,11 +15,6 @@
>
> #include "at91-sama5_common.h"
>
> -/* serial console */
> -#define CONFIG_ATMEL_USART
> -#define CONFIG_USART_BASE ATMEL_BASE_UART1
> -#define CONFIG_USART_ID ATMEL_ID_UART1
> -
> /* SDRAM */
> #define CONFIG_NR_DRAM_BANKS 1
> #define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_DDRCS
> @@ -34,14 +29,8 @@
>
> #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */
>
> -#undef CONFIG_AT91_GPIO
> -#define CONFIG_ATMEL_PIO4
> -
> /* SerialFlash */
> #ifdef CONFIG_CMD_SF
> -#define CONFIG_ATMEL_SPI
> -#define CONFIG_ATMEL_SPI0
> -#define CONFIG_SPI_FLASH_ATMEL
> #define CONFIG_SF_DEFAULT_BUS 0
> #define CONFIG_SF_DEFAULT_CS 0
> #define CONFIG_SF_DEFAULT_SPEED 30000000
> @@ -51,24 +40,9 @@
> #undef CONFIG_CMD_NAND
>
> /* MMC */
> -
> #ifdef CONFIG_CMD_MMC
> -#define CONFIG_MMC
> #define CONFIG_GENERIC_MMC
> #define CONFIG_SDHCI
> -#define CONFIG_ATMEL_SDHCI
> -#define CONFIG_ATMEL_SDHCI0
> -#define CONFIG_ATMEL_SDHCI1
> -#define CONFIG_SUPPORT_EMMC_BOOT
> -#endif
> -
> -/* USB */
> -
> -#ifdef CONFIG_CMD_USB
> -#define CONFIG_USB_EHCI
> -#define CONFIG_USB_EHCI_ATMEL
> -#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
> -#define CONFIG_USB_STORAGE
> #endif
>
> /* USB device */
next prev parent reply other threads:[~2016-10-16 20:11 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-13 2:49 [U-Boot] [PATCH v2 0/4] board: sama5d2_xplained: Convert to use device tree and drivers with DM Wenyou Yang
2016-09-13 2:49 ` [U-Boot] [PATCH v2 1/4] board: sama5d2_xplained: Move config options to defconfigs Wenyou Yang
2016-10-16 20:11 ` Andreas Bießmann [this message]
2016-09-13 2:49 ` [U-Boot] [PATCH v2 2/4] board: sama5d2_xplained: Clean up code Wenyou Yang
2016-10-16 20:17 ` [U-Boot] [U-Boot, v2, " Andreas Bießmann
2016-09-13 2:49 ` [U-Boot] [PATCH v2 3/4] board: sama5d2_xplained: Set 'ethaddr' got from AT24MAC Wenyou Yang
2016-10-16 20:18 ` [U-Boot] [U-Boot, v2, " Andreas Bießmann
2016-10-16 21:42 ` Andreas Bießmann
2016-10-16 22:03 ` Tom Rini
2016-09-13 2:49 ` [U-Boot] [PATCH v2 4/4] board: sama5d2_xplained: Enable an early debug UART Wenyou Yang
2016-10-16 20:20 ` [U-Boot] [U-Boot, v2, " Andreas Bießmann
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=20161016201108.GA3852@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox