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 From patchwork Fri Mar 22 16:37:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1061379 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 44Qq9Z5vhmz9sCJ for ; Sat, 23 Mar 2019 03:38:58 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 6E9EFC220EA; Fri, 22 Mar 2019 16:38:34 +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 E660FC220EF; Fri, 22 Mar 2019 16:38:19 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8A1F5C21DD7; Fri, 22 Mar 2019 16:38:17 +0000 (UTC) Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by lists.denx.de (Postfix) with ESMTPS id 3698DC21C27 for ; Fri, 22 Mar 2019 16:38:17 +0000 (UTC) Received: by mail-ed1-f66.google.com with SMTP id a16so2223282edn.1 for ; Fri, 22 Mar 2019 09:38:17 -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:in-reply-to :references; bh=111sYRR25q4PAr+rGtyWPIh80+/gL9m1317u/VY/ukE=; b=obXOl66py11XSe9kUNCHTozIrY4V9VpPY/L8VXJr3yrNT+UR2Zs4g0mR7MvS3vsec9 k7NFVfjfdnlDFx8csIhtELkkZhfCaCjuAfyeiUHKjs0lsRDMcWScKuMJiCR415JKwWV1 ReJE+tC67nskrhEEjqzTxca6KT+R40dKsKfpvqIEMcw4kKP1sgAOW4Swsh5J1GVJZTVr fJLOyW5ORhxIHxHJ0ymAk7xMoFv5jz7O81cb6xv3TARxPz/JdxcAQgpIBxYLaxepudo9 iVI+vczmqe85hsv/hPkvS0GoOUkX1q0ESktGHrBXDBkjeZU7OTwbqYfFJOArhejgrHIr kCvA== X-Gm-Message-State: APjAAAVGAMoj3xYsT7xXhTnSvWZU+xhqGWmKEx8pJ9kGZvHAliZIdLsp tdEJjwog3OydBscE9mAq2FguiLY= X-Google-Smtp-Source: APXvYqxOkNKd/IJ5SAxanE9fem0ox+uGQW3I6mBo8HhA8B3JpG3op/htsvdCN4vgxCI4ZKsxA8M/uA== X-Received: by 2002:a17:906:4058:: with SMTP id y24mr3000103ejj.20.1553272696508; Fri, 22 Mar 2019 09:38:16 -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.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 22 Mar 2019 09:38:15 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Date: Fri, 22 Mar 2019 12:37:48 -0400 Message-Id: <1553272669-12639-2-git-send-email-trini@konsulko.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1553272669-12639-1-git-send-email-trini@konsulko.com> References: <1553272669-12639-1-git-send-email-trini@konsulko.com> Subject: [U-Boot] [PATCH 2/3] Switch checks of CONFIG_IMAGE_FORMAT_LEGACY to CONFIG_IS_ENABLED 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" So that we can switch legacy image format code off in SPL, change the places we check this outside of command code to use CONFIG_IS_ENABLED instead of a regular check. Signed-off-by: Tom Rini --- arch/arm/mach-imx/hab.c | 2 +- common/bootm.c | 8 ++++---- common/image-fdt.c | 6 +++--- common/image.c | 10 +++++----- include/image.h | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c index d42a15e8772a..49b06b466269 100644 --- a/arch/arm/mach-imx/hab.c +++ b/arch/arm/mach-imx/hab.c @@ -310,7 +310,7 @@ static ulong get_image_ivt_offset(ulong img_addr) buf = map_sysmem(img_addr, 0); switch (genimg_get_format(buf)) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY) +#if CONFIG_IS_ENABLED(IMAGE_FORMAT_LEGACY) case IMAGE_FORMAT_LEGACY: return (image_get_image_size((image_header_t *)img_addr) + 0x1000 - 1) & ~(0x1000 - 1); diff --git a/common/bootm.c b/common/bootm.c index 3adbceaa38e3..26fb47c9fbe0 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -98,7 +98,7 @@ static int bootm_find_os(cmd_tbl_t *cmdtp, int flag, int argc, /* get image parameters */ switch (genimg_get_format(os_hdr)) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY) +#if CONFIG_IS_ENABLED(IMAGE_FORMAT_LEGACY) case IMAGE_FORMAT_LEGACY: images.os.type = image_get_type(os_hdr); images.os.comp = image_get_comp(os_hdr); @@ -743,7 +743,7 @@ err: return ret; } -#if defined(CONFIG_IMAGE_FORMAT_LEGACY) +#if CONFIG_IS_ENABLED(IMAGE_FORMAT_LEGACY) /** * image_get_kernel - verify legacy format kernel image * @img_addr: in RAM address of the legacy format image to be verified @@ -812,7 +812,7 @@ static const void *boot_get_kernel(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], bootm_headers_t *images, ulong *os_data, ulong *os_len) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY) +#if CONFIG_IS_ENABLED(IMAGE_FORMAT_LEGACY) image_header_t *hdr; #endif ulong img_addr; @@ -833,7 +833,7 @@ static const void *boot_get_kernel(cmd_tbl_t *cmdtp, int flag, int argc, *os_data = *os_len = 0; buf = map_sysmem(img_addr, 0); switch (genimg_get_format(buf)) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY) +#if CONFIG_IS_ENABLED(IMAGE_FORMAT_LEGACY) case IMAGE_FORMAT_LEGACY: printf("## Booting kernel from Legacy Image at %08lx ...\n", img_addr); diff --git a/common/image-fdt.c b/common/image-fdt.c index 01186aeac7a4..4178a4a856e3 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -33,7 +33,7 @@ static void fdt_error(const char *msg) puts(" - must RESET the board to recover.\n"); } -#if defined(CONFIG_IMAGE_FORMAT_LEGACY) +#if CONFIG_IS_ENABLED(IMAGE_FORMAT_LEGACY) static const image_header_t *image_get_fdt(ulong fdt_addr) { const image_header_t *fdt_hdr = map_sysmem(fdt_addr, 0); @@ -263,7 +263,7 @@ error: int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch, bootm_headers_t *images, char **of_flat_tree, ulong *of_size) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY) +#if CONFIG_IS_ENABLED(IMAGE_FORMAT_LEGACY) const image_header_t *fdt_hdr; ulong load, load_end; ulong image_start, image_data, image_end; @@ -345,7 +345,7 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch, */ buf = map_sysmem(fdt_addr, 0); switch (genimg_get_format(buf)) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY) +#if CONFIG_IS_ENABLED(IMAGE_FORMAT_LEGACY) case IMAGE_FORMAT_LEGACY: /* verify fdt_addr points to a valid image header */ printf("## Flattened Device Tree from Legacy Image at %08lx\n", diff --git a/common/image.c b/common/image.c index 4d4248f234fb..120d37e05668 100644 --- a/common/image.c +++ b/common/image.c @@ -38,7 +38,7 @@ extern int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); DECLARE_GLOBAL_DATA_PTR; -#if defined(CONFIG_IMAGE_FORMAT_LEGACY) +#if CONFIG_IS_ENABLED(IMAGE_FORMAT_LEGACY) static const image_header_t *image_get_ramdisk(ulong rd_addr, uint8_t arch, int verify); #endif @@ -377,7 +377,7 @@ void image_print_contents(const void *ptr) #ifndef USE_HOSTCC -#if defined(CONFIG_IMAGE_FORMAT_LEGACY) +#if CONFIG_IS_ENABLED(IMAGE_FORMAT_LEGACY) /** * image_get_ramdisk - get and verify ramdisk image * @rd_addr: ramdisk image start address @@ -867,7 +867,7 @@ ulong genimg_get_kernel_addr(char * const img_addr) */ int genimg_get_format(const void *img_addr) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY) +#if CONFIG_IS_ENABLED(IMAGE_FORMAT_LEGACY) const image_header_t *hdr; hdr = (const image_header_t *)img_addr; @@ -933,7 +933,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images, { ulong rd_addr, rd_load; ulong rd_data, rd_len; -#if defined(CONFIG_IMAGE_FORMAT_LEGACY) +#if CONFIG_IS_ENABLED(IMAGE_FORMAT_LEGACY) const image_header_t *rd_hdr; #endif void *buf; @@ -1025,7 +1025,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images, */ buf = map_sysmem(rd_addr, 0); switch (genimg_get_format(buf)) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY) +#if CONFIG_IS_ENABLED(IMAGE_FORMAT_LEGACY) case IMAGE_FORMAT_LEGACY: printf("## Loading init Ramdisk from Legacy " "Image at %08lx ...\n", rd_addr); diff --git a/include/image.h b/include/image.h index 765ffecee0a7..bcbc4d7835cc 100644 --- a/include/image.h +++ b/include/image.h @@ -561,7 +561,7 @@ int boot_get_setup(bootm_headers_t *images, uint8_t arch, ulong *setup_start, #ifndef USE_HOSTCC /* Image format types, returned by _get_format() routine */ #define IMAGE_FORMAT_INVALID 0x00 -#if defined(CONFIG_IMAGE_FORMAT_LEGACY) +#if CONFIG_IS_ENABLED(IMAGE_FORMAT_LEGACY) #define IMAGE_FORMAT_LEGACY 0x01 /* legacy image_header based format */ #endif #define IMAGE_FORMAT_FIT 0x02 /* new, libfdt based format */ From patchwork Fri Mar 22 16:37:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1061381 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 44QqB33GdFz9sCJ for ; Sat, 23 Mar 2019 03:39:23 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 0E034C2210F; Fri, 22 Mar 2019 16:38:51 +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 755ECC220DD; Fri, 22 Mar 2019 16:38:29 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 30C62C220D8; Fri, 22 Mar 2019 16:38:22 +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 923E2C220AF for ; Fri, 22 Mar 2019 16:38:18 +0000 (UTC) Received: by mail-ed1-f68.google.com with SMTP id q14so2211222edr.5 for ; Fri, 22 Mar 2019 09:38:18 -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:in-reply-to :references; bh=lMnxDwEtX5N285VvQuV1ff/Hn9X3WTR5J6wn93wP2Qg=; b=RcRclGg2Yhi26UTj6WKueseYXfNAILL5QlQDyzz7ix3sE5d0bkZgSZg4kE6B6M/Qb8 O9JGgSpiPRTyfpIH9rR60ptBfvZc2Nhrxge1EbLcDHe3w/A/6RXZrsWZ5gRm6x30sL9Y +W8h7HNJ78AggfbgleQ+RkBQEmqQZ3sisHg8bXz6xq/UKMzfKu1N2JBjTOUnkhnKrCWb K2fKJzbjfSHRrKgsQvVL8mK3kH18Xj0U2sIjhekw8Z7siEnAVw4KvqIxvIOxcrwhnON1 oYvXbxJVPi8dZ8lsXs1mZnt0LQWCNUznoZqPnk6ByqTAGZ5auVDzc6PwnTzTUcVGYzew H9Dw== X-Gm-Message-State: APjAAAUU1BasWmdtMIJ61YOIXXN/Vj/yvWWVIOvfeStMqpqOIE5VJFyP R2K5nrStGV1rr5pDdQdSrHSxoNc= X-Google-Smtp-Source: APXvYqzW1554NUwxkS42xXL8vSGyFXBArnQ14Z/GfFceqJ3OnCTv2Wd9JenB4GbbdPair0ObHTnM9Q== X-Received: by 2002:a17:906:15db:: with SMTP id l27mr4939160ejd.242.1553272697962; Fri, 22 Mar 2019 09:38:17 -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.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 22 Mar 2019 09:38:17 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Date: Fri, 22 Mar 2019 12:37:49 -0400 Message-Id: <1553272669-12639-3-git-send-email-trini@konsulko.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1553272669-12639-1-git-send-email-trini@konsulko.com> References: <1553272669-12639-1-git-send-email-trini@konsulko.com> Subject: [U-Boot] [PATCH 3/3] SPL: Default to disabling legacy image support when using FIT 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" When we have a FIT image being used by SPL by default that means the most common case is that we'll never run into a legacy image. Disable legacy image support by default in that case to reclaim space. Signed-off-by: Tom Rini --- common/spl/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index aef7c5b01465..65d19ebff771 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -94,7 +94,7 @@ config SPL_RAW_IMAGE_SUPPORT config SPL_IMAGE_FORMAT_LEGACY bool "Support SPL loading and booting of Legacy images" - default y if !TI_SECURE_DEVICE + default y if !TI_SECURE_DEVICE && !SPL_LOAD_FIT help SPL will support loading and booting Legacy images when this option is y. If this is not set, SPL will move on to other available