diff options
| author |   ToshikazuOhiwa <toshikazu_ohiwa@mail.toyota.co.jp> | 2020-03-30 09:24:26 +0900 |
|---|---|---|
| committer | ToshikazuOhiwa <toshikazu_ohiwa@mail.toyota.co.jp> | 2020-03-30 09:24:26 +0900 |
| commit | 5b80bfd7bffd4c20d80b7c70a7130529e9a755dd (patch) | |
| tree | b4bb18dcd1487dbf1ea8127e5671b7bb2eded033 /external/meta-updater-qemux86-64/recipes-bsp/u-boot/files/0001-Set-up-environment-for-OSTree-integration.patch | |
| parent | 706ad73eb02caf8532deaf5d38995bd258725cb8 (diff) | |
agl-basesystem
Diffstat (limited to 'external/meta-updater-qemux86-64/recipes-bsp/u-boot/files/0001-Set-up-environment-for-OSTree-integration.patch')
| -rw-r--r-- | external/meta-updater-qemux86-64/recipes-bsp/u-boot/files/0001-Set-up-environment-for-OSTree-integration.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/external/meta-updater-qemux86-64/recipes-bsp/u-boot/files/0001-Set-up-environment-for-OSTree-integration.patch b/external/meta-updater-qemux86-64/recipes-bsp/u-boot/files/0001-Set-up-environment-for-OSTree-integration.patch new file mode 100644 index 00000000..8e155d30 --- /dev/null +++ b/external/meta-updater-qemux86-64/recipes-bsp/u-boot/files/0001-Set-up-environment-for-OSTree-integration.patch @@ -0,0 +1,49 @@ +From 6c1f0bd556ce99b5eb2bab9093daa5276f275ee2 Mon Sep 17 00:00:00 2001 +From: Laurent Bonnans <laurent.bonnans@here.com> +Date: Fri, 20 Jul 2018 16:09:20 +0200 +Subject: [PATCH] qemu-x86.h: Set up environment for OSTree integration + +Setup environment for QEMU OSTree integration + +Includes fix for u-boot 2018.07 (explicit IDE initialization) + +Co-Authored-By: Anton Gerasimov <anton@advancedtelematic.com> +Co-Authored-By: Leon Anavi <leon.anavi@konsulko.com> +Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com> +--- + include/configs/qemu-x86.h | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h +index 4b9ddd6f25..ff4b1d14d6 100644 +--- a/include/configs/qemu-x86.h ++++ b/include/configs/qemu-x86.h +@@ -42,4 +42,25 @@ + #define CONFIG_SPL_BOARD_LOAD_IMAGE + #define BOOT_DEVICE_BOARD 11 + ++#undef CONFIG_BOOTARGS ++ ++#define CONFIG_BOOTARGS "root=/dev/hda2 console=ttyS0" ++ ++#undef CONFIG_BOOTDELAY ++#define CONFIG_BOOTDELAY 3 ++ ++#undef CONFIG_BOOTCOMMAND ++#define CONFIG_BOOTCOMMAND "ide reset; run loadenv;" \ ++ "setenv bootargs $bootargs\" console=ttyS0 root=/dev/ram0 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/hda ramdisk_size=16384 \";" \ ++ "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" \ ++ "bootdelay=3\0" \ ++ "loadenv=if ext2load ide 0 $loadaddr /boot/loader/uEnv.txt; then env import -t $loadaddr $filesize; fi;" ++ + #endif /* __CONFIG_H */ +-- +2.18.0 + |