summaryrefslogtreecommitdiffstats
path: root/meta-sota/recipes-bsp/u-boot/u-boot-ota/0001-Set-up-environment-for-OSTree-integration.patch
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2016-08-29 12:38:14 +0000
committerGerrit Code Review <gerrit@172.30.200.200>2016-08-29 12:38:14 +0000
commitdf72ee883ec73cab47cfaa23e0f2feff9f1d2862 (patch)
treee2b596c332c78370d746ba6d29c3d405f53bb0d0 /meta-sota/recipes-bsp/u-boot/u-boot-ota/0001-Set-up-environment-for-OSTree-integration.patch
parent208d0258a615f5eccfcaa573d4c42bd64168381a (diff)
parent69d6b7adc9aef8d39ca66ef8688ac968876ae040 (diff)
Merge "Replaced functionality in qemux86-ota machine with algsetup.sh feature. otaimg is now a live image."
Diffstat (limited to 'meta-sota/recipes-bsp/u-boot/u-boot-ota/0001-Set-up-environment-for-OSTree-integration.patch')
-rw-r--r--meta-sota/recipes-bsp/u-boot/u-boot-ota/0001-Set-up-environment-for-OSTree-integration.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/meta-sota/recipes-bsp/u-boot/u-boot-ota/0001-Set-up-environment-for-OSTree-integration.patch b/meta-sota/recipes-bsp/u-boot/u-boot-ota/0001-Set-up-environment-for-OSTree-integration.patch
new file mode 100644
index 0000000..c33d40c
--- /dev/null
+++ b/meta-sota/recipes-bsp/u-boot/u-boot-ota/0001-Set-up-environment-for-OSTree-integration.patch
@@ -0,0 +1,36 @@
+From 2b4d519bef51d9bfb646588aa5198f71022a867b Mon Sep 17 00:00:00 2001
+From: Anton Gerasimov <anton@advancedtelematic.com>
+Date: Mon, 15 Aug 2016 15:54:20 +0200
+Subject: [PATCH] Set up environment for OSTree integration
+
+---
+ include/configs/qemu-x86.h | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h
+index 476d37d..f49e2a5 100644
+--- a/include/configs/qemu-x86.h
++++ b/include/configs/qemu-x86.h
+@@ -56,4 +56,19 @@
+ #undef CONFIG_ENV_IS_IN_SPI_FLASH
+ #define CONFIG_ENV_IS_NOWHERE
+
++#undef CONFIG_BOOTARGS
++#define CONFIG_BOOTARGS "root=/dev/hda2 console=ttyS0"
++
++#undef CONFIG_BOOTCOMMAND
++#define CONFIG_BOOTCOMMAND "run loadenv;" \
++ "ext2load ide 0:1 $loadaddr $kernel_image;" \
++ "ext2load ide 0:1 $ramdiskaddr $ramdisk_image;" \
++ "zboot $loadaddr - $ramdiskaddr $filesize"
++
++#undef CONFIG_EXTRA_ENV_SETTINGS
++#define CONFIG_EXTRA_ENV_SETTINGS "kernel_image=/bzImage\0" \
++ "ramdisk_image=/initrd\0" \
++ "ramdiskaddr=0x4000000\0" \
++ "loadenv=if ext2ls ide 0:1 /loader.0/uEnv.txt; then ext2load ide 0:1 $loadaddr uEnv.txt; env import -t $loadaddr $filesize; fi;"
++
+ #endif /* __CONFIG_H */
+--
+2.8.3
+