From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas =?iso-8859-1?Q?Bie=DFmann?= Date: Sat, 4 Feb 2017 23:56:15 +0100 Subject: [U-Boot] [U-Boot, v2, 5/8] board: sama5d4ek: move config options to defconfig In-Reply-To: <1477639009-10675-6-git-send-email-wenyou.yang@atmel.com> References: <1477639009-10675-6-git-send-email-wenyou.yang@atmel.com> Message-ID: <20170204225615.sf7ow6jhgj2ccjwb@mba.int.er.biessmann.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Fri, Oct 28, 2016 at 03:16:46PM +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/sama5d4ek_*_defconfig. > > Signed-off-by: Wenyou Yang Reviewed-by: Andreas Bie?mann > --- > > Changes in v2: > - Restore wrong removal of #define CONFIG_USB_ETHER. > - Update the commit log. > > board/atmel/sama5d4ek/sama5d4ek.c | 2 ++ > configs/sama5d4ek_mmc_defconfig | 23 +++++++++++++++++++++++ > configs/sama5d4ek_nandflash_defconfig | 23 +++++++++++++++++++++++ > configs/sama5d4ek_spiflash_defconfig | 23 +++++++++++++++++++++++ > include/configs/sama5d4ek.h | 26 -------------------------- > 5 files changed, 71 insertions(+), 26 deletions(-) > > diff --git a/board/atmel/sama5d4ek/sama5d4ek.c b/board/atmel/sama5d4ek/sama5d4ek.c > index d1b5ff5..a0e4bb7 100644 > --- a/board/atmel/sama5d4ek/sama5d4ek.c > +++ b/board/atmel/sama5d4ek/sama5d4ek.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/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig > index 4899970..fd49b58 100644 > --- a/configs/sama5d4ek_mmc_defconfig > +++ b/configs/sama5d4ek_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-sama5d4ek" > CONFIG_FIT=y > CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC" > CONFIG_BOOTDELAY=3 > @@ -28,9 +29,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 > diff --git a/configs/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig > index 9ebe295..34f5234 100644 > --- a/configs/sama5d4ek_nandflash_defconfig > +++ b/configs/sama5d4ek_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-sama5d4ek" > CONFIG_FIT=y > CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH" > CONFIG_BOOTDELAY=3 > @@ -26,9 +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 > diff --git a/configs/sama5d4ek_spiflash_defconfig b/configs/sama5d4ek_spiflash_defconfig > index dff8995..c7f4655 100644 > --- a/configs/sama5d4ek_spiflash_defconfig > +++ b/configs/sama5d4ek_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-sama5d4ek" > CONFIG_FIT=y > CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH" > CONFIG_BOOTDELAY=3 > @@ -27,9 +28,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 > diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h > index 00ed400..b5b8e4c 100644 > --- a/include/configs/sama5d4ek.h > +++ b/include/configs/sama5d4ek.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 > > @@ -62,20 +47,9 @@ > #endif > > /* MMC */ > - > #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 */