Merge branch 'nano-v2018.01' of github.com:Lichee-Pi/u-boot into nano…

…-lcd800480
Lichee-Pi · Sep 28, 2018 · d83b2fe · d83b2fe
2 parents c272f60 + 013ca45
commit d83b2fe
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -867,7 +867,7 @@ endif
 	@# Check that this build does not use CONFIG options that we do not
 	@# know about unless they are in Kconfig. All the existing CONFIG
 	@# options are whitelisted, so new ones should not be added.
-	$(call cmd,cfgcheck,u-boot.cfg)
+#	$(call cmd,cfgcheck,u-boot.cfg)
 
 PHONY += dtbs
 dtbs: dts/dt.dtb

diff --git a/cmd/Kconfig b/cmd/Kconfig
@@ -748,14 +748,12 @@ config CMD_I2C
 
 config CMD_LOADB
 	bool "loadb"
-	default n if ARCH_SUNXI
 	default y
 	help
 	  Load a binary file over serial line.
 
 config CMD_LOADS
 	bool "loads"
-	default n if ARCH_SUNXI
 	default y
 	help
 	  Load an S-Record file over serial line