From patchwork Wed Sep 2 03:48:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 513281 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 2EAF41401CD for ; Wed, 2 Sep 2015 13:48:32 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B43984B71D; Wed, 2 Sep 2015 05:48:30 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HprC5lOGCIi8; Wed, 2 Sep 2015 05:48:30 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D89934B6DD; Wed, 2 Sep 2015 05:48:29 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 97DD94B6DD for ; Wed, 2 Sep 2015 05:48:26 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id G50sxFFIQmtA for ; Wed, 2 Sep 2015 05:48:26 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0130.outbound.protection.outlook.com [157.56.110.130]) by theia.denx.de (Postfix) with ESMTPS id 1E5B84B6D4 for ; Wed, 2 Sep 2015 05:48:23 +0200 (CEST) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=scottwood@freescale.com; Received: from snotra.am.freescale.net (192.88.168.49) by BN3PR03MB1478.namprd03.prod.outlook.com (10.163.35.141) with Microsoft SMTP Server (TLS) id 15.1.256.15; Wed, 2 Sep 2015 03:48:19 +0000 From: Scott Wood To: Date: Tue, 1 Sep 2015 22:48:08 -0500 Message-ID: <1441165688-28917-1-git-send-email-scottwood@freescale.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1441073484-15640-1-git-send-email-scottwood@freescale.com> References: <1441073484-15640-1-git-send-email-scottwood@freescale.com> MIME-Version: 1.0 X-Originating-IP: [192.88.168.49] X-ClientProxiedBy: BLUPR11CA0039.namprd11.prod.outlook.com (10.141.240.49) To BN3PR03MB1478.namprd03.prod.outlook.com (25.163.35.141) X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB1478; 2:kfa5epbKmxihNkBo6H2OQzNXo9Ymbp2smr2sVu4whhRhX+P/nli5GwSy4iZMUMdz1gR9zcoBdCMcCYMxZZccwJ1v30ucGS0QQ86UrYf4/QKJcInivE+3HNlHvLZHB2ZNPExK+IcluDjIE0+dXW3q20nBKMrSlu5pqBnqO3UMCnE=; 3:7BSPloyrE2PP0AYrY7CrxUj+tJx0Fvsrhv+L2Zr18C3tI8JjBU+QiH+V228W7oBTLcTFhgQTsjNJ3J5JNBVXsnr2vQeNMwYuAE1FBR2DYj7Ufpu2BA/YVCFZvIUP46r7nsqczemTUSosWBrm2rTIfA==; 25:Lan5p1Pt7ntt+Y2XBEdUT2F5xT52hjtYyaX9H+slPR1eKa/hTjFIS3WtYKop4q3zOsgiLYEZOwyG1gKzYi0bVsHVI75O1UTCMu8fOe+3o2ucC8OgI/TjzJPEHPjUNKHZE7tD5XRc94pAwaanA6WaCpUg9VWNZeIF91nFLizoY4Hyd12jGwxPfXfUpetWD7F0ASxyQrxbQzLqtBflGQM3p3NSeVr/Egam6vmbXt+uh3gj3eHbP7AaniVMLZqAaD6u X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN3PR03MB1478; X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB1478; 20:XKkbTYddfgmt9Xs5rMqBuXENj2igxJrUDnNW8Ss62lrZc/wZ2C/BkUbdCNWduA4DrpOisXXgg21gl7aKN+s1N7hLSqDDiEcV8CZ6kWjXh6JMBCxkj4HFq0py1LZ2cK9xNP7KO6oSiC4QxPFnzbitRTSpfws0YlYO0FwC1vykANDcDMdrNcBbUk88yQgmVLQDGrU0883GcuuZHlXyXHwMl9+xQphBJ7SNbmtsI9FbMxnaRzVXSdoG4CUiUNoH54fF2HRZWlZGGl4VS1aLW2SfiFx/Xh0MZ1VVbwHLcT2Lc087Me4s9NgXaAXNoe0AyGLeIx8ByjpXeMzTacEAKIMLEeu7F2zhOtheC0MjlfZfZ0LpH82cFEnmxwnRIsGEnDDdKg22iIZ3sp5K/8z11H/vxDptbRCyr6ejFcY6AE7GhxSN89jSheO5/kNLJLP40bA403DdVagX1NpUlv22w+eeYUYIrAPNs6TujPHaqi1KRKA7L3RWdiBphuIF2/RgCh+7; 4:GYn3WiS1a6vvlPJVEouiDDW/p0bmliE13gjO3ZBa8BFLoXHTbZMpuzqq6Zw5byY1GHNKC1fpJjsPNy31x/1whlFhhJZYxHcMDDhFTVAdvyUlOcecO/GfuPQyShcIo+WOn3v23tihu0Fvbs+KNfuzfcJnGHrCRFj6M0FB4k4zmtiu8cSSbHX34yYIzDJwJX0iyvjWgh0XDDQiUCeCD9hKE5S3ckVrMuMARcoaHMLT6wRgmKaL8JAnyXmmhFbwEJA/0d99XOcifuRYFmbrFfPRp4FerhxYtxv5ahVKcOKPf8Q6XzOTs4MP2qjsEGgZpG/+ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(8121501046)(3002001); SRVR:BN3PR03MB1478; BCL:0; PCL:0; RULEID:; SRVR:BN3PR03MB1478; X-Forefront-PRVS: 0687389FB0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(189002)(199003)(5004730100002)(101416001)(86362001)(68736005)(50986999)(50226001)(66066001)(42186005)(5007970100001)(19580405001)(2371004)(5003940100001)(19580395003)(77156002)(77096005)(4001450100002)(4001540100001)(81156007)(48376002)(62966003)(47776003)(64706001)(76176999)(87976001)(97736004)(105586002)(50466002)(92566002)(2950100001)(36756003)(46102003)(40100003)(5001960100002)(229853001)(106356001)(2351001)(110136002)(122386002)(5001920100001)(189998001)(5001830100001)(5001860100001)(33646002); DIR:OUT; SFP:1102; SCL:1; SRVR:BN3PR03MB1478; H:snotra.am.freescale.net; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: freescale.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR03MB1478; 23:B0sF+ObtFAkGYfYXx9ZYfop/fnCdUlMSMmrRFFflf?= =?us-ascii?Q?3ajtusyytLvsOjeZSkZTyoNnDVA8mYMhxFM9x9Jxx7dz3TkzOQyJHwFbe8EA?= =?us-ascii?Q?VcSPiHCMHzQ7f+yTlwAwAbGHAfXpYPP9qgppo0l/zOGB7u7Tsq4FwPEdLPji?= =?us-ascii?Q?hezGezGauN5pQwOACbzO/zDAuT9JasNWNmHurjBSu13O34WOPtW/+TxHkzRb?= =?us-ascii?Q?ZOrl1VWKlP1T3eYExMEw3IyTRxUjqMY0xuRZYuLd1NT62kGjNGOAU+int3TO?= =?us-ascii?Q?dZjrRf2vYjXRbmI9pxVpEmXgaYS9AR+w0DU4nanvBcl1TXuE5NmO3AJ7PjwC?= =?us-ascii?Q?+XVdpzvBWQMA3SoGCvDBja2doY+4/L4KqGI9L4c0kdvTwaQHYhvIet+25oux?= =?us-ascii?Q?H5Z6O6bfiqpDs3rYoyaxI6MbZ/bhW1PaAo5+jcfmLNO6Sl5KpyscYGAZPMfc?= =?us-ascii?Q?i4N71iJfZuVDJ1tP063o27ccWowX/ETQya1k/riyTNokaxLcheCX1KIfC8Y3?= =?us-ascii?Q?mQchPNGeChzWNgathX9LL3/pLmlN0sdus+a8JJKebl3zwYG92aLHN3EHbAjZ?= =?us-ascii?Q?Hgl3YO7n+kDLNHxctYZxsyIwhLx1ix79IEwSKKPJFbypTegVIJ48ONYEqouP?= =?us-ascii?Q?90LoaK36fNEZgCyOMYLifpFcLwe3igcDJPQWb/Z0F+IeUfi4PKHkB5DUbXlF?= =?us-ascii?Q?MTiqtel/LkPaNuNkgVGlZAhpZgBm44QcOOjHtlWZoj6p3Pup2VnLFpQTh7s0?= =?us-ascii?Q?9AVklI9YT3VTC4xi3AAh1TKJZFL9ZlOrP29DC0DZt+XY55rRjazUSbENYmDx?= =?us-ascii?Q?9dXGhhB+Vsbbknz7dbqUB6NsEbpIXwC+M1GNXQROGc4MmiAsfXao4crzBu4+?= =?us-ascii?Q?N46KMf/JwiDDjhB7sUFAM25c0MBjgpzVdPH9qaroftTH2KAbBRxmPDBkz1ik?= =?us-ascii?Q?F8f8VNhsT6YYG6+tPUa9rmdBPazsCydWKcTq4IpIdikygeczae24QxA1sMPi?= =?us-ascii?Q?LgIhx0iK+yh0m8rXdEGn0dJrDpZkz4/AbrZdjSWQQn/3SGqEJCCwOuORXCbd?= =?us-ascii?Q?nJ1eLU7JoWEV5tEnaWQgfyBe3w5pzYoqypfNTxJIgeR//JWpmJ6RJ0NGEkUI?= =?us-ascii?Q?rmauctNs9w6azwh9GY7WSFZHGyeIVIC3lyS/Qs2FAKO+F3JFKXnQR/cYAs7w?= =?us-ascii?Q?OSnLpaqkpDcu6+U3UxdVPM3C3QMVSvb4oSxvO23epFM2zXInFVIlDsjlUpaz?= =?us-ascii?Q?FUcUFvCurqCKrB7qZs=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB1478; 5:27CuRucflG/C8ZE7kt1Gkpe1AMLGy9npUvDkSfLprHcodLnnSeH5drAwQbnGcxm1s0KZzxnVqQa0YIRF34PT/3jCPH/Yzvcjs2jUgL6Rt5V0krXbv6WRZ5MZAXquIHBtoQ7HSEpAeLMnR7FCfGm75Q==; 24:TRgV+2bZlT9LjHKecwNOpToPuKob7Fjvyo72NDRzcZ4vaF634tt4Jm1twpi45U3KkXQ1ycq1Lpinf9g5Kgo3jeWlNUWtiAu0VqKvhwG2zas=; 20:+Awhz7/fwe5slidAJfccsJtcNZhMF5JSP7mJasR8zIgibdPR63EtDEHccNW/u4pfhAe6A6UNzUcNVrST7j2eDA== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2015 03:48:19.6465 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR03MB1478 Cc: Scott Wood , u-boot@lists.denx.de, Kumar Gala Subject: [U-Boot] [PATCH v2 2/2] fdt_support: Don't panic if stdout alias is missing X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" Currently, using fdt_fixup_stdout() on a device tree that is missing the relevant alias results in this: WARNING: could not set linux,stdout-path FDT_ERR_NOTFOUND. ERROR: /chosen node create failed - must RESET the board to recover. FDT creation failed! hanging...### ERROR ### Please RESET the board ### There is no reason for this to be a fatal error rather than a warning, and removing this allows for a smooth transition on a platform where the device tree currently lacks the correct aliases but will have them in the future. Signed-off-by: Scott Wood Cc: Kumar Gala Cc: Simon Glass Reviewed-by: Simon Glass --- v2: Only continue booting if the problem was a missing alias, not the inability to write to the device tree. --- common/fdt_support.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/common/fdt_support.c b/common/fdt_support.c index f86365e..a7ff2df 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -158,25 +158,30 @@ static int fdt_fixup_stdout(void *fdt, int chosenoff) aliasoff = fdt_path_offset(fdt, "/aliases"); if (aliasoff < 0) { err = aliasoff; - goto error; + goto noalias; } path = fdt_getprop(fdt, aliasoff, sername, &len); if (!path) { err = len; - goto error; + goto noalias; } /* fdt_setprop may break "path" so we copy it to tmp buffer */ memcpy(tmp, path, len); err = fdt_setprop(fdt, chosenoff, "linux,stdout-path", tmp, len); -error: if (err < 0) printf("WARNING: could not set linux,stdout-path %s.\n", fdt_strerror(err)); return err; + +noalias: + printf("WARNING: %s: could not read %s alias: %s\n", + __func__, sername, fdt_strerror(err)); + + return 0; } #else static int fdt_fixup_stdout(void *fdt, int chosenoff)