Now that the skip-at-start feature is properly used in Binman, drop the
various workarounds in the image.

Signed-off-by: Simon Glass <s...@chromium.org>
---

Changes in v2:
- Split out the fixes for skip-at-start into a new patch

 arch/arm/dts/rockchip-vpl-u-boot.dtsi | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/arm/dts/rockchip-vpl-u-boot.dtsi 
b/arch/arm/dts/rockchip-vpl-u-boot.dtsi
index 621161f6c86..71d7a98e5ac 100644
--- a/arch/arm/dts/rockchip-vpl-u-boot.dtsi
+++ b/arch/arm/dts/rockchip-vpl-u-boot.dtsi
@@ -19,7 +19,6 @@
                        bootph-verify;
                        compatible = "fwupd,vbe-abrec";
                        storage = "mmc0";
-                       skip-offset = <0x8000>;
                        area-start = <CONFIG_SPL_PAD_TO>;
                        area-size = <0x800000>;
                        state-offset = <(CONFIG_SPL_PAD_TO - 0x400)>;
@@ -77,7 +76,7 @@
 
                vpl {
                        type = "fit";
-                       offset = <(CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 
0x200 + 0x8000)>;
+                       offset = <(CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 
0x200)>;
                        description = "FIT image for U-Boot TPL";
                        #address-cells = <1>;
                        fit,fdt-list = "of-list";
@@ -122,7 +121,7 @@
 # ifdef CONFIG_BOOTMETH_VBE_ABREC
                vbe-a {
                        type = "section";
-                       offset = <(CONFIG_SPL_PAD_TO + 0x8000)>;
+                       offset = <CONFIG_SPL_PAD_TO>;
                        spl-a {
                                insert-template = <&spl_template>;
                                size = <0x100000>;
@@ -159,7 +158,7 @@
 # else /* CONFIG_BOOTMETH_VBE_SIMPLE */
                vbe {
                        type = "fit";
-                       offset = <(CONFIG_SPL_PAD_TO + 0x8000)>;
+                       offset = <CONFIG_SPL_PAD_TO>;
                        insert-template = <&common_part>;
                };
 # endif /* VBE method */
-- 
2.43.0

Reply via email to