Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/815780/?format=api
{ "id": 815780, "url": "http://patchwork.ozlabs.org/api/patches/815780/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/1505846281-19020-7-git-send-email-jteki@openedev.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": "<1505846281-19020-7-git-send-email-jteki@openedev.com>", "list_archive_url": null, "date": "2017-09-19T18:38:01", "name": "[U-Boot,6/6] i.MX6Q: icore: Add imx6q board for icore/icore_rqs", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "6b6ddae86decd4351280831c70600546f20af731", "submitter": { "id": 20045, "url": "http://patchwork.ozlabs.org/api/people/20045/?format=api", "name": "Jagan Teki", "email": "jagannadh.teki@gmail.com" }, "delegate": { "id": 1693, "url": "http://patchwork.ozlabs.org/api/users/1693/?format=api", "username": "sbabic", "first_name": "Stefano", "last_name": "Babic", "email": "sbabic@denx.de" }, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/1505846281-19020-7-git-send-email-jteki@openedev.com/mbox/", "series": [ { "id": 3946, "url": "http://patchwork.ozlabs.org/api/series/3946/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/list/?series=3946", "date": "2017-09-19T18:37:55", "name": "i.MX6Q: Add SPL_OF_CONTROL support", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/3946/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/815780/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/815780/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>)", "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"m0OhHRH6\"; dkim-atps=neutral" ], "Received": [ "from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xxWzC1KXLz9sPs\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 20 Sep 2017 04:45:42 +1000 (AEST)", "by lists.denx.de (Postfix, from userid 105)\n\tid 48BCDC21DD7; Tue, 19 Sep 2017 18:45:31 +0000 (UTC)", "from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 075FDC21DA4;\n\tTue, 19 Sep 2017 18:45:28 +0000 (UTC)", "by lists.denx.de (Postfix, from userid 105)\n\tid 7CE1AC21D76; Tue, 19 Sep 2017 18:43:54 +0000 (UTC)", "from mail-pf0-f193.google.com (mail-pf0-f193.google.com\n\t[209.85.192.193])\n\tby lists.denx.de (Postfix) with ESMTPS id 69619C21D5F\n\tfor <u-boot@lists.denx.de>; Tue, 19 Sep 2017 18:43:49 +0000 (UTC)", "by mail-pf0-f193.google.com with SMTP id e69so186458pfg.4\n\tfor <u-boot@lists.denx.de>; Tue, 19 Sep 2017 11:43:49 -0700 (PDT)", "from localhost.localdomain ([115.97.191.18])\n\tby smtp.gmail.com with ESMTPSA id\n\te87sm4757779pfl.46.2017.09.19.11.43.43\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tTue, 19 Sep 2017 11:43:46 -0700 (PDT)" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de", "X-Spam-Level": "", "X-Spam-Status": "No, score=0.0 required=5.0 tests=FREEMAIL_FROM,\n\tRCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,\n\tT_DKIM_INVALID autolearn=unavailable\n\tautolearn_force=no version=3.4.0", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=EjmRsAg5X+0U/UCM6RLheWaZH5YyfmtpjfdYlIykaX4=;\n\tb=m0OhHRH6yUHno8IiRYTVa787pBj/w4zhzFgwJO4iBnjo/QqIvPvMi36MIpR5mO6mXP\n\tljfm8nB+5sDleGXaF2yLvnX1FNbmlp+XDa4OlRaBdwrDK1u0YfLYjgSVm/9JWufOzy3z\n\tEUbfs8ybDXcMxG8jaEFEXsaD79JNBqug1o0Z8ZdfIXHItJpjmEAYI5fYqx49vBRg0V16\n\tFYtpxoRBZDCKttM+d6kz/67z/T6Dz1y64PfR3SSnhr58G5d/LH6YrXxoBhaIgMtsA85v\n\tuGy8wrtFVZd2w9ysw9q7y1s/URzi+6/SEjZYtkqOSX4XNCfxFvsI7zpr2Ua7zSif3ng0\n\tc89w==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=EjmRsAg5X+0U/UCM6RLheWaZH5YyfmtpjfdYlIykaX4=;\n\tb=p4FgHu1XqubyYQ1fo/UNEpOlFmvCyXXb05jH7HrFzLafaLOyATHvzktrVycW4Nfbqw\n\tj7viVSN0y1mQzGNLPRIhzdkVlJpo+/T6pgW2yhltHViKyxd8nPa1TVujf4o7xRflxUM9\n\tCqYHOyFtOhDKYI00EqL8G09Q7Y1NW07dCEldgoyCVPkb5he0XhwakpxE1hM/mXgIX1Ly\n\tzbn42i29OU9XapI4etsbRMbUEi5KqenJZytmoC1BnUyduTJUHSnFFMidRHfuQzrzovrZ\n\tba8y2SUY2GMSfjangWwo7hg/OQhFAEpacwbFG/cu+Uki3fm7jYgQKaatzQWPQpIuCWlB\n\tOpGw==", "X-Gm-Message-State": "AHPjjUibQsB+iQZxEqlb619KCiqJV0MHD26nrzKe/e1Onb3b2IfZU9dj\n\tj8CvnL63sP3MLK4z5YP9lIk=", "X-Google-Smtp-Source": "AOwi7QBb6m2vmhxN0Du7ECTlwJ+pguzTmXaJdsBh6kQ3j4j1qtZvW3RSHSA1jBbkyHSilxN/hagPOQ==", "X-Received": "by 10.98.134.206 with SMTP id x197mr2170172pfd.26.1505846627922; \n\tTue, 19 Sep 2017 11:43:47 -0700 (PDT)", "From": "Jagan Teki <jagannadh.teki@gmail.com>", "X-Google-Original-From": "Jagan Teki <jteki@openedev.com>", "To": "Stefano Babic <sbabic@denx.de>", "Date": "Wed, 20 Sep 2017 00:08:01 +0530", "Message-Id": "<1505846281-19020-7-git-send-email-jteki@openedev.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1505846281-19020-1-git-send-email-jteki@openedev.com>", "References": "<1505846281-19020-1-git-send-email-jteki@openedev.com>", "Cc": "Fabio Estevam <fabio.estevam@nxp.com>, u-boot@lists.denx.de", "Subject": "[U-Boot] [PATCH 6/6] i.MX6Q: icore: Add imx6q board for\n\ticore/icore_rqs", "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>", "MIME-Version": "1.0", "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": "From: Jagan Teki <jagan@amarulasolutions.com>\n\nicore and icore_rqs boards are i.MX6QDL SOC type, so\ncreate them as imx6q board and place the code as optimum\nas possible.\n\nSigned-off-by: Jagan Teki <jagan@amarulasolutions.com>\n---\n arch/arm/mach-imx/mx6/Kconfig | 24 +----------\n board/engicam/icorem6_rqs/Kconfig | 12 ------\n board/engicam/icorem6_rqs/MAINTAINERS | 9 ----\n board/engicam/icorem6_rqs/Makefile | 6 ---\n board/engicam/icorem6_rqs/README | 30 -------------\n board/engicam/icorem6_rqs/icorem6_rqs.c | 49 ----------------------\n board/engicam/{icorem6 => imx6q}/Kconfig | 2 +-\n board/engicam/{icorem6 => imx6q}/MAINTAINERS | 8 +++-\n board/engicam/{icorem6 => imx6q}/Makefile | 2 +-\n board/engicam/{icorem6 => imx6q}/README | 9 ++--\n board/engicam/{icorem6/icorem6.c => imx6q/imx6q.c} | 41 +++++++++++++++++-\n configs/imx6qdl_icore_rqs_defconfig | 2 +-\n 12 files changed, 56 insertions(+), 138 deletions(-)\n delete mode 100644 board/engicam/icorem6_rqs/Kconfig\n delete mode 100644 board/engicam/icorem6_rqs/MAINTAINERS\n delete mode 100644 board/engicam/icorem6_rqs/Makefile\n delete mode 100644 board/engicam/icorem6_rqs/README\n delete mode 100644 board/engicam/icorem6_rqs/icorem6_rqs.c\n rename board/engicam/{icorem6 => imx6q}/Kconfig (87%)\n rename board/engicam/{icorem6 => imx6q}/MAINTAINERS (58%)\n rename board/engicam/{icorem6 => imx6q}/Makefile (80%)\n rename board/engicam/{icorem6 => imx6q}/README (71%)\n rename board/engicam/{icorem6/icorem6.c => imx6q/imx6q.c} (88%)", "diff": "diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig\nindex 9f2b30c..412bac7 100644\n--- a/arch/arm/mach-imx/mx6/Kconfig\n+++ b/arch/arm/mach-imx/mx6/Kconfig\n@@ -185,26 +185,7 @@ config TARGET_MX6QARM2\n \tbool \"mx6qarm2\"\n \n config TARGET_MX6Q_ICORE\n-\tbool \"Support Engicam i.Core\"\n-\tselect BOARD_LATE_INIT\n-\tselect MX6QDL\n-\tselect OF_CONTROL\n-\tselect SPL_OF_LIBFDT\n-\tselect DM\n-\tselect DM_ETH\n-\tselect DM_GPIO\n-\tselect DM_I2C\n-\tselect DM_MMC\n-\tselect DM_THERMAL\n-\tselect SUPPORT_SPL\n-\tselect SPL_LOAD_FIT\n-\tselect SPL_DM if SPL\n-\tselect SPL_OF_CONTROL if SPL\n-\tselect SPL_SEPARATE_BSS if SPL\n-\tselect SPL_PINCTRL if SPL\n-\n-config TARGET_MX6Q_ICORE_RQS\n-\tbool \"Support Engicam i.Core RQS\"\n+\tbool \"Support Engicam i.Core(RQS)\"\n \tselect BOARD_LATE_INIT\n \tselect MX6QDL\n \tselect OF_CONTROL\n@@ -439,8 +420,7 @@ source \"board/congatec/cgtqmx6eval/Kconfig\"\n source \"board/el/el6x/Kconfig\"\n source \"board/embest/mx6boards/Kconfig\"\n source \"board/engicam/geam6ul/Kconfig\"\n-source \"board/engicam/icorem6/Kconfig\"\n-source \"board/engicam/icorem6_rqs/Kconfig\"\n+source \"board/engicam/imx6q/Kconfig\"\n source \"board/engicam/isiotmx6ul/Kconfig\"\n source \"board/freescale/mx6qarm2/Kconfig\"\n source \"board/freescale/mx6sabreauto/Kconfig\"\ndiff --git a/board/engicam/icorem6_rqs/Kconfig b/board/engicam/icorem6_rqs/Kconfig\ndeleted file mode 100644\nindex 6dc3a07..0000000\n--- a/board/engicam/icorem6_rqs/Kconfig\n+++ /dev/null\n@@ -1,12 +0,0 @@\n-if TARGET_MX6Q_ICORE_RQS\n-\n-config SYS_BOARD\n-\tdefault \"icorem6_rqs\"\n-\n-config SYS_VENDOR\n-\tdefault \"engicam\"\n-\n-config SYS_CONFIG_NAME\n-\tdefault \"imx6-engicam\"\n-\n-endif\ndiff --git a/board/engicam/icorem6_rqs/MAINTAINERS b/board/engicam/icorem6_rqs/MAINTAINERS\ndeleted file mode 100644\nindex 9a74265..0000000\n--- a/board/engicam/icorem6_rqs/MAINTAINERS\n+++ /dev/null\n@@ -1,9 +0,0 @@\n-ICOREM6QDL_RQS BOARD\n-M:\tJagan Teki <jagan@amarulasolutions.com>\n-S:\tMaintained\n-F:\tboard/engicam/icorem6_rqs\n-F:\tinclude/configs/imx6-engicam.h\n-F:\tconfigs/imx6qdl_icore_rqs_defconfig\n-F:\tarch/arm/dts/imx6qdl-icore-rqs.dtsi\n-F:\tarch/arm/dts/imx6q-icore-rqs.dts\n-F:\tarch/arm/dts/imx6dl-icore-rqs.dts\ndiff --git a/board/engicam/icorem6_rqs/Makefile b/board/engicam/icorem6_rqs/Makefile\ndeleted file mode 100644\nindex 2e3933c..0000000\n--- a/board/engicam/icorem6_rqs/Makefile\n+++ /dev/null\n@@ -1,6 +0,0 @@\n-# Copyright (C) 2016 Amarula Solutions B.V.\n-#\n-# SPDX-License-Identifier:\tGPL-2.0+\n-#\n-\n-obj-y := icorem6_rqs.o\ndiff --git a/board/engicam/icorem6_rqs/README b/board/engicam/icorem6_rqs/README\ndeleted file mode 100644\nindex 97e978c..0000000\n--- a/board/engicam/icorem6_rqs/README\n+++ /dev/null\n@@ -1,30 +0,0 @@\n-How to use U-Boot on Engicam i.CoreM6 RQS Solo/DualLite and Quad/Dual Starter Kit:\n-----------------------------------------------------------------------------------\n-\n-$ make mrproper\n-\n-- Configure U-Boot for Engicam i.CoreM6 RQS Quad/Dual/Solo/DualLite:\n-$ make imx6qdl_icore_rqs_defconfig\n-\n-- Build U-Boot\n-$ make\n-\n-This will generate the SPL image called SPL and the u-boot-dtb.img.\n-\n-- Flash the SPL image into the micro SD card:\n-\n-sudo dd if=SPL of=/dev/mmcblk0 bs=1k seek=1; sync\n-\n-- Flash the u-boot-dtb.img image into the micro SD card:\n-\n-sudo dd if=u-boot-dtb.img of=/dev/mmcblk0 bs=1k seek=69; sync\n-\n-- Jumper settings:\n-\n-MMC Boot: JM3 Closed\n-\n-- Connect the Serial cable between the Starter Kit and the PC for the console.\n-(J28 is the Linux Serial console connector)\n-\n-- Insert the micro SD card in the board, power it up and U-Boot messages should\n-come up.\ndiff --git a/board/engicam/icorem6_rqs/icorem6_rqs.c b/board/engicam/icorem6_rqs/icorem6_rqs.c\ndeleted file mode 100644\nindex c0a6d4f..0000000\n--- a/board/engicam/icorem6_rqs/icorem6_rqs.c\n+++ /dev/null\n@@ -1,49 +0,0 @@\n-/*\n- * Copyright (C) 2016 Amarula Solutions B.V.\n- * Copyright (C) 2016 Engicam S.r.l.\n- * Author: Jagan Teki <jagan@amarulasolutions.com>\n- *\n- * SPDX-License-Identifier:\tGPL-2.0+\n- */\n-\n-#include <asm/arch/sys_proto.h>\n-\n-DECLARE_GLOBAL_DATA_PTR;\n-\n-#ifdef CONFIG_ENV_IS_IN_MMC\n-int board_mmc_get_env_dev(int devno)\n-{\n-\t/* dev 0 for SD/eSD, dev 1 for MMC/eMMC */\n-\treturn (devno == 3) ? 1 : 0;\n-}\n-#endif\n-\n-#ifdef CONFIG_SPL_BUILD\n-#include <spl.h>\n-\n-#ifdef CONFIG_ENV_IS_IN_MMC\n-void board_boot_order(u32 *spl_boot_list)\n-{\n-\tu32 bmode = imx6_src_get_boot_mode();\n-\tu8 boot_dev = BOOT_DEVICE_MMC1;\n-\n-\tswitch ((bmode & IMX6_BMODE_MASK) >> IMX6_BMODE_SHIFT) {\n-\tcase IMX6_BMODE_SD:\n-\tcase IMX6_BMODE_ESD:\n-\t\t/* SD/eSD - BOOT_DEVICE_MMC1 */\n-\t\tbreak;\n-\tcase IMX6_BMODE_MMC:\n-\tcase IMX6_BMODE_EMMC:\n-\t\t/* MMC/eMMC */\n-\t\tboot_dev = BOOT_DEVICE_MMC2;\n-\t\tbreak;\n-\tdefault:\n-\t\t/* Default - BOOT_DEVICE_MMC1 */\n-\t\tprintf(\"Wrong board boot order\\n\");\n-\t\tbreak;\n-\t}\n-\n-\tspl_boot_list[0] = boot_dev;\n-}\n-#endif\n-#endif /* CONFIG_SPL_BUILD */\ndiff --git a/board/engicam/icorem6/Kconfig b/board/engicam/imx6q/Kconfig\nsimilarity index 87%\nrename from board/engicam/icorem6/Kconfig\nrename to board/engicam/imx6q/Kconfig\nindex 4a1c9ac..bb36425 100644\n--- a/board/engicam/icorem6/Kconfig\n+++ b/board/engicam/imx6q/Kconfig\n@@ -1,7 +1,7 @@\n if TARGET_MX6Q_ICORE\n \n config SYS_BOARD\n-\tdefault \"icorem6\"\n+\tdefault \"imx6q\"\n \n config SYS_VENDOR\n \tdefault \"engicam\"\ndiff --git a/board/engicam/icorem6/MAINTAINERS b/board/engicam/imx6q/MAINTAINERS\nsimilarity index 58%\nrename from board/engicam/icorem6/MAINTAINERS\nrename to board/engicam/imx6q/MAINTAINERS\nindex a348bdd..18aeb47 100644\n--- a/board/engicam/icorem6/MAINTAINERS\n+++ b/board/engicam/imx6q/MAINTAINERS\n@@ -1,10 +1,14 @@\n-ICOREM6QDL BOARD\n+IMX6Q ICORE BOARD\n M:\tJagan Teki <jagan@amarulasolutions.com>\n S:\tMaintained\n-F:\tboard/engicam/icorem6\n+F:\tboard/engicam/imx6q\n F:\tinclude/configs/imx6-engicam.h\n F:\tconfigs/imx6qdl_icore_mmc_defconfig\n F:\tconfigs/imx6qdl_icore_nand_defconfig\n+F:\tconfigs/imx6qdl_icore_rqs_defconfig\n F:\tarch/arm/dts/imx6qdl-icore.dtsi\n F:\tarch/arm/dts/imx6q-icore.dts\n F:\tarch/arm/dts/imx6dl-icore.dts\n+F:\tarch/arm/dts/imx6qdl-icore-rqs.dtsi\n+F:\tarch/arm/dts/imx6q-icore-rqs.dts\n+F:\tarch/arm/dts/imx6dl-icore-rqs.dts\ndiff --git a/board/engicam/icorem6/Makefile b/board/engicam/imx6q/Makefile\nsimilarity index 80%\nrename from board/engicam/icorem6/Makefile\nrename to board/engicam/imx6q/Makefile\nindex 9ec9ecd..ef2fb6a 100644\n--- a/board/engicam/icorem6/Makefile\n+++ b/board/engicam/imx6q/Makefile\n@@ -3,4 +3,4 @@\n # SPDX-License-Identifier:\tGPL-2.0+\n #\n \n-obj-y := icorem6.o\n+obj-y := imx6q.o\ndiff --git a/board/engicam/icorem6/README b/board/engicam/imx6q/README\nsimilarity index 71%\nrename from board/engicam/icorem6/README\nrename to board/engicam/imx6q/README\nindex 3779e96..3f3478c 100644\n--- a/board/engicam/icorem6/README\n+++ b/board/engicam/imx6q/README\n@@ -1,11 +1,14 @@\n-How to use U-Boot on Engicam i.CoreM6 Solo/DualLite and Quad/Dual Starter Kit:\n------------------------------------------------------------------------------\n+Hsow to use U-Boot on Engicam i.CoreM6 (RQS) Solo/DualLite/Quad/Dual Starter Kit:\n+--------------------------------------------------------------------------------\n \n $ make mrproper\n \n-- Configure U-Boot for Engicam i.CoreM6 Quad/Dual/Solo/DualLite:\n+- Configure U-Boot for Engicam i.CoreM6 Quad/Duali/Solo/DualLite:\n $ make imx6qdl_icore_mmc_defconfig\n \n+- Configure U-Boot for Engicam i.CoreM6 RQS Quad/Duali/Solo/DualLite:\n+$ make imx6qdl_icore_rqs_defconfig\n+\n - Build U-Boot\n $ make\n \ndiff --git a/board/engicam/icorem6/icorem6.c b/board/engicam/imx6q/imx6q.c\nsimilarity index 88%\nrename from board/engicam/icorem6/icorem6.c\nrename to board/engicam/imx6q/imx6q.c\nindex a967ccd..0600547 100644\n--- a/board/engicam/icorem6/icorem6.c\n+++ b/board/engicam/imx6q/imx6q.c\n@@ -25,13 +25,12 @@\n DECLARE_GLOBAL_DATA_PTR;\n \n #ifdef CONFIG_NAND_MXS\n-\n #define GPMI_PAD_CTRL0\t(PAD_CTL_PKE | PAD_CTL_PUE | PAD_CTL_PUS_100K_UP)\n #define GPMI_PAD_CTRL1\t(PAD_CTL_DSE_40ohm | PAD_CTL_SPEED_MED | \\\n \t\t\tPAD_CTL_SRE_FAST)\n #define GPMI_PAD_CTRL2\t(GPMI_PAD_CTRL0 | GPMI_PAD_CTRL1)\n \n-iomux_v3_cfg_t gpmi_pads[] = {\n+static iomux_v3_cfg_t gpmi_pads[] = {\n \tIOMUX_PADS(PAD_NANDF_CLE__NAND_CLE\t| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),\n \tIOMUX_PADS(PAD_NANDF_ALE__NAND_ALE\t| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),\n \tIOMUX_PADS(PAD_NANDF_WP_B__NAND_WP_B\t| MUX_PAD_CTRL(GPMI_PAD_CTRL2)),\n@@ -190,3 +189,41 @@ void setup_display(void)\n \twritel(reg, &iomux->gpr[3]);\n }\n #endif /* CONFIG_VIDEO_IPUV3 */\n+\n+#ifdef CONFIG_ENV_IS_IN_MMC\n+int board_mmc_get_env_dev(int devno)\n+{\n+\t/* dev 0 for SD/eSD, dev 1 for MMC/eMMC */\n+\treturn (devno == 3) ? 1 : 0;\n+}\n+#endif\n+\n+#ifdef CONFIG_SPL_BUILD\n+#include <spl.h>\n+\n+#ifdef CONFIG_ENV_IS_IN_MMC\n+void board_boot_order(u32 *spl_boot_list)\n+{\n+\tu32 bmode = imx6_src_get_boot_mode();\n+\tu8 boot_dev = BOOT_DEVICE_MMC1;\n+\n+\tswitch ((bmode & IMX6_BMODE_MASK) >> IMX6_BMODE_SHIFT) {\n+\tcase IMX6_BMODE_SD:\n+\tcase IMX6_BMODE_ESD:\n+\t\t/* SD/eSD - BOOT_DEVICE_MMC1 */\n+\t\tbreak;\n+\tcase IMX6_BMODE_MMC:\n+\tcase IMX6_BMODE_EMMC:\n+\t\t/* MMC/eMMC */\n+\t\tboot_dev = BOOT_DEVICE_MMC2;\n+\t\tbreak;\n+\tdefault:\n+\t\t/* Default - BOOT_DEVICE_MMC1 */\n+\t\tprintf(\"Wrong board boot order\\n\");\n+\t\tbreak;\n+\t}\n+\n+\tspl_boot_list[0] = boot_dev;\n+}\n+#endif\n+#endif /* CONFIG_SPL_BUILD */\ndiff --git a/configs/imx6qdl_icore_rqs_defconfig b/configs/imx6qdl_icore_rqs_defconfig\nindex e6b4dff..813201f 100644\n--- a/configs/imx6qdl_icore_rqs_defconfig\n+++ b/configs/imx6qdl_icore_rqs_defconfig\n@@ -3,7 +3,7 @@ CONFIG_ARCH_MX6=y\n CONFIG_SPL_GPIO_SUPPORT=y\n CONFIG_SPL_LIBCOMMON_SUPPORT=y\n CONFIG_SPL_LIBGENERIC_SUPPORT=y\n-CONFIG_TARGET_MX6Q_ICORE_RQS=y\n+CONFIG_TARGET_MX6Q_ICORE=y\n CONFIG_SPL_SERIAL_SUPPORT=y\n CONFIG_SPL_LIBDISK_SUPPORT=y\n CONFIG_SPL_WATCHDOG_SUPPORT=y\n", "prefixes": [ "U-Boot", "6/6" ] }