mirror of
				git://git.openwrt.org/openwrt/openwrt.git
				synced 2025-11-03 22:44:27 -05:00 
			
		
		
		
	uboot-sunxi: use intree dtc explicitly
This replaces pylibfdt hack. Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
		
							parent
							
								
									fb3af86119
								
							
						
					
					
						commit
						8fc4fe7b48
					
				@ -15,6 +15,8 @@ PKG_HASH:=e31cac91545ff41b71cec5d8c22afd695645cd6e2a442ccdacacd60534069341
 | 
			
		||||
 | 
			
		||||
PKG_MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu>
 | 
			
		||||
 | 
			
		||||
UBOOT_USE_INTREE_DTC:=1
 | 
			
		||||
 | 
			
		||||
include $(INCLUDE_DIR)/u-boot.mk
 | 
			
		||||
include $(INCLUDE_DIR)/package.mk
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -1,30 +0,0 @@
 | 
			
		||||
--- a/Makefile
 | 
			
		||||
+++ b/Makefile
 | 
			
		||||
@@ -2000,26 +2000,7 @@ endif
 | 
			
		||||
 # Check dtc and pylibfdt, if DTC is provided, else build them
 | 
			
		||||
 PHONY += scripts_dtc
 | 
			
		||||
 scripts_dtc: scripts_basic
 | 
			
		||||
-	$(Q)if test "$(DTC)" = "$(DTC_INTREE)"; then \
 | 
			
		||||
-		$(MAKE) $(build)=scripts/dtc; \
 | 
			
		||||
-	else \
 | 
			
		||||
-		if ! $(DTC) -v >/dev/null; then \
 | 
			
		||||
-			echo '*** Failed to check dtc version: $(DTC)'; \
 | 
			
		||||
-			false; \
 | 
			
		||||
-		else \
 | 
			
		||||
-			if test "$(call dtc-version)" -lt $(DTC_MIN_VERSION); then \
 | 
			
		||||
-				echo '*** Your dtc is too old, please upgrade to dtc $(DTC_MIN_VERSION) or newer'; \
 | 
			
		||||
-				false; \
 | 
			
		||||
-			else \
 | 
			
		||||
-				if [ -n "$(CONFIG_PYLIBFDT)" ]; then \
 | 
			
		||||
-					if ! echo "import libfdt" | $(PYTHON3) 2>/dev/null; then \
 | 
			
		||||
-						echo '*** pylibfdt does not seem to be available with $(PYTHON3)'; \
 | 
			
		||||
-						false; \
 | 
			
		||||
-					fi; \
 | 
			
		||||
-				fi; \
 | 
			
		||||
-			fi; \
 | 
			
		||||
-		fi; \
 | 
			
		||||
-	fi
 | 
			
		||||
+	$(MAKE) $(build)=scripts/dtc
 | 
			
		||||
 
 | 
			
		||||
 # ---------------------------------------------------------------------------
 | 
			
		||||
 quiet_cmd_cpp_lds = LDS     $@
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user