Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/711681/?format=api
{ "id": 711681, "url": "http://patchwork.ozlabs.org/api/patches/711681/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/20170106045654.21193-5-wenyou.yang@atmel.com/", "project": { "id": 18, "url": "http://patchwork.ozlabs.org/api/projects/18/?format=api", "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": "<20170106045654.21193-5-wenyou.yang@atmel.com>", "list_archive_url": null, "date": "2017-01-06T04:56:53", "name": "[U-Boot,4/4] defconfig: sama5: remove SoCs from CONFIG_SYS_EXTRA_OPTIONS", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "d7e3e3d54c3da807a1c965a121e60483699f5acf", "submitter": { "id": 16102, "url": "http://patchwork.ozlabs.org/api/people/16102/?format=api", "name": "Wenyou Yang", "email": "wenyou.yang@atmel.com" }, "delegate": { "id": 6342, "url": "http://patchwork.ozlabs.org/api/users/6342/?format=api", "username": "abiessmann", "first_name": "Andreas", "last_name": "Bießmann", "email": "andreas.biessmann@googlemail.com" }, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/20170106045654.21193-5-wenyou.yang@atmel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/711681/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/711681/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<u-boot-bounces@lists.denx.de>", "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 3tvsnh6NXPz9t0H\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 6 Jan 2017 16:00:56 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby theia.denx.de (Postfix) with ESMTP id CAEB2B3963;\n\tFri, 6 Jan 2017 06:00:38 +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 8lAkxpk33GOc; Fri, 6 Jan 2017 06:00:38 +0100 (CET)", "from theia.denx.de (localhost [127.0.0.1])\n\tby theia.denx.de (Postfix) with ESMTP id E4B4EB3931;\n\tFri, 6 Jan 2017 06:00:35 +0100 (CET)", "from localhost (localhost [127.0.0.1])\n\tby theia.denx.de (Postfix) with ESMTP id 6EEB8B394D\n\tfor <u-boot@lists.denx.de>; Fri, 6 Jan 2017 06:00:32 +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 NjYQy1tmeJzS for <u-boot@lists.denx.de>;\n\tFri, 6 Jan 2017 06:00:32 +0100 (CET)", "from ussmtp01.atmel.com (nasmtp01.atmel.com [192.199.1.245])\n\tby theia.denx.de (Postfix) with ESMTPS id 26D96B3939\n\tfor <u-boot@lists.denx.de>; Fri, 6 Jan 2017 06:00:27 +0100 (CET)", "from apsmtp01.atmel.com (10.168.254.30) by DVREDG01.corp.atmel.com\n\t(10.42.103.30) with Microsoft SMTP Server (TLS) id 14.3.235.1;\n\tThu, 5 Jan 2017 22:00:17 -0700", "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, 6 Jan 2017 13:03:17 +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 <wenyou.yang@atmel.com>", "To": "U-Boot Mailing List <u-boot@lists.denx.de>", "Date": "Fri, 6 Jan 2017 12:56:53 +0800", "Message-ID": "<20170106045654.21193-5-wenyou.yang@atmel.com>", "X-Mailer": "git-send-email 2.11.0", "In-Reply-To": "<20170106045654.21193-1-wenyou.yang@atmel.com>", "References": "<20170106045654.21193-1-wenyou.yang@atmel.com>", "MIME-Version": "1.0", "Subject": "[U-Boot] [PATCH 4/4] defconfig: sama5: remove SoCs from\n\tCONFIG_SYS_EXTRA_OPTIONS", "X-BeenThere": "u-boot@lists.denx.de", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "U-Boot discussion <u-boot.lists.denx.de>", "List-Unsubscribe": "<http://lists.denx.de/mailman/options/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>", "List-Archive": "<http://lists.denx.de/pipermail/u-boot/>", "List-Post": "<mailto:u-boot@lists.denx.de>", "List-Help": "<mailto:u-boot-request@lists.denx.de?subject=help>", "List-Subscribe": "<http://lists.denx.de/mailman/listinfo/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "u-boot-bounces@lists.denx.de", "Sender": "\"U-Boot\" <u-boot-bounces@lists.denx.de>" }, "content": "The CONFIG_SYS_EXTRA_OPTIONS is deprecated, and the SoC options\nsuch as SAMA5D2, SAMA5D3 and SAMA5D4 are defined as config\nin Kconfig, update the defconfig file, remove these options.\n\nSigned-off-by: Wenyou Yang <wenyou.yang@atmel.com>\n---\n\n configs/ma5d4evk_defconfig | 1 -\n configs/sama5d2_ptc_nandflash_defconfig | 2 +-\n configs/sama5d2_ptc_spiflash_defconfig | 2 +-\n configs/sama5d2_xplained_mmc_defconfig | 10 ++++------\n configs/sama5d2_xplained_spiflash_defconfig | 8 +++-----\n configs/sama5d36ek_cmp_mmc_defconfig | 2 +-\n configs/sama5d36ek_cmp_nandflash_defconfig | 2 +-\n configs/sama5d36ek_cmp_spiflash_defconfig | 2 +-\n configs/sama5d3_xplained_mmc_defconfig | 2 +-\n configs/sama5d3_xplained_nandflash_defconfig | 2 +-\n configs/sama5d3xek_mmc_defconfig | 2 +-\n configs/sama5d3xek_nandflash_defconfig | 2 +-\n configs/sama5d3xek_spiflash_defconfig | 2 +-\n configs/sama5d4_xplained_mmc_defconfig | 2 +-\n configs/sama5d4_xplained_nandflash_defconfig | 2 +-\n configs/sama5d4_xplained_spiflash_defconfig | 2 +-\n configs/sama5d4ek_mmc_defconfig | 3 +--\n configs/sama5d4ek_nandflash_defconfig | 3 +--\n configs/sama5d4ek_spiflash_defconfig | 3 +--\n configs/vinco_defconfig | 2 +-\n 20 files changed, 24 insertions(+), 32 deletions(-)", "diff": "diff --git a/configs/ma5d4evk_defconfig b/configs/ma5d4evk_defconfig\nindex e2a68fb160..cf2e87a247 100644\n--- a/configs/ma5d4evk_defconfig\n+++ b/configs/ma5d4evk_defconfig\n@@ -8,7 +8,6 @@ CONFIG_SPL_SERIAL_SUPPORT=y\n CONFIG_SPL_SPI_FLASH_SUPPORT=y\n CONFIG_SPL_SPI_SUPPORT=y\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D4\"\n CONFIG_BOOTDELAY=3\n CONFIG_VERSION_VARIABLE=y\n # CONFIG_DISPLAY_BOARDINFO is not set\ndiff --git a/configs/sama5d2_ptc_nandflash_defconfig b/configs/sama5d2_ptc_nandflash_defconfig\nindex 04bd12b3ad..4d4c71fbd5 100644\n--- a/configs/sama5d2_ptc_nandflash_defconfig\n+++ b/configs/sama5d2_ptc_nandflash_defconfig\n@@ -6,7 +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_SYS_EXTRA_OPTIONS=\"SAMA5D2,SYS_USE_NANDFLASH\"\n+CONFIG_SYS_EXTRA_OPTIONS=\"SYS_USE_NANDFLASH\"\n CONFIG_BOOTDELAY=3\n # CONFIG_DISPLAY_BOARDINFO is not set\n CONFIG_SPL=y\ndiff --git a/configs/sama5d2_ptc_spiflash_defconfig b/configs/sama5d2_ptc_spiflash_defconfig\nindex 1e8825e535..6e0f27165f 100644\n--- a/configs/sama5d2_ptc_spiflash_defconfig\n+++ b/configs/sama5d2_ptc_spiflash_defconfig\n@@ -7,7 +7,7 @@ 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_SYS_EXTRA_OPTIONS=\"SAMA5D2,SYS_USE_SERIALFLASH\"\n+CONFIG_SYS_EXTRA_OPTIONS=\"SYS_USE_SERIALFLASH\"\n CONFIG_BOOTDELAY=3\n # CONFIG_DISPLAY_BOARDINFO is not set\n CONFIG_SPL=y\ndiff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig\nindex 8a786f1a06..15429639e6 100644\n--- a/configs/sama5d2_xplained_mmc_defconfig\n+++ b/configs/sama5d2_xplained_mmc_defconfig\n@@ -8,11 +8,9 @@ CONFIG_SPL_FAT_SUPPORT=y\n CONFIG_SPL_LIBDISK_SUPPORT=y\n CONFIG_SPL_MMC_SUPPORT=y\n CONFIG_SPL_SERIAL_SUPPORT=y\n-CONFIG_DM_GPIO=y\n-CONFIG_DM_SERIAL=y\n CONFIG_DEFAULT_DEVICE_TREE=\"at91-sama5d2_xplained\"\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D2,SYS_USE_MMC\"\n+CONFIG_SYS_EXTRA_OPTIONS=\"SYS_USE_MMC\"\n CONFIG_BOOTDELAY=3\n # CONFIG_DISPLAY_BOARDINFO is not set\n CONFIG_SPL=y\n@@ -34,24 +32,24 @@ CONFIG_OF_CONTROL=y\n CONFIG_SPL_OF_CONTROL=y\n CONFIG_DM=y\n CONFIG_SPL_DM=y\n-CONFIG_BLK=y\n CONFIG_CLK=y\n CONFIG_SPL_CLK=y\n CONFIG_CLK_AT91=y\n CONFIG_AT91_UTMI=y\n CONFIG_AT91_H32MX=y\n CONFIG_AT91_GENERIC_CLK=y\n+CONFIG_DM_GPIO=y\n CONFIG_ATMEL_PIO4=y\n CONFIG_DM_I2C=y\n CONFIG_SYS_I2C_AT91=y\n CONFIG_DM_MMC=y\n-CONFIG_DM_MMC_OPS=y\n CONFIG_ATMEL_SDHCI=y\n CONFIG_DM_SPI_FLASH=y\n CONFIG_SPI_FLASH=y\n CONFIG_SPI_FLASH_ATMEL=y\n CONFIG_PINCTRL=y\n CONFIG_PINCTRL_AT91PIO4=y\n+CONFIG_DM_SERIAL=y\n CONFIG_DEBUG_UART=y\n CONFIG_DEBUG_UART_ATMEL=y\n CONFIG_DEBUG_UART_BASE=0xf8020000\n@@ -62,8 +60,8 @@ CONFIG_ATMEL_USART=y\n CONFIG_DM_SPI=y\n CONFIG_ATMEL_SPI=y\n CONFIG_USB=y\n-CONFIG_USB_STORAGE=y\n CONFIG_DM_USB=y\n CONFIG_USB_EHCI_HCD=y\n+CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n CONFIG_USB_GADGET_ATMEL_USBA=y\ndiff --git a/configs/sama5d2_xplained_spiflash_defconfig b/configs/sama5d2_xplained_spiflash_defconfig\nindex 51594e71f7..d1367585fa 100644\n--- a/configs/sama5d2_xplained_spiflash_defconfig\n+++ b/configs/sama5d2_xplained_spiflash_defconfig\n@@ -7,11 +7,9 @@ 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_DM_GPIO=y\n-CONFIG_DM_SERIAL=y\n CONFIG_DEFAULT_DEVICE_TREE=\"at91-sama5d2_xplained\"\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D2,SYS_USE_SERIALFLASH\"\n+CONFIG_SYS_EXTRA_OPTIONS=\"SYS_USE_SERIALFLASH\"\n CONFIG_BOOTDELAY=3\n # CONFIG_DISPLAY_BOARDINFO is not set\n CONFIG_SPL=y\n@@ -33,24 +31,24 @@ CONFIG_OF_CONTROL=y\n CONFIG_SPL_OF_CONTROL=y\n CONFIG_DM=y\n CONFIG_SPL_DM=y\n-CONFIG_BLK=y\n CONFIG_CLK=y\n CONFIG_SPL_CLK=y\n CONFIG_CLK_AT91=y\n CONFIG_AT91_UTMI=y\n CONFIG_AT91_H32MX=y\n CONFIG_AT91_GENERIC_CLK=y\n+CONFIG_DM_GPIO=y\n CONFIG_ATMEL_PIO4=y\n CONFIG_DM_I2C=y\n CONFIG_SYS_I2C_AT91=y\n CONFIG_DM_MMC=y\n-CONFIG_DM_MMC_OPS=y\n CONFIG_ATMEL_SDHCI=y\n CONFIG_DM_SPI_FLASH=y\n CONFIG_SPI_FLASH=y\n CONFIG_SPI_FLASH_ATMEL=y\n CONFIG_PINCTRL=y\n CONFIG_PINCTRL_AT91PIO4=y\n+CONFIG_DM_SERIAL=y\n CONFIG_DEBUG_UART=y\n CONFIG_DEBUG_UART_ATMEL=y\n CONFIG_DEBUG_UART_BASE=0xf8020000\ndiff --git a/configs/sama5d36ek_cmp_mmc_defconfig b/configs/sama5d36ek_cmp_mmc_defconfig\nindex ee72c59afe..47c7897a46 100644\n--- a/configs/sama5d36ek_cmp_mmc_defconfig\n+++ b/configs/sama5d36ek_cmp_mmc_defconfig\n@@ -10,7 +10,7 @@ CONFIG_SPL_MMC_SUPPORT=y\n CONFIG_SPL_SERIAL_SUPPORT=y\n CONFIG_DEFAULT_DEVICE_TREE=\"sama5d36ek_cmp\"\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D3,SYS_USE_MMC\"\n+CONFIG_SYS_EXTRA_OPTIONS=\"SYS_USE_MMC\"\n CONFIG_BOOTDELAY=3\n # CONFIG_CONSOLE_MUX is not set\n CONFIG_SYS_CONSOLE_IS_IN_ENV=y\ndiff --git a/configs/sama5d36ek_cmp_nandflash_defconfig b/configs/sama5d36ek_cmp_nandflash_defconfig\nindex aabbf4a4da..a202e9aa1c 100644\n--- a/configs/sama5d36ek_cmp_nandflash_defconfig\n+++ b/configs/sama5d36ek_cmp_nandflash_defconfig\n@@ -8,7 +8,7 @@ CONFIG_SPL_NAND_SUPPORT=y\n CONFIG_SPL_SERIAL_SUPPORT=y\n CONFIG_DEFAULT_DEVICE_TREE=\"sama5d36ek_cmp\"\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D3,SYS_USE_NANDFLASH\"\n+CONFIG_SYS_EXTRA_OPTIONS=\"SYS_USE_NANDFLASH\"\n CONFIG_BOOTDELAY=3\n # CONFIG_CONSOLE_MUX is not set\n CONFIG_SYS_CONSOLE_IS_IN_ENV=y\ndiff --git a/configs/sama5d36ek_cmp_spiflash_defconfig b/configs/sama5d36ek_cmp_spiflash_defconfig\nindex e4131d9d2a..5b13161b76 100644\n--- a/configs/sama5d36ek_cmp_spiflash_defconfig\n+++ b/configs/sama5d36ek_cmp_spiflash_defconfig\n@@ -9,7 +9,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y\n CONFIG_SPL_SPI_SUPPORT=y\n CONFIG_DEFAULT_DEVICE_TREE=\"sama5d36ek_cmp\"\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D3,SYS_USE_SERIALFLASH\"\n+CONFIG_SYS_EXTRA_OPTIONS=\"SYS_USE_SERIALFLASH\"\n CONFIG_BOOTDELAY=3\n # CONFIG_CONSOLE_MUX is not set\n CONFIG_SYS_CONSOLE_IS_IN_ENV=y\ndiff --git a/configs/sama5d3_xplained_mmc_defconfig b/configs/sama5d3_xplained_mmc_defconfig\nindex 49089664de..e74594595c 100644\n--- a/configs/sama5d3_xplained_mmc_defconfig\n+++ b/configs/sama5d3_xplained_mmc_defconfig\n@@ -10,7 +10,7 @@ CONFIG_SPL_MMC_SUPPORT=y\n CONFIG_SPL_SERIAL_SUPPORT=y\n CONFIG_DEFAULT_DEVICE_TREE=\"at91-sama5d3_xplained\"\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D3,SYS_USE_MMC\"\n+CONFIG_SYS_EXTRA_OPTIONS=\"SYS_USE_MMC\"\n CONFIG_BOOTDELAY=3\n CONFIG_SYS_NO_FLASH=y\n # CONFIG_DISPLAY_BOARDINFO is not set\ndiff --git a/configs/sama5d3_xplained_nandflash_defconfig b/configs/sama5d3_xplained_nandflash_defconfig\nindex 5f427c4bbd..053a9da92f 100644\n--- a/configs/sama5d3_xplained_nandflash_defconfig\n+++ b/configs/sama5d3_xplained_nandflash_defconfig\n@@ -8,7 +8,7 @@ CONFIG_SPL_NAND_SUPPORT=y\n CONFIG_SPL_SERIAL_SUPPORT=y\n CONFIG_DEFAULT_DEVICE_TREE=\"at91-sama5d3_xplained\"\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D3,SYS_USE_NANDFLASH\"\n+CONFIG_SYS_EXTRA_OPTIONS=\"SYS_USE_NANDFLASH\"\n CONFIG_BOOTDELAY=3\n CONFIG_SYS_NO_FLASH=y\n # CONFIG_DISPLAY_BOARDINFO is not set\ndiff --git a/configs/sama5d3xek_mmc_defconfig b/configs/sama5d3xek_mmc_defconfig\nindex a8345520be..7545701f71 100644\n--- a/configs/sama5d3xek_mmc_defconfig\n+++ b/configs/sama5d3xek_mmc_defconfig\n@@ -10,7 +10,7 @@ CONFIG_SPL_MMC_SUPPORT=y\n CONFIG_SPL_SERIAL_SUPPORT=y\n CONFIG_DEFAULT_DEVICE_TREE=\"sama5d36ek\"\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D3,SYS_USE_MMC\"\n+CONFIG_SYS_EXTRA_OPTIONS=\"SYS_USE_MMC\"\n CONFIG_BOOTDELAY=3\n # CONFIG_CONSOLE_MUX is not set\n CONFIG_SYS_CONSOLE_IS_IN_ENV=y\ndiff --git a/configs/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig\nindex 2e53ee947f..f7ee7cfc65 100644\n--- a/configs/sama5d3xek_nandflash_defconfig\n+++ b/configs/sama5d3xek_nandflash_defconfig\n@@ -8,7 +8,7 @@ CONFIG_SPL_NAND_SUPPORT=y\n CONFIG_SPL_SERIAL_SUPPORT=y\n CONFIG_DEFAULT_DEVICE_TREE=\"sama5d36ek\"\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D3,SYS_USE_NANDFLASH\"\n+CONFIG_SYS_EXTRA_OPTIONS=\"SYS_USE_NANDFLASH\"\n CONFIG_BOOTDELAY=3\n # CONFIG_CONSOLE_MUX is not set\n CONFIG_SYS_CONSOLE_IS_IN_ENV=y\ndiff --git a/configs/sama5d3xek_spiflash_defconfig b/configs/sama5d3xek_spiflash_defconfig\nindex 6f26b4b5cc..153b52c1c8 100644\n--- a/configs/sama5d3xek_spiflash_defconfig\n+++ b/configs/sama5d3xek_spiflash_defconfig\n@@ -9,7 +9,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y\n CONFIG_SPL_SPI_SUPPORT=y\n CONFIG_DEFAULT_DEVICE_TREE=\"sama5d36ek\"\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D3,SYS_USE_SERIALFLASH\"\n+CONFIG_SYS_EXTRA_OPTIONS=\"SYS_USE_SERIALFLASH\"\n CONFIG_BOOTDELAY=3\n # CONFIG_CONSOLE_MUX is not set\n CONFIG_SYS_CONSOLE_IS_IN_ENV=y\ndiff --git a/configs/sama5d4_xplained_mmc_defconfig b/configs/sama5d4_xplained_mmc_defconfig\nindex dfd607070d..9f581cd37b 100644\n--- a/configs/sama5d4_xplained_mmc_defconfig\n+++ b/configs/sama5d4_xplained_mmc_defconfig\n@@ -10,7 +10,7 @@ CONFIG_SPL_MMC_SUPPORT=y\n CONFIG_SPL_SERIAL_SUPPORT=y\n CONFIG_DEFAULT_DEVICE_TREE=\"at91-sama5d4_xplained\"\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D4,SYS_USE_MMC\"\n+CONFIG_SYS_EXTRA_OPTIONS=\"SYS_USE_MMC\"\n CONFIG_BOOTDELAY=3\n CONFIG_SYS_NO_FLASH=y\n # CONFIG_DISPLAY_BOARDINFO is not set\ndiff --git a/configs/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4_xplained_nandflash_defconfig\nindex 3ac745c01e..08a65c1690 100644\n--- a/configs/sama5d4_xplained_nandflash_defconfig\n+++ b/configs/sama5d4_xplained_nandflash_defconfig\n@@ -8,7 +8,7 @@ CONFIG_SPL_NAND_SUPPORT=y\n CONFIG_SPL_SERIAL_SUPPORT=y\n CONFIG_DEFAULT_DEVICE_TREE=\"at91-sama5d4_xplained\"\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D4,SYS_USE_NANDFLASH\"\n+CONFIG_SYS_EXTRA_OPTIONS=\"SYS_USE_NANDFLASH\"\n CONFIG_BOOTDELAY=3\n CONFIG_SYS_NO_FLASH=y\n # CONFIG_DISPLAY_BOARDINFO is not set\ndiff --git a/configs/sama5d4_xplained_spiflash_defconfig b/configs/sama5d4_xplained_spiflash_defconfig\nindex bd3353b5a0..348610690b 100644\n--- a/configs/sama5d4_xplained_spiflash_defconfig\n+++ b/configs/sama5d4_xplained_spiflash_defconfig\n@@ -9,7 +9,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y\n CONFIG_SPL_SPI_SUPPORT=y\n CONFIG_DEFAULT_DEVICE_TREE=\"at91-sama5d4_xplained\"\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D4,SYS_USE_SERIALFLASH\"\n+CONFIG_SYS_EXTRA_OPTIONS=\"SYS_USE_SERIALFLASH\"\n CONFIG_BOOTDELAY=3\n CONFIG_SYS_NO_FLASH=y\n # CONFIG_DISPLAY_BOARDINFO is not set\ndiff --git a/configs/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig\nindex 799fbbc689..59299417e5 100644\n--- a/configs/sama5d4ek_mmc_defconfig\n+++ b/configs/sama5d4ek_mmc_defconfig\n@@ -10,7 +10,7 @@ CONFIG_SPL_MMC_SUPPORT=y\n CONFIG_SPL_SERIAL_SUPPORT=y\n CONFIG_DEFAULT_DEVICE_TREE=\"at91-sama5d4ek\"\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D4,SYS_USE_MMC\"\n+CONFIG_SYS_EXTRA_OPTIONS=\"SYS_USE_MMC\"\n CONFIG_BOOTDELAY=3\n # CONFIG_CONSOLE_MUX is not set\n CONFIG_SYS_CONSOLE_IS_IN_ENV=y\n@@ -65,4 +65,3 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n CONFIG_USB_GADGET_ATMEL_USBA=y\n CONFIG_LCD=y\n-CONFIG_OF_LIBFDT=y\ndiff --git a/configs/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig\nindex cf2d71483f..4842467f85 100644\n--- a/configs/sama5d4ek_nandflash_defconfig\n+++ b/configs/sama5d4ek_nandflash_defconfig\n@@ -8,7 +8,7 @@ CONFIG_SPL_NAND_SUPPORT=y\n CONFIG_SPL_SERIAL_SUPPORT=y\n CONFIG_DEFAULT_DEVICE_TREE=\"at91-sama5d4ek\"\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D4,SYS_USE_NANDFLASH\"\n+CONFIG_SYS_EXTRA_OPTIONS=\"SYS_USE_NANDFLASH\"\n CONFIG_BOOTDELAY=3\n # CONFIG_CONSOLE_MUX is not set\n CONFIG_SYS_CONSOLE_IS_IN_ENV=y\n@@ -63,4 +63,3 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n CONFIG_USB_GADGET_ATMEL_USBA=y\n CONFIG_LCD=y\n-CONFIG_OF_LIBFDT=y\ndiff --git a/configs/sama5d4ek_spiflash_defconfig b/configs/sama5d4ek_spiflash_defconfig\nindex 67e2fab3d8..f589109049 100644\n--- a/configs/sama5d4ek_spiflash_defconfig\n+++ b/configs/sama5d4ek_spiflash_defconfig\n@@ -9,7 +9,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y\n CONFIG_SPL_SPI_SUPPORT=y\n CONFIG_DEFAULT_DEVICE_TREE=\"at91-sama5d4ek\"\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D4,SYS_USE_SERIALFLASH\"\n+CONFIG_SYS_EXTRA_OPTIONS=\"SYS_USE_SERIALFLASH\"\n CONFIG_BOOTDELAY=3\n # CONFIG_CONSOLE_MUX is not set\n CONFIG_SYS_CONSOLE_IS_IN_ENV=y\n@@ -64,4 +64,3 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n CONFIG_USB_GADGET_ATMEL_USBA=y\n CONFIG_LCD=y\n-CONFIG_OF_LIBFDT=y\ndiff --git a/configs/vinco_defconfig b/configs/vinco_defconfig\nindex 34a02bdfbe..45c888e50a 100644\n--- a/configs/vinco_defconfig\n+++ b/configs/vinco_defconfig\n@@ -1,7 +1,7 @@\n CONFIG_ARM=y\n CONFIG_ARCH_AT91=y\n CONFIG_TARGET_VINCO=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D4,SYS_USE_SERIALFLASH\"\n+CONFIG_SYS_EXTRA_OPTIONS=\"SYS_USE_SERIALFLASH\"\n CONFIG_BOOTDELAY=3\n # CONFIG_DISPLAY_BOARDINFO is not set\n CONFIG_HUSH_PARSER=y\n", "prefixes": [ "U-Boot", "4/4" ] }