diff options
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.patch | 27 |
1 files changed, 16 insertions, 11 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 index c33d40c..186a2a2 100644 --- 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 @@ -1,36 +1,41 @@ -From 2b4d519bef51d9bfb646588aa5198f71022a867b Mon Sep 17 00:00:00 2001 +From ebb26338d0c2f436a86fd4d7cb8d723a90d6a369 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 +Date: Thu, 15 Sep 2016 17:52:41 +0200 +Subject: [PATCH 1/2] Set up environment for OSTree integration --- - include/configs/qemu-x86.h | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) + include/configs/qemu-x86.h | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h -index 476d37d..f49e2a5 100644 +index 78c296f..79df455 100644 --- a/include/configs/qemu-x86.h +++ b/include/configs/qemu-x86.h -@@ -56,4 +56,19 @@ +@@ -74,4 +74,24 @@ #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_BOOTDELAY ++#define CONFIG_BOOTDELAY 3 ++ +#undef CONFIG_BOOTCOMMAND +#define CONFIG_BOOTCOMMAND "run loadenv;" \ -+ "ext2load ide 0:1 $loadaddr $kernel_image;" \ -+ "ext2load ide 0:1 $ramdiskaddr $ramdisk_image;" \ ++ "setenv bootargs $bootargs\" console=ttyS0 root=/dev/hda\";" \ ++ "ext2load ide 0 $loadaddr \"/boot\"$kernel_image;" \ ++ "ext2load ide 0 $ramdiskaddr \"/boot\"$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;" ++ "bootdelay=3\0" \ ++ "loadenv=if ext2load ide 0 $loadaddr /boot/loader/uEnv.txt; then env import -t $loadaddr $filesize; fi;" + #endif /* __CONFIG_H */ -- -2.8.3 +2.9.3 |