Merge git://git.denx.de/u-boot-fsl-qoriq

[u-boot] / include / configs / ls1046a_common.h

diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 47a544c90c5f0b0f86a809f7621aa039c2d7d22a..b66b8ac72c2369ce636fb2a60e1874c2c1761b5f 100644 (file)
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -149,9 +149,6 @@
 #endif
 
 /* Command line configuration */
-#ifndef SPL_NO_ENV
-#define CONFIG_CMD_ENV
-#endif
 
 /* MMC */
 #ifndef SPL_NO_MMC
@@ -240,10 +237,4 @@
 
 #define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /* Increase max gunzip size */
 
-/* Hash command with SHA acceleration supported in hardware */
-#ifdef CONFIG_FSL_CAAM
-#define CONFIG_CMD_HASH
-#define CONFIG_SHA_HW_ACCEL
-#endif
-
 #endif /* __LS1046A_COMMON_H */