Received: from mail-qv1-f53.google.com (mail-qv1-f53.google.com [209.85.219.53]) by mx.groups.io with SMTP id smtpd.web09.1199.1623366044511725295 for ; Thu, 10 Jun 2021 16:00:44 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: gmail.com, ip: 209.85.219.53, mailfrom: tom.rini@gmail.com) Received: by mail-qv1-f53.google.com with SMTP id x6so10694888qvx.4 for ; Thu, 10 Jun 2021 16:00:44 -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=GKnoONVM/UnSPF4oyO46v5aBq6NXZq5y2g28nVzW588=; b=l9z+4HAtiHJGOIJ6oSlRv2vP2k2jiBIZEZH51+zO9LI0NeFkVf6Lp/yDhV6Q7vD9oA A615xjhY05IlRBiiTNzuf+sWLzHofJcUuDp3Ah/o0YMhfpZ3M7hVHBTQHpCfCSNUVwPj 593WcwDFh0DpjjiU2UnAbwcD/VKBhUyhupHCZAiAjHJfUbNs1QhfHGnpro+0Jq/VGsSx JPw8FJHNsm3P3sZaOCsEkezF5DfGeAsCJ4Ws2P/8HeDXRR+tw0yhRNnRIcJzWJe6dBn/ RxGK0CHgrLrKiTeuP9BEoM3HzIiWGzyU9tarFdPqM96uIqPq1mGChut1FgOEfaet5KOc 9E8Q== X-Gm-Message-State: AOAM533VYt5opYkbAk3aHnZBVlAROYDfyptBYvToX52oKKqRf74EwRze Bic/CrbmOWFa6pnVnXqJF9d/zQHWtA== X-Google-Smtp-Source: ABdhPJy29yQhHlFLWe/4roOTFeaShGns8/MEFwgaYOgtb6s2aYdqDafCA18UHiuqswpKFsiufx2stw== X-Received: by 2002:a0c:b8aa:: with SMTP id y42mr2012508qvf.17.1623366043070; Thu, 10 Jun 2021 16:00:43 -0700 (PDT) Return-Path: Received: from bill-the-cat.lan (2603-6081-7b01-cbda-a919-72df-8fd4-9925.res6.spectrum.com. [2603:6081:7b01:cbda:a919:72df:8fd4:9925]) by smtp.gmail.com with ESMTPSA id o123sm3219357qkd.6.2021.06.10.16.00.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jun 2021 16:00:42 -0700 (PDT) From: "Tom Rini" To: meta-ti@lists.yoctoproject.org Subject: [PATCH] conf: am335x-evm: Add extlinux.conf support Date: Thu, 10 Jun 2021 19:00:38 -0400 Message-Id: <20210610230038.22382-1-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 To make use of the "generic distro boot" support in U-Boot, an extlinux.conf file needs to be generated and reside in the extlinux directory. The extlinux.conf that will be generated by default assumes that the kernel image and device trees live one level up (so the root directory) and that in addition to the normally documented variables being set, we can get the correct rootfs by having "uuid" be set in the environment. Signed-off-by: Tom Rini --- conf/machine/include/ti33x.inc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc index 6dfda754e9dd..35e057d57497 100644 --- a/conf/machine/include/ti33x.inc +++ b/conf/machine/include/ti33x.inc @@ -43,6 +43,15 @@ UBOOT_MACHINE = "am335x_evm_config" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" +# Generate an extlinux.conf file +UBOOT_EXTLINUX = "1" +UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}" +UBOOT_EXTLINUX_BOOT_FILES = " \ + extlinux.conf;extlinux/extlinux.conf \ + ${KERNEL_IMAGETYPE} \ + ${KERNEL_DEVICETREE} \ +" + SPL_BINARY = "MLO" UBOOT_SUFFIX = "img" @@ -61,5 +70,5 @@ TI_PDK_LIMIT_BOARDS = "evmAM335x icev2AM335x iceAMIC110 bbbAM335x skAM335x" IMAGE_FSTYPES += "tar.xz wic.xz" WKS_FILE ?= "sdimage-2part.wks" -IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" +IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}" do_image_wic[depends] += "virtual/bootloader:do_deploy" -- 2.17.1