{"id":806922,"url":"http://patchwork.ozlabs.org/api/1.2/patches/806922/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20170829023931.3897-1-woods.technical@gmail.com/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/1.2/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":"<20170829023931.3897-1-woods.technical@gmail.com>","list_archive_url":null,"date":"2017-08-29T02:39:31","name":"[U-Boot] omap3: evm: Fixes for CONFIG_NAND, SPL_OS_BOOT, USB, and environment","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"4f84ddcd57052ebffd8a552cca9dbf35b662128c","submitter":{"id":68279,"url":"http://patchwork.ozlabs.org/api/1.2/people/68279/?format=json","name":"Derald D. Woods","email":"woods.technical@gmail.com"},"delegate":{"id":3651,"url":"http://patchwork.ozlabs.org/api/1.2/users/3651/?format=json","username":"trini","first_name":"Tom","last_name":"Rini","email":"trini@ti.com"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20170829023931.3897-1-woods.technical@gmail.com/mbox/","series":[{"id":288,"url":"http://patchwork.ozlabs.org/api/1.2/series/288/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=288","date":"2017-08-29T02:39:31","name":"[U-Boot] omap3: evm: Fixes for CONFIG_NAND, SPL_OS_BOOT, USB, and environment","version":1,"mbox":"http://patchwork.ozlabs.org/series/288/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/806922/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806922/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=)","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=\"AStvIfam\"; dkim-atps=neutral"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xhCYZ19qJz9s7p\n\tfor ;\n\tTue, 29 Aug 2017 12:40:48 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 495F1C2268F; Tue, 29 Aug 2017 02:40:13 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id D0F70C22693;\n\tTue, 29 Aug 2017 02:40:02 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 61F5BC22693; Tue, 29 Aug 2017 02:39:57 +0000 (UTC)","from mail-io0-f194.google.com (mail-io0-f194.google.com\n\t[209.85.223.194])\n\tby lists.denx.de (Postfix) with ESMTPS id C39D8C2252D\n\tfor ; Tue, 29 Aug 2017 02:39:55 +0000 (UTC)","by mail-io0-f194.google.com with SMTP id m40so2143504ioi.5\n\tfor ; Mon, 28 Aug 2017 19:39:55 -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\te21sm864210ita.33.2017.08.28.19.39.53\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tMon, 28 Aug 2017 19:39:53 -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;\n\tbh=xdSuLjkGNAWfo3B1ls5po21R+8hWU4JlImloTcbel20=;\n\tb=AStvIfamA9QQUn3vEqvXnDnHWa4ITepZwguZHiGYuJ6PId62OQvYfFYH0vAClHNHnM\n\tJecX0CVyTG9VozlF8DF3rnlkcNyjPMQQ9Xa2LwuScDS+Pt5RUzisLatEbosupZhL7JxO\n\tYZBxiWBYsCMi8bfBGB6esk8z3Xb75bTJqPrkIBb/NzkKh8/BFvu8P9v8UDTv4W2fAYrz\n\tVvKwo/28B5Xb+YWalxahLOhUNRVw98oEv8gAQ9mdteN0GpfmUanMyVA7XrVvlagmjMOD\n\tFY2H/N9QIexSWR2bmllPgE7Nn8Uq73Ks9ljHKzT/LMMBL4ReCcCXn5OegGkz0ccAZeci\n\tV9RQ==","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;\n\tbh=xdSuLjkGNAWfo3B1ls5po21R+8hWU4JlImloTcbel20=;\n\tb=MK6+CZgaODViOXfLbKQl55ZKTUnpqMcG9ESBIEkVEGe0T6Sh/BTFNEsFSaEwOhde20\n\t3eavCpi7UzZn6Se/lUv8iwLvly+NN2lQjS/XKb4UTAjUSg8oYX7UXD1BKryabvHGHzzW\n\ti8uypzkValZhJxTtB6x/kC6bfPk2zYHKWJ6GV+UXMU0fgQ0KZHZq1dFFWC61dYpt+c8O\n\tt5xK/ogKnVK6RfBjW7fR4NFTK6H0U4Nslt6b5Cs2opMD5bYSl7/rV15OBQj2OWhWw2uu\n\tOK7yPPc8FHnbv+4HkDpA1Wf7K8pD0E2E4DEjF/CS1busjPrw+hOpvU7WFG1Gqtfnoafe\n\t/i7g==","X-Gm-Message-State":"AHYfb5hj2Agv9oRljs6WFVwq/GO44LsJlHGaZy3x3ox1yRy/RzjxG8rH\n\tiWU9Xigh9+9yLrI2","X-Received":"by 10.36.77.4 with SMTP id l4mr2865777itb.57.1503974393845;\n\tMon, 28 Aug 2017 19:39:53 -0700 (PDT)","From":"\"Derald D. Woods\" ","To":"u-boot@lists.denx.de","Date":"Mon, 28 Aug 2017 21:39:31 -0500","Message-Id":"<20170829023931.3897-1-woods.technical@gmail.com>","X-Mailer":"git-send-email 2.14.1","Cc":"trini@konsulko.com","Subject":"[U-Boot] [PATCH] omap3: evm: Fixes for CONFIG_NAND, SPL_OS_BOOT, USB,\n\tand environment","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","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\" "},"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 board/ti/evm/evm.c | 20 +++++++++++++++++++-\n configs/omap3_evm_defconfig | 2 +-\n include/configs/omap3_evm.h | 30 ++++++++++++++++++++----------\n 3 files changed, 40 insertions(+), 12 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 a07ea0fd55..6316b797fd 100644\n--- a/configs/omap3_evm_defconfig\n+++ b/configs/omap3_evm_defconfig\n@@ -7,7 +7,6 @@ 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@@ -44,6 +43,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 9930483406..8972e96366 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@@ -76,11 +75,14 @@\n #define CONFIG_SPL_OMAP3_ID_NAND\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@@ -101,28 +103,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@@ -137,8 +143,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"]}