{"id":810476,"url":"http://patchwork.ozlabs.org/api/patches/810476/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20170906094755.22262-5-wenyou.yang@microchip.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":"<20170906094755.22262-5-wenyou.yang@microchip.com>","list_archive_url":null,"date":"2017-09-06T09:47:54","name":"[U-Boot,v2,4/5] ARM: at91: spl: Add macro CONFIG_XXXX_BOOT support","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"c2ab1cadce2f7aba399b39bedb1061d7064bac08","submitter":{"id":69532,"url":"http://patchwork.ozlabs.org/api/people/69532/?format=json","name":"Wenyou Yang","email":"Wenyou.Yang@microchip.com"},"delegate":{"id":3651,"url":"http://patchwork.ozlabs.org/api/users/3651/?format=json","username":"trini","first_name":"Tom","last_name":"Rini","email":"trini@ti.com"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20170906094755.22262-5-wenyou.yang@microchip.com/mbox/","series":[{"id":1742,"url":"http://patchwork.ozlabs.org/api/series/1742/?format=json","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/810476/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810476/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=)","Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xnJk11XQZz9sNc\n\tfor ;\n\tWed, 6 Sep 2017 19:50:49 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid D746CC21F54; Wed, 6 Sep 2017 09:49:52 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id EAE3FC21DE1;\n\tWed, 6 Sep 2017 09:49:39 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 97CD8C21E71; Wed, 6 Sep 2017 09:49:31 +0000 (UTC)","from DVREDG01.corp.atmel.com (nasmtp01.atmel.com [192.199.1.245])\n\tby lists.denx.de (Postfix) with ESMTPS id A680DC21EB9\n\tfor ; Wed, 6 Sep 2017 09:49:27 +0000 (UTC)","from apsmtp01.atmel.com (10.168.254.31) by DVREDG01.corp.atmel.com\n\t(10.42.103.30) with Microsoft SMTP Server (TLS) id 14.3.235.1;\n\tWed, 6 Sep 2017 03:48:44 -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:02 +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 ","To":"U-Boot Mailing List , Simon Glass\n\t, Heiko Schocher , Tom Rini\n\t, Andreas ","Date":"Wed, 6 Sep 2017 17:47:54 +0800","Message-ID":"<20170906094755.22262-5-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 4/5] ARM: at91: spl: Add macro CONFIG_XXXX_BOOT\n\tsupport","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","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=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" "},"content":"Use the CONFIG_XXXX_BOOT to indicate the boot media, instead of\nthe CONFIG_SYS_USE_XXXX option, which is declared by\nCONFIG_SYS_EXTRA_OPTIONS option.\n\nSigned-off-by: Wenyou Yang \n---\n\nChanges in v2: None\n\n arch/arm/mach-at91/spl.c | 16 ++++++++++------\n 1 file changed, 10 insertions(+), 6 deletions(-)","diff":"diff --git a/arch/arm/mach-at91/spl.c b/arch/arm/mach-at91/spl.c\nindex e113336b7b..c2e2d90a89 100644\n--- a/arch/arm/mach-at91/spl.c\n+++ b/arch/arm/mach-at91/spl.c\n@@ -37,7 +37,7 @@ u32 spl_boot_device(void)\n \tu32 off = (bootrom_stash.r4 >> ATMEL_SAMA5_BOOT_DEV_ID_OFF) &\n \t\t ATMEL_SAMA5_BOOT_DEV_ID_MASK;\n \n-#if defined(CONFIG_SYS_USE_MMC)\n+#if defined(CONFIG_SYS_USE_MMC) || defined(CONFIG_SD_BOOT)\n \tif (dev == ATMEL_SAMA5_BOOT_FROM_MCI) {\n #if defined(CONFIG_SPL_OF_CONTROL)\n \t\treturn BOOT_DEVICE_MMC1;\n@@ -52,7 +52,9 @@ u32 spl_boot_device(void)\n \t}\n #endif\n \n-#if defined(CONFIG_SYS_USE_SERIALFLASH) || defined(CONFIG_SYS_USE_SPIFLASH)\n+#if defined(CONFIG_SYS_USE_SERIALFLASH) || \\\n+\tdefined(CONFIG_SYS_USE_SPIFLASH) || \\\n+\tdefined(CONFIG_SPI_BOOT)\n \tif (dev == ATMEL_SAMA5_BOOT_FROM_SPI)\n \t\treturn BOOT_DEVICE_SPI;\n #endif\n@@ -71,11 +73,13 @@ u32 spl_boot_device(void)\n #else\n u32 spl_boot_device(void)\n {\n-#ifdef CONFIG_SYS_USE_MMC\n+#if defined(CONFIG_SYS_USE_MMC) || defined(CONFIG_SD_BOOT)\n \treturn BOOT_DEVICE_MMC1;\n-#elif CONFIG_SYS_USE_NANDFLASH\n+#elif defined(CONFIG_SYS_USE_NANDFLASH) || defined(CONFIG_NAND_BOOT)\n \treturn BOOT_DEVICE_NAND;\n-#elif CONFIG_SYS_USE_SERIALFLASH || CONFIG_SYS_USE_SPIFLASH\n+#elif defined(CONFIG_SYS_USE_SERIALFLASH) || \\\n+\tdefined(CONFIG_SYS_USE_SPIFLASH) || \\\n+\tdefined(CONFIG_SPI_BOOT)\n \treturn BOOT_DEVICE_SPI;\n #endif\n \treturn BOOT_DEVICE_NONE;\n@@ -85,7 +89,7 @@ u32 spl_boot_device(void)\n u32 spl_boot_mode(const u32 boot_device)\n {\n \tswitch (boot_device) {\n-#ifdef CONFIG_SYS_USE_MMC\n+#if defined(CONFIG_SYS_USE_MMC) || defined(CONFIG_SD_BOOT)\n \tcase BOOT_DEVICE_MMC1:\n \tcase BOOT_DEVICE_MMC2:\n \t\treturn MMCSD_MODE_FS;\n","prefixes":["U-Boot","v2","4/5"]}