From 4abd447b8d156b3b8bfef80afddffb53259a0a93 Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Thu, 30 Mar 2017 13:37:56 +0200 Subject: Add grub2 support in SOTA Change-Id: Ia37920f6190e9dfe68c4d63a01f204ff6fc66423 Signed-off-by: Anton Gerasimov --- meta-agl-bsp/conf/include/agl_cyclone5.inc | 1 + meta-agl-bsp/conf/include/agl_dra7xx-evm.inc | 1 + meta-agl-bsp/conf/include/agl_h3ulcb.inc | 1 + meta-agl-bsp/conf/include/agl_intel-corei7-64.inc | 1 + meta-agl-bsp/conf/include/agl_joule.inc | 1 + meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc | 1 + meta-agl-bsp/conf/include/agl_m3ulcb.inc | 1 + meta-agl-bsp/conf/include/agl_porter-nogfx.inc | 1 + meta-agl-bsp/conf/include/agl_porter.inc | 1 + meta-agl-bsp/conf/include/agl_qemux86-64.inc | 3 +++ meta-agl-bsp/conf/include/agl_qemux86.inc | 2 ++ meta-agl-bsp/conf/include/agl_raspberrypi2.inc | 1 + meta-agl-bsp/conf/include/agl_raspberrypi3.inc | 1 + 13 files changed, 16 insertions(+) diff --git a/meta-agl-bsp/conf/include/agl_cyclone5.inc b/meta-agl-bsp/conf/include/agl_cyclone5.inc index e69de29bb..9ad4c94b8 100644 --- a/meta-agl-bsp/conf/include/agl_cyclone5.inc +++ b/meta-agl-bsp/conf/include/agl_cyclone5.inc @@ -0,0 +1 @@ +OSTREE_BOOTLOADER ?= "u-boot" diff --git a/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc b/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc index 6e0eabdf1..86ed8d2d6 100644 --- a/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc +++ b/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc @@ -50,3 +50,4 @@ IMAGE_INSTALL_append = " \ IMAGE_CLASSES_append_sota = " image_types_uboot sdcard_image-dra7xx-evm-ota" IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-ota', 'dra7xx-evm-sdimg-ota ', '', d)}" +OSTREE_BOOTLOADER ?= "u-boot" diff --git a/meta-agl-bsp/conf/include/agl_h3ulcb.inc b/meta-agl-bsp/conf/include/agl_h3ulcb.inc index 4176438cb..7f8ea6487 100644 --- a/meta-agl-bsp/conf/include/agl_h3ulcb.inc +++ b/meta-agl-bsp/conf/include/agl_h3ulcb.inc @@ -48,3 +48,4 @@ IMAGE_INSTALL_append_rcar-gen3 = " \ " BBMASK .= "|meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-forward-port/" +OSTREE_BOOTLOADER ?= "u-boot" diff --git a/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc b/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc index c31ac2759..85d83e16a 100644 --- a/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc +++ b/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc @@ -23,3 +23,4 @@ IMAGE_INSTALL_append = " \ libva \ va-intel \ gstreamer-vaapi-1.0 " +OSTREE_BOOTLOADER ?= "u-boot" diff --git a/meta-agl-bsp/conf/include/agl_joule.inc b/meta-agl-bsp/conf/include/agl_joule.inc index 151f93c2a..212cb15af 100644 --- a/meta-agl-bsp/conf/include/agl_joule.inc +++ b/meta-agl-bsp/conf/include/agl_joule.inc @@ -8,3 +8,4 @@ IMAGE_INSTALL_append = " \ libva \ va-intel \ gstreamer-vaapi-1.0 " +OSTREE_BOOTLOADER ?= "u-boot" diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc index d67be93c5..f1f9b87fd 100644 --- a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc +++ b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc @@ -13,3 +13,4 @@ BBMASK .= "|meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-forward-port/" OSTREE_KERNEL = "Image" IMAGE_BOOT_FILES_sota = "m3ulcb-ota-bootfiles/* Image-r8a7796-m3ulcb.dtb" +OSTREE_BOOTLOADER ?= "u-boot" diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb.inc b/meta-agl-bsp/conf/include/agl_m3ulcb.inc index eb3a62ad4..e7904e14a 100644 --- a/meta-agl-bsp/conf/include/agl_m3ulcb.inc +++ b/meta-agl-bsp/conf/include/agl_m3ulcb.inc @@ -51,3 +51,4 @@ BBMASK .= "|meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-forward-port/" OSTREE_KERNEL = "Image" IMAGE_BOOT_FILES_sota = "m3ulcb-ota-bootfiles/* Image-r8a7796-m3ulcb.dtb" +OSTREE_BOOTLOADER ?= "u-boot" diff --git a/meta-agl-bsp/conf/include/agl_porter-nogfx.inc b/meta-agl-bsp/conf/include/agl_porter-nogfx.inc index dd2ab85ae..cd7243151 100644 --- a/meta-agl-bsp/conf/include/agl_porter-nogfx.inc +++ b/meta-agl-bsp/conf/include/agl_porter-nogfx.inc @@ -25,3 +25,4 @@ OSTREE_KERNEL = "uImage+dtb" IMAGE_CLASSES_append_sota = " image_types_uboot " IMAGE_BOOT_FILES_sota = "porter-bootfiles/*" +OSTREE_BOOTLOADER ?= "u-boot" diff --git a/meta-agl-bsp/conf/include/agl_porter.inc b/meta-agl-bsp/conf/include/agl_porter.inc index 4837ced8d..0bd8afd2b 100644 --- a/meta-agl-bsp/conf/include/agl_porter.inc +++ b/meta-agl-bsp/conf/include/agl_porter.inc @@ -185,3 +185,4 @@ OSTREE_KERNEL = "uImage+dtb" IMAGE_CLASSES_append_sota = " image_types_uboot " IMAGE_BOOT_FILES_sota = "porter-bootfiles/*" +OSTREE_BOOTLOADER ?= "u-boot" diff --git a/meta-agl-bsp/conf/include/agl_qemux86-64.inc b/meta-agl-bsp/conf/include/agl_qemux86-64.inc index 81015e076..d48252e92 100644 --- a/meta-agl-bsp/conf/include/agl_qemux86-64.inc +++ b/meta-agl-bsp/conf/include/agl_qemux86-64.inc @@ -21,3 +21,6 @@ APPEND += "quiet" # U-Boot support for SOTA PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot-ota" UBOOT_MACHINE_sota = "qemu-x86_defconfig" +OSTREE_BOOTLOADER ?= "u-boot" + +OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/hda" diff --git a/meta-agl-bsp/conf/include/agl_qemux86.inc b/meta-agl-bsp/conf/include/agl_qemux86.inc index 81015e076..ae284b3f7 100644 --- a/meta-agl-bsp/conf/include/agl_qemux86.inc +++ b/meta-agl-bsp/conf/include/agl_qemux86.inc @@ -21,3 +21,5 @@ APPEND += "quiet" # U-Boot support for SOTA PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot-ota" UBOOT_MACHINE_sota = "qemu-x86_defconfig" +OSTREE_BOOTLOADER ?= "u-boot" +OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/hda" diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi2.inc b/meta-agl-bsp/conf/include/agl_raspberrypi2.inc index 6410941b5..7250f5c22 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi2.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi2.inc @@ -44,3 +44,4 @@ IMAGE_INSTALL_append = " kernel-modules linux-firmware " # Psplash causes crash on first boot on RPi IMAGE_FEATURES_remove = "splash" +OSTREE_BOOTLOADER ?= "u-boot" diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc index 8bbc01716..a3a84be5f 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc @@ -44,3 +44,4 @@ IMAGE_INSTALL_append = " kernel-modules linux-firmware " # Psplash causes crash on first boot on RPi IMAGE_FEATURES_remove = "splash" +OSTREE_BOOTLOADER ?= "u-boot" -- cgit 1.2.3-korg