[U-Boot] [PATCH 1/2] ARM: kirkwood: Enforce size limit for sheevaplug

[U-Boot] [PATCH 1/2] ARM: kirkwood: Enforce size limit for sheevaplug

[Chris Packham]

The u-boot binary sits in flash immediately before the environment.
Don't allow the binary size to grow into the environment space.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
This will actually result in a build failure. Which is what we want, at
least until https://lists.denx.de/pipermail/u-boot/2018-June/330467.html
is merged.

 include/configs/sheevaplug.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index 23dd5ceb7cb9..dc6375841ed8 100644
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -44,6 +44,11 @@
 #define CONFIG_ENV_SIZE			0x20000	/* 128k */
 #define CONFIG_ENV_ADDR			0x80000
 #define CONFIG_ENV_OFFSET		0x80000	/* 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
-- 
2.17.0

[U-Boot] [PATCH 2/2] ARM: kirkwood: Enforce size limit for guruplug

[Chris Packham]

The u-boot binary sits in flash immediately before the environment.
Don't allow the binary size to grow into the environment space.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
---

 include/configs/guruplug.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index 9e7ca60f112f..04b7e944a461 100644
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -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
-- 
2.17.0

[U-Boot] [PATCH 1/2] ARM: kirkwood: Enforce size limit for sheevaplug

[Stefan Roese]

On 04.06.2018 09:51, Chris Packham wrote:
> The u-boot binary sits in flash immediately before the environment.
> Don't allow the binary size to grow into the environment space.
> 
> Signed-off-by: Chris Packham <judge.packham@gmail.com>
> ---
> This will actually result in a build failure. Which is what we want, at
> least until https://lists.denx.de/pipermail/u-boot/2018-June/330467.html
> is merged.
> 
>   include/configs/sheevaplug.h | 5 +++++
>   1 file changed, 5 insertions(+)

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

[U-Boot] [PATCH 2/2] ARM: kirkwood: Enforce size limit for guruplug

[Stefan Roese]

On 04.06.2018 09:51, Chris Packham wrote:
> The u-boot binary sits in flash immediately before the environment.
> Don't allow the binary size to grow into the environment space.
> 
> Signed-off-by: Chris Packham <judge.packham@gmail.com>
> ---
> 
>   include/configs/guruplug.h | 5 +++++
>   1 file changed, 5 insertions(+)

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

[U-Boot] [PATCH 1/2] ARM: kirkwood: Enforce size limit for sheevaplug

[Stefan Roese]

On 04.06.2018 09:51, Chris Packham wrote:
> The u-boot binary sits in flash immediately before the environment.
> Don't allow the binary size to grow into the environment space.
> 
> Signed-off-by: Chris Packham <judge.packham@gmail.com>

Applied to u-boot-marvell/master.

Thanks,
Stefan

[U-Boot] [PATCH 2/2] ARM: kirkwood: Enforce size limit for guruplug

[Stefan Roese]

On 04.06.2018 09:51, Chris Packham wrote:
> The u-boot binary sits in flash immediately before the environment.
> Don't allow the binary size to grow into the environment space.
> 
> Signed-off-by: Chris Packham <judge.packham@gmail.com>

Applied to u-boot-marvell/master.

Thanks,
Stefan