From patchwork Tue Mar 31 08:59:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ye Li X-Patchwork-Id: 1264603 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=J6S527qf; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48s3F12zqVz9sRN for ; Tue, 31 Mar 2020 20:00:02 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8226B81901; Tue, 31 Mar 2020 10:59:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=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=nxp.com header.i=@nxp.com header.b="J6S527qf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3F07181918; Tue, 31 Mar 2020 10:59:49 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0617.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::617]) (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 372FB818F9 for ; Tue, 31 Mar 2020 10:59:42 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ye.li@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iVJgq1QbAjHTytH9Wk9F7dzWKaSWaEIbhOmgG1AGT5oCenbshYWxpQgHBrM2E+En7WkHdvMcX/YWzX9LwW0xpEBBw/KgBRaccjteFT4Lfia5mpcCE8i5cFuJVwVJpv5j1nerrMayflujij71OQOYoGVkR689XlknNca2/2e/Hdbm7MfmRsrsM2bh/bau2tsIYmW2MlojV3z3u9CyblJO4Y0w3U+BW5NBcGJBHJBFe4KD3QyK2ldx2dDoAgPVqbMxYq5nHXpEs6re7a3tTqgXTMDaGN/fRV4VzYMgF9RvlCT0SVmhR8EK8RTcmkq5tOnAqE1y/V39V+EIjNr9tSGs8Q== 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:X-MS-Exchange-SenderADCheck; bh=JdGihO87KlAqtMKHUJixCUTu8oCEZ4+kFV4hQ9DQlFo=; b=BNMRJLCzvG40IYnQ7tFySaGPnesOJUqJAoHRd2bIMOzsn8t2J/HHeI28qD4wPvnWkLovinX2uNgAVPlyw6DkXluMAEK+n98464ymYNpaS4ZFFgwMhv4mdyab0+YdqHZM61KUzUL6CKAb57cpEuiZqY1YB9Y0hsp5ht+nHlzE07up7x/XxtCHBm6cTH1dEA18jn8UoGuHwH2sUsOhomIz29kqojMqGemPYoiQDlxe4Zh70TZeG+OGyl9GoZYMi4lqLcxrqY1xOXSuO8p6c0HoL/QJcy+01n5XFhaLfP7VB80UhkyjZSDdq6m+0TSreWFzutEDTaHPAI7JsWBqoSAfVw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JdGihO87KlAqtMKHUJixCUTu8oCEZ4+kFV4hQ9DQlFo=; b=J6S527qfXNqdZmIzjVEI04g56cavWPgyhh51pxM4wqBuNdo0VqWzDdT6YD7SyvUfEq5Ipy70lqw4peizK1IeliKeZpvrdb4pRe8j6fkXNdTGfTWQncvE8QAoDP27LXB5tjzi/5pr200lYC03HnjZOsZm7xWfjW2N9U9HNa5T7M0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=ye.li@nxp.com; Received: from VI1PR04MB4414.eurprd04.prod.outlook.com (20.177.54.77) by VI1PR04MB5199.eurprd04.prod.outlook.com (20.177.52.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2856.20; Tue, 31 Mar 2020 08:59:39 +0000 Received: from VI1PR04MB4414.eurprd04.prod.outlook.com ([fe80::5ee:92b8:c9d2:9c7d]) by VI1PR04MB4414.eurprd04.prod.outlook.com ([fe80::5ee:92b8:c9d2:9c7d%5]) with mapi id 15.20.2856.019; Tue, 31 Mar 2020 08:59:39 +0000 From: Ye Li To: trini@konsulko.com, u-boot@lists.denx.de Cc: fabio.estevam@nxp.com, peng.fan@nxp.com, abel.vesa@nxp.com, uboot-imx@nxp.com Subject: [PATCH] Revert "common: spl_fit: Default to IH_OS_U_BOOT if FIT_IMAGE_TINY enabled" Date: Tue, 31 Mar 2020 01:59:20 -0700 Message-Id: <1585645160-108428-1-git-send-email-ye.li@nxp.com> X-Mailer: git-send-email 2.7.4 X-ClientProxiedBy: SG2PR06CA0182.apcprd06.prod.outlook.com (2603:1096:4:1::14) To VI1PR04MB4414.eurprd04.prod.outlook.com (2603:10a6:803:69::13) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from ubuntu.localdomain (119.31.174.68) by SG2PR06CA0182.apcprd06.prod.outlook.com (2603:1096:4:1::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2856.20 via Frontend Transport; Tue, 31 Mar 2020 08:59:36 +0000 X-Mailer: git-send-email 2.7.4 X-Originating-IP: [119.31.174.68] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: d3566064-3512-402f-4ce5-08d7d551d7ff X-MS-TrafficTypeDiagnostic: VI1PR04MB5199:|VI1PR04MB5199: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:119; X-Forefront-PRVS: 0359162B6D X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB4414.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(10009020)(4636009)(366004)(346002)(396003)(376002)(136003)(39860400002)(52116002)(36756003)(44832011)(66476007)(66556008)(66946007)(5660300002)(2616005)(956004)(6506007)(86362001)(478600001)(2906002)(6666004)(81166006)(6512007)(8676002)(26005)(81156014)(186003)(16526019)(4326008)(6486002)(4744005)(8936002)(316002); DIR:OUT; SFP:1101; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dz2W5tMbFJre6ZHuIOCrHeyqSixaZz8KMyVH+OWWn9M0u09f+CEF/GRXPsm3UucsSQBi3wJIfEooG1LCjwcbEYmgl75cQnrND1mvv10oJhRgE4N1Z13Vl5h6BGkwq7GO1VYNSFF+8d0Ur+6O1+rozvbEhoPESpZV87EESVLq9FlNnIvAjw1gMV248viROOCBaTMHBJ1RSk9y5ilZEDf489lV1Sso9U0ymmE8AJsKTJjSgmcGqGK+0xZL2ANjadd5aVzq86K9NlF94q+zDrlElied+ka8WYFZNy5Z91FILhFWeqEZMRAyZhe5XQzMsW9PZR1VWnhvBYELzW8Jwa9NnqBsMK+PIjMfA+uGpHxH8u45AvnxxFeEsX+FIBHvFTC+q7wzSGmWG4ztNa9/y0h+iWMZKKSoF26Gb8YBsU41mlUFcS7UCDSnX1tvOnULgSGj X-MS-Exchange-AntiSpam-MessageData: fug2bY0lthPs9l1Wn6TCYN4vr9pO9YIAwwiKoAoZ+Wiies5aSdVMlPGT5GjiW9ugW/airjjixE5t7zi0V37+hzIYd5DMFO3Fsznr+rRLtAuDyGcbXnJtROcv9/uOW1XjNVFNSGliFTZf97FD7D2uAQ== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d3566064-3512-402f-4ce5-08d7d551d7ff X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2020 08:59:39.3032 (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: wKyaAfd3PjYyK+XWABXXgCt8BK5IR9gaTs2BQR93g9/ZX7ZU7dJ/qmcfSPY2emOc X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5199 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.102.2 at phobos.denx.de X-Virus-Status: Clean The patch in commit cf8dcc5d02c32173b74bf1b7600dd2b990a90b13 is not correct, it will append fdt to each loadable image. Actually when using TINY FIT, the first loadable image is thought as u-boot and already have fdt appended. Signed-off-by: Ye Li Tested-by: Fabio Estevam --- common/spl/spl_fit.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index aef1dbd..69dabd2 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -646,10 +646,6 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, if (!spl_fit_image_get_os(fit, node, &os_type)) debug("Loadable is %s\n", genimg_get_os_name(os_type)); -#if CONFIG_IS_ENABLED(FIT_IMAGE_TINY) - else - os_type = IH_OS_U_BOOT; -#endif if (os_type == IH_OS_U_BOOT) { spl_fit_append_fdt(&image_info, info, sector,