diff --git a/Makefile b/Makefile index 7779f44..e181285 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,7 @@ buildroot/output/images/rootfs.cpio.gz: build/rootfs.cpio.gz: buildroot/output/images/rootfs.cpio.gz | build cp $< $@ -build/m2k.itb: u-boot-xlnx/tools/mkimage build/zImage build/rootfs.cpio.gz build/zynq-m2k-reva.dtb build/system_top.bit +build/m2k.itb: u-boot-xlnx/tools/mkimage build/zImage build/rootfs.cpio.gz build/zynq-m2k-reva.dtb build/zynq-m2k-revb.dtb build/system_top.bit u-boot-xlnx/tools/mkimage -f scripts/m2k.its $@ build/system_top.hdf: | build diff --git a/buildroot b/buildroot index 50c07c5..6a099c7 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit 50c07c5ec0021653b8b44b6c33c2fb0da381ebcf +Subproject commit 6a099c77840ea2eca66096d502bdd7f428511c20 diff --git a/hdl b/hdl index 7cff121..99e8aa3 160000 --- a/hdl +++ b/hdl @@ -1 +1 @@ -Subproject commit 7cff12107ef7e85aa6677a7eb0696e2e02c2c65c +Subproject commit 99e8aa385a1f8187482d43da210db4b25f0d7db6 diff --git a/linux b/linux index 751f62f..e4025f7 160000 --- a/linux +++ b/linux @@ -1 +1 @@ -Subproject commit 751f62f1a1faee432d706db37f3864da396c5e02 +Subproject commit e4025f7da76d744664d9dfcbf74b4098966e00db diff --git a/scripts/m2k.its b/scripts/m2k.its index 589638a..f8e8e4b 100644 --- a/scripts/m2k.its +++ b/scripts/m2k.its @@ -23,6 +23,14 @@ compression = "none"; }; + fdt@2 { + description = "zynq-m2k-revb"; + data = /incbin/("../build/zynq-m2k-revb.dtb"); + type = "flat_dt"; + arch = "arm"; + compression = "none"; + }; + fpga@1 { description = "FPGA"; data = /incbin/("../build/system_top.bit"); @@ -130,15 +138,15 @@ fpga = "fpga@1"; }; - config@8 { - description = "Linux with fpga RevA"; - fdt = "fdt@1"; + config@8 { /* RevB */ + description = "Linux with fpga Revb"; + fdt = "fdt@2"; kernel = "linux_kernel@1"; ramdisk = "ramdisk@1"; fpga = "fpga@1"; }; - config@9 { /* This one is actually RevA */ + config@9 { /* RevA */ description = "Linux with fpga RevA"; fdt = "fdt@1"; kernel = "linux_kernel@1";