From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Babic Date: Wed, 26 Jun 2013 16:14:12 +0200 Subject: [U-Boot] [PATCH v3] Add support for Wandboard Quad In-Reply-To: <20130626175149.61b31c7b@triceratops> References: <20130626175149.61b31c7b@triceratops> Message-ID: <51CAF734.9090106@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Tapani, On 26/06/2013 11:51, Tapani wrote: > > Add support for the Quad version of Wandboard; fix compile warning resulting > from having 2G of memory. > > Signed-off-by: Tapani Utriainen > Signed-off-by: Otavio Salvador > --- > board/wandboard/README | 5 +++++ > board/wandboard/wandboard.c | 2 +- > boards.cfg | 1 + > include/configs/wandboard.h | 2 ++ > 4 files changed, 9 insertions(+), 1 deletion(-) > > diff --git a/board/wandboard/README b/board/wandboard/README > index ce83bbe..498db2f 100644 > --- a/board/wandboard/README > +++ b/board/wandboard/README > @@ -22,6 +22,11 @@ To build U-Boot for the Wandboard Solo version: > $ make wandboard_solo_config > $ make > > +To build U-Boot for the Wandboard Quad version: > + > +$ make wandboard_quad_config > +$ make > + > Flashing U-boot into the SD card > -------------------------------- > > diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c > index 5666cbf..43c02ac 100644 > --- a/board/wandboard/wandboard.c > +++ b/board/wandboard/wandboard.c > @@ -48,7 +48,7 @@ DECLARE_GLOBAL_DATA_PTR; > > int dram_init(void) > { > - gd->ram_size = CONFIG_DDR_MB * SZ_1M; > + gd->ram_size = (phys_size_t)CONFIG_DDR_MB * 1024 * 1024; > > return 0; > } > diff --git a/boards.cfg b/boards.cfg > index fff4f45..2635942 100644 > --- a/boards.cfg > +++ b/boards.cfg > @@ -272,6 +272,7 @@ nitrogen6q2g arm armv7 nitrogen6x boundar > nitrogen6s arm armv7 nitrogen6x boundary mx6 nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512 > nitrogen6s1g arm armv7 nitrogen6x boundary mx6 nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024 > wandboard_dl arm armv7 wandboard - mx6 wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024 > +wandboard_quad arm armv7 wandboard - mx6 wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048 > wandboard_solo arm armv7 wandboard - mx6 wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512 > omap3_overo arm armv7 overo - omap3 > omap3_pandora arm armv7 pandora - omap3 > diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h > index 5593f1c..b2995d8 100644 > --- a/include/configs/wandboard.h > +++ b/include/configs/wandboard.h > @@ -103,6 +103,8 @@ > > #if defined(CONFIG_MX6DL) > #define CONFIG_DEFAULT_FDT_FILE "imx6dl-wandboard.dtb" > +#elif defined(CONFIG_MX6Q) > +#define CONFIG_DEFAULT_FDT_FILE "imx6q-wandboard.dtb" > #elif defined(CONFIG_MX6S) > #define CONFIG_DEFAULT_FDT_FILE "imx6s-wandboard.dtb" > #endif Patch does not apply cleanly because your mailer or your editor replaced original with whitespaces. I change back again, but please take care of this issue for the next time. Apart of that: Acked-by: Stefano Babic This patch was pending for a while, I will push it still for the release. Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================