From patchwork Thu Jun 30 16:52:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 642702 X-Patchwork-Delegate: trini@ti.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 3rgQcc3QgDz9sC3 for ; Fri, 1 Jul 2016 02:54:24 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=RAlEzpZ5; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4FCF1A7631; Thu, 30 Jun 2016 18:53:48 +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 8V_OQvD2dZf7; Thu, 30 Jun 2016 18:53:48 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 061E1A761D; Thu, 30 Jun 2016 18:53:17 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 649C1A753A for ; Thu, 30 Jun 2016 18:52:51 +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 Yhx4zC72AkK7 for ; Thu, 30 Jun 2016 18:52:51 +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 mail-it0-f53.google.com (mail-it0-f53.google.com [209.85.214.53]) by theia.denx.de (Postfix) with ESMTPS id 74376A755F for ; Thu, 30 Jun 2016 18:52:45 +0200 (CEST) Received: by mail-it0-f53.google.com with SMTP id a5so155298186ita.1 for ; Thu, 30 Jun 2016 09:52:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=wqCKvBIvujxCaEk1CsHq/8eNzVLgtIT/+DjjpewDLXA=; b=RAlEzpZ5zQxecoXXLmrWfxIShOA2NJNrP5R5psTndohnSCayOYToK6VP1YWqTSpV3C k+pbXGb0ij/BUUfGNPRBvDtjb5PodszJpz3NY7lnLA9yH1GTPFCyjGQErBNrVU1rgzHB ORqIVMgYWvBdgSLunUndgiUu+yI4z6F2iA5hLrAvcx6/nj7Y1tOcS0/meOCIPjXOb1Tl b82egiulkeVciswk2GtG4XyccpgHHz6qpBcCQzt3LmExvUm15A4mzTg4nVtUNuJDXQ5q 4tecS5pK4ixh239d/5HZfe5028nNl0zJruyffFpLF4bMSOEOdirp9tzOyr80J0M4kFt1 KOUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=wqCKvBIvujxCaEk1CsHq/8eNzVLgtIT/+DjjpewDLXA=; b=TTsRzFJIpwWXPn9n/BH8VtSn9QN8ZjgASYymFZsW/G5j1pma9Vbj9IvqazMayzOqem s9eHQY6udrqCwsLBNb21jurYqujrFmtc0tLVwSVb9eexkLOJONv4rUkCuxrdEvSspRWy 9kMmSmgRljGuzUP0UfwnmTmabEj0TUXgbbGrXCJZAS84ZExX2KuDsvQki57o+7dnnHB3 n6rffV8UeX0qDftgQXnY+7DeljkuPwwDv8FFa3mo7zhxM7syROnkQ97ab+jdQqVPcQhy WlaSIIZYVRgCsDoGZj3zL6fFes+G517YI4l1vHihfiSQGP1N5fUao7BYVSbrsz5q0tWM O4ag== X-Gm-Message-State: ALyK8tJ6g628ntLteuuiPnpDekxZNCsSfGqNaLLDWZkuLc69Mc3rpMjBUzKlWZ3CW8h+VG4F X-Received: by 10.36.28.139 with SMTP id c133mr16356257itc.95.1467305563973; Thu, 30 Jun 2016 09:52:43 -0700 (PDT) Received: from kaki.bld.corp.google.com ([2620:0:1005:12:69e4:b067:143d:4667]) by smtp.gmail.com with ESMTPSA id x41sm4247523ioi.25.2016.06.30.09.52.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Jun 2016 09:52:42 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 285FC221F42; Thu, 30 Jun 2016 10:52:40 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Thu, 30 Jun 2016 10:52:15 -0600 Message-Id: <1467305540-13607-10-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1467305540-13607-1-git-send-email-sjg@chromium.org> References: <1467305540-13607-1-git-send-email-sjg@chromium.org> Cc: Tom Rini , Vinoth Eswaran , Joe Hershberger , Michal Simek Subject: [U-Boot] [PATCH 09/14] image: Add a name for invalid types 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" At present the name is NULL, which prevents qsort() fromp being used. Use the name "invalid" instead. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- common/image.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/image.c b/common/image.c index 4e503b3..e9095f4 100644 --- a/common/image.c +++ b/common/image.c @@ -69,7 +69,7 @@ static const image_header_t *image_get_ramdisk(ulong rd_addr, uint8_t arch, #endif static const table_entry_t uimage_arch[] = { - { IH_ARCH_INVALID, NULL, "Invalid ARCH", }, + { IH_ARCH_INVALID, "invalid", "Invalid ARCH", }, { IH_ARCH_ALPHA, "alpha", "Alpha", }, { IH_ARCH_ARM, "arm", "ARM", }, { IH_ARCH_I386, "x86", "Intel x86", }, @@ -97,7 +97,7 @@ static const table_entry_t uimage_arch[] = { }; static const table_entry_t uimage_os[] = { - { IH_OS_INVALID, NULL, "Invalid OS", }, + { IH_OS_INVALID, "invalid", "Invalid OS", }, { IH_OS_LINUX, "linux", "Linux", }, #if defined(CONFIG_LYNXKDI) || defined(USE_HOSTCC) { IH_OS_LYNXOS, "lynxos", "LynxOS", }, @@ -144,7 +144,7 @@ static const table_entry_t uimage_type[] = { { IH_TYPE_KERNEL_NOLOAD, "kernel_noload", "Kernel Image (no loading done)", }, { IH_TYPE_KWBIMAGE, "kwbimage", "Kirkwood Boot Image",}, { IH_TYPE_IMXIMAGE, "imximage", "Freescale i.MX Boot Image",}, - { IH_TYPE_INVALID, NULL, "Invalid Image", }, + { IH_TYPE_INVALID, "invalid", "Invalid Image", }, { IH_TYPE_MULTI, "multi", "Multi-File Image", }, { IH_TYPE_OMAPIMAGE, "omapimage", "TI OMAP SPL With GP CH",}, { IH_TYPE_PBLIMAGE, "pblimage", "Freescale PBL Boot Image",},