Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

test: dm: test.dts - move to sandbox dts directory

Browse source 
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>
This commit is contained in:
Przemyslaw Marczak 2015-05-13 13:38:34 +02:00 committed by Simon Glass
parent e8f339e0e8
commit f64000c302
5 changed files with 7 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/sandbox/dts/Makefile
View file

@ -1,4 +1,5 @@
dtb-$(CONFIG_SANDBOX) += sandbox.dtb
dtb-$(CONFIG_DM_TEST) += test.dtb
targets += $(dtb-y)

26
test/dm/test.dts → arch/sandbox/dts/test.dts
View file

@ -8,20 +8,18 @@
aliases {
console = &uart0;
eth0 = "/eth@10002000";
eth5 = &eth_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 = &eth_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 {

1
test/dm/.gitignore vendored
View file

@ -1 +0,0 @@
/test.dtb

3
test/dm/test-dm.sh
View file

@ -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

3
test/dm/test-main.c
View file

@ -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);
}