| Message ID | 8753ab33-ab8a-4946-a73e-4804d40aa20f@mary.at.omicron.at |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Wed, May 07, 2014 at 10:16:28AM +0200, Christian Riesch wrote: > The commits > > commit b7b5f1a16ca66dfdd817e7339f0e263a5b9f2758 > Author: Albert ARIBAUD <albert.u.boot@aribaud.net> > da850evm, da850_am18xxevm: convert to CONFIG_SPL_MAX_FOOTPRINT > > and > > commit e7497891e34efe5cb2b3a3dc7c6c096c012ede28 > Author: Albert ARIBAUD <albert.u.boot@aribaud.net> > cam_enc_4xx: convert to CONFIG_SPL_MAX_FOOTPRINT > > replaced CONFIG_SPL_MAX_SIZE by CONFIG_SPL_MAX_FOOTPRINT. However, > CONFIG_SPL_MAX_SIZE is used in the Makefile for padding the SPL > when preparing an u-boot.ais image. By removing CONFIG_SPL_MAX_SIZE > said commits broke the ais image of the da850evm and cam_enc_4xx > configurations. > > This patch converts the u-boot.ais target to use CONFIG_SPL_PAD_TO > instead of CONFIG_SPL_MAX_SIZE for padding the SPL and adds > a #define CONFIG_SPL_PAD_TO where it is required. > > Signed-off-by: Christian Riesch <christian.riesch@omicron.at> > Reported-by: Tom Taylor <ttaylor.tampa@gmail.com> > Cc: Sudhakar Rajashekhara <sudhakar.raj@ti.com> > Cc: Heiko Schocher <hs@denx.de> > Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Applied to u-boot-ti/master, thanks!
diff --git a/Makefile b/Makefile index ff38a43..869f442 100644 --- a/Makefile +++ b/Makefile @@ -890,7 +890,7 @@ MKIMAGEFLAGS_u-boot-spl.ais = -s -n $(if $(CONFIG_AIS_CONFIG_FILE), \ spl/u-boot-spl.ais: spl/u-boot-spl.bin FORCE $(call if_changed,mkimage) -OBJCOPYFLAGS_u-boot.ais = -I binary -O binary --pad-to=$(CONFIG_SPL_MAX_SIZE) +OBJCOPYFLAGS_u-boot.ais = -I binary -O binary --pad-to=$(CONFIG_SPL_PAD_TO) u-boot.ais: spl/u-boot-spl.ais u-boot.img FORCE $(call if_changed,pad_cat) diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 509fe20..0ca0c8d 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -386,6 +386,7 @@ #define CONFIG_SPL_STACK 0x8001ff00 #define CONFIG_SPL_TEXT_BASE 0x80000000 #define CONFIG_SPL_MAX_FOOTPRINT 32768 +#define CONFIG_SPL_PAD_TO 32768 #endif /* Load U-Boot Image From MMC */
The commits commit b7b5f1a16ca66dfdd817e7339f0e263a5b9f2758 Author: Albert ARIBAUD <albert.u.boot@aribaud.net> da850evm, da850_am18xxevm: convert to CONFIG_SPL_MAX_FOOTPRINT and commit e7497891e34efe5cb2b3a3dc7c6c096c012ede28 Author: Albert ARIBAUD <albert.u.boot@aribaud.net> cam_enc_4xx: convert to CONFIG_SPL_MAX_FOOTPRINT replaced CONFIG_SPL_MAX_SIZE by CONFIG_SPL_MAX_FOOTPRINT. However, CONFIG_SPL_MAX_SIZE is used in the Makefile for padding the SPL when preparing an u-boot.ais image. By removing CONFIG_SPL_MAX_SIZE said commits broke the ais image of the da850evm and cam_enc_4xx configurations. This patch converts the u-boot.ais target to use CONFIG_SPL_PAD_TO instead of CONFIG_SPL_MAX_SIZE for padding the SPL and adds a #define CONFIG_SPL_PAD_TO where it is required. Signed-off-by: Christian Riesch <christian.riesch@omicron.at> Reported-by: Tom Taylor <ttaylor.tampa@gmail.com> Cc: Sudhakar Rajashekhara <sudhakar.raj@ti.com> Cc: Heiko Schocher <hs@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> --- Sent again since date was wrong in my earlier email. Sorry for that. Christian Makefile | 2 +- include/configs/da850evm.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)