From patchwork Sun Mar 3 22:22:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 1050946 X-Patchwork-Delegate: sbabic@denx.de 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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="i7O1pQqc"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44CHjS6sn4z9sCJ for ; Mon, 4 Mar 2019 09:23:08 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 9DF13C21D65; Sun, 3 Mar 2019 22:23:06 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID 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 3FC03C21C3F; Sun, 3 Mar 2019 22:23:01 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1A710C21C38; Sun, 3 Mar 2019 22:23:00 +0000 (UTC) Received: from mail-it1-f196.google.com (mail-it1-f196.google.com [209.85.166.196]) by lists.denx.de (Postfix) with ESMTPS id 6AA54C21C38 for ; Sun, 3 Mar 2019 22:22:59 +0000 (UTC) Received: by mail-it1-f196.google.com with SMTP id f186so3473901ita.0 for ; Sun, 03 Mar 2019 14:22:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=SVf4prZHOcQSYHR6TBLvk2ea4bRef5g+y9xDXddqfog=; b=i7O1pQqc1BPuDSTyM6wrVd5SYuDV+hNl/imSi8ATD0+S00op7vJm3olYjS57gGjPsY FLCjqXTANPp0sFzIYZJQR66xG4PjYGHs9COe+xr6GLc1C4uUcwQLBKfC1TD7LcwI235n kMbiRKPWsayP2MSSbbC66K1KG9jVlyqlv5+dI5enXPoF5wpD18J2PZDWJs8BOX7d3WNw vqf/T8RMXZGlHAsCa8rUVgzzR25h5ILKXIGimmhE2jrI2hTAYXyIgHtA+DoPBEdavkIC SU+oo8qq1irvvxDKYaXKmyeUqMr9P36bBncXpo82qzVAs5qcbRCWnpSu3Pea+pxRbfoo XF7w== 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; bh=SVf4prZHOcQSYHR6TBLvk2ea4bRef5g+y9xDXddqfog=; b=Z6UHaPVXVFWDfk2XF1iMVhizpZB1EHQaeEls1JhfNLPrINp9U+pbQF8/He9npIXveZ nuO9H/+GduVJucxbrff9FUPkn31ijFxVQwh1a9WNEy2Wsd611/r5L6rhzA4jn8B3ZGBf k/DWsNiYrGXlyf/YKXAAXBO0MDHcgPt8g2JQm6AQI7JasK1qifJ0lwkOwZ2yVGl34l+U Xapc6IjYIEXK2YSUJAPHApk3bKQxe8vjxmHbBuIy1R5hbSLQkmqlh4I3u8WI01+VR68k 46j1d7NlJE8khO0DELkC5OJlciZGJXiDdImxSciaVhud3nGHM2oD59QPxiyb2/B50a/D 6Y9Q== X-Gm-Message-State: APjAAAW8aTz3+gBrga9Oopqp7R/KmBJZotdZWnM74OwmEPkJC5gJyIBm yBx3WluaBBDa19IRzIYB0T3fkF45dkQ= X-Google-Smtp-Source: AHgI3IbCTd2dS1yh/t9FFotSR0raS60VApxvYmv3csWoPjA3w/jYVTS7/EboAWCjQJsk3O+pBLuecA== X-Received: by 2002:a24:2c11:: with SMTP id i17mr8887546iti.146.1551651777937; Sun, 03 Mar 2019 14:22:57 -0800 (PST) Received: from localhost.localdomain (c-73-37-219-234.hsd1.mn.comcast.net. [73.37.219.234]) by smtp.gmail.com with ESMTPSA id q8sm1714100ioj.72.2019.03.03.14.22.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Mar 2019 14:22:57 -0800 (PST) From: Adam Ford To: u-boot@lists.denx.de Date: Sun, 3 Mar 2019 16:22:45 -0600 Message-Id: <20190303222245.30200-1-aford173@gmail.com> X-Mailer: git-send-email 2.17.1 Cc: adam.ford@logicpd.com Subject: [U-Boot] [PATCH] ARM: imx6q_logic: Enable UUID support 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" With UUID support, the root can now point to UUID. This makes swiching between mmc 0 and mmc 1 easier by simplying changing mmcdev between 0 and 1. From there, the scripts handle the rest. Signed-off-by: Adam Ford diff --git a/configs/imx6q_logic_defconfig b/configs/imx6q_logic_defconfig index 5017e5831b..b3ca44eb20 100644 --- a/configs/imx6q_logic_defconfig +++ b/configs/imx6q_logic_defconfig @@ -45,6 +45,7 @@ CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_CACHE=y # CONFIG_CMD_LED is not set +CONFIG_CMD_UUID=y CONFIG_CMD_PMIC=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_MTDPARTS=y diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index 70cc63fc1b..e51b6a0931 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -23,7 +23,7 @@ /* MMC Configs */ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_USDHC_NUM 2 -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* Dev kit SD card */ + /* Ethernet Configs */ #define CONFIG_FEC_XCV_TYPE RMII @@ -43,10 +43,10 @@ "console=" CONSOLE_DEV "\0" \ "mmcdev=1\0" \ "mmcpart=1\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \ "nandroot=ubi0:rootfs rootfstype=ubifs\0" \ "mmcargs=setenv bootargs console=${console},${baudrate}" \ - " root=${mmcroot} ${mtdparts}\0" \ + " root=PARTUUID=${uuid} rootwait rw\0 ${mtdparts}\0" \ "nandargs=setenv bootargs console=${console},${baudrate}" \ " ubi.mtd=fs root=${nandroot} ${mtdparts}\0" \ "ramargs=setenv bootargs console=${console},${baudrate}" \ @@ -60,8 +60,8 @@ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdt_file}\0" \ "loadramdisk=fatload mmc ${mmcdev}:${mmcpart} ${ramdisk_addr_r}" \ " ${ramdisk_file}; setenv ramdisksize ${filesize}\0" \ - "mmcboot=echo Booting from mmc...; run mmcargs; run loadimage;" \ - " run loadfdt; bootz ${loadaddr} - ${fdt_addr_r}\0" \ + "mmcboot=echo Booting from mmc...; run finduuid; run mmcargs;" \ + "run loadimage; run loadfdt; bootz ${loadaddr} - ${fdt_addr_r}\0" \ "mmcramboot=run ramargs; run loadimage;" \ " run loadfdt; run loadramdisk;" \ " bootz ${loadaddr} ${ramdisk_addr_r} ${fdt_addr_r}\0" \