Move Ramdisk and FPGA bitstream to FIT

diff --git a/build/xlnx_4.9/Makefile b/build/xlnx_4.9/Makefile
index 115fc478413945a23cb1f7a45b9363836979c8c6..1aec70161ce656d112af853629656b1d081dac02 100644 (file)
--- a/build/xlnx_4.9/Makefile
+++ b/build/xlnx_4.9/Makefile
@@ -3,8 +3,8 @@ all: image.ub
 microzed.dtb: microzed.dts linux/source/arch/arm/boot/dts/zynq-7000.dtsi
        dtc -I dts -O dtb -o $@ $<
 
-image.ub: uboot-image.its linux/arch/arm/boot/zImage microzed.dtb
+image.ub: uboot-image.its linux/arch/arm/boot/zImage microzed.dtb ../buildroot/images/rootfs.cpio
        mkimage -f uboot-image.its image.ub
 
-linux/arch/arm/boot/zImage linux/source/arch/arm/boot/dts/zynq-7000.dtsi: ../buildroot/images/rootfs.cpio
+linux/arch/arm/boot/zImage linux/source/arch/arm/boot/dts/zynq-7000.dtsi:
        $(MAKE) -C linux

diff --git a/build/xlnx_4.9/linux/.config b/build/xlnx_4.9/linux/.config
index 144c73630b76d313450c6736606d711f6da9bb46..ff1c2aebb7ad7158ed24b79882d4d234f4423323 100644 (file)
--- a/build/xlnx_4.9/linux/.config
+++ b/build/xlnx_4.9/linux/.config
@@ -125,16 +125,7 @@ CONFIG_CGROUPS=y
 # CONFIG_SCHED_AUTOGROUP is not set
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="../../buildroot/images/rootfs.cpio"
-CONFIG_INITRAMFS_ROOT_UID=0
-CONFIG_INITRAMFS_ROOT_GID=0
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-CONFIG_RD_LZ4=y
+# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
@@ -4371,7 +4362,6 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
-CONFIG_LZ4_DECOMPRESS=y
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
@@ -4381,12 +4371,6 @@ CONFIG_XZ_DEC_ARMTHUMB=y
 CONFIG_XZ_DEC_SPARC=y
 CONFIG_XZ_DEC_BCJ=y
 # CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_DECOMPRESS_LZ4=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_DMA=y

diff --git a/build/xlnx_4.9/uboot-image.its b/build/xlnx_4.9/uboot-image.its
index 9756405731ad8063b503aa36e3f892a9318e2815..7facd2dfa4680709256221355250cec2fa293083 100644 (file)
--- a/build/xlnx_4.9/uboot-image.its
+++ b/build/xlnx_4.9/uboot-image.its
@@ -25,6 +25,33 @@
                                algo = "sha1";
                        };
                };
+               ramdisk@1 {
+                       description = "Buildroot ramdisk";
+                       data = /incbin/("../buildroot/images/rootfs.cpio");
+                       type = "ramdisk";
+                       arch = "arm";
+                       os = "linux";
+                       compression = "none";
+                       hash@1 {
+                               algo = "crc32";
+                       };
+                       hash@2 {
+                               algo = "sha1";
+                       };
+               };
+               fpga@1 {
+                       description = "FPGA bitstream";
+                       data = /incbin/("../../fs-overlay/fpga.bit");
+                       type = "fpga";
+                       arch = "arm";
+                       compression = "none";
+                       hash@1 {
+                               algo = "crc32";
+                       };
+                       hash@2 {
+                               algo = "sha1";
+                       };
+               };
                fdt@1 {
                        description = "Flattened Device Tree blob";
                        data = /incbin/("./microzed.dtb");
@@ -45,6 +72,8 @@
                conf@1 {
                        description = "Boot Linux kernel with FDT blob";
                        kernel = "kernel@1";
+                       ramdisk = "ramdisk@1";
+                       fpga = "fpga@1";
                        fdt = "fdt@1";
                };
        };