summaryrefslogtreecommitdiffstats
path: root/recipes-bsp/u-boot/u-boot-ota/0001-Set-up-environment-for-OSTree-integration.patch
diff options
context:
space:
mode:
authorOYTIS <tossel@gmail.com>2016-12-23 11:52:53 +0100
committerGitHub <noreply@github.com>2016-12-23 11:52:53 +0100
commit96ed051bfbee1d3c01d9ad7a45ad53c672623a24 (patch)
tree60050e1f0dd76d03342b37f8cfacf3cf54b00244 /recipes-bsp/u-boot/u-boot-ota/0001-Set-up-environment-for-OSTree-integration.patch
parent1e225f3d9c845081c53b2a462e6f77b4c444449e (diff)
parent84fece9878d2fd861ee1f571139f7c4b2011ee56 (diff)
downloadmeta-updater-96ed051bfbee1d3c01d9ad7a45ad53c672623a24.tar.gz
Merge pull request #14 from advancedtelematic/feat/PRO-1974/uboot-bsp
Move u-boot to BSP layers
Diffstat (limited to 'recipes-bsp/u-boot/u-boot-ota/0001-Set-up-environment-for-OSTree-integration.patch')
-rw-r--r--recipes-bsp/u-boot/u-boot-ota/0001-Set-up-environment-for-OSTree-integration.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/recipes-bsp/u-boot/u-boot-ota/0001-Set-up-environment-for-OSTree-integration.patch b/recipes-bsp/u-boot/u-boot-ota/0001-Set-up-environment-for-OSTree-integration.patch
deleted file mode 100644
index 5172fdd..0000000
--- a/recipes-bsp/u-boot/u-boot-ota/0001-Set-up-environment-for-OSTree-integration.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From ebb26338d0c2f436a86fd4d7cb8d723a90d6a369 Mon Sep 17 00:00:00 2001
2From: Anton Gerasimov <anton@advancedtelematic.com>
3Date: Thu, 15 Sep 2016 17:52:41 +0200
4Subject: [PATCH 1/2] Set up environment for OSTree integration
5
6---
7 include/configs/qemu-x86.h | 20 ++++++++++++++++++++
8 1 file changed, 20 insertions(+)
9
10diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h
11index 78c296f..79df455 100644
12--- a/include/configs/qemu-x86.h
13+++ b/include/configs/qemu-x86.h
14@@ -74,4 +74,24 @@
15 #undef CONFIG_ENV_IS_IN_SPI_FLASH
16 #define CONFIG_ENV_IS_NOWHERE
17
18+#undef CONFIG_BOOTARGS
19+#define CONFIG_BOOTARGS "root=/dev/hda2 console=ttyS0"
20+
21+#undef CONFIG_BOOTDELAY
22+#define CONFIG_BOOTDELAY 3
23+
24+#undef CONFIG_BOOTCOMMAND
25+#define CONFIG_BOOTCOMMAND "run loadenv;" \
26+ "setenv bootargs $bootargs\" console=ttyS0 root=/dev/ram0 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/hda ramdisk_size=16384 \";" \
27+ "ext2load ide 0 $loadaddr \"/boot\"$kernel_image;" \
28+ "ext2load ide 0 $ramdiskaddr \"/boot\"$ramdisk_image;" \
29+ "zboot $loadaddr - $ramdiskaddr $filesize"
30+
31+#undef CONFIG_EXTRA_ENV_SETTINGS
32+#define CONFIG_EXTRA_ENV_SETTINGS "kernel_image=/bzImage\0" \
33+ "ramdisk_image=/initrd\0" \
34+ "ramdiskaddr=0x4000000\0" \
35+ "bootdelay=3\0" \
36+ "loadenv=if ext2load ide 0 $loadaddr /boot/loader/uEnv.txt; then env import -t $loadaddr $filesize; fi;"
37+
38 #endif /* __CONFIG_H */
39--
402.9.3
41