1a53315951
This backports the upstream commit fixing stale references to CONFIG_SUNXI_GMAC which have been later replaced by CONFIG_SUN7I_GMAC. This fixes the designware MAC pinmuxing on e.g: Lamobo R1. Refresh patches while we are at it. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
22 lines
858 B
Diff
22 lines
858 B
Diff
From 53d123333fa0ddc64b2c55d48366f4582ac6922d Mon Sep 17 00:00:00 2001
|
|
From: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Date: Thu, 20 Jul 2017 19:50:52 +0200
|
|
Subject: [PATCH 212/213] Revert "Avoid non-portable sed construct"
|
|
|
|
This reverts commit 208db781cad4c24f538658a9cb17e24fa43ca3c9.
|
|
---
|
|
scripts/Makefile.lib | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/scripts/Makefile.lib
|
|
+++ b/scripts/Makefile.lib
|
|
@@ -309,7 +309,7 @@ quiet_cmd_dtc = DTC $@
|
|
# Bring in any U-Boot-specific include after the '/dts-v1/;' header
|
|
cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
|
|
cat $< $(if $(u_boot_dtsi),\
|
|
- | sed '/^\/ {$$/{x;s%$$%\#include \"$(u_boot_dtsi)\"%;G;}') | \
|
|
+ | sed 's%^/ {$$%\#include \"$(u_boot_dtsi)\"\n&%') | \
|
|
$(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) - ; \
|
|
$(DTC) -O dtb -o $@ -b 0 \
|
|
-i $(dir $<) $(DTC_FLAGS) \
|