From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mickerik.phytec.de ([195.145.39.210]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k56hY-0000Uq-Eb for barebox@lists.infradead.org; Mon, 10 Aug 2020 12:14:53 +0000 From: Robert Karszniewicz Date: Mon, 10 Aug 2020 14:14:51 +0200 Message-Id: <1597061691-184198-1-git-send-email-r.karszniewicz@phytec.de> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH v2] bootm: add global.bootm.root_dev env var for booting via PARTUUID To: barebox@lists.infradead.org SW50cm9kdWNlcyBhIG5ldyBlbnYgdmFyIHdoaWNoIHNwZWNpZmllcyB3aGljaCBkZXZpY2UgaXMg dGhlIHJvb3RmcyBkZXZpY2UgdG8KYmUgdXNlZCBpbiBMaW51eCwgcGFzc2VkIHRvIExpbnV4IHZp YSBib290YXJncywgaWRlbnRpZmllZCBieSB0aGUgcm9vdGZzCnBhcnRpdGlvbidzIFBBUlRVVUlE LgoKZ2xvYmFsLmJvb3RtLnJvb3RfZGV2IHN1cHBsZW1lbnRzIGdsb2JhbC5ib290bS5hcHBlbmRy b290LCBpbiB0aGF0IGl0Cm92ZXJyaWRlcyBhcHBlbmRyb290J3MgbmHDr3ZlIGRlZmF1bHQsIHdo aWNoIHBpY2tzIHRoZSBwYXJ0aXRpb24gdGhhdCB0aGUKa2VybmVsIHJlc2lkZXMgb24gKGdsb2Jh bC5ib290bS5pbWFnZSkuCgpFeGFtcGxlOgpkZXRlY3QgbW1jMgpnbG9iYWwuYm9vdG0uaW1hZ2U9 Jy9tbnQvbW1jMi4wL3pJbWFnZScKZ2xvYmFsLmJvb3RtLmFwcGVuZHJvb3Q9MQpnbG9iYWwuYm9v dG0ucm9vdF9kZXY9L2Rldi9tbWMyLjEKYm9vdCBtbWMKClNpZ25lZC1vZmYtYnk6IFJvYmVydCBL YXJzem5pZXdpY3ogPHIua2Fyc3puaWV3aWN6QHBoeXRlYy5kZT4KLS0tCkNoYW5nZXMgZnJvbSB2 MToKLSBtaW5vciBjb21taXQgbWVzc2FnZSBjaGFuZ2UKCkNoYW5nZXMgZnJvbSBSRkMgdjI6Ci0g cmVwbGFjZWQgcGF0aF9nZXRfbGludXhfcm9vdGFyZygiaW52YWxpZCIpIGJ5IEVSUl9QVFIoLUVJ TlZBTCkKLSBhZGRlZCBlcnJvciBtZXNzYWdlcy4gKEkndmUgbWFkZSB0aGVtIG11dHVhbGx5IGV4 Y2x1c2l2ZSB0byBwcmV2ZW50CiAgTlVMTC1wb2ludGVyIGRlcmVmZXJlbmNlKQoKIGNvbW1vbi9i b290bS5jICB8IDI1ICsrKysrKysrKysrKysrKysrKysrKysrLS0KIGluY2x1ZGUvYm9vdG0uaCB8 ICAyICsrCiAyIGZpbGVzIGNoYW5nZWQsIDI1IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvY29tbW9uL2Jvb3RtLmMgYi9jb21tb24vYm9vdG0uYwppbmRleCA4ZmVj MWVlMzRkZDguLjdmOTUxMTcyY2NmNSAxMDA2NDQKLS0tIGEvY29tbW9uL2Jvb3RtLmMKKysrIGIv Y29tbW9uL2Jvb3RtLmMKQEAgLTY0LDYgKzY0LDcgQEAgdm9pZCBib290bV9kYXRhX2luaXRfZGVm YXVsdHMoc3RydWN0IGJvb3RtX2RhdGEgKmRhdGEpCiAJZ2V0ZW52X3VsKCJnbG9iYWwuYm9vdG0u aW1hZ2UubG9hZGFkZHIiLCAmZGF0YS0+b3NfYWRkcmVzcyk7CiAJZ2V0ZW52X3VsKCJnbG9iYWwu Ym9vdG0uaW5pdHJkLmxvYWRhZGRyIiwgJmRhdGEtPmluaXRyZF9hZGRyZXNzKTsKIAlkYXRhLT5p bml0cmRfZmlsZSA9IGdldGVudl9ub25lbXB0eSgiZ2xvYmFsLmJvb3RtLmluaXRyZCIpOworCWRh dGEtPnJvb3RfZGV2ID0gZ2V0ZW52X25vbmVtcHR5KCJnbG9iYWwuYm9vdG0ucm9vdF9kZXYiKTsK IAlkYXRhLT52ZXJpZnkgPSBib290bV9nZXRfdmVyaWZ5X21vZGUoKTsKIAlkYXRhLT5hcHBlbmRy b290ID0gYm9vdG1fYXBwZW5kcm9vdDsKIAlkYXRhLT5wcm92aWRlX21hY2hpbmVfaWQgPSBib290 bV9wcm92aWRlX21hY2hpbmVfaWQ7CkBAIC02NTUsNyArNjU2LDI1IEBAIGludCBib290bV9ib290 KHN0cnVjdCBib290bV9kYXRhICpib290bV9kYXRhKQogCWlmIChib290bV9kYXRhLT5hcHBlbmRy b290KSB7CiAJCWNoYXIgKnJvb3Rhcmc7CiAKLQkJcm9vdGFyZyA9IHBhdGhfZ2V0X2xpbnV4X3Jv b3RhcmcoZGF0YS0+b3NfZmlsZSk7CisJCWlmIChib290bV9kYXRhLT5yb290X2RldikgeworCQkJ Y29uc3QgY2hhciAqcm9vdF9kZXZfbmFtZSA9IGRldnBhdGhfdG9fbmFtZShib290bV9kYXRhLT5y b290X2Rldik7CisJCQljb25zdCBzdHJ1Y3QgY2RldiAqcm9vdF9jZGV2ID0gY2Rldl9ieV9uYW1l KHJvb3RfZGV2X25hbWUpOworCisJCQlpZiAocm9vdF9jZGV2ICYmIHJvb3RfY2Rldi0+cGFydHV1 aWRbMF0gIT0gMCkgeworCQkJCXJvb3RhcmcgPSBiYXNwcmludGYoInJvb3Q9UEFSVFVVSUQ9JXMi LCByb290X2NkZXYtPnBhcnR1dWlkKTsKKwkJCX0gZWxzZSB7CisJCQkJcm9vdGFyZyA9IEVSUl9Q VFIoLUVJTlZBTCk7CisKKwkJCQlpZiAoIXJvb3RfY2RldikKKwkJCQkJcHJfZXJyKCJubyBjZGV2 IGZvdW5kIGZvciAlcywgY2Fubm90IHNldCByb290PSBvcHRpb25cbiIsCisJCQkJCQlyb290X2Rl dl9uYW1lKTsKKwkJCQllbHNlIGlmICghcm9vdF9jZGV2LT5wYXJ0dXVpZFswXSkKKwkJCQkJcHJf ZXJyKCIlcyBkb2Vzbid0IGhhdmUgYSBQQVJUVVVJRCwgY2Fubm90IHNldCByb290PSBvcHRpb25c biIsCisJCQkJCQlyb290X2Rldl9uYW1lKTsKKwkJCX0KKwkJfSBlbHNlIHsKKwkJCXJvb3Rhcmcg PSBwYXRoX2dldF9saW51eF9yb290YXJnKGRhdGEtPm9zX2ZpbGUpOworCQl9CiAJCWlmICghSVNf RVJSKHJvb3RhcmcpKSB7CiAJCQlwcmludGYoIkFkZGluZyBcIiVzXCIgdG8gS2VybmVsIGNvbW1h bmRsaW5lXG4iLCByb290YXJnKTsKIAkJCWdsb2JhbHZhcl9hZGRfc2ltcGxlKCJsaW51eC5ib290 YXJncy5ib290bS5hcHBlbmRyb290IiwKQEAgLTc0Miw2ICs3NjEsNyBAQCBzdGF0aWMgaW50IGJv b3RtX2luaXQodm9pZCkKIAlnbG9iYWx2YXJfYWRkX3NpbXBsZSgiYm9vdG0uaW1hZ2UiLCBOVUxM KTsKIAlnbG9iYWx2YXJfYWRkX3NpbXBsZSgiYm9vdG0uaW1hZ2UubG9hZGFkZHIiLCBOVUxMKTsK IAlnbG9iYWx2YXJfYWRkX3NpbXBsZSgiYm9vdG0ub2Z0cmVlIiwgTlVMTCk7CisJZ2xvYmFsdmFy X2FkZF9zaW1wbGUoImJvb3RtLnJvb3RfZGV2IiwgTlVMTCk7CiAJZ2xvYmFsdmFyX2FkZF9zaW1w bGUoImJvb3RtLnRlZSIsIE5VTEwpOwogCWdsb2JhbHZhcl9hZGRfc2ltcGxlX2Jvb2woImJvb3Rt LmFwcGVuZHJvb3QiLCAmYm9vdG1fYXBwZW5kcm9vdCk7CiAJZ2xvYmFsdmFyX2FkZF9zaW1wbGVf Ym9vbCgiYm9vdG0ucHJvdmlkZV9tYWNoaW5lX2lkIiwgJmJvb3RtX3Byb3ZpZGVfbWFjaGluZV9p ZCk7CkBAIC03NzEsNSArNzkxLDYgQEAgQkFSRUJPWF9NQUdJQ1ZBUl9OQU1FRChnbG9iYWxfYm9v dG1fb2Z0cmVlLCBnbG9iYWwuYm9vdG0ub2Z0cmVlLCAiYm9vdG0gZGVmYXVsdAogQkFSRUJPWF9N QUdJQ1ZBUl9OQU1FRChnbG9iYWxfYm9vdG1fdGVlLCBnbG9iYWwuYm9vdG0udGVlLCAiYm9vdG0g ZGVmYXVsdCB0ZWUgaW1hZ2UiKTsKIEJBUkVCT1hfTUFHSUNWQVJfTkFNRUQoZ2xvYmFsX2Jvb3Rt X3ZlcmlmeSwgZ2xvYmFsLmJvb3RtLnZlcmlmeSwgImJvb3RtIGRlZmF1bHQgdmVyaWZ5IGxldmVs Iik7CiBCQVJFQk9YX01BR0lDVkFSX05BTUVEKGdsb2JhbF9ib290bV92ZXJib3NlLCBnbG9iYWwu Ym9vdG0udmVyYm9zZSwgImJvb3RtIGRlZmF1bHQgdmVyYm9zaXR5IGxldmVsICgwPXF1aWV0KSIp OwotQkFSRUJPWF9NQUdJQ1ZBUl9OQU1FRChnbG9iYWxfYm9vdG1fYXBwZW5kcm9vdCwgZ2xvYmFs LmJvb3RtLmFwcGVuZHJvb3QsICJBZGQgcm9vdD0gb3B0aW9uIHRvIEtlcm5lbCB0byBtb3VudCBy b290ZnMgZnJvbSB0aGUgZGV2aWNlIHRoZSBLZXJuZWwgY29tZXMgZnJvbSIpOworQkFSRUJPWF9N QUdJQ1ZBUl9OQU1FRChnbG9iYWxfYm9vdG1fYXBwZW5kcm9vdCwgZ2xvYmFsLmJvb3RtLmFwcGVu ZHJvb3QsICJBZGQgcm9vdD0gb3B0aW9uIHRvIEtlcm5lbCB0byBtb3VudCByb290ZnMgZnJvbSB0 aGUgZGV2aWNlIHRoZSBLZXJuZWwgY29tZXMgZnJvbSAoZGVmYXVsdCwgZGV2aWNlIGNhbiBiZSBv dmVycmlkZGVuIHZpYSBnbG9iYWwuYm9vdG0ucm9vdF9kZXYpIik7CitCQVJFQk9YX01BR0lDVkFS X05BTUVEKGdsb2JhbF9ib290bV9yb290X2RldiwgZ2xvYmFsLmJvb3RtLnJvb3RfZGV2LCAiYm9v dG0gZGVmYXVsdCByb290IGRldmljZSAob3ZlcnJpZGVzIGRlZmF1bHQgZGV2aWNlIGluIGdsb2Jh bC5ib290bS5hcHBlbmRyb290KSIpOwogQkFSRUJPWF9NQUdJQ1ZBUl9OQU1FRChnbG9iYWxfYm9v dG1fcHJvdmlkZV9tYWNoaW5lX2lkLCBnbG9iYWwuYm9vdG0ucHJvdmlkZV9tYWNoaW5lX2lkLCAi SWYgdHJ1ZSwgYWRkIHN5c3RlbWQubWFjaGluZV9pZD0gd2l0aCB2YWx1ZSBvZiBnbG9iYWwubWFj aGluZV9pZCB0byBLZXJuZWwiKTsKZGlmZiAtLWdpdCBhL2luY2x1ZGUvYm9vdG0uaCBiL2luY2x1 ZGUvYm9vdG0uaAppbmRleCA3NzgyZGU3YTQ3NmQuLjM2MjhhN2VlYTViOSAxMDA2NDQKLS0tIGEv aW5jbHVkZS9ib290bS5oCisrKyBiL2luY2x1ZGUvYm9vdG0uaApAQCAtMTgsNiArMTgsNyBAQCBz dHJ1Y3QgYm9vdG1fZGF0YSB7CiAJY29uc3QgY2hhciAqaW5pdHJkX2ZpbGU7CiAJY29uc3QgY2hh ciAqb2Z0cmVlX2ZpbGU7CiAJY29uc3QgY2hhciAqdGVlX2ZpbGU7CisJY29uc3QgY2hhciAqcm9v dF9kZXY7CiAJaW50IHZlcmJvc2U7CiAJZW51bSBib290bV92ZXJpZnkgdmVyaWZ5OwogCWJvb2wg Zm9yY2U7CkBAIC0yNSw2ICsyNiw3IEBAIHN0cnVjdCBib290bV9kYXRhIHsKIAkvKgogCSAqIGFw cGVuZHJvb3QgLSBpZiB0cnVlLCB0cnkgdG8gYWRkIGEgc3VpdGFibGUgcm9vdD0gS2VybmVsIG9w dGlvbiB0bwogCSAqIG1vdW50IHRoZSByb290ZnMgZnJvbSB0aGUgc2FtZSBkZXZpY2UgYXMgdGhl IEtlcm5lbCBjb21lcyBmcm9tLgorCSAqIFRoZSBkZWZhdWx0IHJvb3RmcyBkZXZpY2UgY2FuIGJl IG92ZXJyaWRkZW4gd2l0aCByb290X2Rldi4KIAkgKi8KIAlib29sIGFwcGVuZHJvb3Q7CiAJLyoK LS0gCjIuNy40CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KYmFyZWJveCBtYWlsaW5nIGxpc3QKYmFyZWJveEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6 Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vYmFyZWJveAo=