From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B207C433F5 for ; Wed, 15 Sep 2021 02:49:34 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8C62560E9B for ; Wed, 15 Sep 2021 02:49:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8C62560E9B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 82BF680EC5; Wed, 15 Sep 2021 04:49:30 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="hmGOsjwF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1B55B8023C; Wed, 15 Sep 2021 04:49:28 +0200 (CEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0624.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1e::624]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C9BC581BC0 for ; Wed, 15 Sep 2021 04:49:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bDKaxf3Pa2nKV4lS7YNcCXKXQ2CG2O9X8kw1bCdhBAw75mnI9StwTm382KHH8b00ZD5zkqcDlWv65dL1CO7Jv3sql9EboynjIyDAuqPZQZcP9DijupJzAD8EztZI/hh8kzU2d1crq5DPt8ihXhYt0daATaQRCTKfIGFjYsCZ1BMAV4dIZuAy2ZNd/mzoPDv8l+KmjTUBfu1qSnSO8VGrytjpYVNBxJMoyuYy/hANYq78fqmDH6t/0Uvlo2njXWHqyykxjKgtKQ/c0+ANQb5AsRBlNN2MzqnUpdNeXm3febNCq9P+wEeLTdijl9BdSIXFk09aPsC4+aXs2B8Ci+sv2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=C+CoAYpbb9XFmkhccxYubTqDyT0bNNnOUtt1l2HHeyA=; b=A1puC5ndknghJ5em0JP6Yd81waNgRXNshM+4lFfqvF+imu9mCK9tukXv70dnCsegZSwhCTcr4C/YooK31/DAwMIn4+02ruOMEq4yyaSZ/hwsR6KZnhuGXgi2y6rj+7Q6DmsyGyDb8U0sNiLhCkiz183RaH+NoIF00C4RSfJ2vH9JvHy+DN2MBGgEMMbnK75uQUY53++K7m0tqJGVyism98fN3KB2Jxv2TWCL4T6R8Sj9jVhnVCV5Wb9gUrbH8oQby45rM8F2qUVEpF0YQ8h/43eH/A/4hZu7vhGy705kBdPiut5uWqtH87whlEGU9lPHoHyvZVuc0t2NtCkKwH2X0A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=C+CoAYpbb9XFmkhccxYubTqDyT0bNNnOUtt1l2HHeyA=; b=hmGOsjwFdJIJR70pXlXWcetbNDvoam1PHgJ5mjIcPZvaKDvYn+TxIlxEi6ud5sDoamAYC0HgLh37XjOpfPSL2KMdHraube04EfCljZ4KcdB67ghzJAuKUp+IoGe4ly1Ct9JdgJNFnrev7J74LnrMnzLjHnEz5raO2WvVkBd4z1o= Authentication-Results: beaconembedded.com; dkim=none (message not signed) header.d=none;beaconembedded.com; dmarc=none action=none header.from=oss.nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB7PR04MB5996.eurprd04.prod.outlook.com (2603:10a6:10:84::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.22; Wed, 15 Sep 2021 02:49:19 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::4868:6843:a39f:aa53]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::4868:6843:a39f:aa53%4]) with mapi id 15.20.4500.018; Wed, 15 Sep 2021 02:49:19 +0000 Subject: Re: [PATCH] imx8mn_beacon: Fix booting hang and switch to binman To: Adam Ford , "u-boot@lists.denx.de" Cc: "sbabic@denx.de" , "festevam@gmail.com" , dl-uboot-imx , Peng Fan , "aford@beaconembedded.com" References: <20210910201922.263481-1-aford173@gmail.com> From: "Peng Fan (OSS)" Message-ID: Date: Wed, 15 Sep 2021 10:49:09 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 In-Reply-To: <20210910201922.263481-1-aford173@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-ClientProxiedBy: SG2PR04CA0165.apcprd04.prod.outlook.com (2603:1096:4::27) To DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [10.193.99.168] (119.31.174.71) by SG2PR04CA0165.apcprd04.prod.outlook.com (2603:1096:4::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Wed, 15 Sep 2021 02:49:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c56a0b53-1b66-4a7e-d171-08d977f36a51 X-MS-TrafficTypeDiagnostic: DB7PR04MB5996: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:619; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qXyVjE1xRez+moR6aKpnha0F724cUP4WV8+Hcf6+dDsrOAnm4ktd0qvA/M3j008PnhQOPyCbwIAxfo0CJgLlTecZ7g/SVChgFmmQdFJJ42TfcLiwkVxQbzB5Ib6CWsdsdc5WfDXZg3+MTx7+145gmiOqopuzZj/7emZMXC60lXK1Alk69T4tUnLWvIv2MU24uzsLJN9k3T107X55rhteD8FQMjpAbs0J9eQ9FSiQRGjtRWisOftwG9m8esg9C1fuEgbbRwt+8rTmoqWKWFQlti1v05vpxhGfq8z0Qyoyqm4Mu46gvBu4aqT235neqYn8JnsQu3gsTEHv9THXc40KkjVgJepl0v6vSE6ILppXPCOhN607PRxXgFZ5zgtWcXCCCHBlgTi106Dkm8ze2MEe38mitakrBhdYCXuk5dGr1JHmS69zmKAyUE5P+TT+5SoN+wMMlObcHhQCN322yKcBU3fCBbxvR6ra7M1qZ+E0GFyKu+JlOPt1GU6yZa5J9ULtFin3h6dMrTb9lecMLDkMagDF440N1cv697Iyyvky0gw2+8mka2wuC8re5TL5p5IQ1n2T9QTTUPDF0b8Bp3n3PBd1QKU/aXvZ2M/6Y+3h4PTkv33Qo8LZtn4UtcPeHit+ucgd5Gb6mz90a7xKVFMEdCXaHLi8pRAwlYqWClUzpNHy0dejys5HYPZuhq7N4P0h+vPk97bNl0JGncHz7V0oGeidPxzGHQ6qOBSOfd2JfkkITMbTHGzSXDWWeNIzkQ1gk4KuZ4utGi6egHpqYDbfvg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB6PR0402MB2760.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(346002)(366004)(136003)(39860400002)(376002)(31696002)(110136005)(54906003)(8676002)(6486002)(6666004)(2616005)(38100700002)(31686004)(478600001)(86362001)(956004)(52116002)(38350700002)(83380400001)(186003)(5660300002)(26005)(53546011)(66476007)(8936002)(66556008)(66946007)(2906002)(316002)(16576012)(4326008)(43740500002)(45980500001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bHM4UXllQlRKcDl2Y2V4elZKUys0TjkreUdBSVROTG1UclBRTG9zditrSWpN?= =?utf-8?B?b2YyZ1dkT3NtSUx3UGE4QVdEdDU2d24raXd0Y0V6cG9sZXowT3lHdDRaWTNF?= =?utf-8?B?MWxGOWhtL2Y5eHBENjNNWFBKcithK1pTbkpSTnZxSEU5TzJLWWZkcEdsUk5a?= =?utf-8?B?Z0R0SVNtNEdvK1h6enE3Y0d2QlY0cTlpOUFoOHFVZi8zUVdLM1doNlp1Wmt1?= =?utf-8?B?MVJENllYc1hyKzNwQmVWMEkxZTJlNWo4bUsvM1ZwSlFCUEJEYkh2cEhZZVBS?= =?utf-8?B?em1ldFowSm02OVozQUpLZW53U1VXNW5UTzRQR1ZiN0NYbDNiMEJkdDBQTGNB?= =?utf-8?B?MDhLTC9NeGltaE9OazNlTnllTCtENFVvdGcwd1p3dlJsRVV3NUcrSE9JdTFo?= =?utf-8?B?TnBBMHNSQ3R0NWJkaUdMaDkyQWtNYy9UdkxGTFBJUTVobHVXNWkrYTVVT2hs?= =?utf-8?B?clBSOFlKclNmamFJRXE1MVdqT0ZWQ1BwS01tWHNsTkMzYXNnb0JKU1NxRnhR?= =?utf-8?B?TG5HYXNFMjczL1F4dVh0UDRGNjRWOW1KMUhQMmRYcDdZVzRtaTJFSlNRbjlz?= =?utf-8?B?M1BuZGhmU1YvejBCemJKTFp6aDYzVkFJcE0rUkJUbzV1a1RBbnVTNStTZFpk?= =?utf-8?B?TmMyR1JWSFlPS3luZ25GWWZIUDJUaTRlV25ZdlJhVGJsZEtRRUNGOXcrbWFX?= =?utf-8?B?WjVGY01KNzJOZGdFR1ozWlUzaGVzVEFveGh3bDVGMFhyZGYyL3JHekFxb2xs?= =?utf-8?B?dU52VDVrbU5iYUk0M3hkU1lFaFBoNjJYdW16eFlZeEhsZG5naGVjcXBKUVpS?= =?utf-8?B?cW4waHcva1FqTXgxWWRPRjNtWUVMeUxaQStjRy8vMG5udlFDN2xYcFUrUVI5?= =?utf-8?B?dk84K3lCSDdGTUVhNFhZK2wvSUo0d3p5aWdzbWRMemYzNDlzMU9ZaVdtQVVr?= =?utf-8?B?K3ZKWnMvM0VyMVFLbjlRcDEyQjgrQXNIL2xQZ09xZ2E5MS9CU2lXRDZBRW56?= =?utf-8?B?a3NFTWI2MjZobHZibUNIbXFiTDRzMituV1RlalJWWHpzNXJEVG5VK056MHda?= =?utf-8?B?RElXdnhicWFpZEViWXd4aFErQjNRem9qQklaWVFSOThzTmN3WVZKSVZpUnBE?= =?utf-8?B?VHEveVJGUGd3bTc1WG1SY2pyM2MrWDRZS2Fkdy9mQ0pqQTJhcFdsQy8vZ1l1?= =?utf-8?B?b3hZZDEvcW9VaG5xYXhoMG81L1QySFN6TVVzQ2hiRU8xbmJWTmh4Tjl0clcr?= =?utf-8?B?MVd0ekd5dXp5N3JQWmRHSDljVHBHVG5DQ2tieExOelpRdTVPc0RFUHdXbitC?= =?utf-8?B?TkpIcDZxKzV2OCs3aFlnYjNaUVlwRnZhTEJVK25sZ2Rwa1hSclVET0ZrZ2Jy?= =?utf-8?B?Zkw1TXZmU243TWJBQjErZi91ZjBhRlcrWFU2NFEwZmFIMEYzQXNXV2wwSkpu?= =?utf-8?B?WkZPSmsxcWZVYkZ0bU9OZHBMaFkxRmxpbmhzQ0hzSnNqbFhrNzIrSUhFNUxM?= =?utf-8?B?RkdSM29Bd3dBK0Qvb0hXZzIzVzdmSmdzQXVkOWE3R0tWVkY5Tk4wcWVvaWpD?= =?utf-8?B?RVZIOFNCU1BXSmgrZUU3ZEpDUnc5Z3IvVGo5MU5hNEJKbHpMb3FHRXRWV3Qx?= =?utf-8?B?S2E5SUtxS1VBV3daU1FZeFB2WVg3NVF5ZkxDQTVJdEtZdW9IT3VqelR0SE5I?= =?utf-8?B?VTRHR0pnTVFMeG5PdXEwbG5BVGwwMmF4UUhEeDJJdHJYNEp1SDJLaTBXVHAz?= =?utf-8?Q?QdrYJxvg0kJZzn7xy7kDctQ4KgQQdNteeBjfYOv?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c56a0b53-1b66-4a7e-d171-08d977f36a51 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2021 02:49:19.7019 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: XJiTOkonOSNjvX1FrlyM0kuXRWu8zLTssf3GdLRkdfmzEMYfSJbMI4QqNtVqYV6PXYjZuuEis023bWYKXkQGoQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB5996 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean On 2021/9/11 4:19, Adam Ford wrote: > Somewhere along the line, the board stopped being able to boot. > Rather than just fixing the issue, let's fix the issue and migrate > to binman to eliminate a warning when using custom imx tools for > generating the binary. > > Signed-off-by: Adam Ford > > diff --git a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi > index bbc64a2819..69fd69c8d0 100644 > --- a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi > +++ b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi > @@ -4,6 +4,10 @@ > */ > > / { > + binman: binman { > + multiple-images; > + }; > + > wdt-reboot { > compatible = "wdt-reboot"; > wdt = <&wdog1>; > @@ -40,6 +44,9 @@ > &clk { > u-boot,dm-spl; > u-boot,dm-pre-reloc; > + /delete-property/ assigned-clocks; > + /delete-property/ assigned-clock-parents; > + /delete-property/ assigned-clock-rates; > }; > > &gpio1 { > @@ -99,6 +106,10 @@ > u-boot,off-on-delay-us = <20000>; > }; > > +&uart2 { > + u-boot,dm-spl; > +}; > + > &usdhc1 { > u-boot,dm-spl; > sd-uhs-sdr104; > @@ -120,3 +131,122 @@ > &wdog1 { > u-boot,dm-spl; > }; > + > +&binman { > + u-boot-spl-ddr { > + filename = "u-boot-spl-ddr.bin"; > + pad-byte = <0xff>; > + align-size = <4>; > + align = <4>; > + > + u-boot-spl { > + align-end = <4>; > + }; > + > + blob_1: blob-ext@1 { > + filename = "lpddr4_pmu_train_1d_imem.bin"; > + size = <0x8000>; > + }; > + > + blob_2: blob-ext@2 { > + filename = "lpddr4_pmu_train_1d_dmem.bin"; > + size = <0x4000>; > + }; > + > + blob_3: blob-ext@3 { > + filename = "lpddr4_pmu_train_2d_imem.bin"; > + size = <0x8000>; > + }; > + > + blob_4: blob-ext@4 { > + filename = "lpddr4_pmu_train_2d_dmem.bin"; > + size = <0x4000>; > + }; > + }; > + > + > + spl { > + filename = "spl.bin"; > + > + mkimage { > + args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000"; > + > + blob { > + filename = "u-boot-spl-ddr.bin"; > + }; > + }; > + }; > + > + itb { > + filename = "u-boot.itb"; > + > + fit { > + description = "Configuration to load ATF before U-Boot"; > + #address-cells = <1>; > + fit,external-offset = ; > + > + images { > + uboot { > + description = "U-Boot (64-bit)"; > + type = "standalone"; > + arch = "arm64"; > + compression = "none"; > + load = ; > + > + uboot_blob: blob-ext { > + filename = "u-boot-nodtb.bin"; > + }; > + }; > + > + atf { > + description = "ARM Trusted Firmware"; > + type = "firmware"; > + arch = "arm64"; > + compression = "none"; > + load = <0x960000>; > + entry = <0x960000>; > + > + atf_blob: blob-ext { > + filename = "bl31.bin"; > + }; > + }; > + > + fdt { > + description = "NAME"; > + type = "flat_dt"; > + compression = "none"; > + > + uboot_fdt_blob: blob-ext { > + filename = "u-boot.dtb"; > + }; > + }; > + }; > + > + configurations { > + default = "conf"; > + > + conf { > + description = "NAME"; > + firmware = "uboot"; > + loadables = "atf"; > + fdt = "fdt"; > + }; > + }; > + }; > + }; > + > + imx-boot { > + filename = "flash.bin"; > + pad-byte = <0x00>; > + > + spl: blob-ext@1 { > + offset = <0x0>; > + filename = "spl.bin"; > + }; > + > + uboot: blob-ext@2 { > + offset = <0x58000>; > + filename = "u-boot.itb"; > + }; > + }; > +}; > diff --git a/arch/arm/mach-imx/imx8m/Kconfig b/arch/arm/mach-imx/imx8m/Kconfig > index 8fedf45987..9a1eb108e4 100644 > --- a/arch/arm/mach-imx/imx8m/Kconfig > +++ b/arch/arm/mach-imx/imx8m/Kconfig > @@ -116,6 +116,7 @@ config TARGET_IMX8MM_BEACON > > config TARGET_IMX8MN_BEACON > bool "imx8mn Beacon Embedded devkit" > + select BINMAN > select IMX8MN > select SUPPORT_SPL > select IMX8M_LPDDR4 > diff --git a/board/beacon/imx8mn/imximage-8mn-lpddr4.cfg b/board/beacon/imx8mn/imximage-8mn-lpddr4.cfg > new file mode 100644 > index 0000000000..7286b26494 > --- /dev/null > +++ b/board/beacon/imx8mn/imximage-8mn-lpddr4.cfg > @@ -0,0 +1,10 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +/* > + * Copyright 2021 NXP > + */ > + > +#define __ASSEMBLY__ > + > +ROM_VERSION v2 > +BOOT_FROM sd > +LOADER u-boot-spl-ddr.bin 0x912000 > diff --git a/configs/imx8mn_beacon_defconfig b/configs/imx8mn_beacon_defconfig > index 5296204aad..f2515874a2 100644 > --- a/configs/imx8mn_beacon_defconfig > +++ b/configs/imx8mn_beacon_defconfig > @@ -26,9 +26,9 @@ CONFIG_LTO=y > CONFIG_FIT=y > CONFIG_FIT_EXTERNAL_OFFSET=0x3000 > CONFIG_SPL_LOAD_FIT=y > -CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh" > +# CONFIG_USE_SPL_FIT_GENERATOR is not set > CONFIG_OF_SYSTEM_SETUP=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/beacon/imx8mn/imximage-8mn-lpddr4.cfg" > CONFIG_DEFAULT_FDT_FILE="imx8mn-beacon-kit.dtb" > CONFIG_ARCH_MISC_INIT=y > CONFIG_SPL_BOARD_INIT=y > @@ -36,6 +36,7 @@ CONFIG_SPL_BOOTROM_SUPPORT=y > CONFIG_SPL_SEPARATE_BSS=y > CONFIG_SPL_I2C=y > CONFIG_SPL_POWER=y > +CONFIG_SPL_WATCHDOG=y > CONFIG_HUSH_PARSER=y > CONFIG_SYS_PROMPT="u-boot=> " > # CONFIG_BOOTM_NETBSD is not set > @@ -62,7 +63,6 @@ CONFIG_CMD_EXT4_WRITE=y > CONFIG_CMD_FAT=y > CONFIG_OF_CONTROL=y > CONFIG_SPL_OF_CONTROL=y > -CONFIG_OF_SPL_REMOVE_PROPS="interrupt-parent interrupts" > CONFIG_ENV_IS_IN_MMC=y > CONFIG_SYS_RELOC_GD_ENV_ADDR=y > CONFIG_SYS_MMC_ENV_DEV=2 > @@ -106,6 +106,7 @@ CONFIG_PHY_GIGE=y > CONFIG_FEC_MXC=y > CONFIG_MII=y > CONFIG_PINCTRL=y > +CONFIG_SPL_PINCTRL=y > CONFIG_PINCTRL_IMX8M=y > CONFIG_DM_PMIC=y > # CONFIG_SPL_PMIC_CHILDREN is not set > @@ -122,7 +123,9 @@ CONFIG_SPI=y > CONFIG_DM_SPI=y > CONFIG_NXP_FSPI=y > CONFIG_SYSRESET=y > +CONFIG_SPL_SYSRESET=y > CONFIG_SYSRESET_PSCI=y > +CONFIG_SYSRESET_WATCHDOG=y > CONFIG_DM_THERMAL=y > CONFIG_USB=y > # CONFIG_SPL_DM_USB is not set > @@ -134,3 +137,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 > CONFIG_CI_UDC=y > CONFIG_SDP_LOADADDR=0x0 > CONFIG_OF_LIBFDT_OVERLAY=y > +CONFIG_IMX_WATCHDOG=y > Reviewed-by: Peng Fan