diff --git a/04_build_linux.sh b/04_build_linux.sh index bebf9d0..38b5af9 100755 --- a/04_build_linux.sh +++ b/04_build_linux.sh @@ -146,6 +146,10 @@ if [ -f arch/riscv/configs/mpfs_defconfig ] ; then ./scripts/config --enable CONFIG_NLS_ISO8859_1 ./scripts/config --enable CONFIG_BLK_DEV_DM + #Flattened Image Tree file doesn't seem to have an append... lets force it here.. + ./scripts/config --set-str CONFIG_CMDLINE "root=/dev/mmcblk0p3 ro rootfstype=ext4 rootwait console=ttyS0,115200 earlycon uio_pdrv_genirq.of_id=generic-uio net.ifnames=0" + ./scripts/config --enable CONFIG_CMDLINE_FORCE + echo "make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig" make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig else diff --git a/06_generate_debian_console_root.sh b/06_generate_debian_console_root.sh index 8939d8c..c9ca373 100755 --- a/06_generate_debian_console_root.sh +++ b/06_generate_debian_console_root.sh @@ -39,10 +39,10 @@ sync mkdir -p ./deploy/input/ || true echo "label Linux eMMC" > ./deploy/input/extlinux.conf echo " kernel /Image" >> ./deploy/input/extlinux.conf -echo " append root=/dev/mmcblk0p3 ro rootfstype=ext4 rootwait console=ttyS0,115200 earlycon uio_pdrv_genirq.of_id=generic-uio net.ifnames=0" >> ./deploy/input/extlinux.conf +#echo " append root=/dev/mmcblk0p3 ro rootfstype=ext4 rootwait console=ttyS0,115200 earlycon uio_pdrv_genirq.of_id=generic-uio net.ifnames=0" >> ./deploy/input/extlinux.conf echo " fdtdir /" >> ./deploy/input/extlinux.conf echo " fdt /mpfs-beaglev-fire.dtb" >> ./deploy/input/extlinux.conf -echo " #fdtoverlays /overlays/.dtbo" >> ./deploy/input/extlinux.conf +#echo " #fdtoverlays /overlays/.dtbo" >> ./deploy/input/extlinux.conf echo "extlinux/extlinux.conf" cat ./deploy/input/extlinux.conf diff --git a/deploy/boot.scr b/deploy/boot.scr new file mode 100644 index 0000000..a825b45 Binary files /dev/null and b/deploy/boot.scr differ diff --git a/patches/linux/mpfs_defconfig b/patches/linux/mpfs_defconfig index 97764b7..f0befdc 100644 --- a/patches/linux/mpfs_defconfig +++ b/patches/linux/mpfs_defconfig @@ -178,6 +178,7 @@ CONFIG_CHECKPOINT_RESTORE=y # CONFIG_RELAY is not set CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" +# CONFIG_INITRAMFS_FORCE is not set CONFIG_RD_GZIP=y CONFIG_RD_BZIP2=y CONFIG_RD_LZMA=y @@ -315,7 +316,10 @@ CONFIG_COMPAT=y # # Boot options # -CONFIG_CMDLINE="" +CONFIG_CMDLINE="root=/dev/mmcblk0p3 ro rootfstype=ext4 rootwait console=ttyS0,115200 earlycon uio_pdrv_genirq.of_id=generic-uio net.ifnames=0" +# CONFIG_CMDLINE_FALLBACK is not set +# CONFIG_CMDLINE_EXTEND is not set +CONFIG_CMDLINE_FORCE=y CONFIG_EFI_STUB=y CONFIG_EFI=y CONFIG_CC_HAVE_STACKPROTECTOR_TLS=y