Set the options to something more logical, the user can live inside a purecap busybox environment.
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .../grub/morello-fvp/files/grub-config.cfg | 35 +++++++++++++++++++ .../{ => morello-soc}/files/grub-config.cfg | 20 +++++------ 2 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 recipes-bsp/grub/morello-fvp/files/grub-config.cfg rename recipes-bsp/grub/{ => morello-soc}/files/grub-config.cfg (65%)
diff --git a/recipes-bsp/grub/morello-fvp/files/grub-config.cfg b/recipes-bsp/grub/morello-fvp/files/grub-config.cfg new file mode 100644 index 0000000..b8d3b81 --- /dev/null +++ b/recipes-bsp/grub/morello-fvp/files/grub-config.cfg @@ -0,0 +1,35 @@ +set debug="loader,mm" +set term="vt100" +set default="1" +set timeout="5" + +menuentry 'BusyBox Morello Platform (Device Tree) : a64 + c64 sysroot' { + devicetree /morello.dtb + linux /Image \ + acpi=off \ + debug \ + earlycon=pl011,0x2A400000 \ + ip=dhcp \ + root=PARTUUID=%UUID% \ +} + +menuentry 'BusyBox Morello Platform (ACPI) : a64 + c64 sysroot' { + linux /Image \ + acpi=force \ + debug \ + earlycon=pl011,0x2A400000 \ + ip=dhcp \ + root=PARTUUID=%UUID% \ +} + +menuentry 'BusyBox Morello Platform (Device Tree): initramfs pure c64' { + devicetree /morello.dtb + linux /Image \ + acpi=off \ + debug \ + earlycon=pl011,0x2A400000 \ + ip=dhcp \ + root=PARTUUID=%UUID% \ + + initrd /initramfs +} \ No newline at end of file diff --git a/recipes-bsp/grub/files/grub-config.cfg b/recipes-bsp/grub/morello-soc/files/grub-config.cfg similarity index 65% rename from recipes-bsp/grub/files/grub-config.cfg rename to recipes-bsp/grub/morello-soc/files/grub-config.cfg index 2273be7..b1bb393 100644 --- a/recipes-bsp/grub/files/grub-config.cfg +++ b/recipes-bsp/grub/morello-soc/files/grub-config.cfg @@ -3,35 +3,35 @@ set term="vt100" set default="1" set timeout="5"
-menuentry 'BusyBox Morello Platform (Device Tree)' { +menuentry 'BusyBox Morello Platform (Device Tree) : a64 + c64 sysroot' { devicetree /morello.dtb linux /Image \ acpi=off \ - console=ttyAMA0,115200 \ debug \ + console=ttyAMA0,115200 \ earlycon=pl011,0x2A400000 \ ip=dhcp \ - - initrd /initramfs + root=PARTUUID=%UUID% \ }
-menuentry 'BusyBox Morello Platform (ACPI)' { +menuentry 'BusyBox Morello Platform (ACPI) : a64 + c64 sysroot' { linux /Image \ acpi=force \ debug \ earlycon=pl011,0x2A400000 \ ip=dhcp \ root=PARTUUID=%UUID% \ - - initrd /initramfs }
-menuentry 'BusyBox Morello Platform (ACPI) - no initramfs' { +menuentry 'BusyBox Morello Platform (Device Tree): initramfs pure c64' { + devicetree /morello.dtb linux /Image \ - acpi=force \ - console=ttyAMA0,115200 \ + acpi=off \ debug \ + console=ttyAMA0,115200 \ earlycon=pl011,0x2A400000 \ ip=dhcp \ root=PARTUUID=%UUID% \ + + initrd /initramfs } \ No newline at end of file