{"id":723418,"url":"http://patchwork.ozlabs.org/api/patches/723418/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20170203062928.10864-2-wenyou.yang@atmel.com/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170203062928.10864-2-wenyou.yang@atmel.com>","list_archive_url":null,"date":"2017-02-03T06:29:25","name":"[U-Boot,1/4] board: at91sam9x5ek: move config options to defconfig","commit_ref":null,"pull_url":null,"state":"deferred","archived":false,"hash":"bd2e64a27f9f167602c300d34a87ce2921995a7e","submitter":{"id":16102,"url":"http://patchwork.ozlabs.org/api/people/16102/?format=json","name":"Wenyou Yang","email":"wenyou.yang@atmel.com"},"delegate":{"id":6342,"url":"http://patchwork.ozlabs.org/api/users/6342/?format=json","username":"abiessmann","first_name":"Andreas","last_name":"Bießmann","email":"andreas.biessmann@googlemail.com"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20170203062928.10864-2-wenyou.yang@atmel.com/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/723418/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/723418/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Received":["from theia.denx.de (theia.denx.de [85.214.87.163])\n\tby ozlabs.org (Postfix) with ESMTP id 3vF6Xx5Xtsz9s75\n\tfor ;\n\tFri, 3 Feb 2017 17:34:41 +1100 (AEDT)","from localhost (localhost [127.0.0.1])\n\tby theia.denx.de (Postfix) with ESMTP id 492EC4AF41;\n\tFri, 3 Feb 2017 07:34:40 +0100 (CET)","from theia.denx.de ([127.0.0.1])\n\tby localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 0Z3P7mbiKN5s; Fri, 3 Feb 2017 07:34:40 +0100 (CET)","from theia.denx.de (localhost [127.0.0.1])\n\tby theia.denx.de (Postfix) with ESMTP id B445B4AA0D;\n\tFri, 3 Feb 2017 07:34:39 +0100 (CET)","from localhost (localhost [127.0.0.1])\n\tby theia.denx.de (Postfix) with ESMTP id 331464AC55\n\tfor ; Fri, 3 Feb 2017 07:34:36 +0100 (CET)","from theia.denx.de ([127.0.0.1])\n\tby localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id SNzP44cCaUAq for ;\n\tFri, 3 Feb 2017 07:34:36 +0100 (CET)","from eusmtp01.atmel.com (eusmtp01.atmel.com [212.144.249.242])\n\tby theia.denx.de (Postfix) with ESMTPS id 995EC4AA0D\n\tfor ; Fri, 3 Feb 2017 07:34:31 +0100 (CET)","from apsmtp01.atmel.com (10.168.254.30) by eusmtp01.atmel.com\n\t(10.145.145.30) with Microsoft SMTP Server id 14.3.235.1;\n\tFri, 3 Feb 2017 07:34:24 +0100","from shaarm01.corp.atmel.com (10.168.254.13) by\n\tapsmtp01.corp.atmel.com (10.168.254.30) with Microsoft SMTP Server id\n\t14.3.235.1; Fri, 3 Feb 2017 14:37:42 +0800"],"X-policyd-weight":"NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5\n\tNOT_IN_BL_NJABL=-1.5 (only DNSBL check requested)","From":"Wenyou Yang ","To":"U-Boot Mailing List ","Date":"Fri, 3 Feb 2017 14:29:25 +0800","Message-ID":"<20170203062928.10864-2-wenyou.yang@atmel.com>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20170203062928.10864-1-wenyou.yang@atmel.com>","References":"<20170203062928.10864-1-wenyou.yang@atmel.com>","MIME-Version":"1.0","Subject":"[U-Boot] [PATCH 1/4] board: at91sam9x5ek: move config options to\n\tdefconfig","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.15","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" "},"content":"Enable CONFIG_CLK and CONFIG_PINCTRL to support at91 clock\ndriver and at91 pinctrl driver.\n\nMove some config options to configs/sama5d4ek_*_defconfig, and\nmake the drivers, spi, emac, gpio, serial and ehci usb to support\nthe driver model.\n\nDue to the limitation of internal SRAM size, disable the SPL option\nfor the spi flash configuration.\n\nSigned-off-by: Wenyou Yang \n---\n\n board/atmel/at91sam9x5ek/at91sam9x5ek.c | 2 ++\n configs/at91sam9x5ek_dataflash_defconfig | 20 +++++++++++++++++++-\n configs/at91sam9x5ek_mmc_defconfig | 20 +++++++++++++++++++-\n configs/at91sam9x5ek_nandflash_defconfig | 20 +++++++++++++++++++-\n configs/at91sam9x5ek_spiflash_defconfig | 27 +++++++++++++++++++--------\n include/configs/at91sam9x5ek.h | 19 +------------------\n 6 files changed, 79 insertions(+), 29 deletions(-)","diff":"diff --git a/board/atmel/at91sam9x5ek/at91sam9x5ek.c b/board/atmel/at91sam9x5ek/at91sam9x5ek.c\nindex cc81776f9b..0ae42dd158 100644\n--- a/board/atmel/at91sam9x5ek/at91sam9x5ek.c\n+++ b/board/atmel/at91sam9x5ek/at91sam9x5ek.c\n@@ -205,6 +205,7 @@ void lcd_show_board_info(void)\n #endif /* CONFIG_LCD_INFO */\n #endif /* CONFIG_LCD */\n \n+#ifndef CONFIG_DM_SPI\n /* SPI chip select control */\n #ifdef CONFIG_ATMEL_SPI\n int spi_cs_is_valid(unsigned int bus, unsigned int cs)\n@@ -238,6 +239,7 @@ void spi_cs_deactivate(struct spi_slave *slave)\n \t}\n }\n #endif /* CONFIG_ATMEL_SPI */\n+#endif\n \n #ifdef CONFIG_GENERIC_ATMEL_MCI\n int board_mmc_init(bd_t *bd)\ndiff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig\nindex e07e2175e0..c3feca28bc 100644\n--- a/configs/at91sam9x5ek_dataflash_defconfig\n+++ b/configs/at91sam9x5ek_dataflash_defconfig\n@@ -1,6 +1,7 @@\n CONFIG_ARM=y\n CONFIG_ARCH_AT91=y\n CONFIG_TARGET_AT91SAM9X5EK=y\n+CONFIG_DEFAULT_DEVICE_TREE=\"at91sam9g35ek\"\n CONFIG_SYS_EXTRA_OPTIONS=\"AT91SAM9X5,SYS_USE_DATAFLASH\"\n CONFIG_BOOTDELAY=3\n # CONFIG_CONSOLE_MUX is not set\n@@ -21,9 +22,26 @@ CONFIG_CMD_DHCP=y\n CONFIG_CMD_PING=y\n CONFIG_CMD_FAT=y\n CONFIG_CMD_UBI=y\n+CONFIG_OF_CONTROL=y\n+CONFIG_DM=y\n+CONFIG_CLK=y\n+CONFIG_CLK_AT91=y\n+CONFIG_AT91_UTMI=y\n+CONFIG_DM_GPIO=y\n+CONFIG_AT91_GPIO=y\n+CONFIG_DM_SPI_FLASH=y\n CONFIG_SPI_FLASH=y\n CONFIG_SPI_FLASH_ATMEL=y\n+CONFIG_DM_ETH=y\n+CONFIG_MACB=y\n+CONFIG_PINCTRL=y\n+CONFIG_PINCTRL_AT91=y\n+CONFIG_DM_SERIAL=y\n+CONFIG_ATMEL_USART=y\n+CONFIG_DM_SPI=y\n+CONFIG_ATMEL_SPI=y\n CONFIG_USB=y\n+CONFIG_DM_USB=y\n+CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_STORAGE=y\n CONFIG_LCD=y\n-CONFIG_OF_LIBFDT=y\ndiff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig\nindex 9a95a0496a..f4b0edd4ca 100644\n--- a/configs/at91sam9x5ek_mmc_defconfig\n+++ b/configs/at91sam9x5ek_mmc_defconfig\n@@ -1,6 +1,7 @@\n CONFIG_ARM=y\n CONFIG_ARCH_AT91=y\n CONFIG_TARGET_AT91SAM9X5EK=y\n+CONFIG_DEFAULT_DEVICE_TREE=\"at91sam9g35ek\"\n CONFIG_SYS_EXTRA_OPTIONS=\"AT91SAM9X5,SYS_USE_MMC\"\n CONFIG_BOOTDELAY=3\n # CONFIG_CONSOLE_MUX is not set\n@@ -21,9 +22,26 @@ CONFIG_CMD_DHCP=y\n CONFIG_CMD_PING=y\n CONFIG_CMD_FAT=y\n CONFIG_CMD_UBI=y\n+CONFIG_OF_CONTROL=y\n+CONFIG_DM=y\n+CONFIG_CLK=y\n+CONFIG_CLK_AT91=y\n+CONFIG_AT91_UTMI=y\n+CONFIG_DM_GPIO=y\n+CONFIG_AT91_GPIO=y\n+CONFIG_DM_SPI_FLASH=y\n CONFIG_SPI_FLASH=y\n CONFIG_SPI_FLASH_ATMEL=y\n+CONFIG_DM_ETH=y\n+CONFIG_MACB=y\n+CONFIG_PINCTRL=y\n+CONFIG_PINCTRL_AT91=y\n+CONFIG_DM_SERIAL=y\n+CONFIG_ATMEL_USART=y\n+CONFIG_DM_SPI=y\n+CONFIG_ATMEL_SPI=y\n CONFIG_USB=y\n+CONFIG_DM_USB=y\n+CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_STORAGE=y\n CONFIG_LCD=y\n-CONFIG_OF_LIBFDT=y\ndiff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig\nindex 05907b7859..5c3463260e 100644\n--- a/configs/at91sam9x5ek_nandflash_defconfig\n+++ b/configs/at91sam9x5ek_nandflash_defconfig\n@@ -6,6 +6,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y\n CONFIG_SPL_LIBGENERIC_SUPPORT=y\n CONFIG_SPL_NAND_SUPPORT=y\n CONFIG_SPL_SERIAL_SUPPORT=y\n+CONFIG_DEFAULT_DEVICE_TREE=\"at91sam9g35ek\"\n CONFIG_SYS_EXTRA_OPTIONS=\"AT91SAM9X5,SYS_USE_NANDFLASH\"\n CONFIG_BOOTDELAY=3\n # CONFIG_CONSOLE_MUX is not set\n@@ -27,9 +28,26 @@ CONFIG_CMD_DHCP=y\n CONFIG_CMD_PING=y\n CONFIG_CMD_FAT=y\n CONFIG_CMD_UBI=y\n+CONFIG_OF_CONTROL=y\n+CONFIG_DM=y\n+CONFIG_CLK=y\n+CONFIG_CLK_AT91=y\n+CONFIG_AT91_UTMI=y\n+CONFIG_DM_GPIO=y\n+CONFIG_AT91_GPIO=y\n+CONFIG_DM_SPI_FLASH=y\n CONFIG_SPI_FLASH=y\n CONFIG_SPI_FLASH_ATMEL=y\n+CONFIG_DM_ETH=y\n+CONFIG_MACB=y\n+CONFIG_PINCTRL=y\n+CONFIG_PINCTRL_AT91=y\n+CONFIG_DM_SERIAL=y\n+CONFIG_ATMEL_USART=y\n+CONFIG_DM_SPI=y\n+CONFIG_ATMEL_SPI=y\n CONFIG_USB=y\n+CONFIG_DM_USB=y\n+CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_STORAGE=y\n CONFIG_LCD=y\n-CONFIG_OF_LIBFDT=y\ndiff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig\nindex 5fc512b998..939a6bbd4a 100644\n--- a/configs/at91sam9x5ek_spiflash_defconfig\n+++ b/configs/at91sam9x5ek_spiflash_defconfig\n@@ -1,18 +1,12 @@\n CONFIG_ARM=y\n CONFIG_ARCH_AT91=y\n CONFIG_TARGET_AT91SAM9X5EK=y\n-CONFIG_SPL_GPIO_SUPPORT=y\n-CONFIG_SPL_LIBCOMMON_SUPPORT=y\n-CONFIG_SPL_LIBGENERIC_SUPPORT=y\n-CONFIG_SPL_SERIAL_SUPPORT=y\n-CONFIG_SPL_SPI_FLASH_SUPPORT=y\n-CONFIG_SPL_SPI_SUPPORT=y\n+CONFIG_DEFAULT_DEVICE_TREE=\"at91sam9g35ek\"\n CONFIG_SYS_EXTRA_OPTIONS=\"AT91SAM9X5,SYS_USE_SPIFLASH\"\n CONFIG_BOOTDELAY=3\n # CONFIG_CONSOLE_MUX is not set\n CONFIG_SYS_CONSOLE_IS_IN_ENV=y\n # CONFIG_DISPLAY_BOARDINFO is not set\n-CONFIG_SPL=y\n CONFIG_HUSH_PARSER=y\n CONFIG_SYS_PROMPT=\"U-Boot> \"\n CONFIG_CMD_BOOTZ=y\n@@ -28,9 +22,26 @@ CONFIG_CMD_DHCP=y\n CONFIG_CMD_PING=y\n CONFIG_CMD_FAT=y\n CONFIG_CMD_UBI=y\n+CONFIG_OF_CONTROL=y\n+CONFIG_DM=y\n+CONFIG_CLK=y\n+CONFIG_CLK_AT91=y\n+CONFIG_AT91_UTMI=y\n+CONFIG_DM_GPIO=y\n+CONFIG_AT91_GPIO=y\n+CONFIG_DM_SPI_FLASH=y\n CONFIG_SPI_FLASH=y\n CONFIG_SPI_FLASH_ATMEL=y\n+CONFIG_DM_ETH=y\n+CONFIG_MACB=y\n+CONFIG_PINCTRL=y\n+CONFIG_PINCTRL_AT91=y\n+CONFIG_DM_SERIAL=y\n+CONFIG_ATMEL_USART=y\n+CONFIG_DM_SPI=y\n+CONFIG_ATMEL_SPI=y\n CONFIG_USB=y\n+CONFIG_DM_USB=y\n+CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_STORAGE=y\n CONFIG_LCD=y\n-CONFIG_OF_LIBFDT=y\ndiff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h\nindex 6dee45a9f2..0b88bc9ca1 100644\n--- a/include/configs/at91sam9x5ek.h\n+++ b/include/configs/at91sam9x5ek.h\n@@ -27,10 +27,8 @@\n \n /* general purpose I/O */\n #define CONFIG_ATMEL_LEGACY\t\t/* required until (g)pio is fixed */\n-#define CONFIG_AT91_GPIO\n \n /* serial console */\n-#define CONFIG_ATMEL_USART\n #define CONFIG_USART_BASE\tATMEL_BASE_DBGU\n #define CONFIG_USART_ID\t\tATMEL_ID_SYS\n \n@@ -74,12 +72,6 @@\n #define CONFIG_SYS_INIT_SP_ADDR \\\n \t(CONFIG_SYS_SDRAM_BASE + 4 * 1024 - GENERATED_GBL_DATA_SIZE)\n \n-/* DataFlash */\n-#ifdef CONFIG_CMD_SF\n-#define CONFIG_ATMEL_SPI\n-#define CONFIG_SF_DEFAULT_SPEED\t\t30000000\n-#endif\n-\n /* NAND flash */\n #ifdef CONFIG_CMD_NAND\n #define CONFIG_NAND_ATMEL\n@@ -120,18 +112,9 @@\n #define CONFIG_DOS_PARTITION\n #endif\n \n-/* Ethernet */\n-#define CONFIG_MACB\n-#define CONFIG_RMII\n-#define CONFIG_NET_RETRY_COUNT\t\t20\n-#define CONFIG_MACB_SEARCH_PHY\n-\n /* USB */\n #ifdef CONFIG_CMD_USB\n-#ifdef CONFIG_USB_EHCI\n-#define CONFIG_USB_EHCI_ATMEL\n-#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS\t2\n-#else\n+#ifndef CONFIG_USB_EHCI\n #define CONFIG_USB_ATMEL\n #define CONFIG_USB_ATMEL_CLK_SEL_UPLL\n #define CONFIG_USB_OHCI_NEW\n","prefixes":["U-Boot","1/4"]}