Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 810478,
    "url": "http://patchwork.ozlabs.org/api/patches/810478/?format=api",
    "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/20170906094755.22262-6-wenyou.yang@microchip.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": "<20170906094755.22262-6-wenyou.yang@microchip.com>",
    "list_archive_url": null,
    "date": "2017-09-06T09:47:55",
    "name": "[U-Boot,v2,5/5] configs: at91: Remove CONFIG_SYS_EXTRA_OPTIONS assignment",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": false,
    "hash": "31a0538c2444078aaa963ef34ffbdf0921f62fdd",
    "submitter": {
        "id": 69532,
        "url": "http://patchwork.ozlabs.org/api/people/69532/?format=api",
        "name": "Wenyou Yang",
        "email": "Wenyou.Yang@microchip.com"
    },
    "delegate": {
        "id": 3651,
        "url": "http://patchwork.ozlabs.org/api/users/3651/?format=api",
        "username": "trini",
        "first_name": "Tom",
        "last_name": "Rini",
        "email": "trini@ti.com"
    },
    "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/20170906094755.22262-6-wenyou.yang@microchip.com/mbox/",
    "series": [
        {
            "id": 1742,
            "url": "http://patchwork.ozlabs.org/api/series/1742/?format=api",
            "web_url": "http://patchwork.ozlabs.org/project/uboot/list/?series=1742",
            "date": "2017-09-06T09:47:50",
            "name": "configs: at91: Remove value of CONFIG_SYS_EXTRA_OPTIONS option",
            "version": 2,
            "mbox": "http://patchwork.ozlabs.org/series/1742/mbox/"
        }
    ],
    "comments": "http://patchwork.ozlabs.org/api/patches/810478/comments/",
    "check": "pending",
    "checks": "http://patchwork.ozlabs.org/api/patches/810478/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",
        "Authentication-Results": "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=<UNKNOWN>)",
        "Received": [
            "from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xnJlq0BpTz9sCZ\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed,  6 Sep 2017 19:52:22 +1000 (AEST)",
            "by lists.denx.de (Postfix, from userid 105)\n\tid A0B63C21F86; Wed,  6 Sep 2017 09:50:45 +0000 (UTC)",
            "from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 5C48CC21EEA;\n\tWed,  6 Sep 2017 09:50:31 +0000 (UTC)",
            "by lists.denx.de (Postfix, from userid 105)\n\tid 11159C21EFE; Wed,  6 Sep 2017 09:49:40 +0000 (UTC)",
            "from DVREDG02.corp.atmel.com (nasmtp01.atmel.com [192.199.1.246])\n\tby lists.denx.de (Postfix) with ESMTPS id 2089FC21F12\n\tfor <u-boot@lists.denx.de>; Wed,  6 Sep 2017 09:49:35 +0000 (UTC)",
            "from apsmtp01.atmel.com (10.168.254.31) by DVREDG02.corp.atmel.com\n\t(10.42.103.31) with Microsoft SMTP Server (TLS) id 14.3.235.1;\n\tWed, 6 Sep 2017 03:48:52 -0600",
            "from shaarm01.corp.atmel.com (10.168.254.13) by apsmtp01.atmel.com\n\t(10.168.254.31) with Microsoft SMTP Server id 14.3.235.1;\n\tWed, 6 Sep 2017 17:53:09 +0800"
        ],
        "X-Spam-Checker-Version": "SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de",
        "X-Spam-Level": "",
        "X-Spam-Status": "No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED\n\tautolearn=unavailable autolearn_force=no version=3.4.0",
        "From": "Wenyou Yang <wenyou.yang@microchip.com>",
        "To": "U-Boot Mailing List <u-boot@lists.denx.de>, Simon Glass\n\t<sjg@chromium.org>, Heiko Schocher <hs@denx.de>, Tom Rini\n\t<trini@konsulko.com>, Andreas <andreas@biessmann.org>",
        "Date": "Wed, 6 Sep 2017 17:47:55 +0800",
        "Message-ID": "<20170906094755.22262-6-wenyou.yang@microchip.com>",
        "X-Mailer": "git-send-email 2.13.0",
        "In-Reply-To": "<20170906094755.22262-1-wenyou.yang@microchip.com>",
        "References": "<20170906094755.22262-1-wenyou.yang@microchip.com>",
        "MIME-Version": "1.0",
        "Subject": "[U-Boot] [PATCH v2 5/5] configs: at91: Remove\n\tCONFIG_SYS_EXTRA_OPTIONS assignment",
        "X-BeenThere": "u-boot@lists.denx.de",
        "X-Mailman-Version": "2.1.18",
        "Precedence": "list",
        "List-Id": "U-Boot discussion <u-boot.lists.denx.de>",
        "List-Unsubscribe": "<https://lists.denx.de/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": "<https://lists.denx.de/listinfo/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=subscribe>",
        "Content-Type": "text/plain; charset=\"utf-8\"",
        "Content-Transfer-Encoding": "base64",
        "Errors-To": "u-boot-bounces@lists.denx.de",
        "Sender": "\"U-Boot\" <u-boot-bounces@lists.denx.de>"
    },
    "content": "To remove the assignment of CONFIG_SYS_EXTRA_OPTIONS option,\nwhich is deprecated, use the CONFIG_XXXX_BOOT options to\nindicate the boot media, and the SoC is selected by the board.\n\nSigned-off-by: Wenyou Yang <wenyou.yang@microchip.com>\n---\n\nChanges in v2:\n - Rebase the uboot/master (84a42069f253).\n\n board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c |  4 ++--\n board/atmel/at91sam9n12ek/at91sam9n12ek.c       |  6 +++---\n board/atmel/at91sam9x5ek/at91sam9x5ek.c         |  4 ++--\n board/atmel/sama5d2_ptc/sama5d2_ptc.c           |  4 ++--\n board/atmel/sama5d3_xplained/sama5d3_xplained.c |  4 ++--\n board/atmel/sama5d3xek/sama5d3xek.c             |  2 +-\n board/atmel/sama5d4_xplained/sama5d4_xplained.c |  2 +-\n board/atmel/sama5d4ek/sama5d4ek.c               |  2 +-\n configs/at91sam9m10g45ek_mmc_defconfig          |  2 +-\n configs/at91sam9m10g45ek_nandflash_defconfig    |  2 +-\n configs/at91sam9n12ek_mmc_defconfig             |  2 +-\n configs/at91sam9n12ek_nandflash_defconfig       |  2 +-\n configs/at91sam9n12ek_spiflash_defconfig        |  2 +-\n configs/at91sam9x5ek_dataflash_defconfig        |  2 +-\n configs/at91sam9x5ek_mmc_defconfig              |  2 +-\n configs/at91sam9x5ek_nandflash_defconfig        |  2 +-\n configs/at91sam9x5ek_spiflash_defconfig         |  2 +-\n configs/ma5d4evk_defconfig                      |  2 +-\n configs/sama5d2_ptc_nandflash_defconfig         |  2 +-\n configs/sama5d2_ptc_spiflash_defconfig          |  2 +-\n configs/sama5d2_xplained_mmc_defconfig          |  1 +\n configs/sama5d2_xplained_spiflash_defconfig     |  2 +-\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                 |  2 +-\n configs/sama5d4ek_nandflash_defconfig           |  2 +-\n configs/sama5d4ek_spiflash_defconfig            |  2 +-\n configs/vinco_defconfig                         |  2 +-\n include/configs/at91-sama5_common.h             |  6 +++---\n include/configs/at91sam9m10g45ek.h              |  8 ++++----\n include/configs/at91sam9n12ek.h                 | 20 ++++++++++----------\n include/configs/at91sam9x5ek.h                  | 23 ++++++++++-------------\n include/configs/sama5d2_ptc.h                   |  8 ++++----\n include/configs/sama5d2_xplained.h              |  6 +++---\n include/configs/sama5d3_xplained.h              | 13 +++----------\n include/configs/sama5d3xek.h                    | 23 +++++++----------------\n include/configs/sama5d4_xplained.h              | 21 +++++++--------------\n include/configs/sama5d4ek.h                     | 22 +++++++---------------\n include/configs/vinco.h                         |  2 +-\n 48 files changed, 102 insertions(+), 135 deletions(-)",
    "diff": "diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c\nindex 903732b23b..98430c4246 100644\n--- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c\n+++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c\n@@ -84,9 +84,9 @@ void at91_spl_board_init(void)\n \tat91_set_pio_pullup(AT91_PIO_PORTD, 7, 1);\n \tat91_set_pio_pullup(AT91_PIO_PORTD, 8, 1);\n \n-#ifdef CONFIG_SYS_USE_MMC\n+#ifdef CONFIG_SD_BOOT\n \tat91_mci_hw_init();\n-#elif CONFIG_SYS_USE_NANDFLASH\n+#elif CONFIG_NAND_BOOT\n \tat91sam9m10g45ek_nand_hw_init();\n #endif\n }\ndiff --git a/board/atmel/at91sam9n12ek/at91sam9n12ek.c b/board/atmel/at91sam9n12ek/at91sam9n12ek.c\nindex fec93165c1..540adf55b6 100644\n--- a/board/atmel/at91sam9n12ek/at91sam9n12ek.c\n+++ b/board/atmel/at91sam9n12ek/at91sam9n12ek.c\n@@ -224,11 +224,11 @@ int dram_init(void)\n \n void at91_spl_board_init(void)\n {\n-#ifdef CONFIG_SYS_USE_MMC\n+#ifdef CONFIG_SD_BOOT\n \tat91_mci_hw_init();\n-#elif CONFIG_SYS_USE_NANDFLASH\n+#elif CONFIG_NAND_BOOT\n \tat91sam9n12ek_nand_hw_init();\n-#elif CONFIG_SYS_USE_SPIFLASH\n+#elif CONFIG_SPI_BOOT\n \tat91_spi0_hw_init(1 << 4);\n #endif\n }\ndiff --git a/board/atmel/at91sam9x5ek/at91sam9x5ek.c b/board/atmel/at91sam9x5ek/at91sam9x5ek.c\nindex 2452e63881..be6dd4a6d3 100644\n--- a/board/atmel/at91sam9x5ek/at91sam9x5ek.c\n+++ b/board/atmel/at91sam9x5ek/at91sam9x5ek.c\n@@ -235,9 +235,9 @@ int dram_init(void)\n \n void at91_spl_board_init(void)\n {\n-#ifdef CONFIG_SYS_USE_MMC\n+#ifdef CONFIG_SD_BOOT\n \tat91_mci_hw_init();\n-#elif CONFIG_SYS_USE_NANDFLASH\n+#elif CONFIG_NAND_BOOT\n \tat91sam9x5ek_nand_hw_init();\n #endif\n }\ndiff --git a/board/atmel/sama5d2_ptc/sama5d2_ptc.c b/board/atmel/sama5d2_ptc/sama5d2_ptc.c\nindex 9e6544bc07..c441e69ee4 100644\n--- a/board/atmel/sama5d2_ptc/sama5d2_ptc.c\n+++ b/board/atmel/sama5d2_ptc/sama5d2_ptc.c\n@@ -196,11 +196,11 @@ int board_eth_init(bd_t *bis)\n #ifdef CONFIG_SPL_BUILD\n void spl_board_init(void)\n {\n-#ifdef CONFIG_SYS_USE_SERIALFLASH\n+#ifdef CONFIG_SPI_BOOT\n \tboard_spi0_hw_init();\n #endif\n \n-#ifdef CONFIG_SYS_USE_NANDFLASH\n+#ifdef CONFIG_NAND_BOOT\n \tboard_nand_hw_init();\n #endif\n }\ndiff --git a/board/atmel/sama5d3_xplained/sama5d3_xplained.c b/board/atmel/sama5d3_xplained/sama5d3_xplained.c\nindex ba7f9f2443..f32e86b0cb 100644\n--- a/board/atmel/sama5d3_xplained/sama5d3_xplained.c\n+++ b/board/atmel/sama5d3_xplained/sama5d3_xplained.c\n@@ -112,11 +112,11 @@ int dram_init(void)\n #ifdef CONFIG_SPL_BUILD\n void spl_board_init(void)\n {\n-#ifdef CONFIG_SYS_USE_MMC\n+#ifdef CONFIG_SD_BOOT\n #ifdef CONFIG_GENERIC_ATMEL_MCI\n \tsama5d3_xplained_mci0_hw_init();\n #endif\n-#elif CONFIG_SYS_USE_NANDFLASH\n+#elif CONFIG_NAND_BOOT\n \tsama5d3_xplained_nand_hw_init();\n #endif\n }\ndiff --git a/board/atmel/sama5d3xek/sama5d3xek.c b/board/atmel/sama5d3xek/sama5d3xek.c\nindex 88bcd876c9..6d473fc06d 100644\n--- a/board/atmel/sama5d3xek/sama5d3xek.c\n+++ b/board/atmel/sama5d3xek/sama5d3xek.c\n@@ -277,7 +277,7 @@ int board_late_init(void)\n #ifdef CONFIG_SPL_BUILD\n void spl_board_init(void)\n {\n-#if CONFIG_SYS_USE_NANDFLASH\n+#if CONFIG_NAND_BOOT\n \tsama5d3xek_nand_hw_init();\n #endif\n }\ndiff --git a/board/atmel/sama5d4_xplained/sama5d4_xplained.c b/board/atmel/sama5d4_xplained/sama5d4_xplained.c\nindex 854afcb622..195da95bbb 100644\n--- a/board/atmel/sama5d4_xplained/sama5d4_xplained.c\n+++ b/board/atmel/sama5d4_xplained/sama5d4_xplained.c\n@@ -221,7 +221,7 @@ int dram_init(void)\n #ifdef CONFIG_SPL_BUILD\n void spl_board_init(void)\n {\n-#if CONFIG_SYS_USE_NANDFLASH\n+#if CONFIG_NAND_BOOT\n \tsama5d4_xplained_nand_hw_init();\n #endif\n }\ndiff --git a/board/atmel/sama5d4ek/sama5d4ek.c b/board/atmel/sama5d4ek/sama5d4ek.c\nindex ba7974643e..ee07038e2e 100644\n--- a/board/atmel/sama5d4ek/sama5d4ek.c\n+++ b/board/atmel/sama5d4ek/sama5d4ek.c\n@@ -217,7 +217,7 @@ int dram_init(void)\n #ifdef CONFIG_SPL_BUILD\n void spl_board_init(void)\n {\n-#if CONFIG_SYS_USE_NANDFLASH\n+#if CONFIG_NAND_BOOT\n \tsama5d4ek_nand_hw_init();\n #endif\n }\ndiff --git a/configs/at91sam9m10g45ek_mmc_defconfig b/configs/at91sam9m10g45ek_mmc_defconfig\nindex e0e37c4f99..6740ec5b30 100644\n--- a/configs/at91sam9m10g45ek_mmc_defconfig\n+++ b/configs/at91sam9m10g45ek_mmc_defconfig\n@@ -4,7 +4,7 @@ CONFIG_TARGET_AT91SAM9M10G45EK=y\n CONFIG_SYS_MALLOC_F_LEN=0x2000\n CONFIG_DEFAULT_DEVICE_TREE=\"at91sam9m10g45ek\"\n CONFIG_DEBUG_UART=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"AT91SAM9M10G45,SYS_USE_MMC\"\n+CONFIG_SD_BOOT=y\n CONFIG_BOOTDELAY=3\n CONFIG_USE_BOOTARGS=y\n CONFIG_BOOTARGS=\"console=ttyS0,115200 mtdparts=atmel_nand:8M(bootstrap/uboot/kernel)ro,-(rootfs) root=/dev/mmcblk0p2 rw rootwait\"\ndiff --git a/configs/at91sam9m10g45ek_nandflash_defconfig b/configs/at91sam9m10g45ek_nandflash_defconfig\nindex 3d73f83262..63bb7990e3 100644\n--- a/configs/at91sam9m10g45ek_nandflash_defconfig\n+++ b/configs/at91sam9m10g45ek_nandflash_defconfig\n@@ -4,7 +4,7 @@ CONFIG_TARGET_AT91SAM9M10G45EK=y\n CONFIG_SYS_MALLOC_F_LEN=0x2000\n CONFIG_DEFAULT_DEVICE_TREE=\"at91sam9m10g45ek\"\n CONFIG_DEBUG_UART=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"AT91SAM9M10G45,SYS_USE_NANDFLASH\"\n+CONFIG_NAND_BOOT=y\n CONFIG_BOOTDELAY=3\n CONFIG_USE_BOOTARGS=y\n CONFIG_BOOTARGS=\"console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2\"\ndiff --git a/configs/at91sam9n12ek_mmc_defconfig b/configs/at91sam9n12ek_mmc_defconfig\nindex 4c554f260d..cc567c4dbf 100644\n--- a/configs/at91sam9n12ek_mmc_defconfig\n+++ b/configs/at91sam9n12ek_mmc_defconfig\n@@ -4,7 +4,7 @@ CONFIG_TARGET_AT91SAM9N12EK=y\n CONFIG_SYS_MALLOC_F_LEN=0x2000\n CONFIG_DEFAULT_DEVICE_TREE=\"at91sam9n12ek\"\n CONFIG_DEBUG_UART=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"AT91SAM9N12,SYS_USE_MMC\"\n+CONFIG_SD_BOOT=y\n CONFIG_BOOTDELAY=3\n # CONFIG_CONSOLE_MUX is not set\n CONFIG_SYS_CONSOLE_IS_IN_ENV=y\ndiff --git a/configs/at91sam9n12ek_nandflash_defconfig b/configs/at91sam9n12ek_nandflash_defconfig\nindex 19053b43a0..663987bc29 100644\n--- a/configs/at91sam9n12ek_nandflash_defconfig\n+++ b/configs/at91sam9n12ek_nandflash_defconfig\n@@ -4,7 +4,7 @@ CONFIG_TARGET_AT91SAM9N12EK=y\n CONFIG_SYS_MALLOC_F_LEN=0x2000\n CONFIG_DEFAULT_DEVICE_TREE=\"at91sam9n12ek\"\n CONFIG_DEBUG_UART=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"AT91SAM9N12,SYS_USE_NANDFLASH\"\n+CONFIG_NAND_BOOT=y\n CONFIG_BOOTDELAY=3\n # CONFIG_CONSOLE_MUX is not set\n CONFIG_SYS_CONSOLE_IS_IN_ENV=y\ndiff --git a/configs/at91sam9n12ek_spiflash_defconfig b/configs/at91sam9n12ek_spiflash_defconfig\nindex 8a4d836843..94481ca2ae 100644\n--- a/configs/at91sam9n12ek_spiflash_defconfig\n+++ b/configs/at91sam9n12ek_spiflash_defconfig\n@@ -4,7 +4,7 @@ CONFIG_TARGET_AT91SAM9N12EK=y\n CONFIG_SYS_MALLOC_F_LEN=0x2000\n CONFIG_DEFAULT_DEVICE_TREE=\"at91sam9n12ek\"\n CONFIG_DEBUG_UART=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"AT91SAM9N12,SYS_USE_SPIFLASH\"\n+CONFIG_SPI_BOOT=y\n CONFIG_BOOTDELAY=3\n # CONFIG_CONSOLE_MUX is not set\n CONFIG_SYS_CONSOLE_IS_IN_ENV=y\ndiff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig\nindex b82b0a714c..9d61dd8de0 100644\n--- a/configs/at91sam9x5ek_dataflash_defconfig\n+++ b/configs/at91sam9x5ek_dataflash_defconfig\n@@ -4,7 +4,7 @@ CONFIG_TARGET_AT91SAM9X5EK=y\n CONFIG_SYS_MALLOC_F_LEN=0x2000\n CONFIG_DEFAULT_DEVICE_TREE=\"at91sam9g35ek\"\n CONFIG_DEBUG_UART=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"AT91SAM9X5,SYS_USE_DATAFLASH\"\n+CONFIG_SYS_EXTRA_OPTIONS=\"SYS_USE_DATAFLASH\"\n CONFIG_BOOTDELAY=3\n CONFIG_USE_BOOTARGS=y\n CONFIG_BOOTARGS=\"console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs rw\"\ndiff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig\nindex 72c5550692..9fa4801480 100644\n--- a/configs/at91sam9x5ek_mmc_defconfig\n+++ b/configs/at91sam9x5ek_mmc_defconfig\n@@ -4,7 +4,7 @@ CONFIG_TARGET_AT91SAM9X5EK=y\n CONFIG_SYS_MALLOC_F_LEN=0x2000\n CONFIG_DEFAULT_DEVICE_TREE=\"at91sam9g35ek\"\n CONFIG_DEBUG_UART=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"AT91SAM9X5,SYS_USE_MMC\"\n+CONFIG_SD_BOOT=y\n CONFIG_BOOTDELAY=3\n CONFIG_USE_BOOTARGS=y\n CONFIG_BOOTARGS=\"mem=128M console=ttyS0,115200 mtdparts=atmel_nand:8M(bootstrap/uboot/kernel)ro,-(rootfs) root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait\"\ndiff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig\nindex 21f5bcbc2d..b28bec7f0b 100644\n--- a/configs/at91sam9x5ek_nandflash_defconfig\n+++ b/configs/at91sam9x5ek_nandflash_defconfig\n@@ -4,7 +4,7 @@ CONFIG_TARGET_AT91SAM9X5EK=y\n CONFIG_SYS_MALLOC_F_LEN=0x2000\n CONFIG_DEFAULT_DEVICE_TREE=\"at91sam9g35ek\"\n CONFIG_DEBUG_UART=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"AT91SAM9X5,SYS_USE_NANDFLASH\"\n+CONFIG_NAND_BOOT=y\n CONFIG_BOOTDELAY=3\n CONFIG_USE_BOOTARGS=y\n CONFIG_BOOTARGS=\"console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs rw\"\ndiff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig\nindex 8880fc97d8..838d8a0ad7 100644\n--- a/configs/at91sam9x5ek_spiflash_defconfig\n+++ b/configs/at91sam9x5ek_spiflash_defconfig\n@@ -4,7 +4,7 @@ CONFIG_TARGET_AT91SAM9X5EK=y\n CONFIG_SYS_MALLOC_F_LEN=0x2000\n CONFIG_DEFAULT_DEVICE_TREE=\"at91sam9g35ek\"\n CONFIG_DEBUG_UART=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"AT91SAM9X5,SYS_USE_SPIFLASH\"\n+CONFIG_SPI_BOOT=y\n CONFIG_BOOTDELAY=3\n CONFIG_USE_BOOTARGS=y\n CONFIG_BOOTARGS=\"console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs rw\"\ndiff --git a/configs/ma5d4evk_defconfig b/configs/ma5d4evk_defconfig\nindex 0d8c109fbc..cbe76b624f 100644\n--- a/configs/ma5d4evk_defconfig\n+++ b/configs/ma5d4evk_defconfig\n@@ -8,7 +8,7 @@ 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_SYS_EXTRA_OPTIONS=\"\"\n CONFIG_BOOTDELAY=3\n CONFIG_USE_BOOTARGS=y\n CONFIG_BOOTARGS=\"console=ttyS3,115200\"\ndiff --git a/configs/sama5d2_ptc_nandflash_defconfig b/configs/sama5d2_ptc_nandflash_defconfig\nindex bca3ac2fcb..3f1eb90648 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_SERIAL_SUPPORT=y\n CONFIG_SPL_NAND_SUPPORT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D2,SYS_USE_NANDFLASH\"\n+CONFIG_NAND_BOOT=y\n CONFIG_BOOTDELAY=3\n CONFIG_USE_BOOTARGS=y\n CONFIG_BOOTARGS=\"console=ttyS0,57600 earlyprintk mtdparts=atmel_nand:6M(bootstrap)ro, 6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=2 root=ubi0:rootfs\"\ndiff --git a/configs/sama5d2_ptc_spiflash_defconfig b/configs/sama5d2_ptc_spiflash_defconfig\nindex e4fb49f662..ad62f47063 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_SPI_BOOT=y\n CONFIG_BOOTDELAY=3\n CONFIG_USE_BOOTARGS=y\n CONFIG_BOOTARGS=\"console=ttyS0,57600 earlyprintk mtdparts=atmel_nand:6M(bootstrap)ro, 6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=2 root=ubi0:rootfs\"\ndiff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig\nindex dc4d991512..92cbd2293f 100644\n--- a/configs/sama5d2_xplained_mmc_defconfig\n+++ b/configs/sama5d2_xplained_mmc_defconfig\n@@ -14,6 +14,7 @@ CONFIG_DEFAULT_DEVICE_TREE=\"at91-sama5d2_xplained\"\n CONFIG_DEBUG_UART=y\n CONFIG_FIT=y\n CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D2,SYS_USE_MMC\"\n+CONFIG_SD_BOOT=y\n CONFIG_BOOTDELAY=3\n CONFIG_USE_BOOTARGS=y\n CONFIG_BOOTARGS=\"console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rw rootwait\"\ndiff --git a/configs/sama5d2_xplained_spiflash_defconfig b/configs/sama5d2_xplained_spiflash_defconfig\nindex c64b8b8e3b..f0b170c997 100644\n--- a/configs/sama5d2_xplained_spiflash_defconfig\n+++ b/configs/sama5d2_xplained_spiflash_defconfig\n@@ -12,7 +12,7 @@ CONFIG_SPL_SPI_SUPPORT=y\n CONFIG_DEFAULT_DEVICE_TREE=\"at91-sama5d2_xplained\"\n CONFIG_DEBUG_UART=y\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D2,SYS_USE_SERIALFLASH\"\n+CONFIG_SPI_BOOT=y\n CONFIG_BOOTDELAY=3\n CONFIG_USE_BOOTARGS=y\n CONFIG_BOOTARGS=\"console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256K(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs\"\ndiff --git a/configs/sama5d36ek_cmp_mmc_defconfig b/configs/sama5d36ek_cmp_mmc_defconfig\nindex e517a38377..b6c60cbcae 100644\n--- a/configs/sama5d36ek_cmp_mmc_defconfig\n+++ b/configs/sama5d36ek_cmp_mmc_defconfig\n@@ -5,7 +5,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000\n CONFIG_DEFAULT_DEVICE_TREE=\"sama5d36ek_cmp\"\n CONFIG_DEBUG_UART=y\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D3,SYS_USE_MMC\"\n+CONFIG_SD_BOOT=y\n CONFIG_BOOTDELAY=3\n CONFIG_USE_BOOTARGS=y\n CONFIG_BOOTARGS=\"console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait\"\ndiff --git a/configs/sama5d36ek_cmp_nandflash_defconfig b/configs/sama5d36ek_cmp_nandflash_defconfig\nindex c02cc04bc2..01b57efe03 100644\n--- a/configs/sama5d36ek_cmp_nandflash_defconfig\n+++ b/configs/sama5d36ek_cmp_nandflash_defconfig\n@@ -5,7 +5,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000\n CONFIG_DEFAULT_DEVICE_TREE=\"sama5d36ek_cmp\"\n CONFIG_DEBUG_UART=y\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D3,SYS_USE_NANDFLASH\"\n+CONFIG_NAND_BOOT=y\n CONFIG_BOOTDELAY=3\n CONFIG_USE_BOOTARGS=y\n CONFIG_BOOTARGS=\"console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256K(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs\"\ndiff --git a/configs/sama5d36ek_cmp_spiflash_defconfig b/configs/sama5d36ek_cmp_spiflash_defconfig\nindex fd2ce15bb7..e29e3a8098 100644\n--- a/configs/sama5d36ek_cmp_spiflash_defconfig\n+++ b/configs/sama5d36ek_cmp_spiflash_defconfig\n@@ -5,7 +5,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000\n CONFIG_DEFAULT_DEVICE_TREE=\"sama5d36ek_cmp\"\n CONFIG_DEBUG_UART=y\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D3,SYS_USE_SERIALFLASH\"\n+CONFIG_SPI_BOOT=y\n CONFIG_BOOTDELAY=3\n CONFIG_USE_BOOTARGS=y\n CONFIG_BOOTARGS=\"console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256K(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs\"\ndiff --git a/configs/sama5d3_xplained_mmc_defconfig b/configs/sama5d3_xplained_mmc_defconfig\nindex 99c4d5a808..b30968d9cc 100644\n--- a/configs/sama5d3_xplained_mmc_defconfig\n+++ b/configs/sama5d3_xplained_mmc_defconfig\n@@ -13,7 +13,7 @@ CONFIG_SPL_FAT_SUPPORT=y\n CONFIG_DEFAULT_DEVICE_TREE=\"at91-sama5d3_xplained\"\n CONFIG_DEBUG_UART=y\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D3,SYS_USE_MMC\"\n+CONFIG_SD_BOOT=y\n CONFIG_BOOTDELAY=3\n CONFIG_USE_BOOTARGS=y\n CONFIG_BOOTARGS=\"console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait\"\ndiff --git a/configs/sama5d3_xplained_nandflash_defconfig b/configs/sama5d3_xplained_nandflash_defconfig\nindex 904c31b27d..65af64f797 100644\n--- a/configs/sama5d3_xplained_nandflash_defconfig\n+++ b/configs/sama5d3_xplained_nandflash_defconfig\n@@ -11,7 +11,7 @@ CONFIG_SPL_NAND_SUPPORT=y\n CONFIG_DEFAULT_DEVICE_TREE=\"at91-sama5d3_xplained\"\n CONFIG_DEBUG_UART=y\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D3,SYS_USE_NANDFLASH\"\n+CONFIG_NAND_BOOT=y\n CONFIG_BOOTDELAY=3\n CONFIG_USE_BOOTARGS=y\n CONFIG_BOOTARGS=\"console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256K(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs\"\ndiff --git a/configs/sama5d3xek_mmc_defconfig b/configs/sama5d3xek_mmc_defconfig\nindex afb7a51feb..f45449fd93 100644\n--- a/configs/sama5d3xek_mmc_defconfig\n+++ b/configs/sama5d3xek_mmc_defconfig\n@@ -13,7 +13,7 @@ CONFIG_SPL_FAT_SUPPORT=y\n CONFIG_DEFAULT_DEVICE_TREE=\"sama5d36ek\"\n CONFIG_DEBUG_UART=y\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D3,SYS_USE_MMC\"\n+CONFIG_SD_BOOT=y\n CONFIG_BOOTDELAY=3\n CONFIG_USE_BOOTARGS=y\n CONFIG_BOOTARGS=\"console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait\"\ndiff --git a/configs/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig\nindex 6bc0f51698..6217600f01 100644\n--- a/configs/sama5d3xek_nandflash_defconfig\n+++ b/configs/sama5d3xek_nandflash_defconfig\n@@ -11,7 +11,7 @@ CONFIG_SPL_NAND_SUPPORT=y\n CONFIG_DEFAULT_DEVICE_TREE=\"sama5d36ek\"\n CONFIG_DEBUG_UART=y\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D3,SYS_USE_NANDFLASH\"\n+CONFIG_NAND_BOOT=y\n CONFIG_BOOTDELAY=3\n CONFIG_USE_BOOTARGS=y\n CONFIG_BOOTARGS=\"console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256K(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs\"\ndiff --git a/configs/sama5d3xek_spiflash_defconfig b/configs/sama5d3xek_spiflash_defconfig\nindex c225e09111..2fe08e4e59 100644\n--- a/configs/sama5d3xek_spiflash_defconfig\n+++ b/configs/sama5d3xek_spiflash_defconfig\n@@ -12,7 +12,7 @@ CONFIG_SPL_SPI_SUPPORT=y\n CONFIG_DEFAULT_DEVICE_TREE=\"sama5d36ek\"\n CONFIG_DEBUG_UART=y\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D3,SYS_USE_SERIALFLASH\"\n+CONFIG_SPI_BOOT=y\n CONFIG_BOOTDELAY=3\n CONFIG_USE_BOOTARGS=y\n CONFIG_BOOTARGS=\"console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256K(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs\"\ndiff --git a/configs/sama5d4_xplained_mmc_defconfig b/configs/sama5d4_xplained_mmc_defconfig\nindex 0c2b63dab9..4ccdf8d526 100644\n--- a/configs/sama5d4_xplained_mmc_defconfig\n+++ b/configs/sama5d4_xplained_mmc_defconfig\n@@ -13,7 +13,7 @@ CONFIG_SPL_FAT_SUPPORT=y\n CONFIG_DEFAULT_DEVICE_TREE=\"at91-sama5d4_xplained\"\n CONFIG_DEBUG_UART=y\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D4,SYS_USE_MMC\"\n+CONFIG_SD_BOOT=y\n CONFIG_BOOTDELAY=3\n CONFIG_USE_BOOTARGS=y\n CONFIG_BOOTARGS=\"console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait\"\ndiff --git a/configs/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4_xplained_nandflash_defconfig\nindex 3a2dcb12b9..67311f9bcb 100644\n--- a/configs/sama5d4_xplained_nandflash_defconfig\n+++ b/configs/sama5d4_xplained_nandflash_defconfig\n@@ -11,7 +11,7 @@ CONFIG_SPL_NAND_SUPPORT=y\n CONFIG_DEFAULT_DEVICE_TREE=\"at91-sama5d4_xplained\"\n CONFIG_DEBUG_UART=y\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D4,SYS_USE_NANDFLASH\"\n+CONFIG_NAND_BOOT=y\n CONFIG_BOOTDELAY=3\n CONFIG_USE_BOOTARGS=y\n CONFIG_BOOTARGS=\"console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256K(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs\"\ndiff --git a/configs/sama5d4_xplained_spiflash_defconfig b/configs/sama5d4_xplained_spiflash_defconfig\nindex d82a4cddf2..5c08d37741 100644\n--- a/configs/sama5d4_xplained_spiflash_defconfig\n+++ b/configs/sama5d4_xplained_spiflash_defconfig\n@@ -12,7 +12,7 @@ CONFIG_SPL_SPI_SUPPORT=y\n CONFIG_DEFAULT_DEVICE_TREE=\"at91-sama5d4_xplained\"\n CONFIG_DEBUG_UART=y\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D4,SYS_USE_SERIALFLASH\"\n+CONFIG_SPI_BOOT=y\n CONFIG_BOOTDELAY=3\n CONFIG_USE_BOOTARGS=y\n CONFIG_BOOTARGS=\"console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256K(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs\"\ndiff --git a/configs/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig\nindex 10c8d0965e..aaa5855b22 100644\n--- a/configs/sama5d4ek_mmc_defconfig\n+++ b/configs/sama5d4ek_mmc_defconfig\n@@ -13,7 +13,7 @@ CONFIG_SPL_FAT_SUPPORT=y\n CONFIG_DEFAULT_DEVICE_TREE=\"at91-sama5d4ek\"\n CONFIG_DEBUG_UART=y\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D4,SYS_USE_MMC\"\n+CONFIG_SD_BOOT=y\n CONFIG_BOOTDELAY=3\n CONFIG_USE_BOOTARGS=y\n CONFIG_BOOTARGS=\"console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait\"\ndiff --git a/configs/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig\nindex 39ff60db8b..901d17bfa3 100644\n--- a/configs/sama5d4ek_nandflash_defconfig\n+++ b/configs/sama5d4ek_nandflash_defconfig\n@@ -11,7 +11,7 @@ CONFIG_SPL_NAND_SUPPORT=y\n CONFIG_DEFAULT_DEVICE_TREE=\"at91-sama5d4ek\"\n CONFIG_DEBUG_UART=y\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D4,SYS_USE_NANDFLASH\"\n+CONFIG_NAND_BOOT=y\n CONFIG_BOOTDELAY=3\n CONFIG_USE_BOOTARGS=y\n CONFIG_BOOTARGS=\"console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256K(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs\"\ndiff --git a/configs/sama5d4ek_spiflash_defconfig b/configs/sama5d4ek_spiflash_defconfig\nindex 4f848b9175..535031024b 100644\n--- a/configs/sama5d4ek_spiflash_defconfig\n+++ b/configs/sama5d4ek_spiflash_defconfig\n@@ -12,7 +12,7 @@ CONFIG_SPL_SPI_SUPPORT=y\n CONFIG_DEFAULT_DEVICE_TREE=\"at91-sama5d4ek\"\n CONFIG_DEBUG_UART=y\n CONFIG_FIT=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"SAMA5D4,SYS_USE_SERIALFLASH\"\n+CONFIG_SPI_BOOT=y\n CONFIG_BOOTDELAY=3\n CONFIG_USE_BOOTARGS=y\n CONFIG_BOOTARGS=\"console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256K(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs\"\ndiff --git a/configs/vinco_defconfig b/configs/vinco_defconfig\nindex 691320d646..91e3b8fd37 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_SPI_BOOT=y\n CONFIG_BOOTDELAY=3\n CONFIG_USE_BOOTARGS=y\n CONFIG_BOOTARGS=\"console=ttyS0,115200 earlyprintk rw root=/dev/mmcblk0p2 rootfstype=ext4 rootwait quiet lpj=1990656\"\ndiff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h\nindex 435c7dfa8e..dc36c2ae6c 100644\n--- a/include/configs/at91-sama5_common.h\n+++ b/include/configs/at91-sama5_common.h\n@@ -42,7 +42,7 @@\n  * Command line configuration.\n  */\n \n-#ifdef CONFIG_SYS_USE_MMC\n+#ifdef CONFIG_SD_BOOT\n \n #ifdef CONFIG_ENV_IS_IN_MMC\n /* Use raw reserved sectors to save environment */\n@@ -63,7 +63,7 @@\n \n #else\n \n-#ifdef CONFIG_SYS_USE_NANDFLASH\n+#ifdef CONFIG_NAND_BOOT\n /* u-boot env in nand flash */\n #define CONFIG_ENV_OFFSET\t\t0xc0000\n #define CONFIG_ENV_OFFSET_REDUND\t0x100000\n@@ -71,7 +71,7 @@\n #define CONFIG_BOOTCOMMAND\t\t\"nand read 0x21000000 0x180000 0x80000;\"\t\\\n \t\t\t\t\t\"nand read 0x22000000 0x200000 0x600000;\"\t\\\n \t\t\t\t\t\"bootz 0x22000000 - 0x21000000\"\n-#elif CONFIG_SYS_USE_SERIALFLASH\n+#elif CONFIG_SPI_BOOT\n /* u-boot env in serial flash, by default is bus 0 and cs 0 */\n #define CONFIG_ENV_OFFSET\t\t0x6000\n #define CONFIG_ENV_SIZE\t\t\t0x2000\ndiff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h\nindex 36acaa5506..2957da9432 100644\n--- a/include/configs/at91sam9m10g45ek.h\n+++ b/include/configs/at91sam9m10g45ek.h\n@@ -80,7 +80,7 @@\n #define CONFIG_SYS_MEMTEST_START\tCONFIG_SYS_SDRAM_BASE\n #define CONFIG_SYS_MEMTEST_END\t\t0x23e00000\n \n-#ifdef CONFIG_SYS_USE_NANDFLASH\n+#ifdef CONFIG_NAND_BOOT\n /* bootstrap + u-boot + env in nandflash */\n #define CONFIG_ENV_OFFSET\t\t0x120000\n #define CONFIG_ENV_OFFSET_REDUND\t0x100000\n@@ -89,7 +89,7 @@\n #define CONFIG_BOOTCOMMAND\t\t\t\t\t\t\\\n \t\"nand read 0x70000000 0x200000 0x300000;\"\t\t\t\\\n \t\"bootm 0x70000000\"\n-#elif CONFIG_SYS_USE_MMC\n+#elif CONFIG_SD_BOOT\n /* bootstrap + u-boot + env + linux in mmc */\n #define CONFIG_ENV_SIZE\t\t0x4000\n \n@@ -115,7 +115,7 @@\n \n #define CONFIG_SYS_MONITOR_LEN\t\t0x80000\n \n-#ifdef CONFIG_SYS_USE_MMC\n+#ifdef CONFIG_SD_BOOT\n \n #define CONFIG_SPL_BSS_START_ADDR\t0x70000000\n #define CONFIG_SPL_BSS_MAX_SIZE\t\t0x00080000\n@@ -125,7 +125,7 @@\n #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION\t1\n #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME\t\t\"u-boot.img\"\n \n-#elif CONFIG_SYS_USE_NANDFLASH\n+#elif CONFIG_NAND_BOOT\n #define CONFIG_SPL_NAND_DRIVERS\n #define CONFIG_SPL_NAND_BASE\n #define CONFIG_SPL_NAND_ECC\ndiff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h\nindex c9adcf9754..111a7dce7d 100644\n--- a/include/configs/at91sam9n12ek.h\n+++ b/include/configs/at91sam9n12ek.h\n@@ -108,7 +108,7 @@\n #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS\t1\n #endif\n \n-#ifdef CONFIG_SYS_USE_SPIFLASH\n+#ifdef CONFIG_SPI_BOOT\n \n /* bootstrap + u-boot + env + linux in dataflash on CS0 */\n #define CONFIG_ENV_OFFSET\t\t0x5000\n@@ -119,7 +119,7 @@\n \t\"sf probe 0; sf read 0x22000000 0x100000 0x300000; \"\t\t\\\n \t\"bootm 0x22000000\"\n \n-#elif defined(CONFIG_SYS_USE_NANDFLASH)\n+#elif defined(CONFIG_NAND_BOOT)\n \n /* bootstrap + u-boot + env + linux in nandflash */\n #define CONFIG_ENV_OFFSET\t\t0x120000\n@@ -131,7 +131,7 @@\n \t\"nand read 0x22000000 0x200000 0x400000;\"\t\t\t\\\n \t\"bootm 0x22000000 - 0x21000000\"\n \n-#else /* CONFIG_SYS_USE_MMC */\n+#else /* CONFIG_SD_BOOT */\n \n /* bootstrap + u-boot + env + linux in mmc */\n \n@@ -180,13 +180,19 @@\n #define CONFIG_SYS_MCKR\t\t\t0x1301\n #define CONFIG_SYS_MCKR_CSS\t\t0x1302\n \n-#ifdef CONFIG_SYS_USE_MMC\n+#ifdef CONFIG_SD_BOOT\n #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION\t1\n #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME\t\t\"u-boot.img\"\n \n #elif CONFIG_SYS_USE_NANDFLASH\n+#elif CONFIG_SPI_BOOT\n+#define CONFIG_SPL_SPI_LOAD\n+#define CONFIG_SYS_SPI_U_BOOT_OFFS\t0x8400\n+\n+#elif CONFIG_NAND_BOOT\n #define CONFIG_SPL_NAND_DRIVERS\n #define CONFIG_SPL_NAND_BASE\n+#endif\n #define CONFIG_SYS_NAND_U_BOOT_OFFS\t0x40000\n #define CONFIG_SYS_NAND_5_ADDR_CYCLE\n #define CONFIG_SYS_NAND_PAGE_SIZE\t0x800\n@@ -196,10 +202,4 @@\n #define CONFIG_SYS_NAND_BAD_BLOCK_POS\t0x0\n #define CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER\n \n-#elif CONFIG_SYS_USE_SPIFLASH\n-#define CONFIG_SPL_SPI_LOAD\n-#define CONFIG_SYS_SPI_U_BOOT_OFFS\t0x8400\n-\n-#endif\n-\n #endif\ndiff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h\nindex eb798442ca..1d4971c59f 100644\n--- a/include/configs/at91sam9x5ek.h\n+++ b/include/configs/at91sam9x5ek.h\n@@ -15,8 +15,6 @@\n #define CONFIG_SYS_AT91_SLOW_CLOCK\t32768\n #define CONFIG_SYS_AT91_MAIN_CLOCK\t12000000\t/* 12 MHz crystal */\n \n-#define CONFIG_AT91SAM9X5EK\n-\n #define CONFIG_CMDLINE_TAG\t\t/* enable passing of ATAGs */\n #define CONFIG_SETUP_MEMORY_TAGS\n #define CONFIG_INITRD_TAG\n@@ -102,7 +100,7 @@\n #define CONFIG_SYS_MEMTEST_START\tCONFIG_SYS_SDRAM_BASE\n #define CONFIG_SYS_MEMTEST_END\t\t0x26e00000\n \n-#ifdef CONFIG_SYS_USE_NANDFLASH\n+#ifdef CONFIG_NAND_BOOT\n /* bootstrap + u-boot + env + linux in nandflash */\n #define CONFIG_ENV_OFFSET\t\t0x120000\n #define CONFIG_ENV_OFFSET_REDUND\t0x100000\n@@ -110,7 +108,7 @@\n #define CONFIG_BOOTCOMMAND\t\"nand read \" \\\n \t\t\t\t\"0x22000000 0x200000 0x300000; \" \\\n \t\t\t\t\"bootm 0x22000000\"\n-#elif defined(CONFIG_SYS_USE_SPIFLASH)\n+#elif defined(CONFIG_SPI_BOOT)\n /* bootstrap + u-boot + env + linux in spi flash */\n #define CONFIG_ENV_OFFSET\t0x5000\n #define CONFIG_ENV_SIZE\t\t0x3000\n@@ -128,7 +126,7 @@\n #define CONFIG_BOOTCOMMAND\t\"sf probe 0; \" \\\n \t\t\t\t\"sf read 0x22000000 0x84000 0x294000; \" \\\n \t\t\t\t\"bootm 0x22000000\"\n-#else /* CONFIG_SYS_USE_MMC */\n+#else /* CONFIG_SD_BOOT */\n /* bootstrap + u-boot + env + linux in mmc */\n #define CONFIG_ENV_SIZE\t\t0x4000\n #endif\n@@ -160,13 +158,18 @@\n #define CONFIG_SYS_MCKR\t\t\t0x1301\n #define CONFIG_SYS_MCKR_CSS\t\t0x1302\n \n-#ifdef CONFIG_SYS_USE_MMC\n+#ifdef CONFIG_SD_BOOT\n #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION\t1\n #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME\t\t\"u-boot.img\"\n \n-#elif CONFIG_SYS_USE_NANDFLASH\n+#elif CONFIG_SPI_BOOT\n+#define CONFIG_SPL_SPI_LOAD\n+#define CONFIG_SYS_SPI_U_BOOT_OFFS\t0x8400\n+\n+#elif CONFIG_NAND_BOOT\n #define CONFIG_SPL_NAND_DRIVERS\n #define CONFIG_SPL_NAND_BASE\n+#endif\n #define CONFIG_SYS_NAND_U_BOOT_OFFS\t0x40000\n #define CONFIG_SYS_NAND_5_ADDR_CYCLE\n #define CONFIG_SYS_NAND_PAGE_SIZE\t0x800\n@@ -176,10 +179,4 @@\n #define CONFIG_SYS_NAND_BAD_BLOCK_POS\t0x0\n #define CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER\n \n-#elif CONFIG_SYS_USE_SPIFLASH\n-#define CONFIG_SPL_SPI_LOAD\n-#define CONFIG_SYS_SPI_U_BOOT_OFFS\t0x8400\n-\n-#endif\n-\n #endif\ndiff --git a/include/configs/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h\nindex 75a81f1473..3ae16dfc63 100644\n--- a/include/configs/sama5d2_ptc.h\n+++ b/include/configs/sama5d2_ptc.h\n@@ -72,7 +72,7 @@\n #define CONFIG_NET_RETRY_COUNT\t\t20\n #define CONFIG_MACB_SEARCH_PHY\n \n-#ifdef CONFIG_SYS_USE_NANDFLASH\n+#ifdef CONFIG_NAND_BOOT\n #undef CONFIG_ENV_OFFSET\n #undef CONFIG_ENV_OFFSET_REDUND\n #undef CONFIG_BOOTCOMMAND\n@@ -95,13 +95,14 @@\n \n #define CONFIG_SYS_MONITOR_LEN\t\t(512 << 10)\n \n-#ifdef CONFIG_SYS_USE_SERIALFLASH\n+#ifdef CONFIG_SPI_BOOT\n #define CONFIG_SPL_SPI_LOAD\n #define CONFIG_SYS_SPI_U_BOOT_OFFS\t0x8000\n \n-#elif CONFIG_SYS_USE_NANDFLASH\n+#elif CONFIG_NAND_BOOT\n #define CONFIG_SPL_NAND_DRIVERS\n #define CONFIG_SPL_NAND_BASE\n+#endif\n #define CONFIG_PMECC_CAP\t\t8\n #define CONFIG_PMECC_SECTOR_SIZE\t512\n #define CONFIG_SYS_NAND_U_BOOT_OFFS\t0x40000\n@@ -112,6 +113,5 @@\n #define CONFIG_SYS_NAND_BLOCK_SIZE\t0x40000\n #define CONFIG_SYS_NAND_BAD_BLOCK_POS\t0x0\n #define CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER\n-#endif\n \n #endif\ndiff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h\nindex 2a9e9729d1..414daaf974 100644\n--- a/include/configs/sama5d2_xplained.h\n+++ b/include/configs/sama5d2_xplained.h\n@@ -51,7 +51,7 @@\n #define CONFIG_ATMEL_LCD_RGB565\n #endif\n \n-#ifdef CONFIG_SYS_USE_MMC\n+#ifdef CONFIG_SD_BOOT\n \n /* bootstrap + u-boot + env in sd card */\n #undef CONFIG_BOOTCOMMAND\n@@ -73,11 +73,11 @@\n \n #define CONFIG_SYS_MONITOR_LEN\t\t(512 << 10)\n \n-#ifdef CONFIG_SYS_USE_MMC\n+#ifdef CONFIG_SD_BOOT\n #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION\t1\n #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME\t\t\"u-boot.img\"\n \n-#elif CONFIG_SYS_USE_SERIALFLASH\n+#elif CONFIG_SPI_BOOT\n #define CONFIG_SPL_SPI_LOAD\n #define CONFIG_SYS_SPI_U_BOOT_OFFS\t0x10000\n \ndiff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h\nindex 54ea98d454..a6697cdb63 100644\n--- a/include/configs/sama5d3_xplained.h\n+++ b/include/configs/sama5d3_xplained.h\n@@ -69,12 +69,6 @@\n \n #define CONFIG_SYS_LOAD_ADDR\t\t\t0x22000000 /* load address */\n \n-#if CONFIG_SYS_USE_NANDFLASH\n-/* override the bootcmd, bootargs and other configuration for nandflash env */\n-#elif CONFIG_SYS_USE_MMC\n-/* override the bootcmd, bootargs and other configuration for sd/mmc env */\n-#endif\n-\n /* SPL */\n #define CONFIG_SPL_FRAMEWORK\n #define CONFIG_SPL_TEXT_BASE\t\t0x300000\n@@ -86,13 +80,14 @@\n \n #define CONFIG_SYS_MONITOR_LEN\t\t(512 << 10)\n \n-#ifdef CONFIG_SYS_USE_MMC\n+#ifdef CONFIG_SD_BOOT\n #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION\t1\n #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME\t\"u-boot.img\"\n \n-#elif CONFIG_SYS_USE_NANDFLASH\n+#elif CONFIG_NAND_BOOT\n #define CONFIG_SPL_NAND_DRIVERS\n #define CONFIG_SPL_NAND_BASE\n+#endif\n #define CONFIG_SYS_NAND_U_BOOT_OFFS\t0x40000\n #define CONFIG_SYS_NAND_5_ADDR_CYCLE\n #define CONFIG_SYS_NAND_PAGE_SIZE\t0x800\n@@ -103,5 +98,3 @@\n #define CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER\n \n #endif\n-\n-#endif\ndiff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h\nindex a7223e2cf0..bd93a1e84c 100644\n--- a/include/configs/sama5d3xek.h\n+++ b/include/configs/sama5d3xek.h\n@@ -98,14 +98,6 @@\n \n #define CONFIG_SYS_LOAD_ADDR\t\t\t0x22000000 /* load address */\n \n-#ifdef CONFIG_SYS_USE_SERIALFLASH\n-/* override the bootcmd, bootargs and other configuration for spi flash env*/\n-#elif CONFIG_SYS_USE_NANDFLASH\n-/* override the bootcmd, bootargs and other configuration nandflash env */\n-#elif CONFIG_SYS_USE_MMC\n-/* override the bootcmd, bootargs and other configuration for sd/mmc env */\n-#endif\n-\n /* SPL */\n #define CONFIG_SPL_FRAMEWORK\n #define CONFIG_SPL_TEXT_BASE\t\t0x300000\n@@ -117,13 +109,18 @@\n \n #define CONFIG_SYS_MONITOR_LEN\t\t(512 << 10)\n \n-#ifdef CONFIG_SYS_USE_MMC\n+#ifdef CONFIG_SD_BOOT\n #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION\t1\n #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME\t\"u-boot.img\"\n \n-#elif CONFIG_SYS_USE_NANDFLASH\n+#elif CONFIG_SPI_BOOT\n+#define CONFIG_SPL_SPI_LOAD\n+#define CONFIG_SYS_SPI_U_BOOT_OFFS\t0x10000\n+\n+#elif CONFIG_NAND_BOOT\n #define CONFIG_SPL_NAND_DRIVERS\n #define CONFIG_SPL_NAND_BASE\n+#endif\n #define CONFIG_SYS_NAND_U_BOOT_OFFS\t0x40000\n #define CONFIG_SYS_NAND_5_ADDR_CYCLE\n #define CONFIG_SYS_NAND_PAGE_SIZE\t0x800\n@@ -133,10 +130,4 @@\n #define CONFIG_SYS_NAND_BAD_BLOCK_POS\t0x0\n #define CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER\n \n-#elif CONFIG_SYS_USE_SERIALFLASH\n-#define CONFIG_SPL_SPI_LOAD\n-#define CONFIG_SYS_SPI_U_BOOT_OFFS\t0x10000\n-\n-#endif\n-\n #endif\ndiff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h\nindex 9f0f96f799..bc8bf3a168 100644\n--- a/include/configs/sama5d4_xplained.h\n+++ b/include/configs/sama5d4_xplained.h\n@@ -56,14 +56,6 @@\n #define CONFIG_ATMEL_LCD_RGB565\n #endif\n \n-#ifdef CONFIG_SYS_USE_SERIALFLASH\n-/* override the bootcmd, bootargs and other configuration for spi flash env */\n-#elif CONFIG_SYS_USE_NANDFLASH\n-/* override the bootcmd, bootargs and other configuration for nandflash env */\n-#elif CONFIG_SYS_USE_MMC\n-/* override the bootcmd, bootargs and other configuration for sd/mmc env */\n-#endif\n-\n /* SPL */\n #define CONFIG_SPL_FRAMEWORK\n #define CONFIG_SPL_TEXT_BASE\t\t0x200000\n@@ -75,13 +67,19 @@\n \n #define CONFIG_SYS_MONITOR_LEN\t\t(512 << 10)\n \n-#ifdef CONFIG_SYS_USE_MMC\n+#ifdef CONFIG_SD_BOOT\n #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION\t1\n #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME\t\t\"u-boot.img\"\n \n #elif CONFIG_SYS_USE_NANDFLASH\n+#elif CONFIG_SPI_BOOT\n+#define CONFIG_SPL_SPI_LOAD\n+#define CONFIG_SYS_SPI_U_BOOT_OFFS\t0x10000\n+\n+#elif CONFIG_NAND_BOOT\n #define CONFIG_SPL_NAND_DRIVERS\n #define CONFIG_SPL_NAND_BASE\n+#endif\n #define CONFIG_PMECC_CAP\t\t8\n #define CONFIG_PMECC_SECTOR_SIZE\t512\n #define CONFIG_SYS_NAND_U_BOOT_OFFS\t0x40000\n@@ -93,9 +91,4 @@\n #define CONFIG_SYS_NAND_BAD_BLOCK_POS\t0x0\n #define CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER\n \n-#elif CONFIG_SYS_USE_SERIALFLASH\n-#define CONFIG_SPL_SPI_LOAD\n-#define CONFIG_SYS_SPI_U_BOOT_OFFS\t0x10000\n-\n-#endif\n #endif\ndiff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h\nindex 0410d65ea0..94e8e893c0 100644\n--- a/include/configs/sama5d4ek.h\n+++ b/include/configs/sama5d4ek.h\n@@ -54,14 +54,6 @@\n #define CONFIG_ATMEL_HLCD\n #define CONFIG_ATMEL_LCD_RGB565\n \n-#ifdef CONFIG_SYS_USE_SERIALFLASH\n-/* override the bootcmd, bootargs and other configuration for spi flash env*/\n-#elif CONFIG_SYS_USE_NANDFLASH\n-/* override the bootcmd, bootargs and other configuration for nandflash env*/\n-#elif CONFIG_SYS_USE_MMC\n-/* override the bootcmd, bootargs and other configuration for sd/mmc env */\n-#endif\n-\n /* SPL */\n #define CONFIG_SPL_FRAMEWORK\n #define CONFIG_SPL_TEXT_BASE\t\t0x200000\n@@ -73,13 +65,18 @@\n \n #define CONFIG_SYS_MONITOR_LEN\t\t(512 << 10)\n \n-#ifdef CONFIG_SYS_USE_MMC\n+#ifdef CONFIG_SD_BOOT\n #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION\t1\n #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME\t\t\"u-boot.img\"\n \n-#elif CONFIG_SYS_USE_NANDFLASH\n+#elif CONFIG_SPI_BOOT\n+#define CONFIG_SPL_SPI_LOAD\n+#define CONFIG_SYS_SPI_U_BOOT_OFFS\t0x10000\n+\n+#elif CONFIG_NAND_BOOT\n #define CONFIG_SPL_NAND_DRIVERS\n #define CONFIG_SPL_NAND_BASE\n+#endif\n #define CONFIG_PMECC_CAP\t\t8\n #define CONFIG_PMECC_SECTOR_SIZE\t512\n #define CONFIG_SYS_NAND_U_BOOT_OFFS\t0x40000\n@@ -91,9 +88,4 @@\n #define CONFIG_SYS_NAND_BAD_BLOCK_POS\t0x0\n #define CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER\n \n-#elif CONFIG_SYS_USE_SERIALFLASH\n-#define CONFIG_SPL_SPI_LOAD\n-#define CONFIG_SYS_SPI_U_BOOT_OFFS\t0x10000\n-\n-#endif\n #endif\ndiff --git a/include/configs/vinco.h b/include/configs/vinco.h\nindex 8c45f4a32e..31d3b73205 100644\n--- a/include/configs/vinco.h\n+++ b/include/configs/vinco.h\n@@ -82,7 +82,7 @@\n #define CONFIG_USB_ETHER_SMSC95XX\n #define CONFIG_USB_ETHER_RNDIS\n \n-#ifdef CONFIG_SYS_USE_SERIALFLASH\n+#ifdef CONFIG_SPI_BOOT\n /* bootstrap + u-boot + env + linux in serial flash */\n #define CONFIG_ENV_SPI_BUS\tCONFIG_SF_DEFAULT_BUS\n #define CONFIG_ENV_SPI_CS\tCONFIG_SF_DEFAULT_CS\n",
    "prefixes": [
        "U-Boot",
        "v2",
        "5/5"
    ]
}