Merge branch 'master' of git://git.denx.de/u-boot

[platform/kernel/u-boot.git] / include / configs / openrd.h

diff --git a/include/configs/openrd.h b/include/configs/openrd.h
index 3eb408f..b6f80af 100644 (file)
--- a/include/configs/openrd.h
+++ b/include/configs/openrd.h
@@ -35,7 +35,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_SHEEVA_88SV131  1       /* CPU Core subversion */
-#define CONFIG_KIRKWOOD                1       /* SOC Family Name */
 #define CONFIG_KW88F6281       1       /* SOC Name */
 #define CONFIG_MACH_OPENRD_BASE        /* Machine type */
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */
@@ -77,6 +76,11 @@
 #define CONFIG_ENV_SIZE                        0x20000 /* 128k */
 #define CONFIG_ENV_ADDR                        0x60000
 #define CONFIG_ENV_OFFSET              0x60000 /* 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