diff --git a/rkr3-iso/grub/grub.cfg b/rkr3-iso/grub/grub.cfg index 45caca4..569a9fc 100644 --- a/rkr3-iso/grub/grub.cfg +++ b/rkr3-iso/grub/grub.cfg @@ -39,44 +39,44 @@ insmod ext2 menuentry "BredOS" --class arch --class gnu-linux --class gnu --class os --id 'bredos' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/aarch64/vmlinuz-linux-rockchip-rkr6 archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes clk_ignore_unused pd_ignore_unused arm64.nopauth console=tty1 console=ttyFIQ0,1500000 console=both - initrd /%INSTALL_DIR%/boot/aarch64/initramfs-linux-rockchip-rkr6.img + linux /%INSTALL_DIR%/boot/aarch64/vmlinuz-linux-rockchip-rkr3 archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes clk_ignore_unused pd_ignore_unused arm64.nopauth console=tty1 console=ttyFIQ0,1500000 console=both + initrd /%INSTALL_DIR%/boot/aarch64/initramfs-linux-rockchip-rkr3.img } menuentry "BredOS (GPU nomodeset)" --class arch --class gnu-linux --class gnu --class os --id 'bredos-fallback' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/aarch64/vmlinuz-linux-rockchip-rkr6 archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes clk_ignore_unused pd_ignore_unused arm64.nopauth - initrd /%INSTALL_DIR%/boot/aarch64/initramfs-linux-rockchip-rkr6.img console=tty1 console=ttyFIQ0,1500000 console=both + linux /%INSTALL_DIR%/boot/aarch64/vmlinuz-linux-rockchip-rkr3 archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes clk_ignore_unused pd_ignore_unused arm64.nopauth + initrd /%INSTALL_DIR%/boot/aarch64/initramfs-linux-rockchip-rkr3.img console=tty1 console=ttyFIQ0,1500000 console=both } # entries with dtbs # submenu with /%INSTALL_DIR%/boot/aarch64/dtbs/rockchip/rk3588s-roc-pc.dtb - BredOS - Station M3 submenu 'BredOS - Station M3' --class arch --class gnu-linux --class gnu --class os --id 'bredos-station-m3-submenu' { menuentry "BredOS - Station M3" --class arch --class gnu-linux --class gnu --class os --id 'bredos-station-m3' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/aarch64/vmlinuz-linux-rockchip-rkr6 archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes clk_ignore_unused pd_ignore_unused arm64.nopauth console=tty1 console=ttyFIQ0,1500000 console=both + linux /%INSTALL_DIR%/boot/aarch64/vmlinuz-linux-rockchip-rkr3 archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes clk_ignore_unused pd_ignore_unused arm64.nopauth console=tty1 console=ttyFIQ0,1500000 console=both devicetree /%INSTALL_DIR%/boot/aarch64/dtbs/rockchip/rk3588s-roc-pc.dtb - initrd /%INSTALL_DIR%/boot/aarch64/initramfs-linux-rockchip-rkr6.img + initrd /%INSTALL_DIR%/boot/aarch64/initramfs-linux-rockchip-rkr3.img } menuentry "BredOS - Station M3 (GPU nomodeset)" --class arch --class gnu-linux --class gnu --class os --id 'bredos-station-m3-fallback' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/aarch64/vmlinuz-linux-rockchip-rkr6 archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes clk_ignore_unused pd_ignore_unused arm64.nopauth + linux /%INSTALL_DIR%/boot/aarch64/vmlinuz-linux-rockchip-rkr3 archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes clk_ignore_unused pd_ignore_unused arm64.nopauth devicetree /%INSTALL_DIR%/boot/aarch64/dtbs/rockchip/rk3588s-roc-pc.dtb console=tty1 console=ttyFIQ0,1500000 console=both - initrd /%INSTALL_DIR%/boot/aarch64/initramfs-linux-rockchip-rkr6.img + initrd /%INSTALL_DIR%/boot/aarch64/initramfs-linux-rockchip-rkr3.img } } -# linux-rockchip-rkr6 boot/aarch64/dtbs/rockchip/rk3588-firefly-itx-3588j.dtb - BredOS - Firefly ITX-3588J +# linux-rockchip-rkr3 boot/aarch64/dtbs/rockchip/rk3588-firefly-itx-3588j.dtb - BredOS - Firefly ITX-3588J submenu 'BredOS - Firefly ITX-3588J' --class arch --class gnu-linux --class gnu --class os --id 'bredos-firefly-itx-3588j-submenu' { menuentry "BredOS - Firefly ITX-3588J" --class arch --class gnu-linux --class gnu --class os --id 'bredos-firefly-itx-3588j' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/aarch64/vmlinuz-linux-rockchip-rkr6 archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes clk_ignore_unused pd_ignore_unused arm64.nopauth console=tty1 console=ttyFIQ0,1500000 console=both + linux /%INSTALL_DIR%/boot/aarch64/vmlinuz-linux-rockchip-rkr3 archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes clk_ignore_unused pd_ignore_unused arm64.nopauth console=tty1 console=ttyFIQ0,1500000 console=both devicetree /%INSTALL_DIR%/boot/aarch64/dtbs/rockchip/rk3588-firefly-itx-3588j.dtb - initrd /%INSTALL_DIR%/boot/aarch64/initramfs-linux-rockchip-rkr6.img + initrd /%INSTALL_DIR%/boot/aarch64/initramfs-linux-rockchip-rkr3.img } menuentry "BredOS - Firefly ITX-3588J (GPU nomodeset)" --class arch --class gnu-linux --class gnu --class os --id 'bredos-firefly-itx-3588j-fallback' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/aarch64/vmlinuz-linux-rockchip-rkr6 archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes clk_ignore_unused pd_ignore_unused arm64.nopauth console=tty1 console=ttyFIQ0,1500000 console=both + linux /%INSTALL_DIR%/boot/aarch64/vmlinuz-linux-rockchip-rkr3 archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes clk_ignore_unused pd_ignore_unused arm64.nopauth console=tty1 console=ttyFIQ0,1500000 console=both devicetree /%INSTALL_DIR%/boot/aarch64/dtbs/rockchip/rk3588-firefly-itx-3588j.dtb - initrd /%INSTALL_DIR%/boot/aarch64/initramfs-linux-rockchip-rkr6.img + initrd /%INSTALL_DIR%/boot/aarch64/initramfs-linux-rockchip-rkr3.img } } @@ -94,4 +94,4 @@ menuentry 'System shutdown' --class shutdown --class poweroff { menuentry 'System restart' --class reboot --class restart { echo 'System rebooting...' reboot -} \ No newline at end of file +}