From patchwork Fri Mar 22 16:37:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1061378 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=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=konsulko.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44Qq8w55Kpz9sRf for ; Sat, 23 Mar 2019 03:38:24 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 560E6C2210C; Fri, 22 Mar 2019 16:38:19 +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=none 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 71219C21C57; Fri, 22 Mar 2019 16:38:17 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2D74DC21C51; Fri, 22 Mar 2019 16:38:16 +0000 (UTC) Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by lists.denx.de (Postfix) with ESMTPS id B5FF8C21C27 for ; Fri, 22 Mar 2019 16:38:15 +0000 (UTC) Received: by mail-ed1-f68.google.com with SMTP id x10so2184916edh.11 for ; Fri, 22 Mar 2019 09:38:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=uRNP/iZOD9cWMCe7bx20yw+/PFZ/PcIlp/5Z7N30d/c=; b=mDYbUIq5otj2LtefcCNGS3BCNwozXh21aVwe2yoLzYIU5XnHDARuLzG5Y5vXp81LiU P4PRcQBshKBBqjAIDPeR33slriLl8DdGfovsj0VU7JqPCWvsYMeCd0jnz2BFOVIfJfvS H0qib4gYjiUKaQjdj26Ju2UGFEhUfqLuMeP5Wwxv1rxtRxJ83gBNbRe9xG2GozhGuJeR 7TghVfSBObGrq0PBJ1HPcZEtJk48bKQu/5kxSemX/crDomHspuQrN5tndKtbxtteBRmV 1mxHYsmRiLGiy4KOvQPm0fHWQy60mE3ZHjL9nlGmDgGoHN2BTv3e+u2G/wan204w0xP1 bTVw== X-Gm-Message-State: APjAAAXuvHTBlImT4NAIj0M+Svwk8ADcXnD16O19SDmClSZVZuWoWYag fg6ibmTRsEGt89Q0/rc0MOZFS1g= X-Google-Smtp-Source: APXvYqzQyfo0Yy6eBa7GxqHqhk5g8AfqPNSPCdQuqoc98by0sBma4RAqCPmbwp/+lsnqA6o4Mu+WQw== X-Received: by 2002:a17:906:5595:: with SMTP id y21mr6002694ejp.209.1553272694896; Fri, 22 Mar 2019 09:38:14 -0700 (PDT) Received: from bill-the-cat.local (cpe-65-184-134-105.ec.res.rr.com. [65.184.134.105]) by smtp.gmail.com with ESMTPSA id c6sm1151214edl.5.2019.03.22.09.38.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 22 Mar 2019 09:38:14 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Date: Fri, 22 Mar 2019 12:37:47 -0400 Message-Id: <1553272669-12639-1-git-send-email-trini@konsulko.com> X-Mailer: git-send-email 2.7.4 Subject: [U-Boot] [PATCH 1/3] spl: Rename SPL_LEGACY_IMAGE_SUPPORT to SPL_IMAGE_FORMAT_LEGACY 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" We have a symbol named CONFIG_IMAGE_FORMAT_LEGACY already for non-SPL, so rename the SPL symbol so we can make more use of those checks. Signed-off-by: Tom Rini --- common/spl/Kconfig | 6 +++--- common/spl/spl.c | 2 +- configs/lion-rk3368_defconfig | 2 +- configs/puma-rk3399_defconfig | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 206c24076da8..aef7c5b01465 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -92,7 +92,7 @@ config SPL_RAW_IMAGE_SUPPORT is y. If this is not set, SPL will move on to other available boot media to find a suitable image. -config SPL_LEGACY_IMAGE_SUPPORT +config SPL_IMAGE_FORMAT_LEGACY bool "Support SPL loading and booting of Legacy images" default y if !TI_SECURE_DEVICE help @@ -102,7 +102,7 @@ config SPL_LEGACY_IMAGE_SUPPORT config SPL_LEGACY_IMAGE_CRC_CHECK bool "Check CRC of Legacy images" - depends on SPL_LEGACY_IMAGE_SUPPORT + depends on SPL_IMAGE_FORMAT_LEGACY select SPL_CRC32_SUPPORT help Enable this to check the CRC of Legacy images. While this increases @@ -246,7 +246,7 @@ config SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_TYPE config SPL_CRC32_SUPPORT bool "Support CRC32" - default y if SPL_LEGACY_IMAGE_SUPPORT + default y if SPL_IMAGE_FORMAT_LEGACY help Enable this to support CRC32 in uImages or FIT images within SPL. This is a 32-bit checksum value that can be used to verify images. diff --git a/common/spl/spl.c b/common/spl/spl.c index 88d4b8a9bf15..b6532a5234bd 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -236,7 +236,7 @@ int spl_parse_image_header(struct spl_image_info *spl_image, return ret; #endif if (image_get_magic(header) == IH_MAGIC) { -#ifdef CONFIG_SPL_LEGACY_IMAGE_SUPPORT +#ifdef CONFIG_SPL_IMAGE_FORMAT_LEGACY u32 header_size = sizeof(struct image_header); #ifdef CONFIG_SPL_LEGACY_IMAGE_CRC_CHECK diff --git a/configs/lion-rk3368_defconfig b/configs/lion-rk3368_defconfig index d6dd0e5106ea..03409a38a4e9 100644 --- a/configs/lion-rk3368_defconfig +++ b/configs/lion-rk3368_defconfig @@ -33,7 +33,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_ARCH_EARLY_INIT_R=y CONFIG_SPL_BOOTROM_SUPPORT=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set -# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set +# CONFIG_SPL_IMAGE_FORMAT_LEGACY is not set CONFIG_TPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_STACK_R=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200 diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig index 3fcff2580a19..0ab2a5d2b085 100644 --- a/configs/puma-rk3399_defconfig +++ b/configs/puma-rk3399_defconfig @@ -24,7 +24,7 @@ CONFIG_MISC_INIT_R=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_BOARD_INIT=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set -# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set +# CONFIG_SPL_IMAGE_FORMAT_LEGACY is not set CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x4000 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200