Remove grub config and bbappend as these will not be needed.
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .../recipes-bsp/grub/grub-efi_2.%.bbappend | 21 +---------- .../grub/morello-fvp/files/grub-config.cfg | 35 ------------------ .../grub/morello-soc/files/grub-config.cfg | 37 ------------------- 3 files changed, 1 insertion(+), 92 deletions(-) delete mode 100644 meta-morello/recipes-bsp/grub/morello-fvp/files/grub-config.cfg delete mode 100644 meta-morello/recipes-bsp/grub/morello-soc/files/grub-config.cfg
diff --git a/meta-morello/recipes-bsp/grub/grub-efi_2.%.bbappend b/meta-morello/recipes-bsp/grub/grub-efi_2.%.bbappend index 204c1d2..fa9680e 100644 --- a/meta-morello/recipes-bsp/grub/grub-efi_2.%.bbappend +++ b/meta-morello/recipes-bsp/grub/grub-efi_2.%.bbappend @@ -1,9 +1,5 @@
-OUTPUTS_NAME = "grub-efi" - -FILESEXTRAPATHS:prepend := "${THISDIR}:" - GRUB_BUILDIN:morello-soc = " boot chain configfile ext2 fat gzio help linux loadenv \ lsefi normal ntfs ntfscomp part_gpt part_msdos progress read search \ search_fs_file search_fs_uuid search_label terminal terminfo \ @@ -12,19 +8,4 @@ GRUB_BUILDIN:morello-soc = " boot chain configfile ext2 fat gzio help linux load GRUB_BUILDIN:morello-fvp = " boot chain configfile ext2 fat gzio help linux loadenv \ lsefi normal ntfs ntfscomp part_gpt part_msdos progress read search \ search_fs_file search_fs_uuid search_label terminal terminfo \ - " - -SRC_URI:append:morello-soc = " file://files/grub-config.cfg" -SRC_URI:append:morello-fvp = " file://files/grub-config.cfg" - -do_deploy:append:morello-soc() { - install -d ${DEPLOYDIR}/${OUTPUTS_NAME} - install -m 644 ${B}/${GRUB_IMAGE_PREFIX}${GRUB_IMAGE} "${DEPLOYDIR}/${OUTPUTS_NAME}/" - install -m 644 ${WORKDIR}/files/grub-config.cfg "${DEPLOYDIR}/${OUTPUTS_NAME}/grub-config.cfg" -} - -do_deploy:append:morello-fvp() { - install -d ${DEPLOYDIR}/${OUTPUTS_NAME} - install -m 644 ${B}/${GRUB_IMAGE_PREFIX}${GRUB_IMAGE} "${DEPLOYDIR}/${OUTPUTS_NAME}/" - install -m 644 ${WORKDIR}/files/grub-config.cfg "${DEPLOYDIR}/${OUTPUTS_NAME}/grub-config.cfg" -} + " \ No newline at end of file diff --git a/meta-morello/recipes-bsp/grub/morello-fvp/files/grub-config.cfg b/meta-morello/recipes-bsp/grub/morello-fvp/files/grub-config.cfg deleted file mode 100644 index b8d3b81..0000000 --- a/meta-morello/recipes-bsp/grub/morello-fvp/files/grub-config.cfg +++ /dev/null @@ -1,35 +0,0 @@ -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/meta-morello/recipes-bsp/grub/morello-soc/files/grub-config.cfg b/meta-morello/recipes-bsp/grub/morello-soc/files/grub-config.cfg deleted file mode 100644 index b1bb393..0000000 --- a/meta-morello/recipes-bsp/grub/morello-soc/files/grub-config.cfg +++ /dev/null @@ -1,37 +0,0 @@ -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 \ - console=ttyAMA0,115200 \ - 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 \ - console=ttyAMA0,115200 \ - earlycon=pl011,0x2A400000 \ - ip=dhcp \ - root=PARTUUID=%UUID% \ - - initrd /initramfs -} \ No newline at end of file