From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7265229713729126400 X-Received: by 2002:a2e:9a8c:0:b0:2b1:ed29:7c47 with SMTP id p12-20020a2e9a8c000000b002b1ed297c47mr1201007lji.8.1691568110639; Wed, 09 Aug 2023 01:01:50 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:10c7:b0:2b6:9e60:5995 with SMTP id l7-20020a05651c10c700b002b69e605995ls50311ljn.0.-pod-prod-07-eu; Wed, 09 Aug 2023 01:01:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGI8tFt8v+cU5utMzBovHur3PqWI+zxwsTaFbECOqTXKO6VjtSzL7PAOHA548FTplu5++pt X-Received: by 2002:a2e:9bc5:0:b0:2b6:fc60:776f with SMTP id w5-20020a2e9bc5000000b002b6fc60776fmr1228779ljj.30.1691568108522; Wed, 09 Aug 2023 01:01:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691568108; cv=none; d=google.com; s=arc-20160816; b=uwTraRZgocsrEnTA4o4eCUrDG/sY+mVF3OPF/QQkkUa13SSzlKjgGX4xAz6YRu2huk lUgr0/yurfRPkilVEt1Tj53EQfGAh1K6MnxOvGPOHCY6Asb+GVZshIPU75WKiTTSyspp WBMeMCZIJrDINIfxjrtup6VYLZcKRZ4ufGG/KpKuWKy2PcUaEjWO8i0YwZn7TeMtrY9w rk7isAH2nkbFtvKmHIU946PBQPFD+aCKGE7D3M4flOnqIU7qIOq8bIdBpl20EPUvrImY eB0re/jC1K9Ms7z+XLxLezhayaw8ZsmCk1ad07Cj3pzOcpx/q5x4EePyh9ykjuk5pTHT bFgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=6o/uaJJGbOFoPJYG44Won2NMkjWrVCbVF/OJUchj8w8=; fh=swRs1+OhWjovx1IrvOlKBWsdq9manB5qdcuGoHoh5Ak=; b=GXKX7apzpAiktYJDFg6PbOV71mkgwNRssBzvtx8nHBkddBNYP4wSSc1/PCxXyk2VRN 2lRYAxvonELeab7UqclbIEHECCsQojWYFNVmkGb1Cv2UpI9VERLGoIDJ2HadQscEatP7 kJkhXhqDAwvoxYh/JpTuBtdcYn1bMHq0kwqNcTccFdmg4fsmv1pZcBzgNm6btNUGGNDY xisAmCxGedByvGHjUwc7/aFOr9HQUdNPOI7CMOmJQdvlbA5GIvOaR4sHeotuqjsDNwnM 0+UZcHhBB1JCkdhkHvQsX7XBqIcDBTTqW5n9K/X3IXn9LZ4Z8dYU39eNYDXczGvyd/MJ O98g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id a34-20020a05651c212200b002b94a079c55si935733ljq.8.2023.08.09.01.01.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Aug 2023 01:01:48 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 37981kXY009254 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 9 Aug 2023 10:01:47 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH 2/3] Revert "u-boot-script: add support to use builtin dt" Date: Wed, 9 Aug 2023 10:01:45 +0200 Message-Id: <20230809080146.13786-3-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230809080146.13786-1-ubely@ilbers.de> References: <20230809080146.13786-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: t7dfnjrWa8/V This reverts commit a2e734a43b00ec7d1e47ae2e963d1a64d527f0df. --- .../u-boot-script/files/u-boot-script | 3 --- .../u-boot-script/files/update-u-boot-script | 16 ++++------------ .../lib/wic/plugins/source/rootfs-u-boot.py | 3 --- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/meta/recipes-bsp/u-boot-script/files/u-boot-script b/meta/recipes-bsp/u-boot-script/files/u-boot-script index a11212c0..d053d721 100644 --- a/meta/recipes-bsp/u-boot-script/files/u-boot-script +++ b/meta/recipes-bsp/u-boot-script/files/u-boot-script @@ -15,6 +15,3 @@ NO_INITRD="" # U-boot commands to prepend to boot script SCRIPT_PREPEND="" - -# use u-boot builtin device tree -BUILTIN_DT="no" diff --git a/meta/recipes-bsp/u-boot-script/files/update-u-boot-script b/meta/recipes-bsp/u-boot-script/files/update-u-boot-script index f4e36ed2..14a81563 100755 --- a/meta/recipes-bsp/u-boot-script/files/update-u-boot-script +++ b/meta/recipes-bsp/u-boot-script/files/update-u-boot-script @@ -33,18 +33,10 @@ echo "${SCRIPT_PREPEND}" >> ${BOOT_CMD} echo "setenv bootargs ${KERNEL_ARGS}" >> ${BOOT_CMD} -if [ "${BUILTIN_DT}" = "yes" ]; then - echo "echo Loading builtin device tree..." \ - >> ${BOOT_CMD} - echo "fdt addr \${fdtcontroladdr}" >> ${BOOT_CMD} - echo "fdt move \${fdtcontroladdr} \${fdt_addr_r}" >> ${BOOT_CMD} -else - echo "echo Loading /usr/lib/linux-image-${KERNEL_VERSION}/\${fdtfile}..." \ - >> ${BOOT_CMD} - echo "load \${devtype} \${devnum}:${ROOT_PARTITION} \${fdt_addr_r}" \ - "/usr/lib/linux-image-${KERNEL_VERSION}/\${fdtfile}" >> ${BOOT_CMD} -fi - +echo "echo Loading /usr/lib/linux-image-${KERNEL_VERSION}/\${fdtfile}..." \ + >> ${BOOT_CMD} +echo "load \${devtype} \${devnum}:${ROOT_PARTITION} \${fdt_addr_r}" \ + "/usr/lib/linux-image-${KERNEL_VERSION}/\${fdtfile}" >> ${BOOT_CMD} echo "echo Loading /boot/${KERNEL_FILE}-${KERNEL_VERSION}..." >> ${BOOT_CMD} echo "load \${devtype} \${devnum}:\${distro_bootpart} \${kernel_addr_r}" \ "/boot/${KERNEL_FILE}-${KERNEL_VERSION}" >> ${BOOT_CMD} diff --git a/meta/scripts/lib/wic/plugins/source/rootfs-u-boot.py b/meta/scripts/lib/wic/plugins/source/rootfs-u-boot.py index 93600dc2..0b4f9eec 100644 --- a/meta/scripts/lib/wic/plugins/source/rootfs-u-boot.py +++ b/meta/scripts/lib/wic/plugins/source/rootfs-u-boot.py @@ -10,7 +10,6 @@ # Recognized sourceparams: # - no_initrd=yes (disables initrd loading) # - overlays=file.dtbo ... (overlay files) -# - builtin_dt=no (use DT from uboot instead of kernel) # - script_prepend=cmd;... (prepends U-Boot command) import glob @@ -83,8 +82,6 @@ class RootfsUBootPlugin(RootfsPlugin): cfg.write('NO_INITRD="%s"\n' % no_initrd) overlays = source_params.get('overlays') or '' cfg.write('OVERLAYS="%s"\n' % overlays) - builtin_dt = source_params.get('builtin_dt') or '' - cfg.write('BUILTIN_DT="%s"\n' % builtin_dt) script_prepend = source_params.get('script_prepend') or '' # remove escapes from $\{var\} that are needed to avoid expansion by wic script_prepend = re.sub(r'\$\\{([^\\]+)\\}', r'${\1}', script_prepend) -- 2.20.1