ARM: rmobile: Fix environment placement on Draak

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

diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index b13c6c927957ef6b31de84365916c886c5206fa0..04b7e944a461fab71ec3410d645300a3473a482b 100644 (file)
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2009-2014
  * Gerald Kerma <dreagle@doukki.net>
  * Marvell Semiconductor <www.marvell.com>
  * Written-by: Siddarth Gore <gores@marvell.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef _CONFIG_GURUPLUG_H
@@ -14,12 +13,13 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_SHEEVA_88SV131  1       /* CPU Core subversion */
-#define CONFIG_MACH_GURUPLUG   /* Machine type */
 
 /*
  * Standard filesystems
  */
-#define CONFIG_SYS_MVFS
+#define CONFIG_BZIP2
+#define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
+#define CONFIG_MTD_PARTITIONS
 
 /*
  * mv-plug-common.h should be defined after CMD configs since it used them
@@ -39,6 +39,11 @@
  */
 #define CONFIG_ENV_SIZE                        0x20000 /* 128k */
 #define CONFIG_ENV_OFFSET              0xE0000 /* env starts here */
+/*
+ * Environment is right behind U-Boot in flash. Make sure U-Boot
+ * doesn't grow into the environment area.
+ */
+#define CONFIG_BOARD_SIZE_LIMIT                CONFIG_ENV_OFFSET
 
 /*
  * Default environment variables