Hi Simon,
On Tue, May 19, 2015 at 2:21 PM, Joe Hershberger joe.hershberger@gmail.com wrote:
Hi Simon,
On Fri, May 15, 2015 at 8:56 AM, Simon Glass sjg@chromium.org wrote:
On 13 May 2015 at 05:38, Przemyslaw Marczak p.marczak@samsung.com wrote:
The file test.dts from driver model test directory, was compiled by call dtc in script: test/dm/test-dm.sh.
This doesn't allow for including of dtsi files and using of C preprocessor routines in this dts file.
Since the mentioned script builds U-Boot before tests, then moving the test.dts file into sandbox dts directory is reasonable.
Signed-off-by: Przemyslaw Marczak p.marczak@samsung.com Acked-by: Simon Glass sjg@chromium.org Tested on sandbox: Tested-by: Simon Glass sjg@chromium.org
Changes V2:
- new commit
arch/sandbox/dts/Makefile | 1 + arch/sandbox/dts/test.dts | 230 ++++++++++++++++++++++++++++++++++++++++++++++ test/dm/.gitignore | 1 - test/dm/test-dm.sh | 3 +- test/dm/test-main.c | 3 +- test/dm/test.dts | 230 ---------------------------------------------- 6 files changed, 233 insertions(+), 235 deletions(-) create mode 100644 arch/sandbox/dts/test.dts delete mode 100644 test/dm/.gitignore delete mode 100644 test/dm/test.dts
Applied to u-boot-dm, thanks!
This patch effectively reverted fbe07ba0f: dm: test: dts: Sort the aliases in the test device tree file
It seems this file was moved before other patches went in and never updated. Maybe there are other merge-conflict resolution errors?
Ah yes... it also reverted 4772511: dm: rtc: Add tests for real-time clocks
Cheers, -Joe