From patchwork Wed Nov 29 03:28:55 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: 842439 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="AjsJXoal"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3ymmB463jcz9s7B for ; Wed, 29 Nov 2017 14:25:00 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 711DEC21DF3; Wed, 29 Nov 2017 03:24:56 +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_BLOCKED, 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 4BA9BC21C4A; Wed, 29 Nov 2017 03:24:53 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D0DE6C21C4A; Wed, 29 Nov 2017 03:24:51 +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 312B7C21C29 for ; Wed, 29 Nov 2017 03:24:51 +0000 (UTC) Received: by mail-io0-f193.google.com with SMTP id g1so2210204ioc.8 for ; Tue, 28 Nov 2017 19:24:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=lga+IqvUCoCk9x3htQXCVEWKWfVsaRs7rYh8nHMr65E=; b=AjsJXoal1rrmQMDp5hueZ7VrPU6dZfQ4xV5I9E2Ze3TJ07575Jijx479D4vD9++rBT Ut8BmQJyTS6zyWOecXsCpjxR1yEVtH9pGagF0XVv4ZmP2QOl9qu2xXA5JHsQGE/HWw3R BIJUa9IFrfMbVHinjoEpJFKf4GAoiy1z90P53PtgqGAME1qFeXemxR2mCa0ZIUL23sRx aqa8lWcYoXEfv0y3oolEYjVP2Te1919JF+L8vrvwksZqmFOXlFm7jFJrGeHQ2dWUCzBJ EWIbKHvL8SmCbBVFlb9PLHQ0fJOjJGi+0EaDVfdUrbNqxCpQwKxd+CoOds69cvKiohPz IQyA== 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; bh=lga+IqvUCoCk9x3htQXCVEWKWfVsaRs7rYh8nHMr65E=; b=mevbkFPeg171DL8UgOfzbBbr6GcCOhWRpbExR4fq67BwCtZ93Pe2pgT3A9q9izD4bl pIbNMLCbbVWAB6LQM+mlfRgIDvqFVFCNRcLnJtXsfjLOOYL2oisIo8eEix4xe581IROl mIssduY8aTGi4Ymh7U2OQ3G+ukVKUF2V2RfRyDmsXFectoNoC4L3V4LSCZeeiYi+VTSt Ql7pUFGQqexNmuxpSTctSK7RDZbp9w2dX6sEisI78YF4I1OmBuApD7GlHllLTc/PYSzm Rtw7wm6PRjuaRMN5TyBOF7raUDFlLILGaGtZQ0VS+LuDauv36KqGoeVxp5YKcOsiss02 LAWg== X-Gm-Message-State: AJaThX6yPQCRRZ+fi7tgwie52sM1V78AMBRMpFeN5RUjz/4AH07LnaA4 9UPnIfakk6TNysgC2+SW4IArGQ== X-Google-Smtp-Source: AGs4zMZa46DN0J/RBUyij5JEfHL1+x7zGp1PbW0Ps8fbHnGyXNFWBcxaEH2CULuE6ftJcRFrK4Tbtg== X-Received: by 10.107.135.151 with SMTP id r23mr1781205ioi.171.1511925889780; Tue, 28 Nov 2017 19:24:49 -0800 (PST) Received: from ethiopia.hsd1.il.comcast.net (c-98-193-113-254.hsd1.il.comcast.net. [98.193.113.254]) by smtp.gmail.com with ESMTPSA id e88sm560395itd.14.2017.11.28.19.24.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Nov 2017 19:24:49 -0800 (PST) From: "Derald D. Woods" To: u-boot@lists.denx.de Date: Wed, 29 Nov 2017 03:28:55 +0000 Message-Id: <20171129032855.4920-1-woods.technical@gmail.com> X-Mailer: git-send-email 2.14.2 Cc: trini@konsulko.com Subject: [U-Boot] [PATCH] omap3: evm: Explicitly use DISTRO_DEFAULTS features at startup 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" [primary] Check MMC 0:1 for /extlinux/extlinux.conf and boot [fallback 1] Check MMC 0:1 zImage and run mmcbootz [fallback 2] Check MMC 0:1 uImage and run mmcboot [fallback 3] Check NAND partitions and run nandboot If 'extlinux.conf' is not found on MMC 0, the previous boot behavior is followed. Signed-off-by: Derald D. Woods --- configs/omap3_evm_defconfig | 2 +- include/configs/omap3_evm.h | 94 ++++++++++++++++++++++++++++++++------------- 2 files changed, 68 insertions(+), 28 deletions(-) diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index f67bcb1895..0c513664fe 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -6,8 +6,8 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SYS_MPUCLK=720 CONFIG_TARGET_OMAP3_EVM=y CONFIG_DISTRO_DEFAULTS=y -# CONFIG_USE_BOOTCOMMAND is not set CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTCOMMAND=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_DEFAULT_FDT_FILE="omap3-evm.dtb" CONFIG_VERSION_VARIABLE=y diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index df50325ab6..42f2153637 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -86,8 +86,49 @@ /* Environment */ #define CONFIG_PREBOOT "usb start" +#if !defined(CONFIG_SPL_BUILD) + +#include + +#define MEM_LAYOUT_ENV_SETTINGS \ + DEFAULT_LINUX_BOOT_ENV + +#if defined(CONFIG_NAND) +#define BOOTENV_DEV_NAND(devtypeu, devtypel, instance) \ + "bootcmd_" #devtypel #instance "=" \ + "run nandboot\0" + +#define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \ + #devtypel #instance " " +#endif /* CONFIG_NAND */ + +#define BOOTENV_DEV_UIMAGE_MMC(devtypeu, devtypel, instance) \ + "bootcmd_" #devtypel #instance "=" \ + "setenv mmcdev " #instance"; " \ + "run mmcboot\0" + +#define BOOTENV_DEV_NAME_UIMAGE_MMC(devtypeu, devtypel, instance) \ + #devtypel #instance " " + +#define BOOTENV_DEV_ZIMAGE_MMC(devtypeu, devtypel, instance) \ + "bootcmd_" #devtypel #instance "=" \ + "setenv mmcdev " #instance"; " \ + "run mmcbootz\0" + +#define BOOTENV_DEV_NAME_ZIMAGE_MMC(devtypeu, devtypel, instance) \ + #devtypel #instance " " + +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(ZIMAGE_MMC, zimage_mmc, 0) \ + func(UIMAGE_MMC, uimage_mmc, 0) \ + func(NAND, nand, 0) + +#include + #define CONFIG_EXTRA_ENV_SETTINGS \ - DEFAULT_LINUX_BOOT_ENV \ + MEM_LAYOUT_ENV_SETTINGS \ + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ "bootenv=uEnv.txt\0" \ @@ -107,40 +148,39 @@ "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" \ + "mmcbootenv=" \ + "mmc dev ${mmcdev}; " \ + "if mmc rescan && run loadbootenv; then " \ + "run importbootenv; " \ + "if test -n $uenvcmd; then " \ + "echo Running uenvcmd ...; " \ + "run uenvcmd; " \ + "fi; " \ + "fi\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} " CONFIG_DEFAULT_FDT_FILE "\0" \ - "mmcboot=echo Booting ${bootfile} from mmc ...; " \ - "run mmcargs; " \ - "bootm ${loadaddr} - ${fdtaddr}\0" \ - "mmcbootz=echo Booting ${bootfile} from mmc ...; " \ - "run mmcargs; " \ - "bootz ${loadaddr} - ${fdtaddr}\0" \ + "loaddtb=fatload mmc ${mmcdev} ${fdtaddr} ${fdtfile}\0" \ + "mmcboot=run mmcbootenv; " \ + "if run loaduimage && run loaddtb; then " \ + "echo Booting ${bootfile} from mmc ...; " \ + "run mmcargs; " \ + "bootm ${loadaddr} - ${fdtaddr}; " \ + "fi\0" \ + "mmcbootz=run mmcbootenv; " \ + "if run loadzimage && run loaddtb; then " \ + "echo Booting ${bootfile} from mmc ...; " \ + "run mmcargs; " \ + "bootz ${loadaddr} - ${fdtaddr};" \ + "fi\0" \ "nandboot=echo Booting uImage from nand ...; " \ "run nandargs; " \ "nand read ${loadaddr} kernel; " \ "nand read ${fdtaddr} dtb; " \ - "bootm ${loadaddr} - ${fdtaddr}\0" + "bootm ${loadaddr} - ${fdtaddr}\0" \ + BOOTENV -#define CONFIG_BOOTCOMMAND \ - "mmc dev ${mmcdev}; if mmc rescan; then " \ - "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; " \ - "if run loaduimage && run loaddtb; then " \ - "run mmcboot; fi; " \ - "run nandboot; " \ - "fi; " \ - "else run nandboot; fi" +#endif /* !CONFIG_SPL_BUILD */ #endif /* __CONFIG_H */