Re: [U-Boot] [PATCH 13/19] fdt: Stop building the old python libfdt module

2017-05-02 Thread sjg
This is no-longer needed, so stop building it.

Signed-off-by: Simon Glass 
---

 lib/libfdt/libfdt_legacy.swig | 112 --
 lib/libfdt/setup.py   |  38 --
 tools/Makefile|  18 ---
 3 files changed, 168 deletions(-)
 delete mode 100644 lib/libfdt/libfdt_legacy.swig
 delete mode 100644 lib/libfdt/setup.py

Applied to u-boot-fdt/next, thanks!
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot


[U-Boot] [PATCH 13/19] fdt: Stop building the old python libfdt module

2017-04-16 Thread Simon Glass
This is no-longer needed, so stop building it.

Signed-off-by: Simon Glass 
---

 lib/libfdt/libfdt_legacy.swig | 112 --
 lib/libfdt/setup.py   |  38 --
 tools/Makefile|  18 ---
 3 files changed, 168 deletions(-)
 delete mode 100644 lib/libfdt/libfdt_legacy.swig
 delete mode 100644 lib/libfdt/setup.py

diff --git a/lib/libfdt/libfdt_legacy.swig b/lib/libfdt/libfdt_legacy.swig
deleted file mode 100644
index 9880dd998e..00
--- a/lib/libfdt/libfdt_legacy.swig
+++ /dev/null
@@ -1,112 +0,0 @@
-%module libfdt_legacy
-
-%{
-#define SWIG_FILE_WITH_INIT
-#include "libfdt.h"
-%}
-
-%pythoncode %{
-def Raise(errnum):
-raise ValueError('Error %s' % fdt_strerror(errnum))
-
-def Name(fdt, offset):
-name, len = fdt_get_name(fdt, offset)
-return name
-
-def String(fdt, offset):
-offset = fdt32_to_cpu(offset)
-name = fdt_string(fdt, offset)
-return name
-
-def swap32(x):
-return (((x << 24) & 0xFF00) |
-((x <<  8) & 0x00FF) |
-((x >>  8) & 0xFF00) |
-((x >> 24) & 0x00FF))
-
-def fdt32_to_cpu(x):
-return swap32(x)
-
-def Data(prop):
-set_prop(prop)
-return get_prop_data()
-%}
-
-%include "typemaps.i"
-%include "cstring.i"
-
-%typemap(in) void* = char*;
-
-typedef int fdt32_t;
-
-struct fdt_property {
-fdt32_t tag;
-fdt32_t len;
-fdt32_t nameoff;
-char data[0];
-};
-
-/*
- * This is a work-around since I'm not sure of a better way to copy out the
- * contents of a string. This is used in dtoc/GetProps(). The intent is to
- * pass in a pointer to a property and access the data field at the end of
- * it. Ideally the Data() function above would be able to do this directly,
- * but I'm not sure how to do that.
- */
-#pragma SWIG nowarn=454
-%inline %{
-static struct fdt_property *cur_prop;
-
-void set_prop(struct fdt_property *prop) {
-cur_prop = prop;
-}
-%}
-
-%cstring_output_allocate_size(char **s, int *sz, free(*$1));
-%inline %{
-void get_prop_data(char **s, int *sz) {
-*sz = fdt32_to_cpu(cur_prop->len);
-*s = (char *)malloc(*sz);
-if (!*s)
-*sz = 0;
-else
-memcpy(*s, cur_prop + 1, *sz);
-}
-%}
-
-%typemap(in) (const void *) {
-  if (!PyByteArray_Check($input)) {
-SWIG_exception_fail(SWIG_TypeError, "in method '" "$symname" "', argument "
-   "$argnum"" of type '" "$type""'");
-  }
-  $1 = (void *) PyByteArray_AsString($input);
-}
-
-const void *fdt_offset_ptr(const void *fdt, int offset, unsigned int checklen);
-int fdt_path_offset(const void *fdt, const char *path);
-int fdt_first_property_offset(const void *fdt, int nodeoffset);
-int fdt_next_property_offset(const void *fdt, int offset);
-const char *fdt_strerror(int errval);
-const struct fdt_property *fdt_get_property_by_offset(const void *fdt,
-  int offset,
-  int *OUTPUT);
-const char *fdt_get_name(const void *fdt, int nodeoffset, int *OUTPUT);
-const char *fdt_string(const void *fdt, int stroffset);
-int fdt_first_subnode(const void *fdt, int offset);
-int fdt_next_subnode(const void *fdt, int offset);
-
-%typemap(in) (void *) {
-  if (!PyByteArray_Check($input)) {
-SWIG_exception_fail(SWIG_TypeError, "in method '" "$symname" "', argument "
-   "$argnum"" of type '" "$type""'");
-  }
-  $1 = PyByteArray_AsString($input);
-}
-
-int fdt_delprop(void *fdt, int nodeoffset, const char *name);
-
-const char *fdt_strerror(int errval);
-int fdt_pack(void *fdt);
-
-int fdt_totalsize(const void *fdt);
-int fdt_off_dt_struct(const void *fdt);
diff --git a/lib/libfdt/setup.py b/lib/libfdt/setup.py
deleted file mode 100644
index fc881351c6..00
--- a/lib/libfdt/setup.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env python
-
-"""
-setup.py file for SWIG libfdt
-"""
-
-from distutils.core import setup, Extension
-import os
-import sys
-
-# Don't cross-compile - always use the host compiler.
-del os.environ['CROSS_COMPILE']
-del os.environ['CC']
-
-progname = sys.argv[0]
-cflags = sys.argv[1]
-files = sys.argv[2:]
-
-if cflags:
-cflags = [flag for flag in cflags.split(' ') if flag]
-else:
-cflags = None
-
-libfdt_module = Extension(
-'_libfdt_legacy',
-sources = files,
-extra_compile_args =  cflags
-)
-
-sys.argv = [progname, '--quiet', 'build_ext', '--inplace', '--force']
-
-setup (name = 'libfdt_legaacy',
-   version = '0.1',
-   author  = "SWIG Docs",
-   description = """Simple swig libfdt from docs""",
-   ext_modules = [libfdt_module],
-   py_modules = ["libfdt_legacy"],
-   )
diff --git a/tools/Makefile b/tools/Makefile
index 3ffd3eeca9..fb91b5247b 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -130,24 +130,6 @@ tools/_libfdt.so: $(LIBFDT_SRCS)