ogra@anubis:~/datengrab/rpi/uboot/bbb/u-boot$ git diff
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 476430d..6128a88 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -41,8 +41,8 @@
 /* Custom script for NOR */
 #define CONFIG_SYS_LDSCRIPT            "board/ti/am335x/u-boot.lds"
 
-/* Always 128 KiB env size */
-#define CONFIG_ENV_SIZE                        (128 << 10)
+/* Always 16 KiB env size */
+#define CONFIG_ENV_SIZE                        (16 << 10)
 
 /* Enhance our eMMC support / experience. */
 #define CONFIG_CMD_GPT
@@ -479,4 +479,17 @@
 #endif
 #endif  /* NOR support */
 
+/* Save the env to the fat partition. */
+#ifndef CONFIG_SPL_BUILD
+#undef  CONFIG_ENV_IS_NOWHERE
+#undef  CONFIG_ENV_IS_IN_NAND
+#undef  CONFIG_ENV_IS_IN_MMC
+#define CONFIG_ENV_IS_IN_FAT
+#define CONFIG_FAT_WRITE
+#define FAT_ENV_INTERFACE      "mmc"
+#define FAT_ENV_DEVICE_AND_PART        "0"
+#define FAT_ENV_FILE           "uboot.env"
+#define CONFIG_SUPPORT_RAW_INITRD
+#endif
+
 #endif /* ! __CONFIG_AM335X_EVM_H */