Revert "Merge patch series "mkimage: Detect FIT image load address overlaps and fix related test/DTS issues""

This reverts commit 4d84fa1261eb27d57687f2e4c404a78b8653c183, reversing
changes made to b82a1fa7ddc7f3be2f3b75898d5dc44c34420bdd.

I had missed some feedback on this series from earlier, and we have
since had reports of regressions due to this as well. For now, revert
this.

Signed-off-by: Tom Rini <[email protected]>

1 files changed, 0 insertions, 65 deletions

diff --git a/test/py/tests/test_fit_mkimage_validate.py b/test/py/tests/test_fit_mkimage_validate.py
index 27299a58f33..170b2a8cbbb 100644
--- a/test/py/tests/test_fit_mkimage_validate.py
+++ b/test/py/tests/test_fit_mkimage_validate.py
@@ -103,68 +103,3 @@ def test_fit_invalid_default_config(ubman):
 
     assert result.returncode != 0, "mkimage should fail due to missing default config"
     assert re.search(r"Default configuration '.*' not found under /configurations", result.stderr)
-
-def test_fit_load_addr_overlap(ubman):
-    """Test that mkimage fails when load address overlap"""
-
-    its_fname = fit_util.make_fname(ubman, "invalid.its")
-    itb_fname = fit_util.make_fname(ubman, "invalid.itb")
-    kernel = fit_util.make_kernel(ubman, 'kernel.bin', 'kernel')
-    fdt = fit_util.make_dtb(ubman, '''
-/dts-v1/;
-/ {
-    model = "Test FDT";
-    compatible = "test";
-};
-''', 'test')
-
-    # Write ITS with an invalid reference to a nonexistent default config
-    its_text = '''
-/dts-v1/;
-
-/ {
-    images {
-        kernel@1 {
-            description = "Test Kernel";
-            data = /incbin/("kernel.bin");
-            type = "kernel";
-            arch = "sandbox";
-            os = "linux";
-            compression = "none";
-            load = <0x40000>;
-            entry = <0x40000>;
-        };
-        fdt@1 {
-            description = "Test FDT";
-            data = /incbin/("test.dtb");
-            type = "flat_dt";
-            arch = "sandbox";
-            os = "linux";
-            compression = "none";
-            load = <0x40000>;
-            entry = <0x40000>;
-        };
-    };
-
-    configurations {
-        default = "conf@1";
-        conf@1 {
-            kernel = "kernel@1";
-            fdt = "fdt@1";
-        };
-    };
-};
-'''
-
-    with open(its_fname, 'w') as f:
-        f.write(its_text)
-
-    mkimage = os.path.join(ubman.config.build_dir, 'tools/mkimage')
-    cmd = [mkimage, '-f', its_fname, itb_fname]
-
-    result = subprocess.run(cmd, capture_output=True, text=True)
-
-    assert result.returncode != 0, "mkimage should fail due to memory overlap"
-    assert "Error: Overlap detected:" in result.stderr
-    # Check that it identifies the specific overlapping components
-    assert "kernel@1" in result.stderr and "fdt@1" in result.stderr