diff for duplicates of <50F93932.60700@cideas.com> diff --git a/a/1.txt b/N1/1.txt index 2c006fd..09454b7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -43,180 +43,3 @@ expected ********** gvb - ->From 1fb0193670e012072d4a9e5ac480e3201aaf30fd Mon Sep 17 00:00:00 2001 -From: Gerald Van Baren <gvb-LFPmMGy0VdYAvxtiuMwx3w@public.gmane.org> -Date: Thu, 17 Jan 2013 21:14:01 -0500 -Subject: [PATCH] Use the libfdt.h include as the interface definition - -libfdt.h is the libfdt interface definition. It includes fdt.h and -libfdt_env.h, so there is no reason to include those in the general code. - -Signed-off-by: Gerald Van Baren <vanbaren-He//nVnquyzQT0dZR+AlfA@public.gmane.org> ---- - dtc.h | 3 +-- - fdtdump.c | 3 +-- - libfdt/fdt.c | 3 --- - libfdt/fdt_empty_tree.c | 3 --- - libfdt/fdt_ro.c | 3 --- - libfdt/fdt_rw.c | 3 --- - libfdt/fdt_strerror.c | 3 --- - libfdt/fdt_sw.c | 3 --- - libfdt/fdt_wip.c | 3 --- - libfdt/libfdt_internal.h | 1 - - 10 files changed, 2 insertions(+), 26 deletions(-) - -diff --git a/dtc.h b/dtc.h -index 3e42a07..a032645 100644 ---- a/dtc.h -+++ b/dtc.h -@@ -32,8 +32,7 @@ - #include <errno.h> - #include <unistd.h> - --#include <libfdt_env.h> --#include <fdt.h> -+#include <libfdt.h> - - #include "util.h" - -diff --git a/fdtdump.c b/fdtdump.c -index b2c5b37..3919490 100644 ---- a/fdtdump.c -+++ b/fdtdump.c -@@ -8,8 +8,7 @@ - #include <string.h> - #include <ctype.h> - --#include <libfdt_env.h> --#include <fdt.h> -+#include <libfdt.h> - - #include "util.h" - -diff --git a/libfdt/fdt.c b/libfdt/fdt.c -index 57faba3..19b9043 100644 ---- a/libfdt/fdt.c -+++ b/libfdt/fdt.c -@@ -48,11 +48,8 @@ - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ --#include "libfdt_env.h" - --#include <fdt.h> - #include <libfdt.h> -- - #include "libfdt_internal.h" - - int fdt_check_header(const void *fdt) -diff --git a/libfdt/fdt_empty_tree.c b/libfdt/fdt_empty_tree.c -index f72d13b..30c5525 100644 ---- a/libfdt/fdt_empty_tree.c -+++ b/libfdt/fdt_empty_tree.c -@@ -48,11 +48,8 @@ - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ --#include "libfdt_env.h" - --#include <fdt.h> - #include <libfdt.h> -- - #include "libfdt_internal.h" - - int fdt_create_empty_tree(void *buf, int bufsize) -diff --git a/libfdt/fdt_ro.c b/libfdt/fdt_ro.c -index 42da2bd..53c61ed 100644 ---- a/libfdt/fdt_ro.c -+++ b/libfdt/fdt_ro.c -@@ -48,11 +48,8 @@ - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ --#include "libfdt_env.h" - --#include <fdt.h> - #include <libfdt.h> -- - #include "libfdt_internal.h" - - static int _fdt_nodename_eq(const void *fdt, int offset, -diff --git a/libfdt/fdt_rw.c b/libfdt/fdt_rw.c -index fdba618..b6a8815 100644 ---- a/libfdt/fdt_rw.c -+++ b/libfdt/fdt_rw.c -@@ -48,11 +48,8 @@ - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ --#include "libfdt_env.h" - --#include <fdt.h> - #include <libfdt.h> -- - #include "libfdt_internal.h" - - static int _fdt_blocks_misordered(const void *fdt, -diff --git a/libfdt/fdt_strerror.c b/libfdt/fdt_strerror.c -index e6c3cee..c55793c 100644 ---- a/libfdt/fdt_strerror.c -+++ b/libfdt/fdt_strerror.c -@@ -48,11 +48,8 @@ - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ --#include "libfdt_env.h" - --#include <fdt.h> - #include <libfdt.h> -- - #include "libfdt_internal.h" - - struct fdt_errtabent { -diff --git a/libfdt/fdt_sw.c b/libfdt/fdt_sw.c -index f422754..85aaedf 100644 ---- a/libfdt/fdt_sw.c -+++ b/libfdt/fdt_sw.c -@@ -48,11 +48,8 @@ - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ --#include "libfdt_env.h" - --#include <fdt.h> - #include <libfdt.h> -- - #include "libfdt_internal.h" - - static int _fdt_sw_check_header(void *fdt) -diff --git a/libfdt/fdt_wip.c b/libfdt/fdt_wip.c -index c5bbb68..67fa7ca 100644 ---- a/libfdt/fdt_wip.c -+++ b/libfdt/fdt_wip.c -@@ -48,11 +48,8 @@ - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ --#include "libfdt_env.h" - --#include <fdt.h> - #include <libfdt.h> -- - #include "libfdt_internal.h" - - int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name, -diff --git a/libfdt/libfdt_internal.h b/libfdt/libfdt_internal.h -index 381133b..a8b36f4 100644 ---- a/libfdt/libfdt_internal.h -+++ b/libfdt/libfdt_internal.h -@@ -50,7 +50,6 @@ - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ --#include <fdt.h> - - #define FDT_ALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1)) - #define FDT_TAGALIGN(x) (FDT_ALIGN((x), FDT_TAGSIZE)) --- -1.7.9.5 diff --git a/a/content_digest b/N1/content_digest index f389c9e..29fd403 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,14 +3,10 @@ "ref\020130117115456.71a38e3275230cdbb175bfe4@freescale.com\0" "ref\050F843CD.1030309@cideas.com\0" "ref\020130117235048.GF26321@truffula.fritz.box\0" - "ref\020130117235048.GF26321-W9XWwYn+TF0XU02nzanrWNbf9cGiqdzd@public.gmane.org\0" - "From\0Gerald Van Baren <vanbaren-He//nVnquyzQT0dZR+AlfA@public.gmane.org>\0" - "Subject\0Re: [U-Boot] [PATCH 1/5] treewide: include libfdt_env.h before fdt.h\0" + "From\0Gerald Van Baren <vanbaren@cideas.com>\0" + "Subject\0[U-Boot] [PATCH 1/5] treewide: include libfdt_env.h before fdt.h\0" "Date\0Fri, 18 Jan 2013 06:59:46 -0500\0" - "To\0David Gibson <david-xT8FGy+AXnRB3Ne2BGzF6laj5H9X9Tb+@public.gmane.org>\0" - "Cc\0Scott Wood <scottwood-KZfg59tc24xl57MIdRCFDg@public.gmane.org>" - u-boot-0aAXYlwwYIKGBzrmiIFOJg@public.gmane.org - " devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org\0" + "To\0u-boot@lists.denx.de\0" "\00:1\0" "b\0" "On 01/17/2013 06:50 PM, David Gibson wrote:\n" @@ -57,183 +53,6 @@ "* Strange test result:\t0\n" "**********\n" "\n" - "gvb\n" - "\n" - ">From 1fb0193670e012072d4a9e5ac480e3201aaf30fd Mon Sep 17 00:00:00 2001\n" - "From: Gerald Van Baren <gvb-LFPmMGy0VdYAvxtiuMwx3w@public.gmane.org>\n" - "Date: Thu, 17 Jan 2013 21:14:01 -0500\n" - "Subject: [PATCH] Use the libfdt.h include as the interface definition\n" - "\n" - "libfdt.h is the libfdt interface definition. It includes fdt.h and\n" - "libfdt_env.h, so there is no reason to include those in the general code.\n" - "\n" - "Signed-off-by: Gerald Van Baren <vanbaren-He//nVnquyzQT0dZR+AlfA@public.gmane.org>\n" - "---\n" - " dtc.h | 3 +--\n" - " fdtdump.c | 3 +--\n" - " libfdt/fdt.c | 3 ---\n" - " libfdt/fdt_empty_tree.c | 3 ---\n" - " libfdt/fdt_ro.c | 3 ---\n" - " libfdt/fdt_rw.c | 3 ---\n" - " libfdt/fdt_strerror.c | 3 ---\n" - " libfdt/fdt_sw.c | 3 ---\n" - " libfdt/fdt_wip.c | 3 ---\n" - " libfdt/libfdt_internal.h | 1 -\n" - " 10 files changed, 2 insertions(+), 26 deletions(-)\n" - "\n" - "diff --git a/dtc.h b/dtc.h\n" - "index 3e42a07..a032645 100644\n" - "--- a/dtc.h\n" - "+++ b/dtc.h\n" - "@@ -32,8 +32,7 @@\n" - " #include <errno.h>\n" - " #include <unistd.h>\n" - "\n" - "-#include <libfdt_env.h>\n" - "-#include <fdt.h>\n" - "+#include <libfdt.h>\n" - "\n" - " #include \"util.h\"\n" - "\n" - "diff --git a/fdtdump.c b/fdtdump.c\n" - "index b2c5b37..3919490 100644\n" - "--- a/fdtdump.c\n" - "+++ b/fdtdump.c\n" - "@@ -8,8 +8,7 @@\n" - " #include <string.h>\n" - " #include <ctype.h>\n" - "\n" - "-#include <libfdt_env.h>\n" - "-#include <fdt.h>\n" - "+#include <libfdt.h>\n" - "\n" - " #include \"util.h\"\n" - "\n" - "diff --git a/libfdt/fdt.c b/libfdt/fdt.c\n" - "index 57faba3..19b9043 100644\n" - "--- a/libfdt/fdt.c\n" - "+++ b/libfdt/fdt.c\n" - "@@ -48,11 +48,8 @@\n" - " * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,\n" - " * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" - " */\n" - "-#include \"libfdt_env.h\"\n" - "\n" - "-#include <fdt.h>\n" - " #include <libfdt.h>\n" - "-\n" - " #include \"libfdt_internal.h\"\n" - "\n" - " int fdt_check_header(const void *fdt)\n" - "diff --git a/libfdt/fdt_empty_tree.c b/libfdt/fdt_empty_tree.c\n" - "index f72d13b..30c5525 100644\n" - "--- a/libfdt/fdt_empty_tree.c\n" - "+++ b/libfdt/fdt_empty_tree.c\n" - "@@ -48,11 +48,8 @@\n" - " * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,\n" - " * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" - " */\n" - "-#include \"libfdt_env.h\"\n" - "\n" - "-#include <fdt.h>\n" - " #include <libfdt.h>\n" - "-\n" - " #include \"libfdt_internal.h\"\n" - "\n" - " int fdt_create_empty_tree(void *buf, int bufsize)\n" - "diff --git a/libfdt/fdt_ro.c b/libfdt/fdt_ro.c\n" - "index 42da2bd..53c61ed 100644\n" - "--- a/libfdt/fdt_ro.c\n" - "+++ b/libfdt/fdt_ro.c\n" - "@@ -48,11 +48,8 @@\n" - " * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,\n" - " * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" - " */\n" - "-#include \"libfdt_env.h\"\n" - "\n" - "-#include <fdt.h>\n" - " #include <libfdt.h>\n" - "-\n" - " #include \"libfdt_internal.h\"\n" - "\n" - " static int _fdt_nodename_eq(const void *fdt, int offset,\n" - "diff --git a/libfdt/fdt_rw.c b/libfdt/fdt_rw.c\n" - "index fdba618..b6a8815 100644\n" - "--- a/libfdt/fdt_rw.c\n" - "+++ b/libfdt/fdt_rw.c\n" - "@@ -48,11 +48,8 @@\n" - " * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,\n" - " * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" - " */\n" - "-#include \"libfdt_env.h\"\n" - "\n" - "-#include <fdt.h>\n" - " #include <libfdt.h>\n" - "-\n" - " #include \"libfdt_internal.h\"\n" - "\n" - " static int _fdt_blocks_misordered(const void *fdt,\n" - "diff --git a/libfdt/fdt_strerror.c b/libfdt/fdt_strerror.c\n" - "index e6c3cee..c55793c 100644\n" - "--- a/libfdt/fdt_strerror.c\n" - "+++ b/libfdt/fdt_strerror.c\n" - "@@ -48,11 +48,8 @@\n" - " * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,\n" - " * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" - " */\n" - "-#include \"libfdt_env.h\"\n" - "\n" - "-#include <fdt.h>\n" - " #include <libfdt.h>\n" - "-\n" - " #include \"libfdt_internal.h\"\n" - "\n" - " struct fdt_errtabent {\n" - "diff --git a/libfdt/fdt_sw.c b/libfdt/fdt_sw.c\n" - "index f422754..85aaedf 100644\n" - "--- a/libfdt/fdt_sw.c\n" - "+++ b/libfdt/fdt_sw.c\n" - "@@ -48,11 +48,8 @@\n" - " * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,\n" - " * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" - " */\n" - "-#include \"libfdt_env.h\"\n" - "\n" - "-#include <fdt.h>\n" - " #include <libfdt.h>\n" - "-\n" - " #include \"libfdt_internal.h\"\n" - "\n" - " static int _fdt_sw_check_header(void *fdt)\n" - "diff --git a/libfdt/fdt_wip.c b/libfdt/fdt_wip.c\n" - "index c5bbb68..67fa7ca 100644\n" - "--- a/libfdt/fdt_wip.c\n" - "+++ b/libfdt/fdt_wip.c\n" - "@@ -48,11 +48,8 @@\n" - " * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,\n" - " * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" - " */\n" - "-#include \"libfdt_env.h\"\n" - "\n" - "-#include <fdt.h>\n" - " #include <libfdt.h>\n" - "-\n" - " #include \"libfdt_internal.h\"\n" - "\n" - " int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name,\n" - "diff --git a/libfdt/libfdt_internal.h b/libfdt/libfdt_internal.h\n" - "index 381133b..a8b36f4 100644\n" - "--- a/libfdt/libfdt_internal.h\n" - "+++ b/libfdt/libfdt_internal.h\n" - "@@ -50,7 +50,6 @@\n" - " * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,\n" - " * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" - " */\n" - "-#include <fdt.h>\n" - "\n" - " #define FDT_ALIGN(x, a)\t\t(((x) + (a) - 1) & ~((a) - 1))\n" - " #define FDT_TAGALIGN(x)\t\t(FDT_ALIGN((x), FDT_TAGSIZE))\n" - "-- \n" - 1.7.9.5 + gvb -abbf14a05dc888474b3e1a5c6adae3d0561962cc1745c9a4930f8a52d5afa576 +1dce982705afdb52f4fa5c3ae890b28badd1478a8762b2b8446039f748832479
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.