[U-Boot] Fwd: [Question] i.MX6 HIgh Assurance Boot (Secure Boot) support in U-Boot versions >= 2013
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 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 OK. Thanks for the info! BR, Igor Bezukh On Sun, Apr 6, 2014 at 6:10 AM, Nitin Garg wrote: > http://git.freescale.com/git/cgit.cgi/imx/uboot-imx.git/log/?h=imx_v2013.04_3.10.17_1.0.0_beta > > We are working on upstream support, meanwhile its available here. > > Regards, > Nitin Garg > > > -Original Message- > From: u-boot-boun...@lists.denx.de [mailto:u-boot-boun...@lists.denx.de] On > Behalf Of Igor Bezukh > Sent: Friday, April 04, 2014 6:27 AM > To: u-boot@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@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot > > ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Merge conflicts between ARM and mainline U-Boot trees
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. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [half-OT] Re: Fwd: [Question] i.MX6 HIgh Assurance Boot (Secure Boot) support in U-Boot versions >= 2013
On Tue, 8 Apr 2014 10:46:24 +0300, Igor Bezukh wrote: > Barebox ( U-Boot V2) Did I miss a news item? :) Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Merge conflicts between ARM and mainline U-Boot trees
Hi Albert, > > 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 > I can confirm that Albert's solution provided at u-boot-denx-arm/merged works at Samsung's Trats device. Acked-by: Lukasz Majewski Tested-by: Lukasz Majewski -- Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Latest u-boot release on BeagleBone Black for FreeBSD
Hi u-boot community, I am trying to port u-boot (release u-boot-2014.04-rc3.tar.bz2) to FreeBSD on BeagleBone Black. In FreeBSD, there is a u-boot loader (named ubldr), which can call u-boot API to get fdt (Flat Device Tree) data. I have to comment out below 3 lines, in order to get correct fdt data in FreeBSD ubldr from u-boot. Would you please advice what is the best way to fix this? In file common/env_common.c: const uchar *env_get_addr(int index) { // if (gd->env_valid) // return (uchar *)(gd->env_addr + index); // else return &default_environment[index]; } -- Thanks, Xuebing Wang ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Merge conflicts between ARM and mainline U-Boot trees
Hi Albert, 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, Acked-by: Piotr Wilczek Tested-by: Piotr Wilczek Tested on Trats2. Best regards, Piotr Wilczek ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Merge conflicts between ARM and mainline U-Boot trees
Hi Albert, On Apr 8, 2014, at 10:49 AM, Albert ARIBAUD wrote: > 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) > Looks fine to me. > 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. Acked-by: Pantelis Antoniou ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Merge conflicts between ARM and mainline U-Boot trees
On Tuesday, April 08, 2014 at 09:49:17 AM, Albert ARIBAUD wrote: > 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) What was the problem here ... the MKIMAGE/UIMAGE change, right? Looks correct. Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [Question] i.MX6 HIgh Assurance Boot (Secure Boot) support in U-Boot versions >= 2013
Hi Igor, On 04/04/2014 13:26, Igor Bezukh wrote: > Hi, > > I would like to know if i.MX6 High Assurance Boot feature is supported > by U-Boot versions 2013 or higher? > Support for HAB was added to mkimage some times ago. mkimage can fill the CSF fields in the i.MX header structure, setting the CSF inside the IVT (Image Vector Table). Signing must be done with the Freescale's Code Signing Tool (CST). Check Freescale's Documentation for that. 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: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Different Port for TFTP communication
Dear Mario, In message <20140407165243.3b074380...@gemini.denx.de> I wrote: > > As is, this cannot be changed. The TFTP port number is hard wired > in the code - see "net/tftp.c": > > ... > 18 /* Well known TFTP port # */ > 19 #define WELL_KNOWN_PORT 69 > ... Actually this is not correct. There are options to use different port numbers, see further down below in the same file: 798 #ifdef CONFIG_TFTP_PORT 799 ep = getenv("tftpdstp"); 800 if (ep != NULL) 801 TftpRemotePort = simple_strtol(ep, NULL, 10); 802 ep = getenv("tftpsrcp"); 803 if (ep != NULL) 804 TftpOurPort = simple_strtol(ep, NULL, 10); 805 #endif So just make sure to define CONFIG_TFTP_PORT in your board config file, and set the environment variables tftpdstp and/or tftpsrcp as needed. Hope this helps. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de Nail here --X-- for new monitor. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Re
Hello Stefano Stefano Babic 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-Falcon-Boot.pdf) >> 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 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Antw: Re: [Question] How is the Falcon mode working
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 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-Falcon-Boot.pdf) >>> 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: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Merge conflicts between ARM and mainline U-Boot trees
Hi Albert, On 04/08/2014 09:49 AM, Albert ARIBAUD wrote: 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, I also tested this on Trats2. Tested-by: Przemyslaw Marczak Thank you, -- Przemyslaw Marczak Samsung R&D Institute Poland Samsung Electronics p.marc...@samsung.com ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Pull request: u-boot-arm/master
Hi Tom, The following changes since commit 04d2f0a9f33112bd70ce4d9c451fdca1682e3a59: Revert "Start the deprecation process for generic board" (2014-04-04 10:09:19 -0400) are available in the git repository at: git://git.denx.de/u-boot-arm master for you to fetch changes up to 519fdde9e6a6ebce7dc743b4f5621503d25b7a45: Merge branch 'u-boot/master' into 'u-boot-arm/master' (2014-04-08 09:25:08 +0200) Albert ARIBAUD (6): Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master' Merge branch 'u-boot/master' into 'u-boot-arm/master' Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' Merge branch 'u-boot/master' into 'u-boot-arm/master' Andreas Färber (1): arm: Handle .gnu.hash section in ldscripts Chin Liang See (1): socfpga: Adding Clock Manager driver David Feng (1): arm64 patch: gicv3 support Eric Nelson (1): ARM: mx6: Disable PCIe on SABRE Lite/Nitrogen6x Fabio Estevam (7): wandboard: Staticize usdhc1_pads mmc: Add a prototype for board_mmc_init() wandboard: Fix sparse warning wandboard: Include fb: Add a prototype for board_video_skip() mx25pdk: Align the environment with other FSL boards woodburn_sd: Remove CONFIG_BOOT_INTERNAL Hannes Petermaier (2): board/BuR/kwb: fix usage of 'i2c_set_bus_speed' board: enable 32kHz RTC OSC at B&R boards Ilya Ledvich (1): drivers: net: cpsw: init phy with gigabit features Leo Yan (1): ARMv8: fix bug for flush data cache by set/way Marcel Ziswiler (4): arm: vf610: fix anadig register struct arm: vf610: add uart0 clock/iomux definitions arm: vf610: add enet1 support arm: vf610: fix double iomux configuration for vf610twr board Marek Vasut (13): arm: exynos: Squash bogus warnings in pinmux arm: mxs: Adjust the load address of U-Boot and SPL for HAB arm: mxs: Add support for generating signed BootStream ARM: mxs: Add OCOTP driver pci: mx6: Implement power callback ARM: mx6: Add PCIe on SabreSDP arm: mx5: Fix memory slowness on MX53QSB arm: mx5: Avoid hardcoding memory sizes on MX53QSB arm: mx5: Fix memory slowness on M53EVK arm: mx5: Avoid hardcoding memory sizes on M53EVK arm: mxs: Properly set GD pointer in SPL arm: mxs: Add serial console support into SPL arm: mxs: Add support for generating signed BootStream Mela Custodio (1): bootstage: arm: fix fdt stashing code Nitin Garg (3): ARM: Add workaround for Cortex-A9 errata 794072 ARM: Add workaround for Cortex-A9 errata 761320 MX6: Enable ARM errata workaround 794072 and 761320 Piotr Wilczek (12): exynos4:pinmux:fdt: decode peripheral id video:mipidsim:fdt: Add DT support for mipi dsim driver video:exynos_fb:fdt: add additional fdt data drivers:mmc:sdhci: enable support for DT board:samsung: move checkboard to common file arm:exynos: add common DTS file for exynos 4 board:samsung:common: move max77686 init function arm:exynos: enable sdhci and misc_init to common board board:origen: Enable device tree on Origen board:universal: Enable device tree on Universal board:trats: Enable device tree on Trats board:trats2: Enable device tree on Trats2 Przemyslaw Marczak (2): Trats/Trats2: Update Tizen partitions layout and dfu entities usb: dfu: add static alt num count in dfu_config_entities() Stefan Roese (2): arm: omap: cm_t35: Fix: Re-add GPMC_NAND_ECC_LP_x8_LAYOUT arm: am335x: DXR2: Move unconditional LAN9303 reset into command Stefano Babic (6): Merge branch 'master' of git://git.denx.de/u-boot-arm mxs: fix warning in SPL with console support imx: add rules for U-Boot DTB support mx6: add example DTB for mx6qsabreauto Revert "arm: mxs: Add support for generating signed BootStream" Merge branch 'master' of git://git.denx.de/u-boot-arm into master Stephen Warren (1): ARM: tegra: make all I2C ports open-drain Tim Harvey (2): power: add PFUZE100 PMIC driver ventana: Add Gateworks Ventana family support Tom Rini (2): am33xx: Rework #ifdef's around s_init for clarity am335x_evm: Remove SPI SPL from NOR support target Vasili Galka (1): drivers/spi/omap3: Bug fix of premature write transfer completion York Sun (4): armv8/cache: Consolidate setting for MAIR and TCR armv8/cache: Flush D-cache, invalidate I-cache for relocation armv8/cache: Change cache invalidate and flush function armv8: Flush dcache before switching to EL2 Łukasz Majewski (2): config:trats2: Change u-boot's TEXT_BASE from 0x7810 to 0x43e0 build:arm: Remove setting of CROSS_COMPILE environment
Re: [U-Boot] CONFIG_SYS_XIP_BOOT for when it's a choice?
Dear Tom, In message <20140407195731.GL23803@bill-the-cat> you wrote: > > Maybe, maybe not. But it's beside the point. The point is we have SoC > init code that needs to be run once. Sometimes this is true when > CONFIG_SPL_BUILD=y, sometimes this is true when other options are set > instead. What should we call the option to denote one-time init? > Should we extend CONFIG_SKIP_LOWLEVEL_INIT to cover this case? Um... I think, if we build (and use) the SPL, then the low level init code would always be run (if at all) in the SPL; without SPL, it would be run in the normal U-Boot code. CONFIG_SKIP_LOWLEVEL_INIT is intended to skip running this low level init code. To me this looks independent of where this init code is located - it is yet another orthogonal decision. Which sort of extension do you have in mind here? > > If you use the memory mapped mode, then it looks just like any > > other ROM, and we should not need special code either. > > Well, for CONFIG_NOR_BOOT we must have it on am335x (haven't checked > am43xx) to finish doing pinmux as only 12KiB is mapped, in addition to > env related options. On am43xx and QSPI it's just used to denote when > we are doing one-time init in U-Boot proper rather than SPL. Sorry, I lost you. what is the "it" in both sentences referring to? Also, I'm not sure what exactly you mean by "one-time"init - all initialization steps in init_sequence[] are executed only once. These settings you are referring to - can these me made here, or is this stuff that is running before board_init_f() ? Um... I just ran over this in "arch/arm/lib/spl.c": 21 * In the context of SPL, board_init_f must ensure that any clocks/etc for 22 * DDR are enabled, ensure that the stack pointer is valid, clear the BSS 23 * and call board_init_f. We provide this version by default but mark it ^ 24 * as __weak to allow for platforms to do this in their own way if needed. 25 */ 26 void __weak board_init_f(ulong dummy) 27 { 28 /* Clear the BSS. */ 29 memset(__bss_start, 0, __bss_end - __bss_start); 30 31 /* Set global data pointer. */ 32 gd = &gdata; 33 34 board_init_r(NULL, 0); The comment says _f, the code has _r - which is right? > This is, I guess, yet another extension of "we need to treat SPL as a > U-Boot with x/y/z set, not a special magic build target like we do > today" and Kconfig will help. Yes, probabvly. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de A fanatic is a person who can't change his mind and won't change the subject. - Winston Churchill ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] lib: Add CONFIG_FDT_IGNORE_FIXUP_MEMORY_NODE
Dear Nobuhiro, In message you wrote: > > > Please explain why you would want to do this. To me it makes no > > sense. Either U-Boot knows the correct memory size, then it should > > pass it to Linux. Or it does not, then U-Boot should be fixed. > > For example, I can access the memory of all in the U-Boot, but I may > want to control > the highmem on Linux,I do not want to show a specific area from kernel > and userland. Is it not sufficient to pass some "mem=" boot argument? We even have automatic support for this in U-Boot (see the CONFIG_PRAM feature). > > Also, I object that your implementation is ARM specific. If such a > > feature gets added, it should be architecture independent. > > I see. But arch_fixup_memory_node() is used by ARM only. > So, we see to be dependent on the ARM is only this. All architectures that support the device tree update the memory size for Linux, so we should find a generic way to handle this. Actually we should always strive to reduce this arhitecture specific code. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de This restaurant was advertising breakfast any time. So I ordered french toast in the renaissance.- Steven Wright, comedian ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 02/10][v2] powerpc/mpc85xx: Avoid hardcoding in SPL linker script
SPL linker has fix location of bootpg and reset vector with respect to text base. It is not necessary to have fixed locations. Avoid such hardcoding. Signed-off-by: Prabhakar Kushwaha --- Changes for v2: Sending as it is arch/powerpc/cpu/mpc85xx/u-boot-spl.lds |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds index acaa093..4fad68b 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds @@ -66,11 +66,16 @@ SECTIONS } :text = 0x #else #if defined(CONFIG_FSL_IFC) /* Restrict bootpg at 4K boundry for IFC */ - .bootpg ADDR(.text) + 0x1000 : +#ifndef BOOT_PAGE_OFFSET +#define BOOT_PAGE_OFFSET 0x1000 +#endif + .bootpg ADDR(.text) + BOOT_PAGE_OFFSET : { arch/powerpc/cpu/mpc85xx/start.o (.bootpg) } +#ifndef RESET_VECTOR_OFFSET #define RESET_VECTOR_OFFSET 0x1ffc /* IFC has 8K sram */ +#endif #elif defined(CONFIG_FSL_ELBC) #define RESET_VECTOR_OFFSET 0xffc /* LBC has 4k sram */ #else -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 0/0][v2] powerpc: Add support 2 stage boot loader for corenet platform
Signed-off-by: Prabhakar Kushwaha --- Add support of 2 stage boot loader in cornet platforms using SPL framework. B4860QDS: NAND boot T1040RDB: NAND, SD, SPI boot T1042RDB_PI: NAND, SD, SPI boot In current secenrio size of u-boot can become >=512KB. So This patch set will be helpful for those SoC which has less internal SRAM(512KB). here, PBL initialise the internal SRAM and copy SPL(160KB) in SRAM. SPL further initialise DDR using SPD and environment variables and copy u-boot(768 KB) from flash to DDR. Finally SPL transer control to u-boot for futher booting. SPL has following features: - Executes within 256K - No relocation required Run time view of SPL framework during boot :- --- Area| Address | --- Secure boot | 0xFFFC (32KB) | headers | | --- GD, BD | 0xFFFC8000 (4KB)| --- ENV | 0xFFFC9000 (8KB)| --- HEAP| 0xFFFCB000 (30KB) | --- STACK | 0xFFFD8000 (22KB) | --- U-boot SPL | 0xFFFD8000 (160KB) | --- NAND Flash memory Map on T104xRDB -- Start EndDefinition Size 0x000x0Fu-boot 1MB 0x180x19u-boot env 128KB 0x200x21FMAN Ucode 128KB SD Card memory Map on T104xRDB -- Block #blocks Definition Size 0x008 2048u-boot 1MB 0x800 0024u-boot env 8KB 0x820 0256FMAN Ucode 128KB SPI Flash memory Map on T104xRDB -- Start EndDefinition Size 0x000x0Fu-boot 1MB 0x100x101FFFu-boot env 8KB 0x110x12FMAN Ucode 128KB --- This patch set contains:- [PATCH 1/10] powerpc/mpc85xx: Move LAW_EN define outside of config [PATCH 2/10] powerpc/mpc85xx: Avoid hardcoding in SPL linker script [PATCH 3/10] powerpc:Add support of SPL non-relocation [PATCH 4/10] powerpc/mpc85xx:Disable non DDR LAWs before init_law [PATCH 5/10] driver/ifc: define nand_spl_load_image() for SPL [PATCH 6/10] driver/mtd/spi:Read 8KB data chunk during u-boot load in SPL [PATCH 7/10] driver: Add support of image load for MMC & SPI in SPL [PATCH 8/10] Makefile: Add support of RAMBOOT_SPLPBL [PATCH 9/10] board/b4qds:Add support of 2 stage NAND boot-loader [PATCH 10/10] board/t104xrdb: Add support of NAND, SD, SPI boot for T1040RDB -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 01/10][v2] powerpc/mpc85xx: Move LAW_EN define outside of config
LAW_EN is only defined if CONFIG_SYS_CCSRBAR_DEFAULT is not equal to CONFIG_SYS_CCSRBAR_PHYS. in SPL framework CCSRBAR is not relocated hence both are same. This cause compilation error. So LAW_EN define outside of configs Signed-off-by: Prabhakar Kushwaha --- Changes for v2: Sending as it is arch/powerpc/cpu/mpc85xx/start.S |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S index dbbd8e5..67e071b 100644 --- a/arch/powerpc/cpu/mpc85xx/start.S +++ b/arch/powerpc/cpu/mpc85xx/start.S @@ -26,6 +26,8 @@ #undef MSR_KERNEL #define MSR_KERNEL ( MSR_ME ) /* Machine Check */ +#define LAW_EN 0x8000 + #if defined(CONFIG_NAND_SPL) || \ (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_INIT_MINIMAL)) #define MINIMAL_SPL @@ -574,7 +576,6 @@ infinite_debug_loop: #ifdef CONFIG_FSL_CORENET #define CCSR_LAWBARH0 (CONFIG_SYS_CCSRBAR + 0x1000) -#define LAW_EN 0x8000 #define LAW_SIZE_4K0xb #define CCSRBAR_LAWAR (LAW_EN | (0x1e << 20) | LAW_SIZE_4K) #define CCSRAR_C 0x8000 /* Commit */ -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 05/10][v2] driver/ifc: define nand_spl_load_image() for SPL
nand_spl_load_image() can also be used for non TPL framework. Signed-off-by: Prabhakar Kushwaha --- Changes for v2: - Made nand_spl_load_image as default declaration drivers/mtd/nand/fsl_ifc_spl.c | 13 - 1 file changed, 13 deletions(-) diff --git a/drivers/mtd/nand/fsl_ifc_spl.c b/drivers/mtd/nand/fsl_ifc_spl.c index 2f82f7c..5100772 100644 --- a/drivers/mtd/nand/fsl_ifc_spl.c +++ b/drivers/mtd/nand/fsl_ifc_spl.c @@ -88,11 +88,7 @@ static inline int bad_block(uchar *marker, int port_size) return __raw_readw((u16 *)marker) != 0x; } -#ifdef CONFIG_TPL_BUILD int nand_spl_load_image(uint32_t offs, unsigned int uboot_size, void *vdst) -#else -static int nand_load(uint32_t offs, unsigned int uboot_size, void *vdst) -#endif { struct fsl_ifc *ifc = IFC_BASE_ADDR; uchar *buf = (uchar *)CONFIG_SYS_NAND_BASE; @@ -218,15 +214,6 @@ static int nand_load(uint32_t offs, unsigned int uboot_size, void *vdst) } /* - * Defines a static function nand_load_image() here, because non-static makes - * the code too large for certain SPLs(minimal SPL, maximum size <= 4Kbytes) - */ -#ifndef CONFIG_TPL_BUILD -#define nand_spl_load_image(offs, uboot_size, vdst) \ - nand_load(offs, uboot_size, vdst) -#endif - -/* * Main entrypoint for NAND Boot. It's necessary that SDRAM is already * configured and available since this code loads the main U-boot image * from NAND into SDRAM and starts from there. -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 03/10][v2] powerpc:Add support of SPL non-relocation
Current SPL code base has BSS section placed after reset_vector. This means they have to relocate to use the global variables. This put an implicit requirement of having SPL size = Memory/2. To avoid relocation: - Move bss_section within SPL range - Modify relocate_code() Signed-off-by: Prabhakar Kushwaha --- Changes for v2: Sending as it is README |3 +++ arch/powerpc/cpu/mpc85xx/start.S|2 ++ arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 12 3 files changed, 17 insertions(+) diff --git a/README b/README index 025386f..a66afb1 100644 --- a/README +++ b/README @@ -3310,6 +3310,9 @@ FIT uImage format: continuing (the hardware starts execution after just loading the first page rather than the full 4K). + CONFIG_SPL_SKIP_RELOCATE + Avoid SPL relocation + CONFIG_SPL_NAND_BASE Include nand_base.c in the SPL. Requires CONFIG_SPL_NAND_DRIVERS. diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S index 67e071b..c654363 100644 --- a/arch/powerpc/cpu/mpc85xx/start.S +++ b/arch/powerpc/cpu/mpc85xx/start.S @@ -1645,6 +1645,7 @@ relocate_code: mr r10,r5 /* Save copy of Destination Address */ GET_GOT +#ifndef CONFIG_SPL_SKIP_RELOCATE mr r3,r5 /* Destination Address */ lis r4,CONFIG_SYS_MONITOR_BASE@h/* Source Address */ ori r4,r4,CONFIG_SYS_MONITOR_BASE@l @@ -1735,6 +1736,7 @@ relocate_code: mtlrr0 blr /* NEVER RETURNS! */ +#endif .globl in_ram in_ram: diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds index 4fad68b..8453f3a 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds @@ -57,6 +57,16 @@ SECTIONS . = ALIGN(8); __init_begin = .; __init_end = .; +#ifdef CONFIG_SPL_SKIP_RELOCATE + . = ALIGN(4); + __bss_start = .; + .bss : { + *(.sbss*) + *(.bss*) + } + . = ALIGN(4); + __bss_end = .; +#endif /* For ifc, elbc, esdhc, espi, all need the SPL without section .resetvec */ #ifdef CONFIG_SYS_MPC85XX_NO_RESETVEC @@ -86,6 +96,7 @@ SECTIONS } = 0x #endif +#ifndef CONFIG_SPL_SKIP_RELOCATE /* * Make sure that the bss segment isn't linked at 0x0, otherwise its * address won't be updated during relocation fixups. @@ -100,4 +111,5 @@ SECTIONS } . = ALIGN(4); __bss_end = .; +#endif } -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 06/10][v2] driver/mtd/spi:Read 8KB data chunk during u-boot load in SPL
SPI driver perform its operation(read/write) on 64KB buffer chunk for data greater than 64KB. This buffer chunk is allocated from system heap. During SPL boot, 768KB of data is read from SPI flash. Here, heap size may not be sufficient enough to full-fill 64KB buffer requirement of SPI driver. So break down u-boot read operation at 8KB of chunk. Also, fix a warning i.e. "unused variable buf" during CONFIG_FSL_CORENET Signed-off-by: Prabhakar Kushwaha --- Please note currently SPI boot is taking 20sec time. Fix will be sent separately to fix it. Changes for v2: Sending as it is. drivers/mtd/spi/fsl_espi_spl.c | 15 --- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/spi/fsl_espi_spl.c b/drivers/mtd/spi/fsl_espi_spl.c index e5ac79b..a55d741 100644 --- a/drivers/mtd/spi/fsl_espi_spl.c +++ b/drivers/mtd/spi/fsl_espi_spl.c @@ -20,8 +20,10 @@ void spi_boot(void) { void (*uboot)(void) __noreturn; - u32 offset, code_len; + u32 offset, code_len, copy_len = 0; +#ifndef CONFIG_FSL_CORENET unsigned char *buf = NULL; +#endif struct spi_flash *flash; flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS, @@ -56,8 +58,15 @@ void spi_boot(void) code_len = code_len - CONFIG_SPL_MAX_SIZE; #endif /* copy code to DDR */ - spi_flash_read(flash, offset, code_len, - (void *)CONFIG_SYS_SPI_FLASH_U_BOOT_DST); + printf("Loading second stage boot loader "); + while (copy_len <= code_len) { + spi_flash_read(flash, offset + copy_len, 0x2000, + (void *)(CONFIG_SYS_SPI_FLASH_U_BOOT_DST + + copy_len)); + copy_len = copy_len + 0x2000; + putc('.'); + } + /* * Jump to U-Boot image */ -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 04/10][v2] powerpc/mpc85xx:Disable non DDR LAWs before init_law
Before parsing LAW table i.e. init_law, boot loader should disable all previous LAWs except DDR LAWs which has been created by previous pre boot loader during DDR initialization. Signed-off-by: Prabhakar Kushwaha --- Changes for v2: Sending as it is arch/powerpc/cpu/mpc8xxx/law.c | 43 +++- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/cpu/mpc8xxx/law.c b/arch/powerpc/cpu/mpc8xxx/law.c index a401083..0aa6ce1 100644 --- a/arch/powerpc/cpu/mpc8xxx/law.c +++ b/arch/powerpc/cpu/mpc8xxx/law.c @@ -221,6 +221,32 @@ int set_ddr_laws(u64 start, u64 sz, enum law_trgt_if id) } #endif /* not SPL */ +void disable_non_ddr_laws(void) +{ + int i; + int id; + for (i = 0; i < FSL_HW_NUM_LAWS; i++) { + u32 lawar = in_be32(LAWAR_ADDR(i)); + + if (lawar & LAW_EN) { + id = (lawar & ~LAW_EN) >> 20; + switch (id) { + case LAW_TRGT_IF_DDR_1: + case LAW_TRGT_IF_DDR_2: + case LAW_TRGT_IF_DDR_3: + case LAW_TRGT_IF_DDR_4: + case LAW_TRGT_IF_DDR_INTRLV: + case LAW_TRGT_IF_DDR_INTLV_34: + case LAW_TRGT_IF_DDR_INTLV_123: + case LAW_TRGT_IF_DDR_INTLV_1234: + continue; + default: + disable_law(i); + } + } + } +} + void init_laws(void) { int i; @@ -233,6 +259,14 @@ void init_laws(void) #error FSL_HW_NUM_LAWS can not be greater than 32 w/o code changes #endif +#if !defined(CONFIG_SECURE_BOOT) + /* +* if any non DDR LAWs has been created earlier, remove them before +* LAW table is parsed. + */ + disable_non_ddr_laws(); +#endif + /* * Any LAWs that were set up before we booted assume they are meant to * be around and mark them used. @@ -244,15 +278,6 @@ void init_laws(void) gd->arch.used_laws |= (1 << i); } -#if (defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)) || \ - (defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD)) - /* -* in SPL boot we've already parsed the law_table and setup those LAWs -* so don't do it again. -*/ - return; -#endif - for (i = 0; i < num_law_entries; i++) { if (law_table[i].index == -1) set_next_law(law_table[i].addr, law_table[i].size, -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 08/10][v2] Makefile: Add support of CONFIG_SPL_FSL_PBL
Objective of this target to have concatenate binary having - SPL binary in PBL command format - U-boot binary Signed-off-by: Prabhakar Kushwaha --- Changes for v2: - rename CONFIG_RAMBOOT_PBLSPL to CONFIG_SPL_FSL_PBL Makefile | 19 +++ README |4 2 files changed, 23 insertions(+) diff --git a/Makefile b/Makefile index 25cbc95..99533a5 100644 --- a/Makefile +++ b/Makefile @@ -699,7 +699,11 @@ ALL-y += u-boot.srec u-boot.bin System.map ALL-$(CONFIG_NAND_U_BOOT) += u-boot-nand.bin ALL-$(CONFIG_ONENAND_U_BOOT) += u-boot-onenand.bin +ifeq ($(CONFIG_SPL_FSL_PBL),y) +ALL-$(CONFIG_RAMBOOT_PBL) += u-boot-with-spl-pbl.bin +else ALL-$(CONFIG_RAMBOOT_PBL) += u-boot.pbl +endif ALL-$(CONFIG_SPL) += spl/u-boot-spl.bin ALL-$(CONFIG_SPL_FRAMEWORK) += u-boot.img ALL-$(CONFIG_TPL) += tpl/u-boot-tpl.bin @@ -882,6 +886,21 @@ endif u-boot-img.bin: spl/u-boot-spl.bin u-boot.img FORCE $(call if_changed,cat) +#Add a target to create boot binary having SPL binary in PBI format +#concatenated with u-boot binary. It is need by PowerPC SoC having +#internal SRAM <= 512KB. +MKIMAGEFLAGS_u-boot-spl.pbl = -n $(srctree)/$(CONFIG_SYS_FSL_PBL_RCW:"%"=%) \ + -R $(srctree)/$(CONFIG_SYS_FSL_PBL_PBI:"%"=%) -T pblimage + +spl/u-boot-spl.pbl: spl/u-boot-spl.bin FORCE + $(call if_changed,mkimage) + +OBJCOPYFLAGS_u-boot-with-spl-pbl.bin = -I binary -O binary --pad-to=$(CONFIG_SPL_PAD_TO) \ + --gap-fill=0xff + +u-boot-with-spl-pbl.bin: spl/u-boot-spl.pbl u-boot.bin FORCE + $(call if_changed,pad_cat) + # PPC4xx needs the SPL at the end of the image, since the reset vector # is located at 0xfffc. So we can't use the "u-boot-img.bin" target # and need to introduce a new build target with the full blown U-Boot diff --git a/README b/README index a66afb1..68b38f6 100644 --- a/README +++ b/README @@ -486,6 +486,10 @@ The following options need to be configured: PBI commands can be used to configure SoC before it starts the execution. Please refer doc/README.pblimage for more details + CONFIG_SPL_FSL_PBL + It adds a target to create boot binary having SPL binary in PBI format + concatenated with u-boot binary. + CONFIG_SYS_FSL_DDR_BE Defines the DDR controller register space as Big Endian -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 07/10][v2] driver: Add support of image load for MMC & SPI in SPL
Add support of loading image, binary for MMC and SPI during SPL boot. Signed-off-by: Prabhakar Kushwaha --- Changes for v2: new patch drivers/mmc/fsl_esdhc_spl.c| 26 ++ drivers/mtd/spi/fsl_espi_spl.c | 14 ++ include/fsl_esdhc.h|1 + include/spi_flash.h|1 + 4 files changed, 42 insertions(+) diff --git a/drivers/mmc/fsl_esdhc_spl.c b/drivers/mmc/fsl_esdhc_spl.c index e0bbf21..b1cb4b3 100644 --- a/drivers/mmc/fsl_esdhc_spl.c +++ b/drivers/mmc/fsl_esdhc_spl.c @@ -19,6 +19,32 @@ #define MBRDBR_BOOT_SIG_AA 0x1ff #define CONFIG_CFG_DATA_SECTOR 0 + +void mmc_spl_load_image(uint32_t offs, unsigned int size, void *vdst) +{ + uint blk_start, blk_cnt, err; + + struct mmc *mmc = find_mmc_device(0); + if (!mmc) { + puts("spl: mmc device not found!!\n"); + hang(); + } + + if (mmc_init(mmc)) { + puts("MMC init failed\n"); + return; + } + + blk_start = ALIGN(offs, mmc->read_bl_len) / mmc->read_bl_len; + blk_cnt = ALIGN(size, mmc->read_bl_len) / mmc->read_bl_len; + + err = mmc->block_dev.block_read(0, blk_start, blk_cnt, vdst); + if (err != blk_cnt) { + puts("spl: mmc read failed!!\n"); + hang(); + } +} + /* * The main entry for mmc booting. It's necessary that SDRAM is already * configured and available since this code loads the main U-Boot image diff --git a/drivers/mtd/spi/fsl_espi_spl.c b/drivers/mtd/spi/fsl_espi_spl.c index a55d741..b915469 100644 --- a/drivers/mtd/spi/fsl_espi_spl.c +++ b/drivers/mtd/spi/fsl_espi_spl.c @@ -12,6 +12,20 @@ #define ESPI_BOOT_IMAGE_ADDR 0x50 #define CONFIG_CFG_DATA_SECTOR 0 +void spi_spl_load_image(uint32_t offs, unsigned int size, void *vdst) +{ + struct spi_flash *flash; + + flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS, + CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE); + if (flash == NULL) { + puts("\nspi_flash_probe failed"); + hang(); + } + + spi_flash_read(flash, offs, size, vdst); +} + /* * The main entry for SPI booting. It's necessary that SDRAM is already * configured and available since this code loads the main U-Boot image diff --git a/include/fsl_esdhc.h b/include/fsl_esdhc.h index a6e3a5d..9814964 100644 --- a/include/fsl_esdhc.h +++ b/include/fsl_esdhc.h @@ -187,5 +187,6 @@ static inline int fsl_esdhc_mmc_init(bd_t *bis) { return -ENOSYS; } static inline void fdt_fixup_esdhc(void *blob, bd_t *bd) {} #endif /* CONFIG_FSL_ESDHC */ void __noreturn mmc_boot(void); +void mmc_spl_load_image(uint32_t offs, unsigned int size, void *vdst); #endif /* __FSL_ESDHC_H__ */ diff --git a/include/spi_flash.h b/include/spi_flash.h index 1a11286..2db53c7 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -158,5 +158,6 @@ static inline int spi_flash_erase(struct spi_flash *flash, u32 offset, } void spi_boot(void) __noreturn; +void spi_spl_load_image(uint32_t offs, unsigned int size, void *vdst); #endif /* _SPI_FLASH_H_ */ -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 10/10][v2] board/t104xrdb: Add support of NAND, SD, SPI boot for T104xRDB
Add support of 2 stage NAND, SD, SPI boot loader using SPL framework. here, PBL initialise the internal SRAM and copy SPL(160KB). This further initialise DDR using SPD and environment and copy u-boot(768 KB) from NAND to DDR. Finally SPL transer control to u-boot. Initialise/create followings required for SPL framework - Add spl.c which defines board_init_f, board_init_r - update tlb and ddr accordingly Signed-off-by: Prabhakar Kushwaha --- This patch depends upon A) [PATCH 3] powerpc/t104xrdb: Unification of T104xRDB header files http://patchwork.ozlabs.org/patch/335207/ B) [U-Boot,v5] board/t104xrdb: Add support of CPLD http://patchwork.ozlabs.org/patch/336616/ Changes for v2: - Updated defines of SPL - Updated SPL to load env from SPI, MMC to CPC - Updated NAND FW, QE FMAN address board/freescale/t104xrdb/Makefile |7 +- board/freescale/t104xrdb/README| 73 ++ board/freescale/t104xrdb/ddr.c |5 +- board/freescale/t104xrdb/spl.c | 122 ++ board/freescale/t104xrdb/t1040_rcw.cfg |7 ++ board/freescale/t104xrdb/t1042_rcw.cfg |7 ++ board/freescale/t104xrdb/t104x_pbi.cfg | 26 +++ board/freescale/t104xrdb/tlb.c | 12 +++ boards.cfg |6 ++ include/configs/T104xRDB.h | 127 +++- 10 files changed, 372 insertions(+), 20 deletions(-) create mode 100644 board/freescale/t104xrdb/spl.c create mode 100644 board/freescale/t104xrdb/t1040_rcw.cfg create mode 100644 board/freescale/t104xrdb/t1042_rcw.cfg create mode 100644 board/freescale/t104xrdb/t104x_pbi.cfg diff --git a/board/freescale/t104xrdb/Makefile b/board/freescale/t104xrdb/Makefile index 7e7bfb1..6cd304c 100644 --- a/board/freescale/t104xrdb/Makefile +++ b/board/freescale/t104xrdb/Makefile @@ -4,11 +4,14 @@ # SPDX-License-Identifier: GPL-2.0+ # - +ifdef CONFIG_SPL_BUILD +obj-y += spl.o +else obj-y += t104xrdb.o obj-y += cpld.o -obj-y += ddr.o obj-y += eth.o obj-$(CONFIG_PCI) += pci.o +endif +obj-y += ddr.o obj-y += law.o obj-y += tlb.o diff --git a/board/freescale/t104xrdb/README b/board/freescale/t104xrdb/README index 1da52bb..cdbe1fa 100644 --- a/board/freescale/t104xrdb/README +++ b/board/freescale/t104xrdb/README @@ -198,3 +198,76 @@ The below commands apply to the board 2.To change from vbank4 to vbank0 => qixis reset (it will boot using vbank0) + +NAND boot with 2 Stage boot loader +-- +PBL initialise the internal SRAM and copy SPL(160KB) in SRAM. +SPL further initialise DDR using SPD and environment variables and copy +u-boot(768 KB) from flash to DDR. +Finally SPL transer control to u-boot for futher booting. + +SPL has following features: + - Executes within 256K + - No relocation required + + Run time view of SPL framework during boot :- + --- + Area| Address | +--- + Secure boot | 0xFFFC (32KB) | + headers | | + --- + GD, BD | 0xFFFC8000 (4KB)| + --- + ENV | 0xFFFC9000 (8KB)| + --- + HEAP| 0xFFFCB000 (30KB) | + --- + STACK | 0xFFFD8000 (22KB) | + --- + U-boot SPL | 0xFFFD8000 (160KB) | + --- + +NAND Flash memory Map on T104xRDB +-- + Start EndDefinition Size +0x00 0x0Fu-boot 1MB +0x18 0x19u-boot env 128KB +0x28 0x29FMAN Ucode 128KB +0x38 0x39QE Firmware 128KB + +SD Card memory Map on T104xRDB +-- + Block #blocks Definition Size +0x008 2048u-boot 1MB +0x800 0024u-boot env 8KB +0x820 0256FMAN Ucode 128KB +0x920 0256QE Firmware 128KB + +SPI Flash memory Map on T104xRDB +-- + Start EndDefinition Size +0x00 0x0Fu-boot 1MB +0x10 0x101FFFu-boot env 8KB +0x11 0x12FMAN Ucode 128KB +0x13 0x14QE Firmware
[U-Boot] [PATCH 09/10][v2] board/b4qds:Add support of 2 stage NAND boot-loader
Add support of 2 stage NAND boot loader using SPL framework. here, PBL initialise the internal SRAM and copy SPL(160KB). This further initialise DDR using SPD and environment and copy u-boot(768 KB) from NAND to DDR. Finally SPL transer control to u-boot. Initialise/create followings required for SPL framework - Add spl.c which defines board_init_f, board_init_r - update tlb and ddr accordingly Signed-off-by: Prabhakar Kushwaha --- changs for v2 - removed extra if def - updated NAND address of FMAN - updated SPL define values board/freescale/b4860qds/Makefile |9 ++- board/freescale/b4860qds/ddr.c|5 +- board/freescale/b4860qds/spl.c| 114 + board/freescale/b4860qds/tlb.c| 10 boards.cfg|4 +- doc/README.b4860qds | 36 include/configs/B4860QDS.h| 64 ++--- 7 files changed, 230 insertions(+), 12 deletions(-) create mode 100644 board/freescale/b4860qds/spl.c diff --git a/board/freescale/b4860qds/Makefile b/board/freescale/b4860qds/Makefile index e5cc054..0acd2a9 100644 --- a/board/freescale/b4860qds/Makefile +++ b/board/freescale/b4860qds/Makefile @@ -4,9 +4,14 @@ # SPDX-License-Identifier: GPL-2.0+ # +ifdef CONFIG_SPL_BUILD +obj-y += spl.o +else obj-y += b4860qds.o -obj-y += ddr.o obj-$(CONFIG_B4860QDS)+= eth_b4860qds.o -obj-$(CONFIG_PCI) += pci.o +obj-$(CONFIG_PCI) += pci.o +endif + +obj-y += ddr.o obj-y += law.o obj-y += tlb.o diff --git a/board/freescale/b4860qds/ddr.c b/board/freescale/b4860qds/ddr.c index 187c3b3..2c17156 100644 --- a/board/freescale/b4860qds/ddr.c +++ b/board/freescale/b4860qds/ddr.c @@ -179,6 +179,7 @@ phys_size_t initdram(int board_type) { phys_size_t dram_size; +#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_RAMBOOT_PBL) puts("Initializingusing SPD\n"); dram_size = fsl_ddr_sdram(); @@ -186,7 +187,9 @@ phys_size_t initdram(int board_type) dram_size = setup_ddr_tlbs(dram_size / 0x10); dram_size *= 0x10; - puts("DDR: "); +#else + dram_size = fsl_ddr_sdram_size(); +#endif return dram_size; } diff --git a/board/freescale/b4860qds/spl.c b/board/freescale/b4860qds/spl.c new file mode 100644 index 000..3aa5a78 --- /dev/null +++ b/board/freescale/b4860qds/spl.c @@ -0,0 +1,114 @@ +/* Copyright 2013 Freescale Semiconductor, Inc. + * + * SPDX-License-Identifier:GPL-2.0+ + */ + +#include +#include +#include +#include +#include +#include +#include "../common/qixis.h" +#include "b4860qds_qixis.h" + +DECLARE_GLOBAL_DATA_PTR; + +phys_size_t get_effective_memsize(void) +{ + return CONFIG_SYS_L3_SIZE; +} + +unsigned long get_board_sys_clk(void) +{ + u8 sysclk_conf = QIXIS_READ(brdcfg[1]); + + switch ((sysclk_conf & 0x0C) >> 2) { + case QIXIS_CLK_100: + return 1; + case QIXIS_CLK_125: + return 12500; + case QIXIS_CLK_133: + return 1; + } + return ; +} + +unsigned long get_board_ddr_clk(void) +{ + u8 ddrclk_conf = QIXIS_READ(brdcfg[1]); + + switch (ddrclk_conf & 0x03) { + case QIXIS_CLK_100: + return 1; + case QIXIS_CLK_125: + return 12500; + case QIXIS_CLK_133: + return 1; + } + return ; +} + +void board_init_f(ulong bootflag) +{ + u32 plat_ratio, sys_clk, uart_clk; + ccsr_gur_t *gur = (void *)CONFIG_SYS_MPC85xx_GUTS_ADDR; + + /* Memcpy existing GD at CONFIG_SPL_GD_ADDR */ + memcpy((void *)CONFIG_SPL_GD_ADDR, (void *)gd, sizeof(gd_t)); + + /* Update GD pointer */ + gd = (gd_t *)(CONFIG_SPL_GD_ADDR); + + /* compiler optimization barrier needed for GCC >= 3.4 */ + __asm__ __volatile__("" : : : "memory"); + + console_init_f(); + + /* initialize selected port with appropriate baud rate */ + sys_clk = get_board_sys_clk(); + plat_ratio = (in_be32(&gur->rcwsr[0]) >> 25) & 0x1f; + uart_clk = sys_clk * plat_ratio / 2; + + NS16550_init((NS16550_t)CONFIG_SYS_NS16550_COM1, +uart_clk / 16 / CONFIG_BAUDRATE); + + relocate_code(CONFIG_SPL_RELOC_STACK, (gd_t *)CONFIG_SPL_GD_ADDR, 0x0); +} + +void board_init_r(gd_t *gd, ulong dest_addr) +{ + bd_t *bd; + + bd = (bd_t *)(gd + sizeof(gd_t)); + memset(bd, 0, sizeof(bd_t)); + gd->bd = bd; + bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR; + bd->bi_memsize = CONFIG_SYS_L3_SIZE; + + probecpu(); + get_clocks(); + mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR, + CONFIG_SPL_RELOC_MALLOC_SIZE); + +#ifndef CONFIG_SPL_NAND_BOOT + env_init(); + env_relocate(); +#else + /* relocate environment function pointers etc. */ + nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_
Re: [U-Boot] [PATCH 6/7] omap3: zoom1: enable bootz
On Mon, Apr 7, 2014 at 9:29 AM, Tom Rini wrote: > On Thu, Apr 03, 2014 at 06:19:25PM -0500, Nishanth Menon wrote: > >> Boot from zImage and fdt_file if uImage is not available to maintain >> the legacy behavior. > [snip] >> #define CONFIG_EXTRA_ENV_SETTINGS \ >> "loadaddr=0x8200\0" \ >> + "fdt_high=0x\0" \ >> + "fdtaddr=0x80f8\0" \ > > OK, how much memory does this board ever have? If less than 512MB, > don't do fdt_high. If 256MB or more, please put fdtaddr at base+128MB. > Thanks! As per the board dts in kernel, this platform has 128MB. As per the configuration files, CS1 might not be populated on many boards as well. so 128MB seems to be the max memory available here. just remove fdt_high? Regards, Nishanth Menon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2 8/8] omap3: zoom1: switch to generic ti_omap3_common config header
ti_omap3_common contains a lot of common header definitions that help reduce the size of the zoom1 config file. So, use the generic header and customize as needed for the platform (example: no spl). Signed-off-by: Nishanth Menon --- board/logicpd/zoom1/config.mk |1 - include/configs/omap3_zoom1.h | 124 ++--- 2 files changed, 16 insertions(+), 109 deletions(-) diff --git a/board/logicpd/zoom1/config.mk b/board/logicpd/zoom1/config.mk index f5a19ed..c7ebfd9 100644 --- a/board/logicpd/zoom1/config.mk +++ b/board/logicpd/zoom1/config.mk @@ -14,4 +14,3 @@ # (mem base + reserved) # For use with external or internal boots. -CONFIG_SYS_TEXT_BASE = 0x80008000 diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 4f933d9..7c5540f 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -16,16 +16,22 @@ /* * High Level Configuration Options */ -#define CONFIG_OMAP1 /* in a TI OMAP core */ -#define CONFIG_OMAP34XX1 /* which is a 34XX */ #define CONFIG_OMAP3_ZOOM1 1 /* working with Zoom MDK Rev1 */ -#define CONFIG_OMAP_COMMON #define CONFIG_SYS_GENERIC_BOARD -#define CONFIG_SDRC/* The chip has SDRC controller */ - +#define CONFIG_NAND +#define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ #include /* get chip and board defs */ #include +#include + +/* Remove SPL boot option - we do not support that on LDP yet */ +#undef CONFIG_SPL +#undef CONFIG_SPL_FRAMEWORK +#undef CONFIG_SPL_OS_BOOT + +/* Generic NAND definition conflicts with debug_base */ +#undef CONFIG_SYS_NAND_BASE /* * Display CPU and Board information @@ -33,58 +39,16 @@ #define CONFIG_DISPLAY_CPUINFO 1 #define CONFIG_DISPLAY_BOARDINFO 1 -/* Clock Defines */ -#define V_OSCK 2600/* Clock output from T2 */ -#define V_SCLK (V_OSCK >> 1) - #define CONFIG_MISC_INIT_R -#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 #define CONFIG_REVISION_TAG1 -#define CONFIG_OF_LIBFDT 1 -#define CONFIG_CMD_BOOTZ 1 - -/* - * Size of malloc() pool - */ #define CONFIG_ENV_SIZE(128 << 10) /* 128 KiB */ - /* Sector */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10)) /* * Hardware drivers */ -/* - * NS16550 Configuration - */ -#define V_NS16550_CLK 4800/* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE(-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* - * select serial console configuration - */ -#define CONFIG_CONS_INDEX 3 -#define CONFIG_SYS_NS16550_COM3OMAP34XX_UART3 -#define CONFIG_SERIAL3 3 /* UART3 */ - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE -#define CONFIG_BAUDRATE115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200} -#define CONFIG_GENERIC_MMC 1 -#define CONFIG_MMC 1 -#define CONFIG_OMAP_HSMMC 1 -#define CONFIG_DOS_PARTITION 1 - /* USB */ #define CONFIG_MUSB_UDC1 #define CONFIG_USB_OMAP3 1 @@ -100,23 +64,14 @@ #define CONFIG_USBD_MANUFACTURER "Texas Instruments" #define CONFIG_USBD_PRODUCT_NAME "Zoom1" -/* commands to include */ -#include - -#define CONFIG_CMD_EXT2/* EXT2 Support */ -#define CONFIG_CMD_FAT /* FAT support */ -#define CONFIG_CMD_FS_GENERIC /* Generic FS support */ -#define CONFIG_CMD_MTDPARTS/* Enable MTD parts commands */ -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ #define MTDIDS_DEFAULT "nand0=nand" #define MTDPARTS_DEFAULT "mtdparts=nand:512k(x-loader),"\ "1920k(u-boot),128k(u-boot-env),"\ "4m(kernel),-(fs)" -#define CONFIG_CMD_I2C /* I2C serial bus support */ -#define CONFIG_CMD_MMC /* MMC support */ -#define CONFIG_CMD_NAND/* NAND support */ +#if defined(CONFIG_CMD_NAND) #define CONFIG_CMD_NAND_LOCK_UNLOCK /* Enable lock/unlock support */ +#endif #undef CONFIG_CMD_FLASH/* flinfo, erase, protect */ #undef CONFIG_CMD_FPGA /* FPGA configuration Support */ @@ -127,32 +82,24 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP -#define CONFIG_SYS_NO_FLASH -#define CONFIG_SYS_I2C -#define CONFIG_SYS_OMAP24_I2C_SPEED
[U-Boot] [PATCH V2 2/8] OMAP3: zoom1: Configure GPMC for Ethernet
zoom1 uses LAN9211 configured over GPMC Chip Select 1. Signed-off-by: Nishanth Menon --- board/logicpd/zoom1/zoom1.c | 18 ++ board/logicpd/zoom1/zoom1.h | 19 +-- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/board/logicpd/zoom1/zoom1.c b/board/logicpd/zoom1/zoom1.c index 9846f24..56e512f 100644 --- a/board/logicpd/zoom1/zoom1.c +++ b/board/logicpd/zoom1/zoom1.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -26,6 +27,20 @@ DECLARE_GLOBAL_DATA_PTR; +/* gpmc_cfg is initialized by gpmc_init and we use it here */ +extern struct gpmc *gpmc_cfg; + +/* GPMC definitions for Ethenet Controller LAN9211 */ +static const u32 gpmc_lab_enet[] = { + ZOOM1_ENET_GPMC_CONF1, + ZOOM1_ENET_GPMC_CONF2, + ZOOM1_ENET_GPMC_CONF3, + ZOOM1_ENET_GPMC_CONF4, + ZOOM1_ENET_GPMC_CONF5, + ZOOM1_ENET_GPMC_CONF6, + /*CONF7- computed as params */ +}; + /* * Routine: board_init * Description: Early hardware init. @@ -33,6 +48,9 @@ DECLARE_GLOBAL_DATA_PTR; int board_init(void) { gpmc_init(); /* in SRAM or SDRAM, finish GPMC */ + /* CS1 is Ethernet LAN9211 */ + enable_gpmc_cs_config(gpmc_lab_enet, &gpmc_cfg->cs[1], + DEBUG_BASE, GPMC_SIZE_16M); /* board id for Linux */ gd->bd->bi_arch_number = MACH_TYPE_OMAP_LDP; /* boot param addr */ diff --git a/board/logicpd/zoom1/zoom1.h b/board/logicpd/zoom1/zoom1.h index 62ef94f..3a943df 100644 --- a/board/logicpd/zoom1/zoom1.h +++ b/board/logicpd/zoom1/zoom1.h @@ -17,6 +17,13 @@ const omap3_sysinfo sysinfo = { "NAND", }; +#define ZOOM1_ENET_GPMC_CONF1 0x00611000 +#define ZOOM1_ENET_GPMC_CONF2 0x001F1F01 +#define ZOOM1_ENET_GPMC_CONF3 0x00080803 +#define ZOOM1_ENET_GPMC_CONF4 0x1D091D09 +#define ZOOM1_ENET_GPMC_CONF5 0x041D1F1F +#define ZOOM1_ENET_GPMC_CONF6 0x1D0904C4 + /* * IEN - Input Enable * IDIS- Input Disable @@ -94,13 +101,13 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(GPMC_D14), (IEN | PTD | DIS | M0)) /*GPMC_D14*/\ MUX_VAL(CP(GPMC_D15), (IEN | PTD | DIS | M0)) /*GPMC_D15*/\ MUX_VAL(CP(GPMC_NCS0), (IDIS | PTU | EN | M0)) /*GPMC_nCS0*/\ - MUX_VAL(CP(GPMC_NCS1), (IDIS | PTU | EN | M7)) /*GPMC_nCS1*/\ - MUX_VAL(CP(GPMC_NCS2), (IDIS | PTU | EN | M7)) /*GPMC_nCS2*/\ - MUX_VAL(CP(GPMC_NCS3), (IDIS | PTU | EN | M7)) /*GPMC_nCS3*/\ - MUX_VAL(CP(GPMC_NCS4), (IDIS | PTU | EN | M7)) /*GPMC_nCS4*/\ - MUX_VAL(CP(GPMC_NCS5), (IDIS | PTD | DIS | M7)) /*GPMC_nCS5*/\ + MUX_VAL(CP(GPMC_NCS1), (IDIS | PTU | EN | M0)) /*GPMC_nCS1*/\ + MUX_VAL(CP(GPMC_NCS2), (IDIS | PTU | DIS | M7)) /*GPMC_nCS2*/\ + MUX_VAL(CP(GPMC_NCS3), (IEN | PTU | DIS | M4)) /*GPMC_nCS3 -> GPIO54*/\ + MUX_VAL(CP(GPMC_NCS4), (IDIS | PTU | DIS | M4)) /*GPMC_nCS4 -> GPIO 55*/\ + MUX_VAL(CP(GPMC_NCS5), (IDIS | PTD | DIS | M4)) /*GPMC_nCS5 -> GPIO 56*/\ MUX_VAL(CP(GPMC_NCS6), (IEN | PTD | DIS | M7)) /*GPMC_nCS6*/\ - MUX_VAL(CP(GPMC_NCS7), (IEN | PTU | EN | M7)) /*GPMC_nCS7*/\ + MUX_VAL(CP(GPMC_NCS7), (IEN | PTU | EN | M1)) /*GPMC_nCS7 -> GPMC_IO_DIR*/\ MUX_VAL(CP(GPMC_CLK), (IDIS | PTD | DIS | M0)) /*GPMC_CLK*/\ MUX_VAL(CP(GPMC_NADV_ALE), (IDIS | PTD | DIS | M0)) /*GPMC_nADV_ALE*/\ MUX_VAL(CP(GPMC_NOE), (IDIS | PTD | DIS | M0)) /*GPMC_nOE*/\ -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2 6/8] omap3: zoom1: enable bootz
Boot from zImage and fdt_file if uImage is not available to maintain the legacy behavior. Signed-off-by: Nishanth Menon --- include/configs/omap3_zoom1.h | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 110e3db..477fb10 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -45,6 +45,7 @@ #define CONFIG_REVISION_TAG1 #define CONFIG_OF_LIBFDT 1 +#define CONFIG_CMD_BOOTZ 1 /* * Size of malloc() pool @@ -155,7 +156,9 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x8200\0" \ + "fdtaddr=0x80f8\0" \ "bootfile=uImage\0" \ + "fdtfile=omap3-ldp.dtb\0" \ "bootdir=/\0" \ "bootpart=0:1\0" \ "usbtty=cdc_acm\0" \ @@ -175,9 +178,14 @@ "bootscript=echo Running bootscript from mmc ...; " \ "source ${loadaddr}\0" \ "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ + "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ + "loadzimage=setenv bootfile zImage; if run loadimage; then run loadfdt;fi\0"\ "mmcboot=echo Booting from mmc ...; " \ "run mmcargs; " \ "bootm ${loadaddr}\0" \ + "mmczboot=echo Booting from mmc ...; " \ + "run mmcargs; " \ + "bootz ${loadaddr} - ${fdtaddr}\0" \ "nandboot=echo Booting from nand ...; " \ "run nandargs; " \ "nand read ${loadaddr} 28 40; " \ @@ -190,8 +198,10 @@ "else " \ "if run loadimage; then " \ "run mmcboot; " \ + "else if run loadzimage; then " \ + "run mmczboot; " \ "else run nandboot; " \ - "fi; " \ + "fi; fi;" \ "fi; " \ "else run nandboot; fi" -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2 1/8] omap3: zoom1: enable CONFIG_SYS_GENERIC_BOARD
CONFIG_SYS_GENERIC_BOARD should now be enabled for generic functionality Further information in doc/README.generic-board Signed-off-by: Nishanth Menon --- include/configs/omap3_zoom1.h |1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index f0fa96e..c4178d8 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -20,6 +20,7 @@ #define CONFIG_OMAP34XX1 /* which is a 34XX */ #define CONFIG_OMAP3_ZOOM1 1 /* working with Zoom MDK Rev1 */ #define CONFIG_OMAP_COMMON +#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_SDRC/* The chip has SDRC controller */ -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2 4/8] omap3: zoom1: enable common network commands
Basic networking commands for usability. Signed-off-by: Nishanth Menon --- include/configs/omap3_zoom1.h |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 4a4dfd9..4fb3628 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -116,7 +116,9 @@ #undef CONFIG_CMD_IMI /* iminfo */ #undef CONFIG_CMD_IMLS /* List all found images*/ #define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot*/ -#undef CONFIG_CMD_NFS /* NFS support */ +#define CONFIG_CMD_NFS /* NFS support */ +#define CONFIG_CMD_PING +#define CONFIG_CMD_DHCP #define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_I2C -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2 5/8] omap3: zoom1: disable JFFS2 and enable FS_GENERIC
This is more in line with commits 664979a2a9f764b63b8094458b87247d254b0cc1(omap3_beagle: remove JFFS2 support.) and 102ce9ea7afdda80fe25aa786975e1722196bdb9 (omap3_beagle: enable CMD_FS_GENERIC and simplify load of image/ramdisk) CMD_FS_GENERIC allows us to simplify where we load up our image from either from ext2/fat etc. So, lets use that instead of cumbersome options we'd have to use. Sticking with existing conventions, defaults will be: bootfile=uImage bootpart=0:1 (first partition) bootdir=/ (/ in first partition) Signed-off-by: Nishanth Menon --- include/configs/omap3_zoom1.h | 22 -- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 4fb3628..110e3db 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -104,7 +104,13 @@ #define CONFIG_CMD_EXT2/* EXT2 Support */ #define CONFIG_CMD_FAT /* FAT support */ -#define CONFIG_CMD_JFFS2 /* JFFS2 Support*/ +#define CONFIG_CMD_FS_GENERIC /* Generic FS support */ +#define CONFIG_CMD_MTDPARTS/* Enable MTD parts commands */ +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define MTDIDS_DEFAULT "nand0=nand" +#define MTDPARTS_DEFAULT "mtdparts=nand:512k(x-loader),"\ + "1920k(u-boot),128k(u-boot-env),"\ + "4m(kernel),-(fs)" #define CONFIG_CMD_I2C /* I2C serial bus support */ #define CONFIG_CMD_MMC /* MMC support */ @@ -143,19 +149,15 @@ /* CS0 */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */ /* devices */ -#define CONFIG_JFFS2_NAND -/* nand device jffs2 lives on */ -#define CONFIG_JFFS2_DEV "nand0" -/* start of jffs2 partition */ -#define CONFIG_JFFS2_PART_OFFSET 0x68 -#define CONFIG_JFFS2_PART_SIZE 0xf98 /* size of jffs2 */ - /* partition */ /* Environment information */ #define CONFIG_BOOTDELAY 10 #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x8200\0" \ + "bootfile=uImage\0" \ + "bootdir=/\0" \ + "bootpart=0:1\0" \ "usbtty=cdc_acm\0" \ "console=ttyS2,115200n8\0" \ "mmcdev=0\0" \ @@ -172,7 +174,7 @@ "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \ "bootscript=echo Running bootscript from mmc ...; " \ "source ${loadaddr}\0" \ - "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \ + "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ "mmcboot=echo Booting from mmc ...; " \ "run mmcargs; " \ "bootm ${loadaddr}\0" \ @@ -186,7 +188,7 @@ "if run loadbootscript; then " \ "run bootscript; " \ "else " \ - "if run loaduimage; then " \ + "if run loadimage; then " \ "run mmcboot; " \ "else run nandboot; " \ "fi; " \ -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2 3/8] OMAP3: zoom1: enable LAN9211
Zoom1 was wrongly setup for LAN91C96. Fix it by enabling LAN9211. Signed-off-by: Nishanth Menon --- board/logicpd/zoom1/zoom1.c | 20 ++-- include/configs/omap3_zoom1.h | 10 +- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/board/logicpd/zoom1/zoom1.c b/board/logicpd/zoom1/zoom1.c index 56e512f..461a852 100644 --- a/board/logicpd/zoom1/zoom1.c +++ b/board/logicpd/zoom1/zoom1.c @@ -102,9 +102,25 @@ int board_mmc_init(bd_t *bis) int board_eth_init(bd_t *bis) { int rc = 0; -#ifdef CONFIG_LAN91C96 - rc = lan91c96_initialize(0, CONFIG_LAN91C96_BASE); + +#ifdef CONFIG_SMC911X +#define STR_ENV_ETHADDR"ethaddr" + + struct eth_device *dev; + uchar eth_addr[6]; + + rc = smc911x_initialize(0, CONFIG_SMC911X_BASE); + if (!eth_getenv_enetaddr(STR_ENV_ETHADDR, eth_addr)) { + dev = eth_get_dev_by_index(0); + if (dev) { + eth_setenv_enetaddr(STR_ENV_ETHADDR, dev->enetaddr); + } else { + printf("zoom1: Couldn't get eth device\n"); + rc = -1; + } + } #endif + return rc; } #endif diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index c4178d8..4a4dfd9 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -115,7 +115,7 @@ #undef CONFIG_CMD_FPGA /* FPGA configuration Support */ #undef CONFIG_CMD_IMI /* iminfo */ #undef CONFIG_CMD_IMLS /* List all found images*/ -#undef CONFIG_CMD_NET /* bootp, tftpboot, rarpboot*/ +#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot*/ #undef CONFIG_CMD_NFS /* NFS support */ #define CONFIG_SYS_NO_FLASH @@ -265,4 +265,12 @@ #define CONFIG_SYS_CACHELINE_SIZE 64 +#ifdef CONFIG_CMD_NET +/* Ethernet (LAN9211 from SMSC9118 family) */ +#define CONFIG_SMC911X +#define CONFIG_SMC911X_32_BIT +#define CONFIG_SMC911X_BASEDEBUG_BASE + +#endif + #endif /* __CONFIG_H */ -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2 7/8] omap3: zoom1: fix default console
We do not use ttyS2 anymore in Linux, it changed to ttyO2 a few years back. never too late to update. Signed-off-by: Nishanth Menon --- include/configs/omap3_zoom1.h |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 477fb10..4f933d9 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -162,7 +162,7 @@ "bootdir=/\0" \ "bootpart=0:1\0" \ "usbtty=cdc_acm\0" \ - "console=ttyS2,115200n8\0" \ + "console=ttyO2,115200n8\0" \ "mmcdev=0\0" \ "videomode=1024x768@60,vxres=1024,vyres=768\0" \ "videospec=omapfb:vram:2M,vram:4M\0" \ -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2 0/8] omap3: zoom1: long pending cleanups :(
V1: http://lists.denx.de/pipermail/u-boot/2014-April/176867.html changes since v1: - use ti_omap3_common config header - fix typo in commit message - drop fdt_high test log: http://hastebin.com/moqewevulu.xml Nishanth Menon (8): omap3: zoom1: enable CONFIG_SYS_GENERIC_BOARD OMAP3: zoom1: Configure GPMC for Ethernet OMAP3: zoom1: enable LAN9211 omap3: zoom1: enable common network commands omap3: zoom1: disable JFFS2 and enable FS_GENERIC omap3: zoom1: enable bootz omap3: zoom1: fix default console omap3: zoom1: switch to generic ti_omap3_common config header board/logicpd/zoom1/config.mk |1 - board/logicpd/zoom1/zoom1.c | 38 +- board/logicpd/zoom1/zoom1.h | 19 +++-- include/configs/omap3_zoom1.h | 167 - 4 files changed, 98 insertions(+), 127 deletions(-) -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 0/7] omap3: zoom1: long pending cleanups :(
On Mon, Apr 7, 2014 at 9:25 AM, Tom Rini wrote: > On Thu, Apr 03, 2014 at 06:19:19PM -0500, Nishanth Menon wrote: > >> A series of patches to add in ethernet and bootz support. >> >> baseline: v2014.04-rc3 >> >> >> Nishanth Menon (7): >> omap3: zoom1: enable CONFIG_SYS_GENERIC_BOARD >> OMAP3: zoom1: Configure GPMC for Ethernet >> OMAP3: zoom1: enable LAN9211 >> omap3: zoom1: enable common network commands >> omap3: zoom1: disable JFFS2 and enable FS_GENERIC >> omap3: zoom1: enable bootz >> omap3: zoom1: fix default console >> >> board/logicpd/zoom1/zoom1.c | 38 -- >> board/logicpd/zoom1/zoom1.h | 19 ++- >> include/configs/omap3_zoom1.h | 52 >> ++--- > > Can you switch over to include/configs/ti_omap3_common.h as well? I > suspect you'll need some of the patches I posted for omap3_evm to do so > tho. Thanks! Done as the last patch in the series based on v2014.04-rc3 -> I will repost the series in a few mins. lets see if you want further improvements. Regards, Nishanth Menon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Latest u-boot release on BeagleBone Black for FreeBSD
On Mon, 2014-04-07 at 15:16 +0800, Xuebing Wang wrote: > Hi u-boot community, > > I am trying to port u-boot (release u-boot-2014.04-rc3.tar.bz2) to > FreeBSD on BeagleBone Black. > > In FreeBSD, there is a u-boot loader (named ubldr), which can call > u-boot API to get fdt (Flat Device Tree) data. Example is: > -- fdt header > > I have to comment out below 3 lines, in order to get correct fdt data in > FreeBSD ubldr from u-boot. Would you please advice what is the best way > to fix this? > > In file common/env_common.c: > const uchar *env_get_addr(int index) > { > // if (gd->env_valid) > // return (uchar *)(gd->env_addr + index); > // else > return &default_environment[index]; > } > Are you using a fairly recent ubldr on the freebsd side? I made some changes around March 1st on how ubldr finds / loads fdt data... It first looks for env vars named fdtaddr then fdt_addr in the u-boot environment. If the variable exists it tries to validate the data at that address as a valid dtb header and if it is, that's the data that is passed to the kernel. Otherwise it next it looks for env vars named fdtfile then fdt_file. If one of those exists it tries to load that filename from the freebsd filesystem in the usual places where kernel and modules are located (/boot/kernel, /boot/modules). It seems strange to me that things work only if you comment out the dynamic environment in u-boot. You said "in order to get the correct fdt data" and I wonder what you mean by that. Do you mean that the u-boot script stuff is loading fdt data, but it's not the freebsd data but rather the linux data? Unfortunately, freebsd isn't able to use linux or vendor-supplied dtb files yet. We're working towards using only documented bindings but right now we still need freebsd-specific extra properties in the dtb. I added the support for fdtfile/fdt_file specifically to handle this situation until we're able to handle the vendor dtb files. If you manipulate your u-boot environment so that fdtaddr and fdt_addr are unset and fdtfile is the name of the appropriate freebsd dtb file (which you must install on your freebsd image along with the kernel), then everything should work out properly. Of course an alternative is to install the freebsd dtb files onto the msdos partition along with u-boot and let u-boot load them and set fdtaddr. If this is what you're doing and it still isn't working, I suspect the problem is in ubldr, not u-boot itself. We'll have to turn on some debugging in sys/boot/fdt/fdt_loader_cmd.c to track that down. -- Ian ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] How to disable MAC address for usb_ether
On Tue, Apr 08, 2014 at 11:13:04AM +0800, Xuebing Wang wrote: > Hi, > > My board has one Ethernet, one USB Host and one USB Slave. > > Command bdinfo shows below: > > eth0name= cpsw > ethaddr = 90:59:af:54:1a:28 > eth1name= usb_ether > eth1addr= 90:59:af:54:1a:2a > current eth = cpsw > > Would you please teach me how to disable usb_ether MAC address, thus > bdinfo will show "eth1addr= (not set)"? Please note that the eFuse on your chip has at least 2 MAC addresses on it and we probe and setup both to pass along to the kernel. -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] lib: Add CONFIG_FDT_IGNORE_FIXUP_MEMORY_NODE
On Tue, Apr 08, 2014 at 03:05:36PM +0200, Wolfgang Denk wrote: > Dear Nobuhiro, > > In message > you > wrote: > > > > > Please explain why you would want to do this. To me it makes no > > > sense. Either U-Boot knows the correct memory size, then it should > > > pass it to Linux. Or it does not, then U-Boot should be fixed. > > > > For example, I can access the memory of all in the U-Boot, but I may > > want to control > > the highmem on Linux,I do not want to show a specific area from kernel > > and userland. > > Is it not sufficient to pass some "mem=" boot argument? We even have > automatic support for this in U-Boot (see the CONFIG_PRAM feature). There's various ways to do this, yes. But it doesn't cover the >4GB case. > > > Also, I object that your implementation is ARM specific. If such a > > > feature gets added, it should be architecture independent. > > > > I see. But arch_fixup_memory_node() is used by ARM only. > > So, we see to be dependent on the ARM is only this. > > All architectures that support the device tree update the memory size > for Linux, so we should find a generic way to handle this. Actually > we should always strive to reduce this arhitecture specific code. Note that ARM provides arch_fixup_memory_node to make sure we have all of the bank information populated and then calls fdt_fixup_memory_banks, while PowerPC just calls fdt_fixup_memory which calls banks with a '1' for number of banks. MIPS (and everyone else) isn't doing anything about this atm, but probably should. At the high level, we need to see if we _really_ do need to be using arch_fixup_memory_node at all because my gut feeling is (a) we've already always filled in the bank info and if not (b) that is a bug to correct. But I haven't dived in to the relevant code here yet. -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 6/7] omap3: zoom1: enable bootz
On Tue, Apr 08, 2014 at 09:35:29AM -0500, Nishanth Menon wrote: > On Mon, Apr 7, 2014 at 9:29 AM, Tom Rini wrote: > > On Thu, Apr 03, 2014 at 06:19:25PM -0500, Nishanth Menon wrote: > > > >> Boot from zImage and fdt_file if uImage is not available to maintain > >> the legacy behavior. > > [snip] > >> #define CONFIG_EXTRA_ENV_SETTINGS \ > >> "loadaddr=0x8200\0" \ > >> + "fdt_high=0x\0" \ > >> + "fdtaddr=0x80f8\0" \ > > > > OK, how much memory does this board ever have? If less than 512MB, > > don't do fdt_high. If 256MB or more, please put fdtaddr at base+128MB. > > Thanks! > > As per the board dts in kernel, this platform has 128MB. As per the > configuration files, CS1 might not be populated on many boards as > well. so 128MB seems to be the max memory available here. I never trust the dts in the kernel wrt memory size, at least for TI platforms as it's always 128MB and we've always gotten by with a run-time fixup (or people not noticing their board had less memory than it really does). And, aside, they ought to adapt the PowerPC convention of saying 0 for memory size so it's clear that the value is fixed up elsewhere. > just remove fdt_high? Yup. -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 6/7] omap3: zoom1: enable bootz
On Tue, Apr 8, 2014 at 11:22 AM, Tom Rini wrote: > On Tue, Apr 08, 2014 at 09:35:29AM -0500, Nishanth Menon wrote: >> On Mon, Apr 7, 2014 at 9:29 AM, Tom Rini wrote: >> > On Thu, Apr 03, 2014 at 06:19:25PM -0500, Nishanth Menon wrote: >> > >> >> Boot from zImage and fdt_file if uImage is not available to maintain >> >> the legacy behavior. >> > [snip] >> >> #define CONFIG_EXTRA_ENV_SETTINGS \ >> >> "loadaddr=0x8200\0" \ >> >> + "fdt_high=0x\0" \ >> >> + "fdtaddr=0x80f8\0" \ >> > >> > OK, how much memory does this board ever have? If less than 512MB, >> > don't do fdt_high. If 256MB or more, please put fdtaddr at base+128MB. >> > Thanks! >> >> As per the board dts in kernel, this platform has 128MB. As per the >> configuration files, CS1 might not be populated on many boards as >> well. so 128MB seems to be the max memory available here. > > I never trust the dts in the kernel wrt memory size, at least for TI > platforms as it's always 128MB and we've always gotten by with a > run-time fixup (or people not noticing their board had less memory than > it really does). And, aside, they ought to adapt the PowerPC convention > of saying 0 for memory size so it's clear that the value is fixed up > elsewhere. > >> just remove fdt_high? > > Yup. Done in v2. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request: u-boot-arm/master
On Tue, Apr 08, 2014 at 01:40:10PM +0200, Albert ARIBAUD wrote: > Hi Tom, > > The following changes since commit > 04d2f0a9f33112bd70ce4d9c451fdca1682e3a59: > > Revert "Start the deprecation process for generic board" (2014-04-04 > 10:09:19 -0400) > > are available in the git repository at: > > git://git.denx.de/u-boot-arm master > > for you to fetch changes up to 519fdde9e6a6ebce7dc743b4f5621503d25b7a45: > > Merge branch 'u-boot/master' into 'u-boot-arm/master' (2014-04-08 > 09:25:08 +0200) > > > > Albert ARIBAUD (6): > Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' > Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master' > Merge branch 'u-boot/master' into 'u-boot-arm/master' > Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' > Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' > Merge branch 'u-boot/master' into 'u-boot-arm/master' > > Andreas Färber (1): > arm: Handle .gnu.hash section in ldscripts > > Chin Liang See (1): > socfpga: Adding Clock Manager driver > > David Feng (1): > arm64 patch: gicv3 support > > Eric Nelson (1): > ARM: mx6: Disable PCIe on SABRE Lite/Nitrogen6x > > Fabio Estevam (7): > wandboard: Staticize usdhc1_pads > mmc: Add a prototype for board_mmc_init() > wandboard: Fix sparse warning > wandboard: Include > fb: Add a prototype for board_video_skip() > mx25pdk: Align the environment with other FSL boards > woodburn_sd: Remove CONFIG_BOOT_INTERNAL > > Hannes Petermaier (2): > board/BuR/kwb: fix usage of 'i2c_set_bus_speed' > board: enable 32kHz RTC OSC at B&R boards > > Ilya Ledvich (1): > drivers: net: cpsw: init phy with gigabit features > > Leo Yan (1): > ARMv8: fix bug for flush data cache by set/way > > Marcel Ziswiler (4): > arm: vf610: fix anadig register struct > arm: vf610: add uart0 clock/iomux definitions > arm: vf610: add enet1 support > arm: vf610: fix double iomux configuration for vf610twr board > > Marek Vasut (13): > arm: exynos: Squash bogus warnings in pinmux > arm: mxs: Adjust the load address of U-Boot and SPL for HAB > arm: mxs: Add support for generating signed BootStream > ARM: mxs: Add OCOTP driver > pci: mx6: Implement power callback > ARM: mx6: Add PCIe on SabreSDP > arm: mx5: Fix memory slowness on MX53QSB > arm: mx5: Avoid hardcoding memory sizes on MX53QSB > arm: mx5: Fix memory slowness on M53EVK > arm: mx5: Avoid hardcoding memory sizes on M53EVK > arm: mxs: Properly set GD pointer in SPL > arm: mxs: Add serial console support into SPL > arm: mxs: Add support for generating signed BootStream > > Mela Custodio (1): > bootstage: arm: fix fdt stashing code > > Nitin Garg (3): > ARM: Add workaround for Cortex-A9 errata 794072 > ARM: Add workaround for Cortex-A9 errata 761320 > MX6: Enable ARM errata workaround 794072 and 761320 > > Piotr Wilczek (12): > exynos4:pinmux:fdt: decode peripheral id > video:mipidsim:fdt: Add DT support for mipi dsim driver > video:exynos_fb:fdt: add additional fdt data > drivers:mmc:sdhci: enable support for DT > board:samsung: move checkboard to common file > arm:exynos: add common DTS file for exynos 4 > board:samsung:common: move max77686 init function > arm:exynos: enable sdhci and misc_init to common board > board:origen: Enable device tree on Origen > board:universal: Enable device tree on Universal > board:trats: Enable device tree on Trats > board:trats2: Enable device tree on Trats2 > > Przemyslaw Marczak (2): > Trats/Trats2: Update Tizen partitions layout and dfu entities > usb: dfu: add static alt num count in dfu_config_entities() > > Stefan Roese (2): > arm: omap: cm_t35: Fix: Re-add GPMC_NAND_ECC_LP_x8_LAYOUT > arm: am335x: DXR2: Move unconditional LAN9303 reset into command > > Stefano Babic (6): > Merge branch 'master' of git://git.denx.de/u-boot-arm > mxs: fix warning in SPL with console support > imx: add rules for U-Boot DTB support > mx6: add example DTB for mx6qsabreauto > Revert "arm: mxs: Add support for generating signed BootStream" > Merge branch 'master' of git://git.denx.de/u-boot-arm into master > > Stephen Warren (1): > ARM: tegra: make all I2C ports open-drain > > Tim Harvey (2): > power: add PFUZE100 PMIC driver > ventana: Add Gateworks Ventana family support > > Tom Rini (2): > am33xx: Rework #ifdef's around s_init for clarity > am335x_evm: Remove SPI SPL from NOR support target > > Vasili Galka (1): > drivers/spi/omap3: Bug fix of premature write transfer completion > > York Sun (4): > armv8/cache: Consolidate setting for MAIR and TCR >
Re: [U-Boot] [PATCH] lib: Add CONFIG_FDT_IGNORE_FIXUP_MEMORY_NODE
Hello Tom, > Note that ARM provides arch_fixup_memory_node to make sure we have all > of the bank information populated and then calls fdt_fixup_memory_banks, > while PowerPC just calls fdt_fixup_memory which calls banks with a '1' > for number of banks. MIPS (and everyone else) isn't doing anything > about this atm, but probably should. I assume the main reason this is not done for MIPS is the missing support for providing devicetrees from U-Boot. Daniel: Do you know if there is any activity to add this? Best Regards, Thomas ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] CONFIG_SYS_XIP_BOOT for when it's a choice?
On Tue, Apr 08, 2014 at 03:02:44PM +0200, Wolfgang Denk wrote: > Dear Tom, > > In message <20140407195731.GL23803@bill-the-cat> you wrote: > > > > Maybe, maybe not. But it's beside the point. The point is we have SoC > > init code that needs to be run once. Sometimes this is true when > > CONFIG_SPL_BUILD=y, sometimes this is true when other options are set > > instead. What should we call the option to denote one-time init? > > Should we extend CONFIG_SKIP_LOWLEVEL_INIT to cover this case? > > Um... I think, if we build (and use) the SPL, then the low level init > code would always be run (if at all) in the SPL; without SPL, it would > be run in the normal U-Boot code. CONFIG_SKIP_LOWLEVEL_INIT is > intended to skip running this low level init code. To me this looks > independent of where this init code is located - it is yet another > orthogonal decision. > > Which sort of extension do you have in mind here? Maybe talking about this in patches will be clearer. If instead of adding a new CONFIG option, I use CONFIG_SKIP_LOWLEVEL_INIT like this! diff --git a/arch/arm/cpu/armv7/am33xx/board.c b/arch/arm/cpu/armv7/am33xx/board.c index fb44cc8..28c16f8 100644 --- a/arch/arm/cpu/armv7/am33xx/board.c +++ b/arch/arm/cpu/armv7/am33xx/board.c @@ -142,7 +142,7 @@ int arch_misc_init(void) return 0; } -#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_NOR_BOOT) +#ifndef CONFIG_SKIP_LOWLEVEL_INIT /* * This function is the place to do per-board things such as ramp up the * MPU clock frequency. @@ -200,9 +200,7 @@ static void watchdog_disable(void) while (readl(&wdtimer->wdtwwps) != 0x0) ; } -#endif -#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_NOR_BOOT) void s_init(void) { /* diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h index 50c3203..89d14c8 100644 --- a/include/configs/ti_am335x_common.h +++ b/include/configs/ti_am335x_common.h @@ -69,7 +69,8 @@ * Since SPL did pll and ddr initialization for us, * we don't need to do it twice. */ -#if !defined(CONFIG_SPL_BUILD) && !defined(CONFIG_NOR_BOOT) +#if !defined(CONFIG_SPL_BUILD) && !defined(CONFIG_NOR_BOOT) && \ + !defined(CONFIG_QSPI_BOOT) #define CONFIG_SKIP_LOWLEVEL_INIT #endif The following is true: a) am335x_evm build, SPL calls s_init, does DDR init, u-boot.img continues to not do so, just like today. b) am335x_evm_norboot, _no_ SPL, u-boot.bin calls s_init, does DDR init, just like today. c) am43xx_evm build, SPL and u-boot.img work just like am335x_evm d) am43xx_evm_qspiboot, _no_ SPL, u-boot.bin calls s_init, does DDR init, just like today with the patch series that adds the target. If instead we add a new option (for the moment, CONFIG_SYS_XIP_BOOT): diff --git a/arch/arm/cpu/armv7/am33xx/board.c b/arch/arm/cpu/armv7/am33xx/board.c index fb44cc8..133ca1c 100644 --- a/arch/arm/cpu/armv7/am33xx/board.c +++ b/arch/arm/cpu/armv7/am33xx/board.c @@ -142,7 +142,7 @@ int arch_misc_init(void) return 0; } -#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_NOR_BOOT) +#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_SYS_XIP_BOOT) /* * This function is the place to do per-board things such as ramp up the * MPU clock frequency. @@ -200,9 +200,7 @@ static void watchdog_disable(void) while (readl(&wdtimer->wdtwwps) != 0x0) ; } -#endif -#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_NOR_BOOT) void s_init(void) { /* diff --git a/boards.cfg b/boards.cfg index b4203f1..b5a79d0 100644 --- a/boards.cfg +++ b/boards.cfg @@ -267,7 +267,7 @@ Active arm armv7 am33xx silica pengwyn Active arm armv7 am33xx ti am335x am335x_boneblack am335x_evm:SERIAL1,CONS_INDEX=1,EMMC_BOOT Tom Rini Active arm armv7 am33xx ti am335x am335x_evm am335x_evm:SERIAL1,CONS_INDEX=1,NAND Tom Rini Active arm armv7 am33xx ti am335x am335x_evm_nor am335x_evm:SERIAL1,CONS_INDEX=1,NAND,NOR Tom Rini -Active arm armv7 am33xx ti am335x am335x_evm_norboot am335x_evm:SERIAL1,CONS_INDEX=1,NOR,NOR_BOOT Tom Rini +Active arm armv7 am33xx ti am335x am335x_evm_norboot am335x_evm:SERIAL1,CONS_INDEX=1,NOR,NOR_BOOT,SYS_XIP_BOOT Tom Rini Active
Re: [U-Boot] CONFIG_SYS_XIP_BOOT for when it's a choice?
Hi Tom, On Tue, 8 Apr 2014 14:00:29 -0400, Tom Rini wrote: > Maybe talking about this in patches will be clearer. To us people, possibly. To Patchwork, possibly not. :) http://patchwork.ozlabs.org/patch/337713/ Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RFC PATCH] MIPS: incaip: move board specific code out of generic code
Dear Daniel, In message <1396908893-12011-1-git-send-email-daniel.schwierz...@gmail.com> you wrote: > This is required to switch MIPS platform to generic board. > > Cc: Wolfgang Denk > Signed-off-by: Daniel Schwierzeck > --- > Wolfgang, I would rather remove this board. It is obviously dead and no one > ever > cared about it since you have added it. The code does not conform to current > coding style. Also it needs a lot of cleanup if we switch to driver model > eventually. I agree that it nakes no sense to put endless efforts on this ancient piece of dead hardware. I'll be happy if you can provide a removal patch. Alternatively, I can do one, but it will take a while until I find time to do so. Thanks. Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de Business is like a wheelbarrow. Nothing ever happens until you start pushing. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] U-Boot Loop
Hi, I'm running a PowerPC board that uses U-Boot and I get into this loop (see terminal output below). It doesn't matter how I get into this loop. What I really care about is how to break out of it without manually resetting the board. Is there a way to break out of this loop and reset the system via the terminal? Ctrl-X and Ctrl-C doesn't seem to do anything. TERMINAL OUTPUT Waiting for PHY auto negotiation to complete.. TIMEOUT ! eTSEC1: No link. Speed: 1000, full duplex Using eTSEC2 device TFTP from server 192.168.128.127; our IP address is 192.168.128.128 Filename 'oe/bsp/mvme2500/vxWorks'. Load address: 0x100 Loading: T T T T T T T T T T Retry count exceeded; starting again Waiting for PHY auto negotiation to complete.. TIMEOUT ! eTSEC3: No link. Waiting for PHY auto negotiation to complete.. TIMEOUT ! eTSEC1: No link. Speed: 1000, full duplex Using eTSEC2 device TFTP from server 192.168.128.127; our IP address is 192.168.128.128 Filename 'oe/bsp/mvme2500/vxWorks'. Load address: 0x100 Loading: T T T T T T T T T T Retry count exceeded; starting again Waiting for PHY auto negotiation to complete.. TIMEOUT ! eTSEC3: No link. Waiting for PHY auto negotiation to complete.. TIMEOUT ! eTSEC1: No link. Speed: 1000, full duplex Using eTSEC2 device TFTP from server 192.168.128.127; our IP address is 192.168.128.128 Filename 'oe/bsp/mvme2500/vxWorks'. Load address: 0x100 Loading: T T T T T T T T T T Retry count exceeded; starting again Waiting for PHY auto negotiation to complete.. TIMEOUT ! eTSEC3: No link. Waiting for PHY auto negotiation to complete.. TIMEOUT ! eTSEC1: No link. Speed: 1000, full duplex Using eTSEC2 device TFTP from server 192.168.128.127; our IP address is 192.168.128.128 Filename 'oe/bsp/mvme2500/vxWorks'. Load address: 0x100 Loading: T T T T T T T T T ÿT Retry count exceeded; starting again Waiting for PHY auto negotiation to complete.. TIMEOUT ! eTSEC3: No link. Waiting for PHY auto negotiation to complete.. TIMEOUT ! eTSEC1: No link. Speed: 1000, full duplex Using eTSEC2 device TFTP from server 192.168.128.127; our IP address is 192.168.128.128 Filename 'oe/bsp/mvme2500/vxWorks'. Load address: 0x100 Loading: T T T T T T T T T T Retry count exceeded; starting again Waiting for PHY auto negotiation to complete.. TIMEOUT ! eTSEC3: No link. Waiting for PHY auto negotiation to complete.. TIMEOUT ! eTSEC1: No link. Speed: 1000, full duplex Thanks Dang This email is non-binding, is subject to contract, and neither Kulicke & Soffa Industries Inc nor its subsidiaries shall have any obligation to you to consummate the transactions herein or to enter into any agreement, other than in accordance with the terms and conditions of a definitive agreement if and when negotiated, finalized and executed between the parties. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] buildman: make output dir configurable
Hi Daniel, On 28 March 2014 14:46, Daniel Schwierzeck wrote: > Add an option to specify the output directory to override the > default path '../'. This is useful for building in a ramdisk. > > Signed-off-by: Daniel Schwierzeck > Cc: Simon Glass > --- > tools/buildman/buildman.py | 2 ++ > tools/buildman/control.py | 2 +- > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/tools/buildman/buildman.py b/tools/buildman/buildman.py > index 8822efe..0d95246 100755 > --- a/tools/buildman/buildman.py > +++ b/tools/buildman/buildman.py > @@ -101,6 +101,8 @@ parser.add_option('-T', '--threads', type='int', > default=None, help='Number of builder threads to use') > parser.add_option('-u', '--show_unknown', action='store_true', > default=False, help='Show boards with unknown build result') > +parser.add_option('-o', '--output-dir', type='string', > + dest='output_dir', default='..', help='Output directory') > Can you expand the help here a bit? This is the directory where all the builds happen, with a separate sub-directory for each commit. It also holds the working directory (.bm-work). So maybe 'Build output directory, also used for working space' ? > > parser.usage = """buildman -b [options] > > diff --git a/tools/buildman/control.py b/tools/buildman/control.py > index 8e6a08f..d2f4102 100644 > --- a/tools/buildman/control.py > +++ b/tools/buildman/control.py > @@ -145,7 +145,7 @@ def DoBuildman(options, args): > options.step = len(series.commits) - 1 > > # Create a new builder with the selected options > -output_dir = os.path.join('..', options.branch) > +output_dir = os.path.join(options.output_dir, options.branch) > builder = Builder(toolchains, output_dir, options.git_dir, > options.threads, options.jobs, checkout=True, > show_unknown=options.show_unknown, step=options.step) > -- > 1.8.3.2 > > Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] CONFIG_SYS_XIP_BOOT for when it's a choice?
Dear Tom, In message <20140408180029.GR23803@bill-the-cat> you wrote: > > Maybe talking about this in patches will be clearer. If instead of > adding a new CONFIG option, I use CONFIG_SKIP_LOWLEVEL_INIT like this! I like this, too :-) > Pasting it out, I like using CONFIG_SKIP_LOWLEVEL_INIT more to cover > this code. Does that work for you? Yes, it does. Thanks! Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de Only two things are infinite, the universe and human stupidity, and I'm not sure about the former. -- Albert Einstein ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] buildman: make output dir configurable
2014-04-08 21:35 GMT+02:00 Simon Glass : > Hi Daniel, > > On 28 March 2014 14:46, Daniel Schwierzeck > wrote: >> >> Add an option to specify the output directory to override the >> default path '../'. This is useful for building in a ramdisk. >> >> Signed-off-by: Daniel Schwierzeck >> Cc: Simon Glass >> --- >> tools/buildman/buildman.py | 2 ++ >> tools/buildman/control.py | 2 +- >> 2 files changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/tools/buildman/buildman.py b/tools/buildman/buildman.py >> index 8822efe..0d95246 100755 >> --- a/tools/buildman/buildman.py >> +++ b/tools/buildman/buildman.py >> @@ -101,6 +101,8 @@ parser.add_option('-T', '--threads', type='int', >> default=None, help='Number of builder threads to use') >> parser.add_option('-u', '--show_unknown', action='store_true', >> default=False, help='Show boards with unknown build result') >> +parser.add_option('-o', '--output-dir', type='string', >> + dest='output_dir', default='..', help='Output directory') > > > Can you expand the help here a bit? This is the directory where all the > builds happen, with a separate sub-directory for each commit. It also holds > the working directory (.bm-work). So maybe 'Build output directory, also > used for working space' ? > sure. How about that? -o OUTPUT_DIR, --output-dir=OUTPUT_DIR Directory where all builds happen and buildman has its workspace (default is ../) -- - Daniel ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RFC PATCH] MIPS: incaip: move board specific code out of generic code
2014-04-08 21:39 GMT+02:00 Wolfgang Denk : > Dear Daniel, > > In message <1396908893-12011-1-git-send-email-daniel.schwierz...@gmail.com> > you wrote: >> This is required to switch MIPS platform to generic board. >> >> Cc: Wolfgang Denk >> Signed-off-by: Daniel Schwierzeck >> --- >> Wolfgang, I would rather remove this board. It is obviously dead and no one >> ever >> cared about it since you have added it. The code does not conform to current >> coding style. Also it needs a lot of cleanup if we switch to driver model >> eventually. > > I agree that it nakes no sense to put endless efforts on this ancient > piece of dead hardware. I'll be happy if you can provide a removal > patch. Alternatively, I can do one, but it will take a while until I > find time to do so. > ok I will prepare a patch during the next merge window, thanks. -- - Daniel ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] mmc changes in v2014.04-rc3 cause problems when using mmc in SPL
Hi, While merging v2014.04-rc3 into our sunxi u-boot branch, I hit a problem where mmc would no longer work in the SPL. The problem is that the new mmc_create call forces use of HEAP memory, while in the SPL there may be no HEAP. For now I've created a small 2048 bytes HEAP in our SPL, but if possible I would like to get rid of the need for a HEAP though, as we only have 24K of RAM for our SPL. Regards, Hans ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Different Port for TFTP communication
Hi Mario, You need to define CONFIG_TFTP_PORT in your board config file. Then you can use the env-vars "tftpdstp" and "tftpsrcp" for source/destination TFTP ports. You can check the source code at: net/tftp.c:798 Kind regards, Nikolay On 4/8/2014 1:00 PM, u-boot-requ...@lists.denx.de wrote: 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 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 5/10] common/env: Point default environment for GD
On Mon, 2014-04-07 at 12:10 +0530, Prabhakar Kushwaha wrote: > On 4/5/2014 5:21 AM, Scott Wood wrote: > > That doesn't really answer my question of how it gets initialized for > > NOR flash. What line in what file does the initialization? It looks > > like the answer is env_init() -- so it doesn't "always" hold the > > address. Why can't env_init() do this on NAND, SPI, etc, provided you > > actually have the environment available before relocation[1]? > > > > I'm also not sure what it has to do with SPL as opposed to non-XIP. > > Doesn't this also apply for non-SPL PBL boot, etc? Why wouldn't you do > > this in env_relocate_spec()? > > > > BTW, I notice a few Freescale boards initialize this in their spl.c > > file. > > > > Also, you don't mention what the actual bug is you see. What uses > > gd->env_addr after relocation, other than api/? I'm not saying that > > api/ isn't important, but I'm wondering if you saw an effect elsewhere. > > > > -Scott > > > > [1] I realize that in many cases we don't, but that's something we need > > to fix, since it's important to how DDR gets set up among other things. > > > > I analyzed further with P5020_NAND boot. i found following observation: > 1. env_init happens in board_init_f > 2. DDR always initialized with default_environment > 3. env_relocate happens in board_init_r > > Looks like, during non-XIP & non - SPL boot, ddr can only be initialized > with fixed settings. > is it a accepted behavior? if Yes, DDR init parameters cannot be changed > like ECC on/off. It is the current behavior on many boards, but it needs to be fixed (as I noted above). -Scott ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] mmc changes in v2014.04-rc3 cause problems when using mmc in SPL
On Wed, Apr 09, 2014 at 12:05:04AM +0200, Hans de Goede wrote: > Hi, > > While merging v2014.04-rc3 into our sunxi u-boot branch, I hit a problem > where mmc would no longer work in the SPL. > > The problem is that the new mmc_create call forces use of HEAP memory, > while in the SPL there may be no HEAP. > > For now I've created a small 2048 bytes HEAP in our SPL, but if possible > I would like to get rid of the need for a HEAP though, as we only have > 24K of RAM for our SPL. 24K should still be enough to have a small malloc pool and the rest of SPL, especially since it sounds like you already didn't have FAT support in there (which has required malloc for ages and is why Pantelis didn't spot this as a problem I think). How close to the limit are we today in the sunxi platforms? Thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/9] arm: rmobile: Add define of SCIF register for R8A7790 and R8A7791
Signed-off-by: Nobuhiro Iwamatsu --- arch/arm/include/asm/arch-rmobile/rcar-base.h | 8 1 file changed, 8 insertions(+) diff --git a/arch/arm/include/asm/arch-rmobile/rcar-base.h b/arch/arm/include/asm/arch-rmobile/rcar-base.h index 4331d31..41240f3 100644 --- a/arch/arm/include/asm/arch-rmobile/rcar-base.h +++ b/arch/arm/include/asm/arch-rmobile/rcar-base.h @@ -21,6 +21,14 @@ #define GPIO5_BASE 0xE6055000 #define SH_QSPI_BASE 0xE6B1 +/* SCIF */ +#define SCIF0_BASE 0xE6E6 +#define SCIF1_BASE 0xE6E68000 +#define SCIF2_BASE 0xE6E58000 +#define SCIF3_BASE 0xE6EA8000 +#define SCIF4_BASE 0xE6EE +#define SCIF5_BASE 0xE6EE8000 + #define S3C_BASE 0xE6784000 #define S3C_INT_BASE 0xE6784A00 #define S3C_MEDIA_BASE 0xE6784B00 -- 1.8.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 3/9] arm: rmobile: koelsch: Remove CONFIG_USE_ARCH_MEMSET and MEMCPY
Because do not need these feature to koelsch board, this delete it. Signed-off-by: Nobuhiro Iwamatsu --- include/configs/koelsch.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index 2e81d29..ad6eecd 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -55,8 +55,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_USE_ARCH_MEMSET -#define CONFIG_USE_ARCH_MEMCPY #define CONFIG_TMU_TIMER /* STACK */ -- 1.8.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/9] arm: rmobile: koelsch: Remove define of SCIF register
The define of SCIF register was already defined in rcar-base.h. Signed-off-by: Nobuhiro Iwamatsu --- include/configs/koelsch.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index 1a93d17..2e81d29 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -80,7 +80,6 @@ /* SCIF */ #define CONFIG_SCIF_CONSOLE #define CONFIG_CONS_SCIF0 -#define SCIF0_BASE 0xe6e6 #undef CONFIG_SYS_CONSOLE_INFO_QUIET #undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE #undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE -- 1.8.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 4/9] arm: rmobile: koelsch: Enable optimization of thumb
This adds CONFIG_SYS_THUMB_BUILD to config, in order to enable optimization of thumb. Signed-off-by: Nobuhiro Iwamatsu --- include/configs/koelsch.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index ad6eecd..8cee73b 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -35,6 +35,7 @@ #define CONFIG_CMD_SF #define CONFIG_CMD_SPI #define CONFIG_SYS_TEXT_BASE 0xE6304000 +#define CONFIG_SYS_THUMB_BUILD #defineCONFIG_CMDLINE_TAG #defineCONFIG_SETUP_MEMORY_TAGS -- 1.8.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 6/9] arm: rmobile: lager: Remove CONFIG_USE_ARCH_MEMSET and MEMCPY
Because do not need these feature to lager board, this delete it. Signed-off-by: Nobuhiro Iwamatsu --- include/configs/lager.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/configs/lager.h b/include/configs/lager.h index 085fa77..3bc494f 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -57,8 +57,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_USE_ARCH_MEMSET -#define CONFIG_USE_ARCH_MEMCPY #define CONFIG_TMU_TIMER /* STACK */ -- 1.8.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 8/9] gpio: r8a7791-gpio: Fix typo in macro
Fix typo from __ASM_R8A7791_H__ to __ASM_R8A7791_GPIO_H__. Signed-off-by: Nobuhiro Iwamatsu --- arch/arm/include/asm/arch-rmobile/r8a7791-gpio.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/arch-rmobile/r8a7791-gpio.h b/arch/arm/include/asm/arch-rmobile/r8a7791-gpio.h index d3cf0c1..42e8259 100644 --- a/arch/arm/include/asm/arch-rmobile/r8a7791-gpio.h +++ b/arch/arm/include/asm/arch-rmobile/r8a7791-gpio.h @@ -1,5 +1,5 @@ -#ifndef __ASM_R8A7791_H__ -#define __ASM_R8A7791_H__ +#ifndef __ASM_R8A7791_GPIO_H__ +#define __ASM_R8A7791_GPIO_H__ /* Pin Function Controller: * GPIO_FN_xx - GPIO used to select pin function @@ -435,4 +435,4 @@ enum { GPIO_FN_MLB_DAT, GPIO_FN_CAN1_RX_B, }; -#endif /* __ASM_R8A7791_H__ */ +#endif /* __ASM_R8A7791_GPIO_H__ */ -- 1.8.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 7/9] arm: rmobile: lager: Enable optimization of thumb
This adds CONFIG_SYS_THUMB_BUILD to config, in order to enable optimization of thumb. Signed-off-by: Nobuhiro Iwamatsu --- include/configs/lager.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/lager.h b/include/configs/lager.h index 3bc494f..80c9001 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -36,6 +36,7 @@ #define CONFIG_CMD_SF #define CONFIG_CMD_SPI #define CONFIG_SYS_TEXT_BASE 0xE808 +#define CONFIG_SYS_THUMB_BUILD #defineCONFIG_CMDLINE_TAG #defineCONFIG_SETUP_MEMORY_TAGS -- 1.8.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 5/9] arm: rmobile: lager: Remove define of SCIF register
The define of SCIF register was already defined in rcar-base.h. Signed-off-by: Nobuhiro Iwamatsu --- include/configs/lager.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/configs/lager.h b/include/configs/lager.h index ac31128..085fa77 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -82,7 +82,6 @@ /* SCIF */ #define CONFIG_SCIF_CONSOLE #define CONFIG_CONS_SCIF0 -#define SCIF0_BASE 0xe6e6 #undef CONFIG_SYS_CONSOLE_INFO_QUIET #undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE #undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE -- 1.8.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 9/9] gpio: r8a7790-gpio: Fix typo in macro
Fix typo from __ASM_R8A7790_H__ to __ASM_R8A7790_GPIO_H__. Signed-off-by: Nobuhiro Iwamatsu --- arch/arm/include/asm/arch-rmobile/r8a7790-gpio.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/arch-rmobile/r8a7790-gpio.h b/arch/arm/include/asm/arch-rmobile/r8a7790-gpio.h index 444e361..74b5f1d 100644 --- a/arch/arm/include/asm/arch-rmobile/r8a7790-gpio.h +++ b/arch/arm/include/asm/arch-rmobile/r8a7790-gpio.h @@ -1,5 +1,5 @@ -#ifndef __ASM_R8A7790_H__ -#define __ASM_R8A7790_H__ +#ifndef __ASM_R8A7790_GPIO_H__ +#define __ASM_R8A7790_GPIO_H__ /* Pin Function Controller: * GPIO_FN_xx - GPIO used to select pin function @@ -384,4 +384,4 @@ enum { GPIO_FN_TCLK1_B, }; -#endif /* __ASM_R8A7790_H__ */ +#endif /* __ASM_R8A7790_GPIO_H__ */ -- 1.8.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V2] mmc:eSDHC: Workaround for data timeout issue on Txxx SoC
Thanks a lot. BTW, how about other patches? I saw there are patches conflict with mine now. Regards & Thanks -- Haijun On 04/02/2014 06:27 PM, Pantelis Antoniou wrote: Hi Haijun, The patch looks good but it doesn't apply after the mmc changes I've made I've reworked and applied it; On Mar 18, 2014, at 11:04 AM, Haijun Zhang wrote: 1. The Data timeout counter value in eSDHC_SYSCTL register is not working as it should be, so add quirks to enable this workaround to fix it to the max value 0xE. 2. For eSDHC the Block Count size each transmission should not exceed 0x blocks, Fix b_max to 0x to limit the transfer size for read and write command. ^ this is already handled by the default value of 0x 3. Add CONFIG_SYS_FSL_ERRATUM_ESDHC111 to enable its workaround. Signed-off-by: Haijun Zhang --- changes for V2 - Rewrite the comments. arch/powerpc/include/asm/config_mpc85xx.h | 5 + drivers/mmc/fsl_esdhc.c | 5 - 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 9a20b97..df44451 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -734,6 +734,8 @@ defined(CONFIG_PPC_T1020) || defined(CONFIG_PPC_T1022) #define CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY #define CONFIG_SYS_FSL_ERRATUM_A006261 #define CONFIG_SYS_CCSRBAR_DEFAULT 0xfe00 +#define CONFIG_SYS_FSL_ERRATUM_ESDHC111 +#define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE #elif defined(CONFIG_PPC_T2080) || defined(CONFIG_PPC_T2081) #define CONFIG_E6500 @@ -778,6 +780,9 @@ defined(CONFIG_PPC_T1020) || defined(CONFIG_PPC_T1022) #define CONFIG_SYS_CCSRBAR_DEFAULT 0xfe00 #define CONFIG_SYS_FSL_SFP_VER_3_0 #define CONFIG_SYS_FSL_ISBC_VER 2 +#define CONFIG_SYS_FSL_ERRATUM_ESDHC111 +#define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE + #elif defined(CONFIG_PPC_C29X) #define CONFIG_MAX_CPUS 1 diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index 7b146a3..e888079 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -244,6 +244,9 @@ static int esdhc_setup_data(struct mmc *mmc, struct mmc_data *data) timeout++; #endif +#ifdef ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE + timeout = 0xE; +#endif esdhc_clrsetbits32(®s->sysctl, SYSCTL_TIMEOUT_MASK, timeout << 16); return 0; --8<- @@ -604,7 +607,7 @@ int fsl_esdhc_initialize(bd_t *bis, struct fsl_esdhc_cfg *cfg) mmc->f_min = 40; mmc->f_max = MIN(gd->arch.sdhc_clk, 5200); - mmc->b_max = 0; + mmc->b_max = 0x; mmc_register(mmc); return 0; --8<- ^ This chunk is no longer needed. -- 1.8.5 Acked-by: Pantelis Antoniou ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] build:arm: Remove setting of CROSS_COMPILE environment variable
Hi Albert, > Applied to u-boot-arm/master, thanks! BTW, you failed to rephrase the commit message. Anyway it's too late and OK for me. > -- 8< -- > For building u-boot on ARM the CROSS_COMPILE environment variable, when > not defined, was set to default value (prefix arm-linux-). > > Since not all cross compilers have the arm-linux- prefix and this > setting prevents from building u-boot on natively arm powered devices it > would be best to remove it. > > As a side note: > The most universal way to cross compile u-boot is to > specify the CROSS_COMPILE environment variable explicitly - e.g.: > CROSS_COMPILE=/ /arm-v7a-linux-gnueabi- make > > -- >8 -- Best Regards Masahiro Yamada ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 2/2] mx6: add example DTB for mx6qsabreauto
Hi Stefano, On Mon, 31 Mar 2014 09:50:36 +0200 Stefano Babic wrote: > Signed-off-by: Stefano Babic > CC: Fabio Estevam > > --- > > Changes in v2: > - Use the same dts name as in kernel: imx6q-sabreauto.dts (Fabio Estevam, > Lars Steubesand) > > arch/arm/dts/Makefile|1 + > arch/arm/dts/imx6q-sabreauto.dts | 13 + > include/configs/mx6qsabreauto.h |3 +++ > 3 files changed, 17 insertions(+) > create mode 100644 arch/arm/dts/imx6q-sabreauto.dts > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index e2fcca5..6acd861 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -2,6 +2,7 @@ dtb-$(CONFIG_EXYNOS5) += exynos5250-arndale.dtb \ > exynos5250-snow.dtb \ > exynos5250-smdk5250.dtb \ > exynos5420-smdk5420.dtb > +dtb-$(CONFIG_MX6) += imx6q-sabreauto.dtb > dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \ > tegra20-medcom-wide.dtb \ > tegra20-paz00.dtb \ > diff --git a/arch/arm/dts/imx6q-sabreauto.dts > b/arch/arm/dts/imx6q-sabreauto.dts > new file mode 100644 > index 000..a3c9c91 > --- /dev/null > +++ b/arch/arm/dts/imx6q-sabreauto.dts > @@ -0,0 +1,13 @@ > +/* > ++ * Copyright 2012 Freescale Semiconductor, Inc. > ++ * Copyright 2011 Linaro Ltd. > ++ * > ++ * SPDX-License-Identifier: GPL-2.0+ > ++ */ > + This patch has been applied, but the license block in arch/arm/dts/imx6q-sabreauto.dts looks weird. Could you fix the broken format in a follow-up patch? Best Regards Masahiro Yamada ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Bug in buildsystem for SPL LDSCRIPT
Hi Andreas, On Mon, 07 Apr 2014 11:35:07 +0200 "Andreas Biesmann" wrote: > and also to the list ... sorry for the noise > > On 04/07/2014 11:27 AM, Andreas Biesmann wrote: > > Hi Masahiro, > > > > a late bug report ;) changing my board config file will not regenerate > > the spl/u-boot-spl.lds for the board though it depends on it. The > > LDSCRIPT is patched with some size information for range checking which > > is not updated in my case. However regenerating the file by deleting it > > first works. Cold you please provide a fix for that in 2014.04? Could you give me an example in which spl/u-bool-spl.lds is not correctly regenerated. Which board did you build first and which one did you do next? Best Regards Masahiro Yamada ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] lib: Add CONFIG_FDT_IGNORE_FIXUP_MEMORY_NODE
Hi Nobuhiro, Tom, > diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c > index e40691d..8da9dac 100644 > --- a/arch/arm/lib/bootm-fdt.c > +++ b/arch/arm/lib/bootm-fdt.c > @@ -18,6 +18,7 @@ > #include > #include > > +#ifndef CONFIG_FDT_IGNORE_FIXUP_MEMORY_NODE > DECLARE_GLOBAL_DATA_PTR; > > int arch_fixup_memory_node(void *blob) > @@ -34,3 +35,4 @@ int arch_fixup_memory_node(void *blob) > > return fdt_fixup_memory_banks(blob, start, size, CONFIG_NR_DRAM_BANKS); > } > +#endif /* CONFIG_FDT_IGNORE_FIXUP_MEMORY_NODE */ I am not happy about defining CONFIG macro to disable some code. Please do #ifdef CONFIG_FDT_FIXUP_MEMORY_NODE . #endif rather than #ifndef CONFIG_FDT_IGNORE_FIXUP_MEMORY_NODE . #endif We expect most of boards should be fixed-up by U-Boot. So, add #define CONFIG_FDT_FIXUP_MEMORY_NODE to include/config_defaults.h and #undef CONFIG_FDT_FIXUP_MEMORY_NODE only to boards for which you want to skip memory fix-up. Basically, we should not use CONFIG macros for negation. CONFIG_SKIP_LOWLEVEL_INIT, CONFIG_SYS_DCACHE_OFF, are examples of bad macros. See ifndef CONFIG_SKIP_LOWLEVEL_INIT obj-y += lowlevel_init.o endif everywhere in Makefiles, which suggests we had chosen a bad macro name. Best Regards Masahiro Yamada ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Bug in buildsystem for SPL LDSCRIPT
Hi Masahiro, On 04/09/2014 04:27 AM, Masahiro Yamada wrote: > On Mon, 07 Apr 2014 11:35:07 +0200 > "Andreas Biesmann" wrote: > >> and also to the list ... sorry for the noise >> >> On 04/07/2014 11:27 AM, Andreas Biesmann wrote: >>> Hi Masahiro, >>> >>> a late bug report ;) changing my board config file will not regenerate >>> the spl/u-boot-spl.lds for the board though it depends on it. The >>> LDSCRIPT is patched with some size information for range checking which >>> is not updated in my case. However regenerating the file by deleting it >>> first works. Cold you please provide a fix for that in 2014.04? > > Could you give me an example in which spl/u-bool-spl.lds is not > correctly regenerated. it is not regenerated when the configuration is changed. Here is my use case: ---8<--- abiessmann@punisher % git describe v2014.04-rc3-91-g36490ee abiessmann@punisher % PATH=$ARMa8_PATH:$PATH make O=/tmp/tricorder ARCH=arm CROSS_COMPILE=arm-cortexa8-linux-gnueabi- -j16 -s tricorder_config all Configuring for tricorder board... PATH=$ARMa8_PATH:$PATH make O=/tmp/tricorder ARCH=arm -j16 -s all 27.23s user 2.47s system 539% cpu 5.507 total abiessmann@punisher % grep CONFIG_SPL_MAX_SIZE include/configs/tricorder.h #define CONFIG_SPL_MAX_SIZE (57 * 1024) /* 7 KB for stack */ abiessmann@punisher % head -1 /tmp/tricorder/spl/u-boot-spl.lds MEMORY { .sram : ORIGIN = 0x4020, LENGTH = (57 * 1024) } --->8--- ... modify configuration ---8<--- abiessmann@punisher % grep CONFIG_SPL_MAX_SIZE include/configs/tricorder.h #define CONFIG_SPL_MAX_SIZE (59 * 1024) /* 7 KB for stack */ abiessmann@punisher % PATH=$ARMa8_PATH:$PATH make O=/tmp/tricorder ARCH=arm CROSS_COMPILE=arm-cortexa8-linux-gnueabi- -j16 -s all PATH=$ARMa8_PATH:$PATH make O=/tmp/tricorder ARCH=arm -j16 -s all 25.25s user 2.16s system 550% cpu 4.974 total abiessmann@punisher % head -1 /tmp/tricorder/spl/u-boot-spl.lds MEMORY { .sram : ORIGIN = 0x4020, LENGTH = (57 * 1024) } abiessmann@punisher % ls -l /tmp/tricorder/spl/u-boot-spl.lds -rw-r--r-- 1 abiessmann abiessmann 699 Apr 9 08:27 /tmp/tricorder/spl/u-boot-spl.lds abiessmann@punisher % ls -l /tmp/tricorder/spl/u-boot-spl -rwxr-xr-x 1 abiessmann abiessmann 571948 Apr 9 08:28 /tmp/tricorder/spl/u-boot-spl* abiessmann@punisher % ls -l include/configs/tricorder.h -rw-r--r-- 1 abiessmann abiessmann 12071 Apr 9 08:28 include/configs/tricorder.h abiessmann@punisher % --->8--- Best regards Andreas Bießmann ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 2/2] mx6: add example DTB for mx6qsabreauto
Hi Masahiro, On 09/04/2014 04:19, Masahiro Yamada wrote: >> --- /dev/null >> +++ b/arch/arm/dts/imx6q-sabreauto.dts >> @@ -0,0 +1,13 @@ >> +/* >> ++ * Copyright 2012 Freescale Semiconductor, Inc. >> ++ * Copyright 2011 Linaro Ltd. >> ++ * >> ++ * SPDX-License-Identifier: GPL-2.0+ >> ++ */ >> + > > This patch has been applied, but the license block > in arch/arm/dts/imx6q-sabreauto.dts looks weird. It is ! Thanks to have noted it ! > > Could you fix the broken format in a follow-up patch? Of course ! 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: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot