From 7208396bbf1df1c7a85d263b7ff054e6b45d8240 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 24 Jul 2020 08:42:06 -0400 Subject: Revert "Merge tag 'dm-pull-20jul20' of git://git.denx.de/u-boot-dm" This reverts commit 5d3a21df6694ebd66d5c34c9d62a26edc7456fc7, reversing changes made to 56d37f1c564107e27d873181d838571b7d7860e7. Unfortunately this is causing CI failures: https://travis-ci.org/github/trini/u-boot/jobs/711313649 Signed-off-by: Tom Rini --- tools/binman/test/156_mkimage.dts | 23 --------- tools/binman/test/157_blob_ext.dts | 14 ------ tools/binman/test/158_blob_ext_missing.dts | 16 ------- tools/binman/test/159_blob_ext_missing_sect.dts | 23 --------- tools/binman/test/160_pack_overlap_zero.dts | 18 ------- tools/binman/test/161_fit.dts | 62 ------------------------ tools/binman/test/162_fit_external.dts | 64 ------------------------- 7 files changed, 220 deletions(-) delete mode 100644 tools/binman/test/156_mkimage.dts delete mode 100644 tools/binman/test/157_blob_ext.dts delete mode 100644 tools/binman/test/158_blob_ext_missing.dts delete mode 100644 tools/binman/test/159_blob_ext_missing_sect.dts delete mode 100644 tools/binman/test/160_pack_overlap_zero.dts delete mode 100644 tools/binman/test/161_fit.dts delete mode 100644 tools/binman/test/162_fit_external.dts (limited to 'tools/binman/test') diff --git a/tools/binman/test/156_mkimage.dts b/tools/binman/test/156_mkimage.dts deleted file mode 100644 index 933b13143a..0000000000 --- a/tools/binman/test/156_mkimage.dts +++ /dev/null @@ -1,23 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - size = <0x80>; - - mkimage { - args = "-n test -T script"; - - u-boot-spl { - }; - - _testing { - return-contents-later; - }; - }; - }; -}; diff --git a/tools/binman/test/157_blob_ext.dts b/tools/binman/test/157_blob_ext.dts deleted file mode 100644 index 8afdd5339e..0000000000 --- a/tools/binman/test/157_blob_ext.dts +++ /dev/null @@ -1,14 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - blob-ext { - filename = "refcode.bin"; - }; - }; -}; diff --git a/tools/binman/test/158_blob_ext_missing.dts b/tools/binman/test/158_blob_ext_missing.dts deleted file mode 100644 index d315e5592e..0000000000 --- a/tools/binman/test/158_blob_ext_missing.dts +++ /dev/null @@ -1,16 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - size = <0x80>; - - blob-ext { - filename = "missing-file"; - }; - }; -}; diff --git a/tools/binman/test/159_blob_ext_missing_sect.dts b/tools/binman/test/159_blob_ext_missing_sect.dts deleted file mode 100644 index 5f14c54138..0000000000 --- a/tools/binman/test/159_blob_ext_missing_sect.dts +++ /dev/null @@ -1,23 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - size = <0x80>; - - section { - blob-ext { - filename = "missing-file"; - }; - }; - - blob-ext2 { - type = "blob-ext"; - filename = "missing-file2"; - }; - }; -}; diff --git a/tools/binman/test/160_pack_overlap_zero.dts b/tools/binman/test/160_pack_overlap_zero.dts deleted file mode 100644 index 731aa1cbe6..0000000000 --- a/tools/binman/test/160_pack_overlap_zero.dts +++ /dev/null @@ -1,18 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - u-boot { - }; - - fill { - size = <0>; - offset = <3>; - }; - }; -}; diff --git a/tools/binman/test/161_fit.dts b/tools/binman/test/161_fit.dts deleted file mode 100644 index c52d760b73..0000000000 --- a/tools/binman/test/161_fit.dts +++ /dev/null @@ -1,62 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - u-boot { - }; - fit { - description = "test-desc"; - #address-cells = <1>; - - images { - kernel { - description = "Vanilla Linux kernel"; - type = "kernel"; - arch = "ppc"; - os = "linux"; - compression = "gzip"; - load = <00000000>; - entry = <00000000>; - hash-1 { - algo = "crc32"; - }; - hash-2 { - algo = "sha1"; - }; - u-boot { - }; - }; - fdt-1 { - description = "Flattened Device Tree blob"; - type = "flat_dt"; - arch = "ppc"; - compression = "none"; - hash-1 { - algo = "crc32"; - }; - hash-2 { - algo = "sha1"; - }; - u-boot-spl-dtb { - }; - }; - }; - - configurations { - default = "conf-1"; - conf-1 { - description = "Boot Linux kernel with FDT blob"; - kernel = "kernel"; - fdt = "fdt-1"; - }; - }; - }; - u-boot-nodtb { - }; - }; -}; diff --git a/tools/binman/test/162_fit_external.dts b/tools/binman/test/162_fit_external.dts deleted file mode 100644 index 19518e05a5..0000000000 --- a/tools/binman/test/162_fit_external.dts +++ /dev/null @@ -1,64 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - u-boot { - }; - fit { - fit,external-offset = <0>; - description = "test-desc"; - #address-cells = <1>; - - images { - kernel { - description = "Vanilla Linux kernel"; - type = "kernel"; - arch = "ppc"; - os = "linux"; - compression = "gzip"; - load = <00000000>; - entry = <00000000>; - hash-1 { - algo = "crc32"; - }; - hash-2 { - algo = "sha1"; - }; - u-boot { - }; - }; - fdt-1 { - description = "Flattened Device Tree blob"; - type = "flat_dt"; - arch = "ppc"; - compression = "none"; - hash-1 { - algo = "crc32"; - }; - hash-2 { - algo = "sha1"; - }; - _testing { - return-contents-later; - }; - }; - }; - - configurations { - default = "conf-1"; - conf-1 { - description = "Boot Linux kernel with FDT blob"; - kernel = "kernel"; - fdt = "fdt-1"; - }; - }; - }; - u-boot-nodtb { - }; - }; -}; -- cgit v1.2.3