X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfig_fsl_chain_trust.h;h=3922241be005c234230d850c4c0f6ce5d52e3dd2;hb=0f259fe79d7f0dca716bc954c211b0e6bc606d72;hp=6b6ae7cc781a774c30f75df5753b03d170e17f2c;hpb=85fc970d74d09f33fcdcc649e73c5dc4f5334605;p=platform%2Fkernel%2Fu-boot.git

diff --git a/include/config_fsl_chain_trust.h b/include/config_fsl_chain_trust.h
index 6b6ae7c..3922241 100644
--- a/include/config_fsl_chain_trust.h
+++ b/include/config_fsl_chain_trust.h
@@ -1,22 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright 2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef __CONFIG_FSL_CHAIN_TRUST_H
 #define __CONFIG_FSL_CHAIN_TRUST_H
 
-/* For secure boot, since ENVIRONMENT in flash/external memories is
- * not verified, undef CONFIG_ENV_xxx and set default env
- * (CONFIG_ENV_IS_NOWHERE)
- */
-#ifdef CONFIG_SECURE_BOOT
-
-#undef CONFIG_ENV_IS_IN_EEPROM
-#undef CONFIG_ENV_IS_IN_SPI_FLASH
-
-#endif
+#include <linux/stringify.h>
 
 #ifdef CONFIG_CHAIN_OF_TRUST
 
@@ -39,7 +29,7 @@
  *	 "41066b564c6ffcef40ccbc1e0a5d0d519604000c785d97bbefd25e4d288d1c8b"
  */
 
-#ifdef CONFIG_BOOTARGS
+#ifdef CONFIG_USE_BOOTARGS
 #define CONFIG_SET_BOOTARGS	"setenv bootargs \'" CONFIG_BOOTARGS" \';"
 #else
 #define CONFIG_SET_BOOTARGS	"setenv bootargs \'root=/dev/ram "	\