aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/grub/grub/0001-fdt-add-grub_fdt_create_empty_tree-function.patch
diff options
context:
space:
mode:
authorKoen Kooi <koen.kooi@linaro.org>2014-01-13 13:54:28 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-14 11:33:18 +0000
commitcd29ff3927a6deae5e808525bd56acf7b4b0b60c (patch)
tree0eefd9962ccd8b6fe089379b7e5bfbc8f98c69f3 /meta/recipes-bsp/grub/grub/0001-fdt-add-grub_fdt_create_empty_tree-function.patch
parent7c3b070b9cdd8b1d564d8900858cd31d11b20e6f (diff)
downloadopenembedded-core-contrib-cd29ff3927a6deae5e808525bd56acf7b4b0b60c.tar.gz
openembedded-core-contrib-cd29ff3927a6deae5e808525bd56acf7b4b0b60c.tar.bz2
openembedded-core-contrib-cd29ff3927a6deae5e808525bd56acf7b4b0b60c.zip
grub git: update to latest git
Drop the 2 patches since the functionality is upstream now. Also sync PACKAGECONFIG with grub 2.00 recipe. The debugedit problem for 64 bit machines in do_package is still present, though: ERROR: debugedit failed with exit code 256 (cmd was '/build/linaro/build/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/rpm/bin/debugedit' -b '/build/linaro/build/build/tmp-eglibc/work/aarch64-oe-linux' -d '/usr/src/debug' -i -l '/build/linaro/build/build/tmp-eglibc/work/aarch64-oe-linux/grub/2.00+AUTOINC+0776112c53-r0/debugsources.list' '/build/linaro/build/build/tmp-eglibc/work/aarch64-oe-linux/grub/2.00+AUTOINC+0776112c53-r0/package/usr/lib/grub/arm64-efi/cpio_be.module'): /build/linaro/build/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/rpm/bin/debugedit: /build/linaro/build/build/tmp-eglibc/work/aarch64-oe-linux/grub/2.00+AUTOINC+0776112c53-r0/package/usr/lib/grub/arm64-efi/cpio_be.module: Unhandled relocation 258 in .debug_info section ERROR: Function failed: split_and_strip_files ERROR: Logfile of failure stored in: /build/linaro/build/build/tmp-eglibc/work/aarch64-oe-linux/grub/2.00+AUTOINC+0776112c53-r0/temp/log.do_package.29234 ERROR: Task 10 (/build/linaro/build/openembedded-core/meta/recipes-bsp/grub/grub_git.bb, do_package) failed with exit code '1' Signed-off-by: Koen Kooi <koen.kooi@linaro.org> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-bsp/grub/grub/0001-fdt-add-grub_fdt_create_empty_tree-function.patch')
-rw-r--r--meta/recipes-bsp/grub/grub/0001-fdt-add-grub_fdt_create_empty_tree-function.patch73
1 files changed, 0 insertions, 73 deletions
diff --git a/meta/recipes-bsp/grub/grub/0001-fdt-add-grub_fdt_create_empty_tree-function.patch b/meta/recipes-bsp/grub/grub/0001-fdt-add-grub_fdt_create_empty_tree-function.patch
deleted file mode 100644
index 341457488d..0000000000
--- a/meta/recipes-bsp/grub/grub/0001-fdt-add-grub_fdt_create_empty_tree-function.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From b3417ec69ff7d52379a8f2cb291dbecccdab684f Mon Sep 17 00:00:00 2001
-From: Leif Lindholm <leif.lindholm@linaro.org>
-Date: Wed, 4 Dec 2013 13:09:21 +0000
-Subject: [PATCH 1/2] fdt: add grub_fdt_create_empty_tree() function
-
-Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
----
- grub-core/lib/fdt.c | 39 +++++++++++++++++++++++++++++++++++++++
- include/grub/fdt.h | 1 +
- 2 files changed, 40 insertions(+)
-
-diff --git a/grub-core/lib/fdt.c b/grub-core/lib/fdt.c
-index 9f34dc7..581a118 100644
---- a/grub-core/lib/fdt.c
-+++ b/grub-core/lib/fdt.c
-@@ -423,3 +423,42 @@ int grub_fdt_set_prop (void *fdt, unsigned int nodeoffset, const char *name,
- grub_memcpy (prop + 3, val, len);
- return 0;
- }
-+
-+struct empty_tree {
-+ grub_fdt_header_t header;
-+ grub_uint64_t empty_rsvmap[2];
-+ struct {
-+ grub_uint32_t prop_start;
-+ grub_uint8_t name[1];
-+ grub_uint32_t prop_end;
-+ grub_uint32_t node_end;
-+ } empty_node;
-+};
-+
-+int
-+grub_fdt_create_empty_tree (void *fdt, unsigned int size)
-+{
-+ struct empty_tree *et;
-+
-+ if (size < sizeof (struct empty_tree))
-+ return -1;
-+
-+ grub_memset (fdt, 0, size);
-+ et = fdt;
-+
-+ et->empty_node.node_end = grub_cpu_to_be32 (FDT_END);
-+ et->empty_node.prop_end = grub_cpu_to_be32 (FDT_END_NODE);
-+ et->empty_node.prop_start = grub_cpu_to_be32 (FDT_BEGIN_NODE);
-+ ((struct empty_tree *) fdt)->header.off_mem_rsvmap =
-+ grub_cpu_to_be32 (ALIGN_UP (sizeof (grub_fdt_header_t), 8));
-+
-+ grub_fdt_set_off_dt_strings (fdt, sizeof (struct empty_tree));
-+ grub_fdt_set_off_dt_struct (fdt, sizeof (grub_fdt_header_t) + 16);
-+ grub_fdt_set_version (fdt, FDT_SUPPORTED_VERSION);
-+ grub_fdt_set_last_comp_version (fdt, FDT_SUPPORTED_VERSION);
-+ grub_fdt_set_size_dt_struct (fdt, sizeof (et->empty_node));
-+ grub_fdt_set_totalsize (fdt, size);
-+ grub_fdt_set_magic (fdt, FDT_MAGIC);
-+
-+ return 0;
-+}
-diff --git a/include/grub/fdt.h b/include/grub/fdt.h
-index 2ad0536..06eec19 100644
---- a/include/grub/fdt.h
-+++ b/include/grub/fdt.h
-@@ -82,6 +82,7 @@ typedef struct {
- #define grub_fdt_set_size_dt_struct(fdt, value) \
- grub_fdt_set_header(fdt, size_dt_struct, value)
-
-+int grub_fdt_create_empty_tree (void *fdt, unsigned int size);
- int grub_fdt_check_header (void *fdt, unsigned int size);
- int grub_fdt_find_subnode (const void *fdt, unsigned int parentoffset,
- const char *name);
---
-1.8.4.2
-