From patchwork Wed Dec 21 11:00:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 707723 X-Patchwork-Delegate: sbabic@denx.de 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 3tkBYh4TnXz9sxN for ; Wed, 21 Dec 2016 22:02:00 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1C550B391A; Wed, 21 Dec 2016 12:01:53 +0100 (CET) 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 aM51snhiSMJg; Wed, 21 Dec 2016 12:01:52 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B980DB391E; Wed, 21 Dec 2016 12:01:47 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E83E8B3910 for ; Wed, 21 Dec 2016 12:01:37 +0100 (CET) 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 jBbki_qeaIFG for ; Wed, 21 Dec 2016 12:01:37 +0100 (CET) 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-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by theia.denx.de (Postfix) with ESMTPS id 4EF23B38FD for ; Wed, 21 Dec 2016 12:01:36 +0100 (CET) Received: by mail-wm0-f66.google.com with SMTP id l2so4214701wml.2 for ; Wed, 21 Dec 2016 03:01:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rj3QJmz0R6ZOb8eQKRrm0s4r/ZUe4Mav1QIP58aT9GU=; b=W9QIAvWPsDheaG3/BXv4RPtsb+5sD5ZsCXLsTfekAL5tJ0b5cromxQ8ThIUL6TIqQ7 cghVUEvvy4FNRe3p7ujyZAzEB95cw1t8Qp1xTkvFFc7KKLbQWAvLVC7GEK0squolqqFb vPQVPUVnRa2puYWHHyAde9yePskHlvPRgoHMHJjcPWDfBO9IKgYoZtysEE8v+yvSKWxg Vj023EtpFc03pjtrQQYHxqEQlH/TbprhX8KyKuQ/xJdfFfMXRCkICvplUF9b+M4oyqvh iYe2ReXxgWHsJhUartco/0MBEq4T4gN+PbYUeCCAlCKop2Y5q4d3zzQLCVHxxsgGGgG5 /SzQ== X-Gm-Message-State: AIkVDXLs73GQOd04H1Hro1SxB+e9EVVPD6O+kqqcRPJG+I61/bVm+FW0g9fCoprMzKMVbQ== X-Received: by 10.28.23.137 with SMTP id 131mr4251017wmx.121.1482318091844; Wed, 21 Dec 2016 03:01:31 -0800 (PST) Received: from jagan-XPS-13-9350.homenet.telecomitalia.it (host47-201-static.1-79-b.business.telecomitalia.it. [79.1.201.47]) by smtp.gmail.com with ESMTPSA id l2sm30026430wji.7.2016.12.21.03.01.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Dec 2016 03:01:31 -0800 (PST) From: Jagan Teki To: Stefano Babic Date: Wed, 21 Dec 2016 12:00:21 +0100 Message-Id: <1482318029-21701-3-git-send-email-jagan@openedev.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1482318029-21701-1-git-send-email-jagan@openedev.com> References: <1482318029-21701-1-git-send-email-jagan@openedev.com> Cc: u-boot@lists.denx.de, Matteo Lisi Subject: [U-Boot] [PATCH 02/10] imx6: engicam: Use bootm instead of bootz 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" From: Jagan Teki Boot Linux with uImage instead of zImage, so update bootz with bootm. Cc: Stefano Babic Cc: Matteo Lisi Cc: Michael Trimarchi Signed-off-by: Jagan Teki --- configs/imx6dl_icore_mmc_defconfig | 1 - configs/imx6dl_icore_nand_defconfig | 1 - configs/imx6dl_icore_rqs_mmc_defconfig | 1 - configs/imx6q_icore_mmc_defconfig | 1 - configs/imx6q_icore_nand_defconfig | 1 - configs/imx6q_icore_rqs_mmc_defconfig | 1 - configs/imx6ul_geam_mmc_defconfig | 1 - configs/imx6ul_geam_nand_defconfig | 1 - include/configs/imx6qdl_icore.h | 8 ++++---- include/configs/imx6qdl_icore_rqs.h | 8 ++++---- include/configs/imx6ul_geam.h | 8 ++++---- 11 files changed, 12 insertions(+), 20 deletions(-) diff --git a/configs/imx6dl_icore_mmc_defconfig b/configs/imx6dl_icore_mmc_defconfig index 5f09425..2ac0e66 100644 --- a/configs/imx6dl_icore_mmc_defconfig +++ b/configs/imx6dl_icore_mmc_defconfig @@ -15,7 +15,6 @@ CONFIG_SYS_MAXARGS=32 # CONFIG_CMD_IMLS is not set # CONFIG_BLK is not set # CONFIG_DM_MMC_OPS is not set -CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MII=y diff --git a/configs/imx6dl_icore_nand_defconfig b/configs/imx6dl_icore_nand_defconfig index af3a9f8..4e81a41 100644 --- a/configs/imx6dl_icore_nand_defconfig +++ b/configs/imx6dl_icore_nand_defconfig @@ -13,7 +13,6 @@ CONFIG_HUSH_PARSER=y CONFIG_AUTO_COMPLETE=y CONFIG_SYS_MAXARGS=32 # CONFIG_CMD_IMLS is not set -CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MII=y diff --git a/configs/imx6dl_icore_rqs_mmc_defconfig b/configs/imx6dl_icore_rqs_mmc_defconfig index 230cd20..0757371 100644 --- a/configs/imx6dl_icore_rqs_mmc_defconfig +++ b/configs/imx6dl_icore_rqs_mmc_defconfig @@ -15,7 +15,6 @@ CONFIG_SYS_MAXARGS=32 # CONFIG_CMD_IMLS is not set # CONFIG_BLK is not set # CONFIG_DM_MMC_OPS is not set -CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_MII=y diff --git a/configs/imx6q_icore_mmc_defconfig b/configs/imx6q_icore_mmc_defconfig index 8f812b4..551c688 100644 --- a/configs/imx6q_icore_mmc_defconfig +++ b/configs/imx6q_icore_mmc_defconfig @@ -15,7 +15,6 @@ CONFIG_SYS_MAXARGS=32 # CONFIG_CMD_IMLS is not set # CONFIG_BLK is not set # CONFIG_DM_MMC_OPS is not set -CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MII=y diff --git a/configs/imx6q_icore_nand_defconfig b/configs/imx6q_icore_nand_defconfig index 4735be8..274e62b 100644 --- a/configs/imx6q_icore_nand_defconfig +++ b/configs/imx6q_icore_nand_defconfig @@ -13,7 +13,6 @@ CONFIG_HUSH_PARSER=y CONFIG_AUTO_COMPLETE=y CONFIG_SYS_MAXARGS=32 # CONFIG_CMD_IMLS is not set -CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MII=y diff --git a/configs/imx6q_icore_rqs_mmc_defconfig b/configs/imx6q_icore_rqs_mmc_defconfig index f7c25c4..e29afa0 100644 --- a/configs/imx6q_icore_rqs_mmc_defconfig +++ b/configs/imx6q_icore_rqs_mmc_defconfig @@ -15,7 +15,6 @@ CONFIG_SYS_MAXARGS=32 # CONFIG_CMD_IMLS is not set # CONFIG_BLK is not set # CONFIG_DM_MMC_OPS is not set -CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_MII=y diff --git a/configs/imx6ul_geam_mmc_defconfig b/configs/imx6ul_geam_mmc_defconfig index d5be076..4aaf93d 100644 --- a/configs/imx6ul_geam_mmc_defconfig +++ b/configs/imx6ul_geam_mmc_defconfig @@ -15,7 +15,6 @@ CONFIG_SYS_MAXARGS=32 # CONFIG_CMD_IMLS is not set # CONFIG_BLK is not set # CONFIG_DM_MMC_OPS is not set -CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_MII=y diff --git a/configs/imx6ul_geam_nand_defconfig b/configs/imx6ul_geam_nand_defconfig index cc45602..a21c53a 100644 --- a/configs/imx6ul_geam_nand_defconfig +++ b/configs/imx6ul_geam_nand_defconfig @@ -15,7 +15,6 @@ CONFIG_SYS_MAXARGS=32 # CONFIG_CMD_IMLS is not set # CONFIG_BLK is not set # CONFIG_DM_MMC_OPS is not set -CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_MII=y diff --git a/include/configs/imx6qdl_icore.h b/include/configs/imx6qdl_icore.h index 0125385..d57c73e 100644 --- a/include/configs/imx6qdl_icore.h +++ b/include/configs/imx6qdl_icore.h @@ -38,7 +38,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "splashpos=m,m\0" \ - "image=zImage\0" \ + "image=uImage\0" \ "console=ttymxc3\0" \ "fdt_high=0xffffffff\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ @@ -60,16 +60,16 @@ "run mmcargs; " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ "if run loadfdt; then " \ - "bootz ${loadaddr} - ${fdt_addr}; " \ + "bootm ${loadaddr} - ${fdt_addr}; " \ "else " \ "if test ${boot_fdt} = try; then " \ - "bootz; " \ + "bootm; " \ "else " \ "echo WARN: Cannot load the DT; " \ "fi; " \ "fi; " \ "else " \ - "bootz; " \ + "bootm; " \ "fi\0" #define CONFIG_BOOTCOMMAND \ diff --git a/include/configs/imx6qdl_icore_rqs.h b/include/configs/imx6qdl_icore_rqs.h index 0121563..0f39dcb 100644 --- a/include/configs/imx6qdl_icore_rqs.h +++ b/include/configs/imx6qdl_icore_rqs.h @@ -33,7 +33,7 @@ /* Default environment */ #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ - "image=zImage\0" \ + "image=uImage\0" \ "console=ttymxc3\0" \ "fdt_high=0xffffffff\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ @@ -55,16 +55,16 @@ "run mmcargs; " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ "if run loadfdt; then " \ - "bootz ${loadaddr} - ${fdt_addr}; " \ + "bootm ${loadaddr} - ${fdt_addr}; " \ "else " \ "if test ${boot_fdt} = try; then " \ - "bootz; " \ + "bootm; " \ "else " \ "echo WARN: Cannot load the DT; " \ "fi; " \ "fi; " \ "else " \ - "bootz; " \ + "bootm; " \ "fi\0" #define CONFIG_BOOTCOMMAND \ diff --git a/include/configs/imx6ul_geam.h b/include/configs/imx6ul_geam.h index 787da08..7c8a420 100644 --- a/include/configs/imx6ul_geam.h +++ b/include/configs/imx6ul_geam.h @@ -37,7 +37,7 @@ /* Default environment */ #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ - "image=zImage\0" \ + "image=uImage\0" \ "console=ttymxc0\0" \ "fdt_high=0xffffffff\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ @@ -59,16 +59,16 @@ "run mmcargs; " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ "if run loadfdt; then " \ - "bootz ${loadaddr} - ${fdt_addr}; " \ + "bootm ${loadaddr} - ${fdt_addr}; " \ "else " \ "if test ${boot_fdt} = try; then " \ - "bootz; " \ + "bootm; " \ "else " \ "echo WARN: Cannot load the DT; " \ "fi; " \ "fi; " \ "else " \ - "bootz; " \ + "bootm; " \ "fi\0" #define CONFIG_BOOTCOMMAND \