April 2014 - U-Boot

[U-Boot] Merge conflicts between ARM and mainline U-Boot trees
by Albert ARIBAUD 08 Apr '14

08 Apr '14

Hello all, There are four merge conflicts currently between ARM and mainline. I have created a 'merged' branch on the ARM repository with what I think the resolutions should be. Some are trivial, others, less. Could commit authors and/or custodians (CC:ed) please confirm or indicate correct resolutions? Overall resolutions can be seen (assuming your remote for the ARM tree is 'u-boot-arm' git fetch git://git.denx.de/u-boot-arm merged:arm-merged git show arm-merged Resolutions, from the most to the least trivial: arch/arm/cpu/arm926ejs/mxs/Makefile: - commits 1a9df13d and b97241b3 (both Marek) include/mmc.h: - commits 3c7ca967 (Fabio) and 93bfd616 (Pantelis) include/configs/trats2.h: - commits 4d6c9671 (Piotr) and aafd2c5d (Przemyslaw) include/configs/trats.h: - commits fe601647 (Piotr) and 9960d9a8 (Lukasz) - note: I manually removed CONFIG_EFI_PARTITION and CONFIG_PARTITION_UUIDS which are already defined in include/configs/exynos4-dt.h Thanks in advance! Amicalement, -- Albert.

6 5

Re: [U-Boot] Antw: Re: [Question] How is the Falcon mode working
by Stefano Babic 08 Apr '14

08 Apr '14

Hi Frank, please do not drop the ML from your replies, thanks. On 08/04/2014 12:44, Frank Ihle wrote: > Hello Stefano > > >>>>> Stefano Babic <sbabic(a)denx.de> 07.04.14 18.07 Uhr >>> >>Hi Frank, >> >>On 07/04/2014 15:49, Frank Ihle wrote: >>> Hi U-Boot, >>> >>> you recently gave me the hint about the Falcon Mode for my Fast >>> Booting investigations. But I think might got it wrong, could >>> somebody correct me if so?: >>> >>> - According to the "Falcon Mode" Pdf of October 2013 >>> > (http://www.denx.de/wiki/pub/U-Boot/MiniSummitELCE2013/2013-ELCE-U-Boot-Falc…) >>> The Falcon mode is just about to chose 2 different execution modes >>> during startup - one that starts Linux directly (and skips u-boot) >>> and the other for instance to make updates, or failsafe mode (and >>> starts u-boot). Or does it even contain more functionality ? >> >>The second starts U-Boot as you are used to. > > agreed > >>> - According to the "Minimizing boot times using U-Boot Falcon Mode" >>> Pdf of July 2012 >>> (http://schedule2012.rmll.info/IMG/pdf/LSM2012_UbootFalconMode_Babic.pdf) >>> it's mentioned that this can only run with boards, which are able to >>> work with SPL. I guess here SPL means Second Programm Bootloader. I'm >>> not an expert in this area, but wouldn't it be possible to run every >>> board with an SPL, since it's just Software like a Bootloader? >> >>Of course, but not all boards supported in mainline were converted to >>use SPL, and for this reason not all boards support out of the box >>Falcon Mode. > > So this "part" of including more and more boards is up to the U-Boot > team, not of the Board developer ? ( except one would like to do this by > himself .. ) No. Everybody is free to add support if he needs sending patches to ML for review. Generally, SPL support is done on SOC-layer and the board developer decides himself how the board boots, in case there is more as one option. Most boards were converted to SPL, most not. Feel free to send a patch for your board. > >>> And if >>> not what is the "real" eye of the needle here ? I'm just asking >>> because I didn't get the problem here. >> >>It is simply a snapshot of the current U-Boot mainline. The switch >>between Linux/U-Boot is implemented in SPL, and this makes sense because >>SPL is much smaller that the whole U-Boot, dropping also the time that a >>SOC needs to load an image from the storage media. > > That's what I understood too. I gotta say, this sounds like a working > alternative to skipping U-Boot completely when it comes too keep the > boot times at their lowest, I like that implementation. > > Kind Regards, > > Frank 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(a)denx.de =====================================================================

1 0

[U-Boot] Re
by Frank Ihle 08 Apr '14

08 Apr '14

Hello Stefano >>>> Stefano Babic <sbabic(a)denx.de> 07.04.14 18.07 Uhr >>> >Hi Frank, > >On 07/04/2014 15:49, Frank Ihle wrote: >> Hi U-Boot, >> >> you recently gave me the hint about the Falcon Mode for my Fast >> Booting investigations. But I think might got it wrong, could >> somebody correct me if so?: >> >> - According to the "Falcon Mode" Pdf of October 2013 >> (http://www.denx.de/wiki/pub/U-Boot/MiniSummitELCE2013/2013-ELCE-U-Boot-Falc…) >> The Falcon mode is just about to chose 2 different execution modes >> during startup - one that starts Linux directly (and skips u-boot) >> and the other for instance to make updates, or failsafe mode (and >> starts u-boot). Or does it even contain more functionality ? > >The second starts U-Boot as you are used to. agreed >> - According to the "Minimizing boot times using U-Boot Falcon Mode" >> Pdf of July 2012 >> (http://schedule2012.rmll.info/IMG/pdf/LSM2012_UbootFalconMode_Babic.pdf) >> it's mentioned that this can only run with boards, which are able to >> work with SPL. I guess here SPL means Second Programm Bootloader. I'm >> not an expert in this area, but wouldn't it be possible to run every >> board with an SPL, since it's just Software like a Bootloader? > >Of course, but not all boards supported in mainline were converted to >use SPL, and for this reason not all boards support out of the box >Falcon Mode. So this "part" of including more and more boards is up to the U-Boot team, not of the Board developer ? ( except one would like to do this by himself .. ) >> And if >> not what is the "real" eye of the needle here ? I'm just asking >> because I didn't get the problem here. > >It is simply a snapshot of the current U-Boot mainline. The switch >between Linux/U-Boot is implemented in SPL, and this makes sense because >SPL is much smaller that the whole U-Boot, dropping also the time that a >SOC needs to load an image from the storage media. That's what I understood too. I gotta say, this sounds like a working alternative to skipping U-Boot completely when it comes too keep the boot times at their lowest, I like that implementation. Kind Regards, Frank

1 0

[U-Boot] Different Port for TFTP communication
by Mario Albrecht 08 Apr '14

08 Apr '14

Hi, I have a short question about TFTP usage in u-boot. Is it possible to change the Port for TFTP communication while u-boot is running. Standard path for TFTP is 69 an let's say, we want to change port to 1500. Regards Mario

2 2

[U-Boot] [Question] i.MX6 HIgh Assurance Boot (Secure Boot) support in U-Boot versions >= 2013
by Igor Bezukh 08 Apr '14

08 Apr '14

Hi, I would like to know if i.MX6 High Assurance Boot feature is supported by U-Boot versions 2013 or higher? Thanks and BR! Igor Bezukh

2 1

[U-Boot] Fwd: [Question] i.MX6 HIgh Assurance Boot (Secure Boot) support in U-Boot versions >= 2013
by Igor Bezukh 08 Apr '14

08 Apr '14

Nitin, Do you know if Freescale is intended to provide i.MX6 HAB support for Barebox ( U-Boot V2) ? BR, Igor ---------- Forwarded message ---------- From: Igor Bezukh <igor(a)rtembedded.org> Date: Sun, Apr 6, 2014 at 10:40 AM Subject: Re: [U-Boot] [Question] i.MX6 HIgh Assurance Boot (Secure Boot) support in U-Boot versions >= 2013 To: Nitin Garg <nitin.garg(a)freescale.com> OK. Thanks for the info! BR, Igor Bezukh On Sun, Apr 6, 2014 at 6:10 AM, Nitin Garg <nitin.garg(a)freescale.com> wrote: > http://git.freescale.com/git/cgit.cgi/imx/uboot-imx.git/log/?h=imx_v2013.04… > > We are working on upstream support, meanwhile its available here. > > Regards, > Nitin Garg > > > -----Original Message----- > From: u-boot-bounces(a)lists.denx.de [mailto:u-boot-bounces@lists.denx.de] On Behalf Of Igor Bezukh > Sent: Friday, April 04, 2014 6:27 AM > To: u-boot(a)lists.denx.de > Subject: [U-Boot] [Question] i.MX6 HIgh Assurance Boot (Secure Boot) support in U-Boot versions >= 2013 > > Hi, > > I would like to know if i.MX6 High Assurance Boot feature is supported by U-Boot versions 2013 or higher? > > Thanks and BR! > Igor Bezukh > _______________________________________________ > U-Boot mailing list > U-Boot(a)lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot > >

2 1

[U-Boot] {PATCH v3 3/4] arm: exynos: clock: Remove exynos4x12_set_mmc_clk function
by Beomho Seo 08 Apr '14

08 Apr '14

exynos4x12_set_mmc_clk function have been removed. Because, exynos4x12_clock and exynos4_clock return smae div_fsys* value. Signed-off-by: Beomho Seo <beomho.seo(a)samsung.com> Signed-off-by: Jaehoon Chung <jh80.chung(a)samsung.com> Tested-by: Piotr Wilczek <p.wilczek(a)samsung.com> Cc: Lukasz Majewski <l.majewski(a)samsung.com> Cc: Piotr Wilczek <p.wilczek(a)samsung.com> Cc: Minkyu Kang <mk7.kang(a)samsung.com> --- Changes for v3: - None. Changes for v2: - None. arch/arm/cpu/armv7/exynos/clock.c | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/arch/arm/cpu/armv7/exynos/clock.c b/arch/arm/cpu/armv7/exynos/clock.c index 1fea4d6..2c2029a 100644 --- a/arch/arm/cpu/armv7/exynos/clock.c +++ b/arch/arm/cpu/armv7/exynos/clock.c @@ -893,30 +893,6 @@ static void exynos4_set_mmc_clk(int dev_index, unsigned int div) (div & 0xff) << ((dev_index << 4) + 8)); } -/* exynos4x12: set the mmc clock */ -static void exynos4x12_set_mmc_clk(int dev_index, unsigned int div) -{ - struct exynos4x12_clock *clk = - (struct exynos4x12_clock *)samsung_get_base_clock(); - unsigned int addr; - - /* - * CLK_DIV_FSYS1 - * MMC0_PRE_RATIO [15:8], MMC1_PRE_RATIO [31:24] - * CLK_DIV_FSYS2 - * MMC2_PRE_RATIO [15:8], MMC3_PRE_RATIO [31:24] - */ - if (dev_index < 2) { - addr = (unsigned int)&clk->div_fsys1; - } else { - addr = (unsigned int)&clk->div_fsys2; - dev_index -= 2; - } - - clrsetbits_le32(addr, 0xff << ((dev_index << 4) + 8), - (div & 0xff) << ((dev_index << 4) + 8)); -} - /* exynos5: set the mmc clock */ static void exynos5_set_mmc_clk(int dev_index, unsigned int div) { @@ -1612,10 +1588,7 @@ void set_mmc_clk(int dev_index, unsigned int div) else exynos5_set_mmc_clk(dev_index, div); } else { - if (proid_is_exynos4412()) - exynos4x12_set_mmc_clk(dev_index, div); - else - exynos4_set_mmc_clk(dev_index, div); + exynos4_set_mmc_clk(dev_index, div); } } -- 1.7.9.5

2 2

[U-Boot] [PATCH 1/8] arm: rmobile: lager: Update QoS initialization to version 0.955
by Nobuhiro Iwamatsu 08 Apr '14

08 Apr '14

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> --- board/renesas/lager/qos.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/board/renesas/lager/qos.c b/board/renesas/lager/qos.c index f1ac060..3742757 100644 --- a/board/renesas/lager/qos.c +++ b/board/renesas/lager/qos.c @@ -12,7 +12,7 @@ #include <asm/io.h> #include <asm/arch/rmobile.h> -/* QoS version 0.954 */ +/* QoS version 0.955 */ enum { DBSC3_R00, DBSC3_R01, DBSC3_R02, DBSC3_R03, DBSC3_R04, @@ -475,7 +475,7 @@ void qos_init(void) axi_qos = (struct rcar_axi_qos *)MP_AXI_ASDS0_BASE; writel(0x00000001, &axi_qos->qosconf); writel(0x00002014, &axi_qos->qosctset0); - writel(0x00000001, &axi_qos->qosreqctr); + writel(0x00000040, &axi_qos->qosreqctr); writel(0x00002006, &axi_qos->qosthres0); writel(0x00002001, &axi_qos->qosthres1); writel(0x00000000, &axi_qos->qosthres2); @@ -484,19 +484,19 @@ void qos_init(void) axi_qos = (struct rcar_axi_qos *)MP_AXI_ASDS1_BASE; writel(0x00000001, &axi_qos->qosconf); writel(0x00002014, &axi_qos->qosctset0); - writel(0x00000001, &axi_qos->qosreqctr); + writel(0x00000040, &axi_qos->qosreqctr); writel(0x00002006, &axi_qos->qosthres0); writel(0x00002001, &axi_qos->qosthres1); writel(0x00000000, &axi_qos->qosthres2); writel(0x00000001, &axi_qos->qosqon); axi_qos = (struct rcar_axi_qos *)MP_AXI_MLP_BASE; - writel(0x00000000, &axi_qos->qosconf); - writel(0x00002002, &axi_qos->qosctset0); - writel(0x00000001, &axi_qos->qosreqctr); + writel(0x00000001, &axi_qos->qosconf); + writel(0x00001FF0, &axi_qos->qosctset0); + writel(0x00000020, &axi_qos->qosreqctr); writel(0x00002006, &axi_qos->qosthres0); writel(0x00002001, &axi_qos->qosthres1); - writel(0x00000000, &axi_qos->qosthres2); + writel(0x00002001, &axi_qos->qosthres2); writel(0x00000001, &axi_qos->qosqon); axi_qos = (struct rcar_axi_qos *)MP_AXI_MMUMP_BASE; -- 1.8.5

1 7

[U-Boot] [PATCH] fs: fat: Fix cache align error message in fatwrite to use USB media
by Nobuhiro Iwamatsu 08 Apr '14

08 Apr '14

Use of malloc of do_fat_write() from USB media causes cache error on ARM v7 platforms. Perhaps, the same problem will occur at any other CPUs. This replaces malloc with memalign to fix cache buffer alignment. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> Signed-off-by: Yoshiyuki Ito <yoshiyuki.ito.ub(a)renesas.com> --- fs/fat/fat_write.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c index 9f5e911..cef138e 100644 --- a/fs/fat/fat_write.c +++ b/fs/fat/fat_write.c @@ -952,7 +952,7 @@ static int do_fat_write(const char *filename, void *buffer, } mydata->fatbufnum = -1; - mydata->fatbuf = malloc(FATBUFSIZE); + mydata->fatbuf = memalign(ARCH_DMA_MINALIGN, FATBUFSIZE); if (mydata->fatbuf == NULL) { debug("Error: allocating memory\n"); return -1; -- 1.8.5

2 2

[U-Boot] mx28: U-Boot fails to boot with VDD5V only power configuration
by Ankur Patel 08 Apr '14

08 Apr '14

Dear Friends, I'm bringing up a custom i.MX28 based board. I'm having trouble bringing up the u-boot (version v2013.04) loader. The Powersupply has been design as detailed in section 4.1.2.1 (VDD5V source only) of application note AN4199: http://www.freescale.com/files/32bit/doc/app_note/AN4199.pdf I am referring Patch L2.6.35_10.12_SDK_5V_SUPPLY_PATCH.tar.gz<https://www.freescale.com/webapp/Download?colCode=L2.6.35_10.12_5V_SUPPLY_P…> at freescale website which is for bootlets with VDD5V only support. I have even applied the patch to bootlet code imx-bootlets-src-10.12.01.tar.gz which is working fine. Based on the bootlet patch, I have modified the u-boot code but I couldn't able to boot. Please find the u-boot patch at http://pastebin.com/VudxqTHQ Can anyone please review it and share what is missing in the patch? Regards, Ankur

1 0