u-boot: drop patch, no longer required

This commit is contained in:
MilhouseVH 2019-04-25 21:14:44 +01:00
parent d958510083
commit 1d66e27c93

View File

@ -1,47 +0,0 @@
From 3f028d24ed02173fea0950c28b3192f44e40c2a9 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sat, 2 Dec 2017 11:47:07 +0100
Subject: [PATCH] dont build libfdt
---
scripts/Makefile.spl | 2 +-
scripts/dtc/Makefile | 2 +-
tools/dtoc/fdt.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
index e2f0741db6..9264103366 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -249,7 +249,7 @@ $(obj)/$(SPL_BIN)-pad.bin: $(obj)/$(SPL_BIN)
$(obj)/$(SPL_BIN).dtb: dts/dt-spl.dtb FORCE
$(call if_changed,copy)
-pythonpath = PYTHONPATH=scripts/dtc/pylibfdt
+pythonpath = python
quiet_cmd_dtocc = DTOC C $@
cmd_dtocc = $(pythonpath) $(srctree)/tools/dtoc/dtoc -d $(obj)/$(SPL_BIN).dtb -o $@ platdata
diff --git a/scripts/dtc/Makefile b/scripts/dtc/Makefile
index 90ef2db85c..077acd50d9 100644
--- a/scripts/dtc/Makefile
+++ b/scripts/dtc/Makefile
@@ -31,4 +31,4 @@ $(obj)/dtc-lexer.lex.o: $(obj)/dtc-parser.tab.h
clean-files := dtc-lexer.lex.c dtc-parser.tab.c dtc-parser.tab.h
# Added for U-Boot
-subdir-$(CONFIG_PYLIBFDT) += pylibfdt
+#subdir-$(CONFIG_PYLIBFDT) += pylibfdt
diff --git a/tools/dtoc/fdt.py b/tools/dtoc/fdt.py
index dbc338653b..04f3c5935c 100644
--- a/tools/dtoc/fdt.py
+++ b/tools/dtoc/fdt.py
@@ -10,7 +10,7 @@ import struct
import sys
import fdt_util
-import libfdt
+from pylibfdt import libfdt
# This deals with a device tree, presenting it as an assortment of Node and
# Prop objects, representing nodes and properties, respectively. This file