diff options
| author | Przemyslaw Marczak <p.marczak@samsung.com> | 2015-05-13 13:38:34 +0200 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-05-14 19:59:07 -0600 |
| commit | f64000c302f78103cb704e9843ab0c9ae1629bf1 (patch) | |
| tree | 8d9f80a34d5d246fbd15618a6691cb93ae3caebd | |
| parent | e8f339e0e8bb15ba6e4079d0a239ddc211a02935 (diff) | |
| download | u-boot-imx-f64000c302f78103cb704e9843ab0c9ae1629bf1.zip u-boot-imx-f64000c302f78103cb704e9843ab0c9ae1629bf1.tar.gz u-boot-imx-f64000c302f78103cb704e9843ab0c9ae1629bf1.tar.bz2 | |
test: dm: test.dts - move to sandbox dts directory
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>
| -rw-r--r-- | arch/sandbox/dts/Makefile | 1 | ||||
| -rw-r--r-- | arch/sandbox/dts/test.dts (renamed from test/dm/test.dts) | 26 | ||||
| -rw-r--r-- | test/dm/.gitignore | 1 | ||||
| -rwxr-xr-x | test/dm/test-dm.sh | 3 | ||||
| -rw-r--r-- | test/dm/test-main.c | 3 |
5 files changed, 7 insertions, 27 deletions
diff --git a/arch/sandbox/dts/Makefile b/arch/sandbox/dts/Makefile index a4c980b..562a078 100644 --- a/arch/sandbox/dts/Makefile +++ b/arch/sandbox/dts/Makefile @@ -1,4 +1,5 @@ dtb-$(CONFIG_SANDBOX) += sandbox.dtb +dtb-$(CONFIG_DM_TEST) += test.dtb targets += $(dtb-y) diff --git a/test/dm/test.dts b/arch/sandbox/dts/test.dts index 0085848..d0c40be 100644 --- a/test/dm/test.dts +++ b/arch/sandbox/dts/test.dts @@ -8,20 +8,18 @@ aliases { console = &uart0; - eth0 = "/eth@10002000"; - eth5 = ð_5; i2c0 = "/i2c@0"; - pci0 = &pci; spi0 = "/spi@0"; + pci0 = &pci; + testfdt6 = "/e-test"; testbus3 = "/some-bus"; testfdt0 = "/some-bus/c-test@0"; testfdt1 = "/some-bus/c-test@1"; testfdt3 = "/b-test"; testfdt5 = "/some-bus/c-test@5"; - testfdt6 = "/e-test"; testfdt8 = "/a-test"; - rtc0 = &rtc_0; - rtc1 = &rtc_1; + eth0 = "/eth@10002000"; + eth5 = ð_5; usb0 = &usb_0; usb1 = &usb_1; usb2 = &usb_2; @@ -141,22 +139,6 @@ sandbox,size = <256>; }; }; - - rtc_0: rtc@43 { - reg = <0x43>; - compatible = "sandbox-rtc"; - emul { - compatible = "sandbox,i2c-rtc"; - }; - }; - - rtc_1: rtc@61 { - reg = <0x61>; - compatible = "sandbox-rtc"; - emul { - compatible = "sandbox,i2c-rtc"; - }; - }; }; pci: pci-controller { diff --git a/test/dm/.gitignore b/test/dm/.gitignore deleted file mode 100644 index b741b8a..0000000 --- a/test/dm/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/test.dtb diff --git a/test/dm/test-dm.sh b/test/dm/test-dm.sh index 6158f68..5c47ffd 100755 --- a/test/dm/test-dm.sh +++ b/test/dm/test-dm.sh @@ -6,12 +6,11 @@ die() { } NUM_CPUS=$(cat /proc/cpuinfo |grep -c processor) -dtc -I dts -O dtb test/dm/test.dts -o test/dm/test.dtb make O=sandbox sandbox_config || die "Cannot configure U-Boot" make O=sandbox -s -j${NUM_CPUS} || die "Cannot build U-Boot" dd if=/dev/zero of=spi.bin bs=1M count=2 echo -n "this is a test" > testflash.bin dd if=/dev/zero bs=1M count=4 >>testflash.bin -./sandbox/u-boot -d test/dm/test.dtb -c "dm test" +./sandbox/u-boot -d ./sandbox/arch/sandbox/dts/test.dtb -c "dm test" rm spi.bin rm testflash.bin diff --git a/test/dm/test-main.c b/test/dm/test-main.c index a47bb37..7348f69 100644 --- a/test/dm/test-main.c +++ b/test/dm/test-main.c @@ -78,8 +78,7 @@ int dm_test_main(const char *test_name) */ if (!gd->fdt_blob || fdt_next_node(gd->fdt_blob, 0, NULL) < 0) { puts("Please run with test device tree:\n" - " dtc -I dts -O dtb test/dm/test.dts -o test/dm/test.dtb\n" - " ./u-boot -d test/dm/test.dtb\n"); + " ./u-boot -d arch/sandbox/dts/test.dtb\n"); ut_assert(gd->fdt_blob); } |