PXA: Add MMC driver using the generic MMC framework

[u-boot] / common / env_embedded.c

diff --git a/common/env_embedded.c b/common/env_embedded.c
index ae6cac4390d8ad60f3551b0a5173d67fce14c5e4..6ce1307767a90ae0ef77f9330435d713bdd0e0c5 100644 (file)
--- a/common/env_embedded.c
+++ b/common/env_embedded.c
@@ -44,7 +44,7 @@
  * Generate embedded environment table
  * inside U-Boot image, if needed.
  */
-#if defined(ENV_IS_EMBEDDED)
+#if defined(ENV_IS_EMBEDDED) || defined(CONFIG_BUILD_ENVCRC)
 /*
  * Only put the environment in it's own section when we are building
  * U-Boot proper.  The host based program "tools/envcrc" does not need
@@ -154,7 +154,7 @@ env_t environment __PPCENV__ = {
        "autoload="     CONFIG_SYS_AUTOLOAD                     "\0"
 #endif
 #ifdef CONFIG_ROOTPATH
-       "rootpath="     MK_STR(CONFIG_ROOTPATH)         "\0"
+       "rootpath="     CONFIG_ROOTPATH                 "\0"
 #endif
 #ifdef CONFIG_GATEWAYIP
        "gatewayip="    MK_STR(CONFIG_GATEWAYIP)        "\0"
@@ -166,7 +166,7 @@ env_t environment __PPCENV__ = {
        "hostname="     MK_STR(CONFIG_HOSTNAME)         "\0"
 #endif
 #ifdef CONFIG_BOOTFILE
-       "bootfile="     MK_STR(CONFIG_BOOTFILE)         "\0"
+       "bootfile="     CONFIG_BOOTFILE                 "\0"
 #endif
 #ifdef CONFIG_LOADADDR
        "loadaddr="     MK_STR(CONFIG_LOADADDR)         "\0"