X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=env%2FKconfig;h=c06b8ba8cb7ed0a80b420d3d166fe9302b588d0a;hb=ed7fe2bee12a464da5b944cc2218d924793b8a80;hp=1b7906cf726b39d63930491d800a13723f57398a;hpb=f3a0d2c1af630cc09a34c2159aa2dfa12b831762;p=platform%2Fkernel%2Fu-boot.git

diff --git a/env/Kconfig b/env/Kconfig
index 1b7906c..c06b8ba 100644
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -82,10 +82,10 @@ config ENV_IS_IN_FLASH
 	depends on !CHAIN_OF_TRUST
 	default y if ARCH_CINTEGRATOR
 	default y if ARCH_INTEGRATOR_CP
-	default y if M548x || M547x || M5282 || MCF547x_8x
+	default y if M548x || M547x || M5282
 	default y if MCF532x || MCF52x2
 	default y if MPC86xx || MPC83xx
-	default y if ARCH_MPC8572 || ARCH_MPC8548 || ARCH_MPC8641
+	default y if ARCH_MPC8548 || ARCH_MPC8641
 	default y if SH && !CPU_SH4
 	help
 	  Define this if you have a flash device which you want to use for the
@@ -670,6 +670,24 @@ config DELAY_ENVIRONMENT
 	  later by U-Boot code. With CONFIG_OF_CONTROL this is instead
 	  controlled by the value of /config/load-environment.
 
+config ENV_IMPORT_FDT
+	bool "Amend environment by FDT properties"
+	depends on OF_CONTROL
+	help
+	  If selected, after the environment has been loaded from its
+	  persistent location, the "env_fdt_path" variable is looked
+	  up and used as a path to a node in the control DTB. The
+	  property/value pairs in that node is then used to update the
+	  run-time environment. This can be useful to use the same
+	  U-Boot binary with different board variants.
+
+config ENV_FDT_PATH
+	string "Default value for env_fdt_path variable"
+	depends on ENV_IMPORT_FDT
+	default "/config/environment"
+	help
+	  The initial value of the env_fdt_path variable.
+
 config ENV_APPEND
 	bool "Always append the environment with new data"
 	default n