Merge pull request #423 from trabucayre/sdcard_boot

buildroot: added rootfs.ext4 creation, updated genimage.cfg to adds rootfs as second SDCard partition

Author: enjoy-digital

buildroot/board/litex_vexriscv/genimage.cfg

@@ -21,4 +21,9 @@ image sdcard.img {
 		bootable = "true"
 		image = "boot.vfat"
 	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+	}
 }

buildroot/board/litex_vexriscv/post-image.sh

@@ -10,12 +10,14 @@ LINUX_ON_VEXRISCV_OUT_DIR=$BR2_EXTERNAL_LITEX_VEXRISCV_PATH/../images
 DST_DTB=$LINUX_ON_VEXRISCV_OUT_DIR/rv32.dtb
 DST_OPENSBI=$LINUX_ON_VEXRISCV_OUT_DIR/opensbi.bin
 DST_IMAGE=$LINUX_ON_VEXRISCV_OUT_DIR/Image
-DST_ROOTFS=$LINUX_ON_VEXRISCV_OUT_DIR/rootfs.cpio
+DST_ROOTFS_CPIO=$LINUX_ON_VEXRISCV_OUT_DIR/rootfs.cpio
+DST_ROOTFS_EXT4=$LINUX_ON_VEXRISCV_OUT_DIR/rootfs.ext4
 
-rm -f $DST_OPENSBI $DST_ROOTFS $DST_IMAGE
+rm -f $DST_OPENSBI $DST_ROOTFS_CPIO $DST_ROOTFS_EXT4 $DST_IMAGE
 ln -s $BINARIES_DIR/fw_jump.bin $DST_OPENSBI
 ln -s $BINARIES_DIR/Image $DST_IMAGE
-ln -s $BINARIES_DIR/rootfs.cpio $DST_ROOTFS
+ln -s $BINARIES_DIR/rootfs.cpio $DST_ROOTFS_CPIO
+ln -s $BINARIES_DIR/rootfs.ext4 $DST_ROOTFS_EXT4
 
 if [ ! -e $DST_DTB ]; then
 	echo ""

buildroot/configs/litex_vexriscv_defconfig

@@ -30,6 +30,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="console"
 
 # Filesystem
 BR2_TARGET_ROOTFS_CPIO=y
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
 
 # Image
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_LITEX_VEXRISCV_PATH)/board/litex_vexriscv/post-image.sh"

buildroot/configs/litex_vexriscv_usbhost_defconfig

@@ -30,6 +30,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="console"
 
 # Filesystem
 BR2_TARGET_ROOTFS_CPIO=y
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
 
 # Image
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_LITEX_VEXRISCV_PATH)/board/litex_vexriscv/post-image.sh"

images/boot_mmcblk0p2.json

@@ -0,0 +1,5 @@
+{
+	"Image"       : "0x40000000",
+	"rv32.dtb"    : "0x40ef0000",
+	"opensbi.bin" : "0x40f00000"
+}

images/boot.json renamed to images/boot_ram0.json

@@ -10,6 +10,7 @@
 import re
 import sys
 import argparse
+import shutil
 
 from litex.soc.integration.builder import Builder
 from litex.soc.cores.cpu.vexriscv_smp import VexRiscvSMP
@@ -59,6 +60,9 @@ def main():
     parser.add_argument("--spi-data-width", default=8,   type=int,       help="SPI data width (max bits per xfer).")
     parser.add_argument("--spi-clk-freq",   default=1e6, type=int,       help="SPI clock frequency.")
     parser.add_argument("--fdtoverlays",    default="",                  help="Device Tree Overlays to apply.")
+    parser.add_argument("--rootfs",         default="ram0",              help="Location of the RootFS.",
+        choices=["ram0", "mmcblk0p2"]
+    )
     VexRiscvSMP.args_fill(parser)
     args = parser.parse_args()
 
@@ -174,12 +178,15 @@ def main():
         builder.build(run=args.build, build_name=board_name)
 
         # DTS --------------------------------------------------------------------------------------
-        soc.generate_dts(board_name)
+        soc.generate_dts(board_name, args.rootfs)
         soc.compile_dts(board_name, args.fdtoverlays)
 
         # DTB --------------------------------------------------------------------------------------
         soc.combine_dtb(board_name, args.fdtoverlays)
 
+        # boot.json --------------------------------------------------------------------------------
+        shutil.copyfile(f"images/boot_{args.rootfs}.json", "images/boot.json")
+
         # PCIe Driver ------------------------------------------------------------------------------
         if "pcie" in board.soc_capabilities:
             from litepcie.software import generate_litepcie_software

make.py

@@ -73,12 +73,17 @@ def configure_ethernet(self, remote_ip):
 
         # DTS generation ---------------------------------------------------------------------------
 
-        def generate_dts(self, board_name):
+        def generate_dts(self, board_name, rootfs="ram0"):
             json_src = os.path.join("build", board_name, "csr.json")
             dts = os.path.join("build", board_name, "{}.dts".format(board_name))
+            initrd = "enabled" if rootfs == "ram0" else "disabled"
 
             with open(json_src) as json_file, open(dts, "w") as dts_file:
-                dts_content = generate_dts(json.load(json_file), polling=False)
+                dts_content = generate_dts(json.load(json_file),
+                    initrd      = initrd,
+                    polling     = False,
+                    root_device = rootfs
+                )
                 dts_file.write(dts_content)
 
         # DTS compilation --------------------------------------------------------------------------