| Message ID | 1447754018-12365-14-git-send-email-valentin.longchamp@keymile.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Tue, Nov 17, 2015 at 10:53:36AM +0100, Valentin Longchamp wrote: > It should be after the u-boot reserved sectors and before the env > sectors, since the solution used for kmvect1 (tell the linker to put the > firmware into the u-boot produced binary, at the end of the area) should > be the exception. > > The #define is only "conditional" so that we can still support kmvect1. > > Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com> Applied to u-boot/master, thanks!
diff --git a/include/configs/km/km8309-common.h b/include/configs/km/km8309-common.h index d7f6cb1..a69fdf1 100644 --- a/include/configs/km/km8309-common.h +++ b/include/configs/km/km8309-common.h @@ -29,8 +29,10 @@ /* QE microcode/firmware address */ #define CONFIG_SYS_QE_FMAN_FW_IN_NOR -/* at end of uboot partition, before env */ -#define CONFIG_SYS_QE_FW_ADDR 0xF00B0000 +/* between the u-boot partition and env */ +#ifndef CONFIG_SYS_QE_FW_ADDR +#define CONFIG_SYS_QE_FW_ADDR 0xF00C0000 +#endif /* * System IO Config
It should be after the u-boot reserved sectors and before the env sectors, since the solution used for kmvect1 (tell the linker to put the firmware into the u-boot produced binary, at the end of the area) should be the exception. The #define is only "conditional" so that we can still support kmvect1. Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com> --- Changes in v2: None include/configs/km/km8309-common.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)