From patchwork Wed Apr 25 12:35:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 904198 X-Patchwork-Delegate: monstr@monstr.eu 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; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="NmnWZhn/"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40WKR50crdz9rxs for ; Wed, 25 Apr 2018 22:35:11 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 57581C21F9F; Wed, 25 Apr 2018 12:35:06 +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=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 F0CB0C21F16; Wed, 25 Apr 2018 12:35:03 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id DF8B6C21F16; Wed, 25 Apr 2018 12:35:02 +0000 (UTC) Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by lists.denx.de (Postfix) with ESMTPS id 80245C21E13 for ; Wed, 25 Apr 2018 12:35:02 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id p18-v6so33976404wrm.1 for ; Wed, 25 Apr 2018 05:35:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:subject:date:message-id; bh=Jk0Baac//7jrHvrnka/F/P4sAENC4EVuaZadIxU1QCg=; b=NmnWZhn/4gN92DXxxqU2Rmq3U5Dj9taL+Ta6gnL061QICLytmL1bFMiZoDAn5KG0LR KS3odu1Tsgd8yTh963pNvOkpFpombVa5wSudmjRxsalx5q+bE/5kICcJY0a29FhdPLYN oq+cCVu3O5PgzGu8cX4iqvTQztEdOZd/hYwCpZTcsXsHSYxv93UyRI6KJ8RX6vMWpVJ5 pqEC0aUpeNCujeRLaVHsXy1orZP/KtJzoMf6iCppF9+7ShXtemB064EkT8ZJ7yvJyNbG QW39adOs+iSqF1IBKsSFJlRSbf1uxHSiV2GFglr5+aHdWrahX2+0zq5NukZmc3B+s7mo kcHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id; bh=Jk0Baac//7jrHvrnka/F/P4sAENC4EVuaZadIxU1QCg=; b=BEWGlTxnLYFaK4FxZ7Rxt8RlgHn0ssXuMJCEMQWnjY8fp+BKndZFnISqJ+VpUJz+6B QZgjA5JgULmKgwd+8g00fgyz9YQhUmqDZKWiJo0CLfmEXDqbONVGSOLPHfdY4zkkdMUZ hiDheLuNQA027xJN8g++6uDq51hE7ap+2eCagCJtWZ99hgNeYhB6LboKiz/fN8F3LEoO IvxvMgIw5ssJm140KawAS3jkEXkIc9RZ0Wx8LR5SaudiKfnz9G6+kxzivblkHhAY1RKt 0am+m8OFE27bqEa5xjftCCT7xIFt9qKyn95Ed8rKQwZ7HHV869MiQwPtINMiBLMEiwa3 oEjQ== X-Gm-Message-State: ALQs6tDqGNp3M6D+EKnZzuLnL+Ok0IxAbR3ZRyXLL69sw7izPaqN4Yr5 QHzH3oAC1YcYdDMkXUBGPx6l0MLx X-Google-Smtp-Source: AIpwx4+8pdpFey4aWvhKCl6JX5+i/fFbLpbEhpNZeMoPPp9bb36RFuIcGWzgkTzJEw3BexZhZsFcbg== X-Received: by 2002:adf:b067:: with SMTP id g36-v6mr23796942wra.128.1524659701882; Wed, 25 Apr 2018 05:35:01 -0700 (PDT) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id 31-v6sm16190109wrm.68.2018.04.25.05.35.01 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 25 Apr 2018 05:35:01 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, Alexander Graf Date: Wed, 25 Apr 2018 14:35:00 +0200 Message-Id: <259c5c653b90ed88aabd3a8017168623af0b30f7.1524659698.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.17.0 Subject: [U-Boot] [PATCH] arm64: zynqmp: Simplify boot_target variable composition 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" Call calloc for space allocation only at one location and include if/else to sprintf. This will simplify run time device adding based on id aliases. Signed-off-by: Michal Simek Reviewed-by: Alexander Graf --- board/xilinx/zynqmp/zynqmp.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index 6d09a4c73139..f7fe1fdfff7b 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -454,6 +454,7 @@ int board_late_init(void) { u32 reg = 0; u8 bootmode; + int env_targets_len = 0; const char *mode; char *new_targets; char *env_targets; @@ -530,14 +531,13 @@ int board_late_init(void) * and default boot_targets */ env_targets = env_get("boot_targets"); - if (env_targets) { - new_targets = calloc(1, strlen(mode) + - strlen(env_targets) + 2); - sprintf(new_targets, "%s %s", mode, env_targets); - } else { - new_targets = calloc(1, strlen(mode) + 2); - sprintf(new_targets, "%s", mode); - } + if (env_targets) + env_targets_len = strlen(env_targets); + + new_targets = calloc(1, strlen(mode) + env_targets_len + 2); + + sprintf(new_targets, "%s %s", mode, + env_targets ? env_targets : ""); env_set("boot_targets", new_targets);