Patchwork [U-Boot] hawkboard/omapl-138: Add support for generating ais image for hawkboard

login
register
mail settings
Submitter Sughosh Ganu
Date June 13, 2012, 6:39 p.m.
Message ID <1339612746-29273-1-git-send-email-urwithsughosh@gmail.com>
Download mbox | patch
Permalink /patch/164737/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Sughosh Ganu - June 13, 2012, 6:39 p.m.
Parameters used for configuring certain SoC peripherals are parsed
from the cfg file and appended as part of the ais image's header. The
u-boot-spl.ais generated is flashed separately to the nand, so do not
delete the file after generation of u-boot.ais.

Signed-off-by: Sughosh Ganu <urwithsughosh@gmail.com>
---
 .gitignore                                    |    3 +++
 Makefile                                      |    5 +++--
 board/davinci/da8xxevm/hawkboard-ais-nand.cfg |    4 ++++
 include/configs/hawkboard.h                   |    1 +
 4 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 board/davinci/da8xxevm/hawkboard-ais-nand.cfg
Tom Rini - June 21, 2012, 4:57 p.m.
On Thu, Jun 14, 2012 at 12:09:06AM +0530, Sughosh Ganu wrote:

> Parameters used for configuring certain SoC peripherals are parsed
> from the cfg file and appended as part of the ais image's header. The
> u-boot-spl.ais generated is flashed separately to the nand, so do not
> delete the file after generation of u-boot.ais.
> 
> Signed-off-by: Sughosh Ganu <urwithsughosh@gmail.com>

Queued up for u-boot-ti/master, thanks!
Tom Rini - June 21, 2012, 4:59 p.m.
On Thu, Jun 21, 2012 at 09:57:49AM -0700, Tom Rini wrote:
> On Thu, Jun 14, 2012 at 12:09:06AM +0530, Sughosh Ganu wrote:
> 
> > Parameters used for configuring certain SoC peripherals are parsed
> > from the cfg file and appended as part of the ais image's header. The
> > u-boot-spl.ais generated is flashed separately to the nand, so do not
> > delete the file after generation of u-boot.ais.
> > 
> > Signed-off-by: Sughosh Ganu <urwithsughosh@gmail.com>
> 
> Queued up for u-boot-ti/master, thanks!

Correction, applied to u-boot-ti/next.

Patch

diff --git a/.gitignore b/.gitignore
index 0f32fd8..d8a1893 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,3 +75,6 @@  cscope.*
 /onenand_ipl/onenand-ipl*
 /onenand_ipl/board/*/onenand*
 /onenand_ipl/board/*/*.S
+
+# spl ais files
+/spl/*.ais
diff --git a/Makefile b/Makefile
index 0197239..8ac0530 100644
--- a/Makefile
+++ b/Makefile
@@ -441,7 +441,8 @@  $(obj)u-boot.ubl:       $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
 		rm $(obj)spl/u-boot-spl-pad.bin
 
 $(obj)u-boot.ais:       $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
-		$(obj)tools/mkimage -s -n /dev/null -T aisimage \
+		$(obj)tools/mkimage -s -n $(if $(CONFIG_AIS_CONFIG_FILE),$(CONFIG_AIS_CONFIG_FILE),"/dev/null") \
+			-T aisimage \
 			-e $(CONFIG_SPL_TEXT_BASE) \
 			-d $(obj)spl/u-boot-spl.bin \
 			$(obj)spl/u-boot-spl.ais
@@ -450,7 +451,6 @@  $(obj)u-boot.ais:       $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
 			$(obj)spl/u-boot-spl.ais $(obj)spl/u-boot-spl-pad.ais
 		cat $(obj)spl/u-boot-spl-pad.ais $(obj)u-boot.bin > \
 			$(obj)u-boot.ais
-		rm $(obj)spl/u-boot-spl{,-pad}.ais
 
 $(obj)u-boot.sb:       $(obj)u-boot.bin $(obj)spl/u-boot-spl.bin
 		elftosb -zdf imx28 -c $(TOPDIR)/board/$(BOARDDIR)/u-boot.bd \
@@ -783,6 +783,7 @@  clobber:	tidy
 	@[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -name "*" -type l -print | xargs rm -f
 	@[ ! -d $(obj)onenand_ipl ] || find $(obj)onenand_ipl -name "*" -type l -print | xargs rm -f
 	@rm -f $(obj)dts/*.tmp
+	@rm -f $(obj)spl/u-boot-spl{,-pad}.ais
 
 mrproper \
 distclean:	clobber unconfig
diff --git a/board/davinci/da8xxevm/hawkboard-ais-nand.cfg b/board/davinci/da8xxevm/hawkboard-ais-nand.cfg
new file mode 100644
index 0000000..76282de
--- /dev/null
+++ b/board/davinci/da8xxevm/hawkboard-ais-nand.cfg
@@ -0,0 +1,4 @@ 
+#	PLL0CFG0	PLL0CFG1	
+PLL0	0x00180001	0x00000205
+#	PLL1CFG0	PLL1CFG1	DRPYC1R		SDCR		SDTIMR1		SDTIMR2		SDRCR		CLK2XSRC	
+DDR2	0x15010001	0x00000002	0x00000043	0x00134632	0x26492a09	0x7d13c722	0x00000249	0x00000000
diff --git a/include/configs/hawkboard.h b/include/configs/hawkboard.h
index 6d2d4fb..5fa1273 100644
--- a/include/configs/hawkboard.h
+++ b/include/configs/hawkboard.h
@@ -43,6 +43,7 @@ 
 #define CONFIG_SYS_HZ			1000
 #define CONFIG_SKIP_LOWLEVEL_INIT
 #define CONFIG_BOARD_EARLY_INIT_F
+#define CONFIG_AIS_CONFIG_FILE		"board/$(BOARDDIR)/hawkboard-ais-nand.cfg"
 
 #define CONFIG_SYS_DA850_SYSCFG_SUSPSRC (	\
 	DAVINCI_SYSCFG_SUSPSRC_EMAC |		\