From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 5FB7CE00D63; Wed, 4 Oct 2017 14:12:42 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM autolearn=no version=3.3.1 X-Spam-HAM-Report: * -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no * trust * [209.85.216.194 listed in list.dnswl.org] * 0.5 RCVD_IN_SORBS_SPAM RBL: SORBS: sender is a spam source * [209.85.216.194 listed in dnsbl.sorbs.net] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id B94F2E00D1C for ; Wed, 4 Oct 2017 14:12:40 -0700 (PDT) Received: by mail-qt0-f194.google.com with SMTP id q4so21868163qtq.8 for ; Wed, 04 Oct 2017 14:12:40 -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:cc:subject:date:message-id:organization; bh=RKNwk2dLAL/JrDtJZBfz37ZNbVXBEg8oUs/hcGzoqcU=; b=sfQ3pXokeNCRnxmR9OYFF6+WPfDOO03oMo83gMDBHb5ZJGq+WwEy4GpTFV3i911KoC jo/7mjx3Yg0aNuyf78kD8zQxhzC+wbUnBoYwkQduEPeKZ4lRlNw/ODFtuqWiZUys7tje VmXC0Eve88Fcq5PhBJzcELVz3p+2KsrxfMXvYHkD7iF+heZUOU+zZc/5UDnD2Wo0JC5f 6eqes0BIoLLefn7EqH2z/n78VphtwLHJUL8VOrkfVxBYSZhqmklwDwah9N/OHy62ovmX 3ShTG3lJ2u7hDzfQMB0nR9JRSA8X8GgW5ZMK/yeIswNU/JSoEP1u7TGLp3xryWNcFEDm ARyA== X-Gm-Message-State: AMCzsaXxHeYTbpxGzYiXUyxkkc153vejM73CokhdTvePzswuD+m0eiYO rems8CTME5RNKeEMG1d/2gAoog== X-Google-Smtp-Source: AOwi7QC0+HfIMRWaNFUBYU/kUPEC47jSeAZInmdw027XO5VJT+joyjdSlR3F14D5YQkzuSywdHGtQQ== X-Received: by 10.200.11.130 with SMTP id h2mr7081614qti.194.1507151559514; Wed, 04 Oct 2017 14:12:39 -0700 (PDT) Received: from localhost.localdomain ([181.220.79.73]) by smtp.gmail.com with ESMTPSA id t3sm10422404qkh.58.2017.10.04.14.12.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Oct 2017 14:12:37 -0700 (PDT) Received: by localhost.localdomain (sSMTP sendmail emulation); Wed, 04 Oct 2017 18:12:29 -0300 From: Otavio Salvador To: meta-freescale Mailing List Date: Wed, 4 Oct 2017 18:12:28 -0300 Message-Id: <20171004211228.13517-1-otavio@ossystems.com.br> X-Mailer: git-send-email 2.14.2 Organization: O.S. Systems Software LTDA. Cc: Otavio Salvador Subject: [PATCH] Use wic.gz for all i.MX machines by default X-BeenThere: meta-freescale@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Usage and development list for the meta-fsl-* layers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Oct 2017 21:12:42 -0000 This change moves the default image for all i.MX machines. We moved from sdcard.gz to wic.gz. Following machines were change: - imx25pdk: use imx-uboot.wks - imx6qdlsabreauto: use imx-uboot-spl-bootpart.wks - imx6qdlsabresd: use imx-uboot-spl-bootpart.wks - imx6ulevk: use imx-uboot-spl-bootpart.wks Signed-off-by: Otavio Salvador --- conf/machine/imx25pdk.conf | 2 +- conf/machine/imx6qdlsabreauto.conf | 1 + conf/machine/imx6qdlsabresd.conf | 1 + conf/machine/imx6ulevk.conf | 1 + conf/machine/include/imx-base.inc | 7 +++---- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/conf/machine/imx25pdk.conf b/conf/machine/imx25pdk.conf index f35d0db4..e22d9f4e 100644 --- a/conf/machine/imx25pdk.conf +++ b/conf/machine/imx25pdk.conf @@ -17,7 +17,7 @@ SERIAL_CONSOLE = "115200 ttymxc0" MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" -WKS_FILE ?= "imx-uboot.wks" +WKS_FILE = "imx-uboot.wks" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \ kernel-image \ kernel-devicetree \ diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf index 8967c150..0eed1e5c 100644 --- a/conf/machine/imx6qdlsabreauto.conf +++ b/conf/machine/imx6qdlsabreauto.conf @@ -31,6 +31,7 @@ UBOOT_MACHINE ?= "mx6sabreauto_defconfig" UBOOT_MAKE_TARGET = "all" UBOOT_SUFFIX = "img" SPL_BINARY = "SPL" +WKS_FILE = "imx-uboot-spl-bootpart.wks" SERIAL_CONSOLE = "115200 ttymxc3" diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf index 92c92884..91ca9b45 100644 --- a/conf/machine/imx6qdlsabresd.conf +++ b/conf/machine/imx6qdlsabresd.conf @@ -31,6 +31,7 @@ UBOOT_MACHINE ?= "mx6sabresd_defconfig" UBOOT_MAKE_TARGET = "all" UBOOT_SUFFIX = "img" SPL_BINARY = "SPL" +WKS_FILE = "imx-uboot-spl-bootpart.wks" SERIAL_CONSOLE = "115200 ttymxc0" diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf index dadd525b..1b55a4ad 100644 --- a/conf/machine/imx6ulevk.conf +++ b/conf/machine/imx6ulevk.conf @@ -23,3 +23,4 @@ UBOOT_CONFIG[sd] = "mx6ul_14x14_evk_config,sdcard" UBOOT_CONFIG[emmc] = "mx6ul_14x14_evk_emmc_config,sdcard" UBOOT_CONFIG[qspi1] = "mx6ul_14x14_evk_qspi1_config" UBOOT_CONFIG[mfgtool] = "mx6ul_14x14_evk_config" +WKS_FILE = "imx-uboot-spl-bootpart.wks" diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index c96216de..d2414472 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -222,8 +222,8 @@ IMX_DEFAULT_KERNEL_use-mainline-bsp = "linux-fslc" PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}" -SOC_DEFAULT_IMAGE_FSTYPES = "sdcard.gz" -SOC_DEFAULT_IMAGE_FSTYPES_mxs = "uboot-mxsboot-sdcard sdcard.gz" +SOC_DEFAULT_IMAGE_FSTYPES = "wic.gz" +SOC_DEFAULT_IMAGE_FSTYPES_mxs = "uboot-mxsboot-sdcard wic.gz" SDCARD_ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext4" IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}" @@ -240,8 +240,7 @@ WKS_FILE_DEPENDS ?= " \ e2fsprogs-native \ bmap-tools-native \ " - -SOC_DEFAULT_IMAGE_FSTYPES_mx25 = "wic.gz" +WKS_FILE ?= "imx-uboot-bootpart.wks" SERIAL_CONSOLE = "115200 ttymxc0" SERIAL_CONSOLE_mxs = "115200 ttyAMA0" -- 2.14.2