Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/809174/?format=api
{ "id": 809174, "url": "http://patchwork.ozlabs.org/api/1.2/patches/809174/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/20170902224305.19008-1-woods.technical@gmail.com/", "project": { "id": 18, "url": "http://patchwork.ozlabs.org/api/1.2/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": "<20170902224305.19008-1-woods.technical@gmail.com>", "list_archive_url": null, "date": "2017-09-02T22:43:05", "name": "[U-Boot,v3] omap3: evm: Fixes for CONFIG_NAND, SPL_OS_BOOT, USB, and environment", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "de2de9b3326abb186ccd64129dc456c91702c8b0", "submitter": { "id": 68279, "url": "http://patchwork.ozlabs.org/api/1.2/people/68279/?format=api", "name": "Derald D. Woods", "email": "woods.technical@gmail.com" }, "delegate": { "id": 3651, "url": "http://patchwork.ozlabs.org/api/1.2/users/3651/?format=api", "username": "trini", "first_name": "Tom", "last_name": "Rini", "email": "trini@ti.com" }, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/20170902224305.19008-1-woods.technical@gmail.com/mbox/", "series": [ { "id": 1182, "url": "http://patchwork.ozlabs.org/api/1.2/series/1182/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/list/?series=1182", "date": "2017-09-02T22:43:05", "name": "[U-Boot,v3] omap3: evm: Fixes for CONFIG_NAND, SPL_OS_BOOT, USB, and environment", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/1182/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/809174/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/809174/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=\"E6zNMcli\"; dkim-atps=neutral" ], "Received": [ "from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xlB3T44tRz9sPs\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSun, 3 Sep 2017 08:43:33 +1000 (AEST)", "by lists.denx.de (Postfix, from userid 105)\n\tid 68A53C21EDF; Sat, 2 Sep 2017 22:43:28 +0000 (UTC)", "from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 87261C21C5C;\n\tSat, 2 Sep 2017 22:43:25 +0000 (UTC)", "by lists.denx.de (Postfix, from userid 105)\n\tid 6B652C21C5C; Sat, 2 Sep 2017 22:43:24 +0000 (UTC)", "from mail-io0-f193.google.com (mail-io0-f193.google.com\n\t[209.85.223.193])\n\tby lists.denx.de (Postfix) with ESMTPS id 1ED3CC21C59\n\tfor <u-boot@lists.denx.de>; Sat, 2 Sep 2017 22:43:23 +0000 (UTC)", "by mail-io0-f193.google.com with SMTP id z67so2221867iof.1\n\tfor <u-boot@lists.denx.de>; Sat, 02 Sep 2017 15:43:23 -0700 (PDT)", "from exodus.hsd1.il.comcast.net\n\t([2601:247:c080:b23:38e6:1741:d4a3:983])\n\tby smtp.gmail.com with ESMTPSA id\n\tv25sm1694222iov.23.2017.09.02.15.43.20\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tSat, 02 Sep 2017 15:43:21 -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=5X//XhWTxdPaJpih7Z5HvIbSnKl2YRWwiLzTDsH03ZU=;\n\tb=E6zNMcliI4IsSg1ntJx76z2j61DS7iu+kW7OozTMfdamInGV/esZOSj/X8+meadQ00\n\tX8RKLYL13Xvq3B8DAsOm+gZ/PE8ypPpAXDWYnvkq0KLVEGEXaBTcsh8QfU6knFjOZLUe\n\tYq/iHrAyqDkOhKiJcQki+b+p304DQJgwN0TJlva+b+WYu42OBCRJZ/hnKh+Za5foBEqv\n\t7nvkApkyL5a+8jtze4UsTb3bcU49XafjWUhlKxPkxBRg2p3s0jfIaBFNQKzV9yUkxOns\n\t6cPQI2aa69qQZr/RVPh1fhrZl0N8NAUdk98Wa9MDPsQusQ6O6CjXIShhGPrZZW8ZGTa8\n\trviw==", "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=5X//XhWTxdPaJpih7Z5HvIbSnKl2YRWwiLzTDsH03ZU=;\n\tb=atHILAiWGeKkcPJ+cTOWrS3yCoaRhFbFKQLY3lZFCV70qwG7AMAtUZjLQ9sRWBrovT\n\tKFuvpdNdsFHs5TgFYVGou8tagigaRensRG2RuqDeNDBkJD0JQIIKi4/UAQrvykSMi/ol\n\tV6Z8qzekWmelMdcMT8yoiND4B2K1ZXoyqaO0aQqI09sxD2n0GxbYvoZJq6vq9CHoUPtg\n\tfc1ukdMr3bT/42QDTbDYCqR0G3+HjvYrRcNanTpnE2ngAE41mHBEW64C2/4yaKIwc75t\n\tFZOYE7uqre9U66+DMiiaLRkvAQJAmm/1u/pvuRf9Gmtl5RtsexbGuDAugU8N8E1qe4tu\n\tyKUQ==", "X-Gm-Message-State": "AHPjjUgO81YnGIZ4xS/eIvmaOYCM7zZmg91BN8wXgzWk6a+eYdzU682h\n\t168jMnTohIAo1//I", "X-Google-Smtp-Source": "ADKCNb7sr9niKbXP4MvvC2OVkuqBxYmIgbhlnsJmJ9j0zAV+OASrUA9LwRRiVP+5+vI2zLFONI7C0A==", "X-Received": "by 10.107.50.211 with SMTP id y202mr2763953ioy.106.1504392201597;\n\tSat, 02 Sep 2017 15:43:21 -0700 (PDT)", "From": "\"Derald D. Woods\" <woods.technical@gmail.com>", "To": "u-boot@lists.denx.de", "Date": "Sat, 2 Sep 2017 17:43:05 -0500", "Message-Id": "<20170902224305.19008-1-woods.technical@gmail.com>", "X-Mailer": "git-send-email 2.14.1", "In-Reply-To": "<20170902223741.18887-1-woods.technical@gmail.com>", "References": "<20170902223741.18887-1-woods.technical@gmail.com>", "Cc": "trini@konsulko.com", "Subject": "[U-Boot] [PATCH v3] omap3: evm: Fixes for CONFIG_NAND, SPL_OS_BOOT, \n\tUSB, and environment", "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": "- Pass MTDPARTS kernel arguments to kernel\n- Use Kconfig CONFIG_NAND instead of CONFIG_SYS_EXTRA_OPTIONS=\"NAND\"\n- Call 'usb_stop' on kernel start\n- Update Falcon mode setup to match other OMAP3 boards\n- Use \"uEnv.txt\" as boot script instead of \"boot.scr\"\n\n---\nChanges in v3:\n- Fix subject 'PATCHi' -> 'PATCH'\n\nChanges in v2:\n- Rebase with master on 2017-09-02\n\n---\n board/ti/evm/evm.c | 20 +++++++++++++++++++-\n configs/omap3_evm_defconfig | 3 ++-\n include/configs/omap3_evm.h | 31 ++++++++++++++++++++-----------\n 3 files changed, 41 insertions(+), 13 deletions(-)", "diff": "diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c\nindex 6bf57f9269..1f0433dcc0 100644\n--- a/board/ti/evm/evm.c\n+++ b/board/ti/evm/evm.c\n@@ -122,6 +122,17 @@ int board_init(void)\n \treturn 0;\n }\n \n+#if defined(CONFIG_SPL_OS_BOOT)\n+int spl_start_uboot(void)\n+{\n+\t/* break into full u-boot on 'c' */\n+\tif (serial_tstc() && serial_getc() == 'c')\n+\t\treturn 1;\n+\n+\treturn 0;\n+}\n+#endif /* CONFIG_SPL_OS_BOOT */\n+\n #if defined(CONFIG_SPL_BUILD)\n /*\n * Routine: get_board_mem_timings\n@@ -323,7 +334,14 @@ void board_mmc_power_init(void)\n }\n #endif /* CONFIG_MMC */\n \n-#if defined(CONFIG_USB_EHCI_HCD)\n+#if defined(CONFIG_USB_EHCI_HCD) && !defined(CONFIG_SPL_BUILD)\n+/* Call usb_stop() before starting the kernel */\n+void show_boot_progress(int val)\n+{\n+\tif (val == BOOTSTAGE_ID_RUN_OS)\n+\t\tusb_stop();\n+}\n+\n static struct omap_usbhs_board_data usbhs_bdata = {\n \t.port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED,\n \t.port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,\ndiff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig\nindex 9977e8e10f..51fd210d41 100644\n--- a/configs/omap3_evm_defconfig\n+++ b/configs/omap3_evm_defconfig\n@@ -7,7 +7,7 @@ CONFIG_SYS_MPUCLK=720\n CONFIG_TARGET_OMAP3_EVM=y\n CONFIG_SPL_STACK_R_ADDR=0x82000000\n CONFIG_DISTRO_DEFAULTS=y\n-CONFIG_SYS_EXTRA_OPTIONS=\"NAND\"\n+CONFIG_ENV_IS_IN_NAND=y\n CONFIG_BOOTDELAY=3\n CONFIG_SYS_CONSOLE_INFO_QUIET=y\n CONFIG_DEFAULT_FDT_FILE=\"omap3-evm.dtb\"\n@@ -44,6 +44,7 @@ CONFIG_DM=y\n CONFIG_SPL_DM=y\n CONFIG_DM_GPIO=y\n CONFIG_MMC_OMAP_HS=y\n+CONFIG_NAND=y\n CONFIG_MTD=y\n CONFIG_DM_SERIAL=y\n CONFIG_SYS_NS16550=y\ndiff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h\nindex dd7ea5c8a6..2c48b4f3d8 100644\n--- a/include/configs/omap3_evm.h\n+++ b/include/configs/omap3_evm.h\n@@ -36,7 +36,6 @@\n #define CONFIG_INITRD_TAG\n #define CONFIG_REVISION_TAG\n \n-\n /* Override OMAP3 serial console configuration */\n #undef CONFIG_CONS_INDEX\n #define CONFIG_CONS_INDEX 1\n@@ -72,13 +71,15 @@\n #define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET\n #define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET\n #define CONFIG_ENV_OVERWRITE\n-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */\n #define CONFIG_MTD_PARTITIONS /* required for UBI partition support */\n+/* NAND: SPL falcon mode configs */\n+#if defined(CONFIG_SPL_OS_BOOT)\n+#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000\n+#endif /* CONFIG_SPL_OS_BOOT */\n #endif /* CONFIG_NAND */\n \n-#define CONFIG_USB_OMAP3\n-\n /* MUSB */\n+#define CONFIG_USB_OMAP3\n #define CONFIG_USB_MUSB_OMAP2PLUS\n #define CONFIG_USB_MUSB_PIO_ONLY\n #define CONFIG_USB_ETHER\n@@ -99,28 +100,32 @@\n \n #define CONFIG_EXTRA_ENV_SETTINGS \\\n \tDEFAULT_LINUX_BOOT_ENV \\\n-\t\"mtdids=\" CONFIG_MTDIDS_DEFAULT \"\\0\"\t\\\n+\t\"mtdids=\" CONFIG_MTDIDS_DEFAULT \"\\0\" \\\n \t\"mtdparts=\" CONFIG_MTDPARTS_DEFAULT \"\\0\" \\\n-\t\"loadaddr=0x82000000\\0\" \\\n-\t\"usbtty=cdc_acm\\0\" \\\n+\t\"bootenv=uEnv.txt\\0\" \\\n+\t\"optargs=\\0\" \\\n \t\"mmcdev=0\\0\" \\\n \t\"console=ttyO0,115200n8\\0\" \\\n \t\"mmcargs=setenv bootargs console=${console} \" \\\n+\t\t\"${mtdparts} \" \\\n \t\t\"${optargs} \" \\\n \t\t\"root=/dev/mmcblk0p2 rw \" \\\n \t\t\"rootfstype=ext4 rootwait\\0\" \\\n \t\"nandargs=setenv bootargs console=${console} \" \\\n+\t\t\"${mtdparts} \" \\\n \t\t\"${optargs} \" \\\n \t\t\"root=ubi0:rootfs rw ubi.mtd=rootfs noinitrd \" \\\n \t\t\"rootfstype=ubifs rootwait\\0\" \\\n-\t\"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\\0\" \\\n+\t\"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\\0\" \\\n+\t\"importbootenv=echo Importing environment from mmc ...; \" \\\n+\t\t\"env import -t ${loadaddr} ${filesize}\\0\" \\\n \t\"bootscript=echo Running bootscript from mmc ...; \" \\\n \t\t\"source ${loadaddr}\\0\" \\\n \t\"loaduimage=setenv bootfile uImage; \" \\\n \t\t\"fatload mmc ${mmcdev} ${loadaddr} uImage\\0\" \\\n \t\"loadzimage=setenv bootfile zImage; \" \\\n \t\t\"fatload mmc ${mmcdev} ${loadaddr} zImage\\0\" \\\n-\t\"loaddtb=fatload mmc ${mmcdev} ${fdtaddr} omap3-evm.dtb\\0\" \\\n+\t\"loaddtb=fatload mmc ${mmcdev} ${fdtaddr} \" CONFIG_DEFAULT_FDT_FILE \"\\0\" \\\n \t\"mmcboot=echo Booting ${bootfile} from mmc ...; \" \\\n \t\t\"run mmcargs; \" \\\n \t\t\"bootm ${loadaddr} - ${fdtaddr}\\0\" \\\n@@ -135,8 +140,12 @@\n \n #define CONFIG_BOOTCOMMAND \\\n \t\"mmc dev ${mmcdev}; if mmc rescan; then \" \\\n-\t\t\"if run loadbootscript; then \" \\\n-\t\t\t\"run bootscript; \" \\\n+\t\t\"if run loadbootenv; then \" \\\n+\t\t\t\"run importbootenv; \" \\\n+\t\t\t\"if test -n $uenvcmd; then \" \\\n+\t\t\t\t\"echo Running uenvcmd ...; \" \\\n+\t\t\t\t\"run uenvcmd; \" \\\n+\t\t\t\"fi; \" \\\n \t\t\"else \" \\\n \t\t\t\"if run loadzimage && run loaddtb; then \" \\\n \t\t\t\t\"run mmcbootz; fi; \" \\\n", "prefixes": [ "U-Boot", "v3" ] }