summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Salveti <ricardo@opensourcefoundries.com>2018-03-06 22:36:34 -0300
committerRicardo Salveti <ricardo@opensourcefoundries.com>2018-03-27 22:10:35 -0300
commitfb31a145a67287afe61f14a5992a9964e817a7bb (patch)
tree0482562048bdd07d3c05e672ffb1924adbde2128
parentb11ad30a2f94782b26d905d56132120e852e2578 (diff)
grub: make hikey config compatible with sota
Different rootfs label and grub.cfg path when sota is enabled. Signed-off-by: Ricardo Salveti <ricardo@opensourcefoundries.com>
-rw-r--r--recipes-bsp/grub/grub/sota_compatible_grub_config.patch10
-rw-r--r--recipes-bsp/grub/grub_git.bbappend5
2 files changed, 15 insertions, 0 deletions
diff --git a/recipes-bsp/grub/grub/sota_compatible_grub_config.patch b/recipes-bsp/grub/grub/sota_compatible_grub_config.patch
new file mode 100644
index 0000000..a8a6459
--- /dev/null
+++ b/recipes-bsp/grub/grub/sota_compatible_grub_config.patch
@@ -0,0 +1,10 @@
+diff --git a/cfg.emmc b/cfg.emmc
+index ff8a90d..b21df00 100644
+--- a/cfg.emmc
++++ b/cfg.emmc
+@@ -1,3 +1,3 @@
+-search.fs_label rootfs root
+-set prefix=($root)'/boot/grub'
++search.fs_label otaroot root
++set prefix=($root)'/boot/grub2'
+ configfile $prefix/grub.cfg
diff --git a/recipes-bsp/grub/grub_git.bbappend b/recipes-bsp/grub/grub_git.bbappend
new file mode 100644
index 0000000..1bcdbd7
--- /dev/null
+++ b/recipes-bsp/grub/grub_git.bbappend
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI_append_sota_hikey += " \
+ file://sota_compatible_grub_config.patch;patchdir=.. \
+"