From patchwork Sat Sep 2 22:43:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Derald D. Woods" X-Patchwork-Id: 809174 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="E6zNMcli"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xlB3T44tRz9sPs for ; Sun, 3 Sep 2017 08:43:33 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 68A53C21EDF; Sat, 2 Sep 2017 22:43:28 +0000 (UTC) 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, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 87261C21C5C; Sat, 2 Sep 2017 22:43:25 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6B652C21C5C; Sat, 2 Sep 2017 22:43:24 +0000 (UTC) Received: from mail-io0-f193.google.com (mail-io0-f193.google.com [209.85.223.193]) by lists.denx.de (Postfix) with ESMTPS id 1ED3CC21C59 for ; Sat, 2 Sep 2017 22:43:23 +0000 (UTC) Received: by mail-io0-f193.google.com with SMTP id z67so2221867iof.1 for ; Sat, 02 Sep 2017 15:43:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5X//XhWTxdPaJpih7Z5HvIbSnKl2YRWwiLzTDsH03ZU=; b=E6zNMcliI4IsSg1ntJx76z2j61DS7iu+kW7OozTMfdamInGV/esZOSj/X8+meadQ00 X8RKLYL13Xvq3B8DAsOm+gZ/PE8ypPpAXDWYnvkq0KLVEGEXaBTcsh8QfU6knFjOZLUe Yq/iHrAyqDkOhKiJcQki+b+p304DQJgwN0TJlva+b+WYu42OBCRJZ/hnKh+Za5foBEqv 7nvkApkyL5a+8jtze4UsTb3bcU49XafjWUhlKxPkxBRg2p3s0jfIaBFNQKzV9yUkxOns 6cPQI2aa69qQZr/RVPh1fhrZl0N8NAUdk98Wa9MDPsQusQ6O6CjXIShhGPrZZW8ZGTa8 rviw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5X//XhWTxdPaJpih7Z5HvIbSnKl2YRWwiLzTDsH03ZU=; b=atHILAiWGeKkcPJ+cTOWrS3yCoaRhFbFKQLY3lZFCV70qwG7AMAtUZjLQ9sRWBrovT KFuvpdNdsFHs5TgFYVGou8tagigaRensRG2RuqDeNDBkJD0JQIIKi4/UAQrvykSMi/ol V6Z8qzekWmelMdcMT8yoiND4B2K1ZXoyqaO0aQqI09sxD2n0GxbYvoZJq6vq9CHoUPtg fc1ukdMr3bT/42QDTbDYCqR0G3+HjvYrRcNanTpnE2ngAE41mHBEW64C2/4yaKIwc75t FZOYE7uqre9U66+DMiiaLRkvAQJAmm/1u/pvuRf9Gmtl5RtsexbGuDAugU8N8E1qe4tu yKUQ== X-Gm-Message-State: AHPjjUgO81YnGIZ4xS/eIvmaOYCM7zZmg91BN8wXgzWk6a+eYdzU682h 168jMnTohIAo1//I X-Google-Smtp-Source: ADKCNb7sr9niKbXP4MvvC2OVkuqBxYmIgbhlnsJmJ9j0zAV+OASrUA9LwRRiVP+5+vI2zLFONI7C0A== X-Received: by 10.107.50.211 with SMTP id y202mr2763953ioy.106.1504392201597; Sat, 02 Sep 2017 15:43:21 -0700 (PDT) Received: from exodus.hsd1.il.comcast.net ([2601:247:c080:b23:38e6:1741:d4a3:983]) by smtp.gmail.com with ESMTPSA id v25sm1694222iov.23.2017.09.02.15.43.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 02 Sep 2017 15:43:21 -0700 (PDT) From: "Derald D. Woods" 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, USB, and environment X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" - Pass MTDPARTS kernel arguments to kernel - Use Kconfig CONFIG_NAND instead of CONFIG_SYS_EXTRA_OPTIONS="NAND" - Call 'usb_stop' on kernel start - Update Falcon mode setup to match other OMAP3 boards - Use "uEnv.txt" as boot script instead of "boot.scr" --- Changes in v3: - Fix subject 'PATCHi' -> 'PATCH' Changes in v2: - Rebase with master on 2017-09-02 --- board/ti/evm/evm.c | 20 +++++++++++++++++++- configs/omap3_evm_defconfig | 3 ++- include/configs/omap3_evm.h | 31 ++++++++++++++++++++----------- 3 files changed, 41 insertions(+), 13 deletions(-) diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c index 6bf57f9269..1f0433dcc0 100644 --- a/board/ti/evm/evm.c +++ b/board/ti/evm/evm.c @@ -122,6 +122,17 @@ int board_init(void) return 0; } +#if defined(CONFIG_SPL_OS_BOOT) +int spl_start_uboot(void) +{ + /* break into full u-boot on 'c' */ + if (serial_tstc() && serial_getc() == 'c') + return 1; + + return 0; +} +#endif /* CONFIG_SPL_OS_BOOT */ + #if defined(CONFIG_SPL_BUILD) /* * Routine: get_board_mem_timings @@ -323,7 +334,14 @@ void board_mmc_power_init(void) } #endif /* CONFIG_MMC */ -#if defined(CONFIG_USB_EHCI_HCD) +#if defined(CONFIG_USB_EHCI_HCD) && !defined(CONFIG_SPL_BUILD) +/* Call usb_stop() before starting the kernel */ +void show_boot_progress(int val) +{ + if (val == BOOTSTAGE_ID_RUN_OS) + usb_stop(); +} + static struct omap_usbhs_board_data usbhs_bdata = { .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED, .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY, diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index 9977e8e10f..51fd210d41 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -7,7 +7,7 @@ CONFIG_SYS_MPUCLK=720 CONFIG_TARGET_OMAP3_EVM=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_DISTRO_DEFAULTS=y -CONFIG_SYS_EXTRA_OPTIONS="NAND" +CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_DEFAULT_FDT_FILE="omap3-evm.dtb" @@ -44,6 +44,7 @@ CONFIG_DM=y CONFIG_SPL_DM=y CONFIG_DM_GPIO=y CONFIG_MMC_OMAP_HS=y +CONFIG_NAND=y CONFIG_MTD=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index dd7ea5c8a6..2c48b4f3d8 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -36,7 +36,6 @@ #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG - /* Override OMAP3 serial console configuration */ #undef CONFIG_CONS_INDEX #define CONFIG_CONS_INDEX 1 @@ -72,13 +71,15 @@ #define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET #define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET #define CONFIG_ENV_OVERWRITE -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ #define CONFIG_MTD_PARTITIONS /* required for UBI partition support */ +/* NAND: SPL falcon mode configs */ +#if defined(CONFIG_SPL_OS_BOOT) +#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000 +#endif /* CONFIG_SPL_OS_BOOT */ #endif /* CONFIG_NAND */ -#define CONFIG_USB_OMAP3 - /* MUSB */ +#define CONFIG_USB_OMAP3 #define CONFIG_USB_MUSB_OMAP2PLUS #define CONFIG_USB_MUSB_PIO_ONLY #define CONFIG_USB_ETHER @@ -99,28 +100,32 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ - "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \ + "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ - "loadaddr=0x82000000\0" \ - "usbtty=cdc_acm\0" \ + "bootenv=uEnv.txt\0" \ + "optargs=\0" \ "mmcdev=0\0" \ "console=ttyO0,115200n8\0" \ "mmcargs=setenv bootargs console=${console} " \ + "${mtdparts} " \ "${optargs} " \ "root=/dev/mmcblk0p2 rw " \ "rootfstype=ext4 rootwait\0" \ "nandargs=setenv bootargs console=${console} " \ + "${mtdparts} " \ "${optargs} " \ "root=ubi0:rootfs rw ubi.mtd=rootfs noinitrd " \ "rootfstype=ubifs rootwait\0" \ - "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \ + "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ + "importbootenv=echo Importing environment from mmc ...; " \ + "env import -t ${loadaddr} ${filesize}\0" \ "bootscript=echo Running bootscript from mmc ...; " \ "source ${loadaddr}\0" \ "loaduimage=setenv bootfile uImage; " \ "fatload mmc ${mmcdev} ${loadaddr} uImage\0" \ "loadzimage=setenv bootfile zImage; " \ "fatload mmc ${mmcdev} ${loadaddr} zImage\0" \ - "loaddtb=fatload mmc ${mmcdev} ${fdtaddr} omap3-evm.dtb\0" \ + "loaddtb=fatload mmc ${mmcdev} ${fdtaddr} " CONFIG_DEFAULT_FDT_FILE "\0" \ "mmcboot=echo Booting ${bootfile} from mmc ...; " \ "run mmcargs; " \ "bootm ${loadaddr} - ${fdtaddr}\0" \ @@ -135,8 +140,12 @@ #define CONFIG_BOOTCOMMAND \ "mmc dev ${mmcdev}; if mmc rescan; then " \ - "if run loadbootscript; then " \ - "run bootscript; " \ + "if run loadbootenv; then " \ + "run importbootenv; " \ + "if test -n $uenvcmd; then " \ + "echo Running uenvcmd ...; " \ + "run uenvcmd; " \ + "fi; " \ "else " \ "if run loadzimage && run loaddtb; then " \ "run mmcbootz; fi; " \