From 0452cfeb41dc55d9e1b1fb5784450c645796b8ab Mon Sep 17 00:00:00 2001 From: digitalLumberjack Date: Sat, 21 Nov 2020 11:11:18 +0100 Subject: [PATCH] fix(install): change boot partition name to RECALBOXBOOT --- CHANGELOG.md | 1 + board/recalbox/grub2/genimage-x86-64.cfg | 2 +- board/recalbox/grub2/genimage-x86.cfg | 2 +- board/recalbox/odroidgo2/genimage.cfg | 2 +- board/recalbox/odroidxu4/genimage.cfg | 2 +- board/recalbox/rpi/genimage.cfg | 2 +- custom/package/rpi-firmware/cmdline.txt | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f5395bcd56..6a59932426 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ All notable changes to this project will be documented in this file. ## [Next] +- Change boot partition name to RECALBOXBOOT - Add model3 arcade system - Add odroidgo2 build stage in .gitlab-ci.yml - Bump ES diff --git a/board/recalbox/grub2/genimage-x86-64.cfg b/board/recalbox/grub2/genimage-x86-64.cfg index f0990f524c..90590ace86 100644 --- a/board/recalbox/grub2/genimage-x86-64.cfg +++ b/board/recalbox/grub2/genimage-x86-64.cfg @@ -1,6 +1,6 @@ image boot.vfat { vfat { - extraargs = "-F 32 -n RECALBOX" + extraargs = "-F 32 -n RECALBOXBOOT" file boot/grub/grub.cfg { image = 'pc-boot/boot/grub/grub.cfg' } file boot/linux { image = 'pc-boot/boot/linux' } file boot/initrd.gz { image = 'pc-boot/boot/initrd.gz' } diff --git a/board/recalbox/grub2/genimage-x86.cfg b/board/recalbox/grub2/genimage-x86.cfg index b641aa7f8d..eb4d967231 100644 --- a/board/recalbox/grub2/genimage-x86.cfg +++ b/board/recalbox/grub2/genimage-x86.cfg @@ -1,6 +1,6 @@ image boot.vfat { vfat { - extraargs = "-F 32 -n RECALBOX" + extraargs = "-F 32 -n RECALBOXBOOT" file boot/grub/grub.cfg { image = 'pc-boot/boot/grub/grub.cfg' } file boot/linux { image = 'pc-boot/boot/linux' } file boot/initrd.gz { image = 'pc-boot/boot/initrd.gz' } diff --git a/board/recalbox/odroidgo2/genimage.cfg b/board/recalbox/odroidgo2/genimage.cfg index 419268e018..f2edc1bc2c 100644 --- a/board/recalbox/odroidgo2/genimage.cfg +++ b/board/recalbox/odroidgo2/genimage.cfg @@ -1,6 +1,6 @@ image boot.vfat { vfat { - extraargs = "-F 32 -n RECALBOX" + extraargs = "-F 32 -n RECALBOXBOOT" file boot/linux { image = 'odroidgo2-firmware/boot/linux' } file boot/recalbox { image = 'odroidgo2-firmware/boot/recalbox' } file boot/uInitrd { image = 'odroidgo2-firmware/boot/uInitrd' } diff --git a/board/recalbox/odroidxu4/genimage.cfg b/board/recalbox/odroidxu4/genimage.cfg index 54cd816112..0fe8a664cf 100644 --- a/board/recalbox/odroidxu4/genimage.cfg +++ b/board/recalbox/odroidxu4/genimage.cfg @@ -1,6 +1,6 @@ image boot.vfat { vfat { - extraargs = "-F 32 -n RECALBOX" + extraargs = "-F 32 -n RECALBOXBOOT" file boot/linux { image = 'odroidxu4-firmware/boot/linux' } file boot/recalbox { image = 'odroidxu4-firmware/boot/recalbox' } file boot/uInitrd { image = 'odroidxu4-firmware/boot/uInitrd' } diff --git a/board/recalbox/rpi/genimage.cfg b/board/recalbox/rpi/genimage.cfg index e11ce2ae78..ee5e30413d 100644 --- a/board/recalbox/rpi/genimage.cfg +++ b/board/recalbox/rpi/genimage.cfg @@ -1,6 +1,6 @@ image boot.vfat { vfat { - extraargs = "-F 32 -n RECALBOX" + extraargs = "-F 32 -n RECALBOXBOOT" @files # Setting the size to 1200M exposes the error (from genimage command line): diff --git a/custom/package/rpi-firmware/cmdline.txt b/custom/package/rpi-firmware/cmdline.txt index 9133bf9dad..1dcbab3790 100644 --- a/custom/package/rpi-firmware/cmdline.txt +++ b/custom/package/rpi-firmware/cmdline.txt @@ -1 +1 @@ -dwc_otg.fiq_fix_enable=1 sdhci-bcm2708.sync_after_dma=0 dwc_otg.lpm_enable=0 console=tty3 consoleblank=0 loglevel=3 elevator=deadline vt.global_cursor_default=0 logo.nologo splash label=RECALBOX rootwait fastboot noswap +dwc_otg.fiq_fix_enable=1 sdhci-bcm2708.sync_after_dma=0 dwc_otg.lpm_enable=0 console=tty3 consoleblank=0 loglevel=3 elevator=deadline vt.global_cursor_default=0 logo.nologo splash label=RECALBOXBOOT rootwait fastboot noswap -- GitLab