From patchwork Tue Sep 5 13:01:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 810154 X-Patchwork-Delegate: yorksun@freescale.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=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xmn0y4jmrz9t16 for ; Tue, 5 Sep 2017 23:01:54 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 45CF1C21DD7; Tue, 5 Sep 2017 13:01:51 +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=BAD_ENC_HEADER, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS 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 B90C6C21C57; Tue, 5 Sep 2017 13:01:48 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id ECB30C21C57; Tue, 5 Sep 2017 13:01:46 +0000 (UTC) Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0086.outbound.protection.outlook.com [104.47.32.86]) by lists.denx.de (Postfix) with ESMTPS id 3389BC21C45 for ; Tue, 5 Sep 2017 13:01:46 +0000 (UTC) Received: from BN6PR03CA0070.namprd03.prod.outlook.com (10.173.137.32) by BN6PR03MB3314.namprd03.prod.outlook.com (10.174.233.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10; Tue, 5 Sep 2017 13:01:43 +0000 Received: from BN1BFFO11FD035.protection.gbl (2a01:111:f400:7c10::1:189) by BN6PR03CA0070.outlook.office365.com (2603:10b6:404:4c::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10 via Frontend Transport; Tue, 5 Sep 2017 13:01:43 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1BFFO11FD035.mail.protection.outlook.com (10.58.144.98) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1385.11 via Frontend Transport; Tue, 5 Sep 2017 13:01:43 +0000 Received: from ubuntu1604.ap.freescale.net (ubuntu1604.ap.freescale.net [10.232.133.7]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v85D1elJ008925; Tue, 5 Sep 2017 06:01:40 -0700 From: Rajesh Bhagat To: Date: Tue, 5 Sep 2017 18:31:35 +0530 Message-ID: <1504616495-21011-1-git-send-email-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.7.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131490901032311381; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39380400002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(53936002)(5660300001)(498600001)(77096006)(68736007)(8656003)(47776003)(4326008)(97736004)(2906002)(50466002)(48376002)(54906002)(110136004)(626005)(189998001)(86362001)(33646002)(8936002)(50226002)(8676002)(81166006)(5003940100001)(6666003)(106466001)(6916009)(356003)(105606002)(104016004)(50986999)(36756003)(81156014)(85426001)(2351001)(305945005)(139555002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR03MB3314; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD035; 1:sOTj/BIXFLu1WPXLIRIdmfodLghtRkX6Krt/c1gzl0ncyepkOqq5WoNvQDoUKhPWsgPr8WN97B2/4UW36bghE+Cmk+dmRyk+QW3RKiGNdneACVVXv9GsFCOPwP9T9SHN MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 161adc85-1174-4643-1a55-08d4f45e41b1 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(2017052603199)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BN6PR03MB3314; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB3314; 3:r+23UrPRsSFP3KMCSatkgchJygP/UdXxqhHH9BVtRsIGWhCIwljCtH+6ahs3QvkY+VaeTzPzg8Oj6CFONhfT3hfcmP/dq44rz81dqPUkfFPqSOKIi/cJvovCnU87EzGjYYiO0RKrJTAx+HF5hCn36LUGeiO1FrjMsbanPrdCfYXiQXy2100Z1+wQCyfBoKhP5VHUY8DHJFk1yvY7LnI5BWj6HgUaNd3sHixZwWtfCFMEx66EYWQwg16wPhinlj/LiV1fcjaQwdGIWjVM3N/rA6p869l8S9RmAnFJMLRDQH6jECmvqQmawax6u8qMsE3wirBD61E44TZl1EZCe6QGipm0231e6AW5taFh+J3gd0E=; 25:bNRRPvAIHMv0UnbybNWiSI9Vztd/H4RU2z3b+J6J/9oyQANdr9Mbe/KzhKxnC3TPJMPOy/6yWoNxZr0ol8/M4aQRT4cVSQimtKSBrO9qvuM4ZlaCZ8UNewlUzC6SV1Ujg2QMZ3uQBdF/DzQMijsHYEZazANgPW8pSzqezapTIcXaMCFSoUpkDQoZKVMZFKGtFRirN5lW5M8/K7vLyihapO4eu9BSIkYEzayGsKKB20YENHWMzo7JD6RxFSFn0Z+DIvhIqViFve4336mtJXLfIJCg1DOv2BzQcI980oyWJK/hw0RDrKaoXrkskAGGMN8wkLWDWg91aFsd9Kp68/DnFQ== X-MS-TrafficTypeDiagnostic: BN6PR03MB3314: X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB3314; 31:cvqNZgF5ljJcIC/Fk+tbL6S+ojxtayqQICWpnmJl8DoVF69m2QaDBlmDyjD6kmMEplByBLiZ99unZfUVObSqB6Dm4Jc03CKnLZ7uh0DOwdoWsd71yBTiv1pxRD7e/9Z8Yl5A7YqrgwsTO9k+RO/U/mLUZQgV8ggOxYlqOCW57uEpvK2g34QNGPFBFTctUEJxDroTh4oT/XjEraXonQtUNlqBKKmiNh6N2VP7hOBlc5Q=; 4:hBYZSMAexidgqt+SrPCUe4xiAsUsKTcmznAwuebNyckBdph3x92QkbZLllCfO6/4rzBothHIUPT6eB+zUiyOHYQIQ04SPZB40gmL8y/7wrHUvCJ78F4spsFikgdprEWK0oB3sVP7WllDgoMWkHontQYrRWeBM0HLHfbpuyjC3ptAP1lLCXnYB4vYf+6itHFnQst7Q2ZxOOfmmhXC2k0i2LE+4Gf58ZcKYmC6V1hIDhx6rM+VqTqafyDNlovJOnUYzaAIOArj7IZ0Un/xKAZRoSKkLsGTv9k20af8b++Hims= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(100000703101)(100105400095)(6055026)(6096035)(20161123559100)(201703131430075)(201703131448075)(201703131433075)(201703161259150)(201703151042153)(20161123565025)(20161123561025)(20161123556025)(20161123563025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN6PR03MB3314; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN6PR03MB3314; X-Forefront-PRVS: 0421BF7135 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR03MB3314; 23:lqCJzslypTQLapqc3Y6Xt6TCBwrYjkIPv74M6duaS?= LlY2kVgJZnYn+x4/K+Fjuy+XVyKOFLKP8BWIEPnI6KHkYgschs47reGdskzMW1Nt7J+u4Bqf2rN2gK8FVoR6NVl4SEhbEvbFCzOcdxABXwebWnS2rlOWjXj96nwKH7vPdG5o8Bj6f9/o+dPsRzj2BGnpQmb2gEBUCjDAST9aRW6o8GxRFmnGBf05yTvgyvpO1BGBGJ10aPWgLKP0VF3wxhITs4wq31BpuKRVbvX9WJTrqcbZC+XJJ7WUMaYDi6hz0AY4EkxlmqVowwqd9+foUtt7zuPj2UmWsKgLtPKez5JUg3Gz4gNtvIKvJHqPMmupdlukGGg1q7Yh7ZcqeQOPEUquIwL1vG/jVYSYIdbBCfR6O3TTB2Q30x1bZF9onvAY67UQGlIc+HSGIj+xH7OoKSPWfUZ6rq0ibjOxTBswFlLiSpjSduS3yIHoppKspujfAJrjXZHH8px11zYd/nr8RJZ9JQxa5zUvrRKp6wRrJVMgvMWGSWHpni5JLdd+iQi6718RtVZdhaS80gmXuyIXRpDJdOaUuf+qzTmql4RZ/1OphiTYmXWuciyRGiLRNU6tnsv/enn7edGGmbDfJgFa/7cTXQcyVe6UlSLBIUUnEv4ezgkTaBDK5S7wBp5e+iuqRR8KmyGyXpyTOy/4J0+R/Njh8o7NkGxDleodTlJVan1yVo64NQyBeXpTqCFGT3JauLfRXE2KFhRFbRHE8eIZbL3HGzh2Ot+OwjLnGPj5E0AZKSOOmuOwlslCYNgEq6njY8fBQM+eOhPXOhDBiAJg8W2LBUkVAd7HSul/ki/SnIOBTY806MS5L0uvRuFgMfkzIirNF+jseMd3QgRtpZY/G6aqlJkAnHUBjvEtPPdNnJBpAe48cOOREc6Nx4KBceUmgtyRm7B75qc7cy+Bnrfu0bAFKg7kDTpGmbYIYix4O2VoHlvzqnt0VnMaGKj+SVfSzBGBvRLTtF7g24FFRaFoZZelLl6RbCJKW1b32IVWw4x3aHFVEVqro9AdGaJGzzG/Hq+1QAoSpQz4R3AX8Lkvejdt4K6EGnAWN/sOw0MP8THyg== X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB3314; 6:GEMqt5JCjogvXZu46bN/GpDhHuD1m2DV/UfjM2Oe9IpHhqBeYCTzlat1zBlf4QUV3ll1l2h8UqosOJnNHgJIL90WwS8GW9GwfJl2vP688LEPkh30IkQqPMFxPNQ21iRWV0caPdGFqpvik7eUstAmCsQi5xwOkUO3lSB5zF1PZzF7/PYBLBuwTiCy2NeVoOhjlBafzg3HYTTRgFGoImlAufOlEYF2oJnvRB4mfpOjBBcqCmCl/khHk80yWJ8JWJfvhsO98/eBugOHGZwVNtdRSSKSIN95putrHYnxr5OHyUYRe2SafBSjIwfdMx286WBxjAWf2KU3tSx4AY8HqrWm5g==; 5:v+LfPIL9jcJU+AK9uaTGVp3yWLJBr/SmSf4LgpWyfke6h5mHIm61Lah8L9ar9wAX8DlsWxA/vu0CuxTJV9JdWt0a2pyDslO760SBNJDoiGVRJNQd15v1pEtm8ykj0kRKr5RYHR9M0CZkY+q/biNPLQ==; 24:a0mwK6TDrPlAC0c0Ac22FwoIFxytH9kLTRuComJ+liCBzZrTF3Xcw0yKce0hD0vLVef4j5GM2nlDBVIyma3ppiRxCovOGj/gAdgrzR6rIHU=; 7:JM+4W1M2dEs09CIp8APtRI/GQV7KFj0I7Su2beaCSOnPfo3A3lJXHyF5bC8TB426jTsXh2LqyW3nPPOP1Wl3WL9WjFGM3DyaYQUMOwoAwh2SlvuRyGiTW8cZXXNQNtMmVXDVFzs9vipqIY3VjKVpIltRoAphaoyCYINe6Y1pDlN3bRtWmWdZyLNJt0LKo+MWPwVDWxrqy3rjPeb9iX3KAK7p/gjU2fg4Wths+C0v0Og= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2017 13:01:43.0595 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR03MB3314 Cc: Bhaskar Upadhaya Subject: [U-Boot] [PATCH v2] arm64: ls1012ardb: Add distro boot support 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Include common config_distro_defaults.h and config_distro_bootcmd.h for u-boot enviroments to support automatical distro boot which scan boot.scr from external storage devices(e.g. SD and USB) and execute autoboot script. Signed-off-by: Bhaskar Upadhaya Signed-off-by: Rajesh Bhagat --- Changes in v2: - Rebased to latest u-boot configs/ls1012ardb_qspi_defconfig | 1 + include/configs/ls1012a_common.h | 10 +++++++++- include/configs/ls1012ardb.h | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/configs/ls1012ardb_qspi_defconfig b/configs/ls1012ardb_qspi_defconfig index 81702e3..39d7a54 100644 --- a/configs/ls1012ardb_qspi_defconfig +++ b/configs/ls1012ardb_qspi_defconfig @@ -50,3 +50,4 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y +CONFIG_DISTRO_DEFAULTS=y diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index 020c506..95ba24d 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -90,6 +90,14 @@ #define CONFIG_HWCONFIG #define HWCONFIG_BUFFER_SIZE 128 +#include +#ifndef CONFIG_SPL_BUILD +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(USB, usb, 0) +#include +#endif + /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ "verify=no\0" \ @@ -101,6 +109,7 @@ "kernel_load=0xa0000000\0" \ "kernel_size=0x2800000\0" \ +#undef CONFIG_BOOTCOMMAND #define CONFIG_BOOTCOMMAND "sf probe 0:0; sf read $kernel_load "\ "$kernel_start $kernel_size && "\ "bootm $kernel_load" @@ -108,7 +117,6 @@ /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ #define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING 1 #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MAXARGS 64 /* max command args */ diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h index e9edcd2..c342aef 100644 --- a/include/configs/ls1012ardb.h +++ b/include/configs/ls1012ardb.h @@ -70,6 +70,44 @@ #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END 0x9fffffff +#undef CONFIG_EXTRA_ENV_SETTINGS +#define CONFIG_EXTRA_ENV_SETTINGS \ + "verify=no\0" \ + "fdt_high=0xffffffffffffffff\0" \ + "initrd_high=0xffffffffffffffff\0" \ + "fdt_addr=0x00f00000\0" \ + "kernel_addr=0x01000000\0" \ + "scriptaddr=0x80000000\0" \ + "fdtheader_addr_r=0x80100000\0" \ + "kernelheader_addr_r=0x80200000\0" \ + "kernel_addr_r=0x81000000\0" \ + "fdt_addr_r=0x90000000\0" \ + "load_addr=0xa0000000\0" \ + "kernel_size=0x2800000\0" \ + "console=ttyS0,115200\0" \ + BOOTENV \ + "boot_scripts=ls1012ardb_boot.scr\0" \ + "scan_dev_for_boot_part=" \ + "part list ${devtype} ${devnum} devplist; " \ + "env exists devplist || setenv devplist 1; " \ + "for distro_bootpart in ${devplist}; do " \ + "if fstype ${devtype} " \ + "${devnum}:${distro_bootpart} " \ + "bootfstype; then " \ + "run scan_dev_for_boot; " \ + "fi; " \ + "done\0" \ + "installer=load mmc 0:2 $load_addr " \ + "/flex_installer_arm64.itb; " \ + "bootm $load_addr#$board\0" \ + "qspi_bootcmd=echo Trying load from qspi..;" \ + "sf probe && sf read $load_addr " \ + "$kernel_addr $kernel_size && bootm $load_addr#$board\0" \ + +#undef CONFIG_BOOTCOMMAND +#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) +#define CONFIG_BOOTCOMMAND "pfe stop;run distro_bootcmd;run qspi_bootcmd" +#endif #include