Re: [U-Boot] [PATCH 50/71] serial: arm: Implement CONFIG_SERIAL_MULTI into imx serial driver
On 17/09/2012 01:21, Marek Vasut wrote: Implement support for CONFIG_SERIAL_MULTI into imx serial driver. This driver was so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the imx driver. Also, add a weak implementation of default_serial_console() returning this driver. Signed-off-by: Marek Vasut ma...@denx.de Cc: Marek Vasut marek.va...@gmail.com Cc: Tom Rini tr...@ti.com Cc: Stefano Babic sba...@denx.de --- Hi Marek, I have later realized that you pushed this series for u-boot-dm and not u-boot. Anyway, is there some reason to prohibit to merge them directly into mainline ? I do not see any special DM code here. Regards, Stefano -- = 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] [PATCH V2 2/2] i.MX6: mx6qsabrelite: Add splash screen support
+ MXC_CCM_CHSCCDR_IPU1_DI0_PODF_OFFSET) + |(CHSCCDR_IPU_PRE_CLK_540M_PFD + MXC_CCM_CHSCCDR_IPU1_DI0_PRE_CLK_SEL_OFFSET); + writel(reg, mxc_ccm-chsccdr); + + writel(0x201, IOMUXC_BASE_ADDR + 0x8); /* 16 bpp */ This is GPR2, right ? Nobody can easy understand. Use structure (not offset) and constants to set it. +} + +void lcd_enable(void) +{ + + int ret = ipuv3_fb_init(lvds_xga, 0, IPU_PIX_FMT_RGB666); + if (ret) + printf(LCD cannot be configured: %d\n, ret); +} + int board_early_init_f(void) { setup_iomux_uart(); setup_buttons(); + lcd_iomux(); return 0; } @@ -396,9 +477,18 @@ int board_init(void) setup_sata(); #endif +#ifdef CONFIG_VIDEO + lcd_enable(); +#endif return 0; } +int board_late_init(void) +{ + setenv(stdout, serial); + return 0; This is wrong, we found a better way to do this. You should add a overwrite_console() function, see for example the MX5 boards. --- a/include/configs/mx6qsabrelite.h +++ b/include/configs/mx6qsabrelite.h @@ -39,9 +39,10 @@ #define CONFIG_REVISION_TAG /* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024) +#define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) #define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_BOARD_LATE_INIT #define CONFIG_MISC_INIT_R #define CONFIG_MXC_GPIO @@ -121,6 +122,17 @@ /* Miscellaneous commands */ #define CONFIG_CMD_BMODE +/* Framebuffer and LCD */ +#define CONFIG_VIDEO +#define CONFIG_VIDEO_IPUV3 +#define CONFIG_CFB_CONSOLE +#define CONFIG_VGA_AS_SINGLE_DEVICE +#define CONFIG_VIDEO_BMP_RLE8 +#define CONFIG_SPLASH_SCREEN +#define CONFIG_BMP_16BPP +#define CONFIG_VIDEO_LOGO +#define CONFIG_IPUV3_CLK 26000 ...adding also CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE 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] [PATCH V2 2/2] i.MX6: mx6qsabrelite: Add splash screen support
On 18/09/2012 15:28, Eric Nelson wrote: Do you have a reference to the patch so I can follow precedent? See http://patchwork.ozlabs.org/patch/177403/ Check changes in .h. 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] [PATCH] mx51evk: Add CONFIG_REVISION_TAG
On 18/09/2012 15:41, Benoît Thébaudeau wrote: Hi Greg, Fabio, On Tuesday, September 18, 2012 3:00:58 PM, Greg Topmiller wrote: Fabio/Benoit, I tried the get_board_rev alone and it worked on my mx51evk. In the FSL u-boot version I am using the set_board_rev is: static inline void set_board_rev(int rev) { system_rev |= (rev 0xF) 8; } It is not called for the mx51evk but is used for mx35_3stack. The set_board_rev code below doesn't make sense when looking at the FSL u-boot code or the main line and comparing to the mx51evk schematic. I don't see where either the FSL u-boot or the main line u-boot set up iomux for GPIO0_22. There are four pin possibilities, EIM_EB2, NANDF_CS6, CSPI1_MOSI, and UART3_RXD. On the schematic the UART3_RXD is tied low so that would be the only pin to make sense in this case. To make the set_board_rev code below work the mx51evk board specific code would have to set up the UART3_RXD to be GPIO0_22 by making its function ALT3. That being said the code below would not be a problem since the if logic would most likely be positive in any case and the system_rev would be or'd with board rev 2. Let me know if you want the schematic I'm looking at. It's a PDF. Best Regards, Greg -Original Message- From: Fabio Estevam [mailto:feste...@gmail.com] Sent: Monday, September 17, 2012 11:25 PM To: Benoît Thébaudeau Cc: U-Boot-Users ML; Greg Topmiller; Stefano Babic Subject: Re: [PATCH] mx51evk: Add CONFIG_REVISION_TAG Hi Benoît , On Mon, Sep 17, 2012 at 4:04 PM, Benoît Thébaudeau benoit.thebaud...@advansee.com wrote: +u32 get_board_rev(void) +{ + return get_cpu_rev(); +} Is this enough? Looking at FSL U-boot there is also a: static inline void set_board_rev(void) { if ((__REG(GPIO1_BASE_ADDR + 0x0) (0x1 22)) == 0) system_rev |= BOARD_REV_2_0 BOARD_VER_OFFSET; } On mx53loco I had very weird problems when kernel was running and it took me sometime to find out that it was due to wrong detection of the board revision, so I suggest to double check this to avoid this kind of problem on mx51evk too. Regards, Fabio Estevam It looks like there is confusion between the 3stack and Babbage boards here: Fabio, the code you refer to in FSL U-Boot comes from the Babbage board, while AFAIK, the mx51evk mainline U-Boot board corresponds to the 3stack board (this is also FSL's naming for this board on their website). There has been always confusion about Freescale's names. Babbage was the internal name for the first mx51 development board. When this board becomes available, it was referenced on Freescale's website as mx51evk. So babbage = mx51evk. 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] [PATCH] mx51evk: Add CONFIG_REVISION_TAG
On 18/09/2012 16:02, Fabio Estevam wrote: So, do you mean that mainline U-Boot board naming is broken for mx51evk? No, the name in U-boot mainline is fine and it matches the name in the website. Right. I dislike if the name is different as the official name. As we can see, this generates a lot of confusion. IMHO we should also align some other boards, such as mx53loco that is officially called mx53qsb. 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] [PATCH V2 2/2] i.MX6: mx6qsabrelite: Add splash screen support
On 18/09/2012 16:02, Eric Nelson wrote: Hi Fabio and Stefano, While trying to understand this, I wonder whether the use of overwrite_console() addresses Wolfgang's original concern. I think the suggestion was to set the preboot variable to change things: Wolfgang's first concern was to avoid to hardcode variable inside the code, as it was done in the original mx51 / mx53 code (and not only in i.MX boards). #define CONFIG_PREBOOT setenv stdout serial This makes sense if you want maintain the possibility that u-boot output is displayed on the LCD. Is this really the case ? In most cases, we want to display a splashscreen, while the console is still managed by serial line. If this is the case, adding overwrite_console() tells video subsystem to not change the stdout variable, and then it is not required to set it back to serial neither in code nor with the help of the preboot variable. The has the benefit of allowing saveenv to completely overwrite the decision. Am I over-thinking this? It depends if you want also U-Boot's output on the display or only a picture. 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] [PATCH] spi: Use DIV_ROUND_UP at appropriate places
On 14/06/2013 15:18, Jagan Teki wrote: This does not scale. What if a (trivial) patch touches 10 drivers? Yes, you are correct if the changes is common to across the all drivers or If the changes which are more in 10 spi drivers out of 20 or 10 for your example - use spi: and I think it's good to use above syntax as you changesd two drivers. I am just showing the possibilities of using the coding guidelines, nothing more. There is another issue: patman recognizes each subpart: and checks for an alias to find the e-mail to send patches, and stops to go on if it is not found. In this example, you can use patman if there is an entry for spi: (and this is you as SPI custodian) and also for mxc_spi:, and usually there is no maintainer for each driver. I agree that using a long chain does not scale, and I think the hidden rule to use subsystem: subject works well in most cases, Axel did in this patchset. Regards, Stefano -- = 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] [PATCH] ARM: mxs: Make the console buffer smaller
Hi Marek, On 15/06/2013 23:41, Marek Vasut wrote: Using 1024 bytes for console buffer is unnecessarily too much, lower the amount for all MXS boards to 256. Signed-off-by: Marek Vasut ma...@denx.de Cc: Fabio Estevam fabio.este...@freescale.com Cc: Lauri Hintsala lauri.hints...@bluegiga.com Cc: Otavio Salvador ota...@ossystems.com.br Cc: Stefano Babic sba...@denx.de --- include/configs/mxs.h |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Note: This depends on http://patchwork.ozlabs.org/patch/251631/ diff --git a/include/configs/mxs.h b/include/configs/mxs.h index a684166..161d89d 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -92,7 +92,7 @@ #ifndef CONFIG_SYS_PROMPT #define CONFIG_SYS_PROMPT= #endif -#define CONFIG_SYS_CBSIZE1024/* Console I/O buffer size */ +#define CONFIG_SYS_CBSIZE256 /* Console I/O buffer size */ #define CONFIG_SYS_PBSIZE\ (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) /* Print buffer size */ I am missing something: which is the real advantage to reduce the console buffer ? I do not think that the saved memory is worth, and on the other side more elaborated scripts (usings nested if-then-else) are quite long nowadays. Best regards, Stefano -- = 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] [PATCH] ARM: mxs: Make the console buffer smaller
Hallo Marek, On 17/06/2013 14:51, Marek Vasut wrote: I am missing something: which is the real advantage to reduce the console buffer ? I do not think that the saved memory is worth, and on the other side more elaborated scripts (usings nested if-then-else) are quite long nowadays. True, but so far they didn't overflow this limit I believe. Some of them are hanging on the verge of blowing it though, good point. I think that a point to consider is if all scripts are already provided or we let the user/owner of the board to add his own scripts, as I presume. It is pity if he cannot do what u-boot really supports only to save some bytes. Best regards, Stefano -- = 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] [RFC] Safe Linux Updater
Hi Mats, On 17/06/2013 15:25, Mats Kärrman wrote: Dear Wolfgang, I havn't seen the scripts of Alexandre but it sounds something like what we have already implemented. Wolfgang Denk wrote: Please note that this is a feature standardized for example in the Open Source Development Labs Carrier Grade Linux Requirements Definition, which says something like: CGL shall provide support for detecting a repeating reboot cycle due to recurring failures and will go to an offline state if this occurs. As I read Alexandre, the aim is to revert to a previous functional image, not to go to an offline state. This is already done in u-boot checking the value of the boot counter (in not persistency storage) and calling a script that switch back to the previous copy, if any. I find that the proposal does not scale well. Having partitions on a disk / SDCARd is a case, but we have several different way to boot. Think about kernel / rootfs into UBI or UBIFS, or saved as raw data in other kind of storages (NOR, SPI,..). Because we are talking about the feature updating, this should be abstracted from the specific case to be generalized in U-Boot. Normally you want to avoid all erase / write operations to the boot loader and it's private data structures in the process of a normal reboot / reset. But a failing boot is not a normal boot. This should only occur when an update fails. There are runtime conditions that can cause the boot to fail, due for example to power-supply. Or a degrading of the resources (flash gets wrong), and so on. Even if a failure due to a wrong update is a common case to have a failing boot, this is not the only use case. 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] [PATCH 1/2] PHY: micrel: helper function for KSZ9031
Hi Joe, On 20/06/2013 13:26, SARTRE Leo wrote: micrel.c: Add function ksz9031_phy_extended_write, helper to MDD register write micrel.h: Prototype and define MDD registers Signed-off-by: Leo Sartre lsar...@adeneo-embedded.com --- drivers/net/phy/micrel.c | 29 +++-- include/micrel.h |7 +++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 2a8b6cb..5b5c11b 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -85,7 +85,7 @@ static int ksz90xx_startup(struct phy_device *phydev) } #ifdef CONFIG_PHY_MICREL_KSZ9021 -/* +/** * KSZ9021 */ @@ -148,9 +148,34 @@ static struct phy_driver ksz9021_driver = { }; #endif -/* +/** * KSZ9031 */ + +/* PHY Registers */ +#define MII_KSZ9031_MMD_ACCES_CTRL 0x0d +#define MII_KSZ9031_MMD_REG_DATA 0x0e + +/* Accessors to extended registers*/ +int ksz9031_phy_extended_write(struct phy_device *phydev, +int devaddr, +int regnum, +u16 val) +{ + /*select register addr for mmd*/ + phy_write(phydev, MDIO_DEVAD_NONE, + MII_KSZ9031_MMD_ACCES_CTRL, devaddr); + /*select register for mmd*/ + phy_write(phydev, MDIO_DEVAD_NONE, + MII_KSZ9031_MMD_REG_DATA, regnum); + /*setup mode*/ + phy_write(phydev, MDIO_DEVAD_NONE, + MII_KSZ9031_MMD_ACCES_CTRL, (devaddr | 0xC000)); + /*write the value*/ + return phy_write(phydev, MDIO_DEVAD_NONE, + MII_KSZ9031_MMD_REG_DATA, val); +} + static struct phy_driver ksz9031_driver = { .name = Micrel ksz9031, .uid = 0x221620, diff --git a/include/micrel.h b/include/micrel.h index 25e8a46..d63ff45 100644 --- a/include/micrel.h +++ b/include/micrel.h @@ -9,8 +9,15 @@ #define MII_KSZ9021_EXT_RGMII_TX_DATA_SKEW 0x106 #define MII_KSZ9021_EXT_ANALOG_TEST 0x107 +#define MII_KSZ9031_EXT_RGMII_CTRL_SIG_SKEW 0x4 +#define MII_KSZ9031_EXT_RGMII_RX_DATA_SKEW 0x5 +#define MII_KSZ9031_EXT_RGMII_TX_DATA_SKEW 0x6 +#define MII_KSZ9031_EXT_RGMII_CLOCK_SKEW 0x8 + struct phy_device; int ksz9021_phy_extended_write(struct phy_device *phydev, int regnum, u16 val); int ksz9021_phy_extended_read(struct phy_device *phydev, int regnum); +int ksz9031_phy_extended_write(struct phy_device *phydev, int devaddr, +int regnum, u16 val); #endif This patchset belongs to two are, mainly i.MX (for Congatec) and to Network (this patch). Can you ACK/NACK this ? I will enqueue the other two patches in the meantime. To proceed, I propose I can merge then whole patchset into u-boot-imx to avoid to have inconsistent trees. Thanks, Stefano -- = 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] [PATCH v3] Add support for Wandboard Quad
Hi Tapani, On 26/06/2013 11:51, Tapani wrote: Add support for the Quad version of Wandboard; fix compile warning resulting from having 2G of memory. Signed-off-by: Tapani Utriainen tap...@technexion.com Signed-off-by: Otavio Salvador ota...@ossystems.com.br --- board/wandboard/README | 5 + board/wandboard/wandboard.c | 2 +- boards.cfg | 1 + include/configs/wandboard.h | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/board/wandboard/README b/board/wandboard/README index ce83bbe..498db2f 100644 --- a/board/wandboard/README +++ b/board/wandboard/README @@ -22,6 +22,11 @@ To build U-Boot for the Wandboard Solo version: $ make wandboard_solo_config $ make +To build U-Boot for the Wandboard Quad version: + +$ make wandboard_quad_config +$ make + Flashing U-boot into the SD card diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c index 5666cbf..43c02ac 100644 --- a/board/wandboard/wandboard.c +++ b/board/wandboard/wandboard.c @@ -48,7 +48,7 @@ DECLARE_GLOBAL_DATA_PTR; int dram_init(void) { - gd-ram_size = CONFIG_DDR_MB * SZ_1M; + gd-ram_size = (phys_size_t)CONFIG_DDR_MB * 1024 * 1024; return 0; } diff --git a/boards.cfg b/boards.cfg index fff4f45..2635942 100644 --- a/boards.cfg +++ b/boards.cfg @@ -272,6 +272,7 @@ nitrogen6q2g arm armv7 nitrogen6x boundar nitrogen6s arm armv7 nitrogen6x boundary mx6 nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512 nitrogen6s1g arm armv7 nitrogen6x boundary mx6 nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024 wandboard_dlarm armv7 wandboard - mx6 wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024 +wandboard_quad arm armv7 wandboard - mx6 wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048 wandboard_solo arm armv7 wandboard - mx6 wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512 omap3_overo arm armv7 overo - omap3 omap3_pandoraarm armv7 pandora - omap3 diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 5593f1c..b2995d8 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -103,6 +103,8 @@ #if defined(CONFIG_MX6DL) #define CONFIG_DEFAULT_FDT_FILEimx6dl-wandboard.dtb +#elif defined(CONFIG_MX6Q) +#define CONFIG_DEFAULT_FDT_FILEimx6q-wandboard.dtb #elif defined(CONFIG_MX6S) #define CONFIG_DEFAULT_FDT_FILEimx6s-wandboard.dtb #endif Patch does not apply cleanly because your mailer or your editor replaced original tab with whitespaces. I change back again, but please take care of this issue for the next time. Apart of that: Acked-by: Stefano Babic sba...@denx.de This patch was pending for a while, I will push it still for the release. Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2] spi: mxc_spi: Update pre and post divider algorithm
On 11/05/2013 07:25, Dirk Behme wrote: The spi clock divisor is of the form x * (2**y), or x y, where x is 1 to 16, and y is 0 to 15. Note the similarity with floating point numbers. Convert the desired divisor to the smallest number which is = desired divisor, and can be represented in this form. The previous algorithm chose a divisor which could be almost twice as large as needed. Signed-off-by: Troy Kisky troy.ki...@boundarydevices.com Signed-off-by: Dirk Behme dirk.be...@gmail.com --- Applied to u-boot-imx as a fix, thanks ! 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] [PATCH] dwc_ahsata: Allow use with dcache enabled
On 16/06/2013 01:09, Eric Nelson wrote: Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks. 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] [PATCH V2] ARM: mxs: Consolidate configuration options
Hi Marek, On 16/06/2013 15:39, Marek Vasut wrote: Pull all the duplicate configuration options into configs/mxs.h from the board configuration files. This reduces the files greatly and makes them somewhat more readable. Besides, we do no longer have such a horrible duplication of code. Note that the mx23evk grew in size slightly. This is due to the CONFIG_SYS_CBSIZE now being set to 1024 as it is on the rest of MXS systems. This patch also fixes the OCRAM size for i.MX23. The i.MX23 has only 32kB of OCRAM, while i.MX28 has 128kB of OCRAM. I verified the configuration didn't change for each of the boards, but I didn't boot-test it on the boards I do not have. I configured U-Boot for each board using the make ... board_config command and then ran cpp -I include -dM include/config.h , which dumped all the configuration options. I did this both before and after this patch and finally compared the results for each MXS board. Actually, the results do differ slightly, since the configs/mxs.h file now properly includes the correct iomux-mx23.h or iomux-mx28.h , so while comparing, I had to ignore these new defines. These have no impact on U-Boot configuration though. Signed-off-by: Marek Vasut ma...@denx.de Cc: Fabio Estevam fabio.este...@freescale.com Cc: Lauri Hintsala lauri.hints...@bluegiga.com Cc: Otavio Salvador ota...@ossystems.com.br Cc: Stefano Babic sba...@denx.de --- This is a nice cleanup, but as we probably cannot test all boards before release, I apply it to u-boot-imx, next branch. Regards, Stefano -- = 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] [PATCH v3 2/2] imx: Add support for the SabreSD shipped with i.MX6DL
On 14/06/2013 17:13, Fabio Estevam wrote: On Tue, Jun 4, 2013 at 4:00 AM, Pierre Aubert p.aub...@staubli.com wrote: The SabreSD platform is available with i.MX6Q or i.MX6DL. This patch adds the support of the i.MX6DL. The config file and the board directory are renamed to remove the reference to the MX6Q. Signed-off-by: Pierre Aubert p.aub...@staubli.com CC: Stefano Babic sba...@denx.de Reviewed-by: Fabio Estevam fabio.este...@freescale.com Applied to u-boot-imx (both patches), thanks. 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] [PATCH v2] mx27: add function enable_caches
On 14/06/2013 18:21, Philippe Reynes wrote: Signed-off-by: Philippe Reynes trem...@yahoo.fr --- Applied to u-boot-imx, thanks. 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] [PATCH RESEND] mx27: add i2c clock
On 14/06/2013 18:21, Philippe Reynes wrote: Signed-off-by: Eric Jarrige eric.jarr...@armadeus.org Signed-off-by: Philippe Reynes trem...@yahoo.fr --- Applied to u-boot-imx, thanks. 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] [PATCH v2 0/4] imx: nitrogen6x: Config changes
On 06/06/2013 19:39, Robert Winkler wrote: These are just some config changes for nitrogen6x. RAW_INITRD, BOOTZ, FS_GENERIC are being used by this project http://www.eewiki.net/display/linuxonarm/i.MX6x+SABRE+Lite DCACHE can finally be enabled because some related bugs have been fixed. Robert Winkler (4): imx: nitrogen6x: Enabled data cache imx: nitrogen6x: Enable bootz imx: nitrogen6x: Enable raw initrd imx: nitrogen6x: Enable filesystem generic commands include/configs/nitrogen6x.h | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) Patches applied to u-boot-imx, thanks. 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] [PATCH 4/6] README: mxs: Introduce README.mxs
On 03/05/2013 20:08, Fabio Estevam wrote: From: Fabio Estevam fabio.este...@freescale.com Create a README.mxs file that contains instructions on how to use U-boot for both MX23 and MX28. As boot from NAND has only been tested on mx28, make it clear that it only applies to MX28. While at it, do some small cleanups for the sake of consistency: - Use MX28 instead of i.MX28 - Use section instead of chapter when referring to specific parts of the reference manual chapters. Signed-off-by: Fabio Estevam fabio.este...@freescale.com --- Applied to u-boot-imx, thanks. 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] [PATCH 3/6] README: mx28_common: Fix structure of sentence
On 03/05/2013 20:07, Fabio Estevam wrote: From: Fabio Estevam fabio.este...@freescale.com Re-structure the sentence a bit so that it can clearer. Signed-off-by: Fabio Estevam fabio.este...@freescale.com --- Applied to u-boot-imx, thanks. 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] [PATCH 2/6] README: mx28_common: Do not hardcode the SSP port
On 03/05/2013 20:07, Fabio Estevam wrote: From: Fabio Estevam fabio.este...@freescale.com MX28 can boot from SSP0 or SSP1, so it is better not to hardcode the SSP port in the instructions. Signed-off-by: Fabio Estevam fabio.este...@freescale.com --- Applied to u-boot-imx, thanks. 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] [PATCH 1/6] README: mx28_common: Keep the text within 80 columns
On 03/05/2013 20:07, Fabio Estevam wrote: From: Fabio Estevam fabio.este...@freescale.com In order to improve readability keep the text within 80 columns. Signed-off-by: Fabio Estevam fabio.este...@freescale.com --- Applied to u-boot-imx, thanks. 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] [PATCH 6/6] m28evk: Move README file inside board directory
On 03/05/2013 20:08, Fabio Estevam wrote: From: Fabio Estevam fabio.este...@freescale.com Board specific READMEs should be located inside the respective board directory. Signed-off-by: Fabio Estevam fabio.este...@freescale.com --- Applied to u-boot-imx, thanks. 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] [PATCH 5/6] mx28evk: Move README file inside board directory
On 03/05/2013 20:08, Fabio Estevam wrote: From: Fabio Estevam fabio.este...@freescale.com Board specific READMEs should be located inside the respective board directory. Signed-off-by: Fabio Estevam fabio.este...@freescale.com --- .../freescale/mx28evk/README |0 1 file changed, 0 insertions(+), 0 deletions(-) rename doc/README.mx28evk = board/freescale/mx28evk/README (100%) diff --git a/doc/README.mx28evk b/board/freescale/mx28evk/README similarity index 100% rename from doc/README.mx28evk rename to board/freescale/mx28evk/README Strange, I cannot find this patch in patchworks..anyway Applied to u-boot-imx, thanks. 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] [PATCH v2 1/2] vf610twr: Add default environment in line with other Freescale boards
Hi Otavio, hi Alison, On 26/06/2013 19:12, Otavio Salvador wrote: Signed-off-by: Otavio Salvador ota...@ossystems.com.br --- both patches are slight changes - if I get an ACK by Alison as board maintainer, I could still push them before my PR for the release. Thanks, Stefano -- = 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] [PATCH v2 1/2] vf610twr: Add default environment in line with other Freescale boards
Hi Alison, On 27/06/2013 10:00, Wang Huan-B18965 wrote: Hi, stefano, I am ok with the default environment changes. But the sys text base should not be changed, otherwise the u-boot could not work. The reason I have explained in the other email. Of course, and I will not apply the patches until there are open comments. Regards, Stefano -- = 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] [PATCH] MAINTAINERS: Add an entry to the mx6q wandboard variant
On 26/06/2013 18:53, Fabio Estevam wrote: Signed-off-by: Fabio Estevam fabio.este...@freescale.com --- Applied to u-boot-imx, thanks ! 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] [PATCH] video: mxsfb: Break the line in videomode message
Hi Fabio, hi Marek, On 26/06/2013 21:56, Marek Vasut wrote: Dear Fabio Estevam, Currently we have the following on boot: CPU: Freescale i.MX28 rev1.2 at 454 MHz BOOT: SSP SD/MMC #0, 3V3 DRAM: 128 MiB MMC: MXS MMC: 0 Video: MXSFB: 'videomode' variable not set!In:serial Break the line of the warning message in order to have a better reading format. Signed-off-by: Fabio Estevam fabio.este...@freescale.com --- drivers/video/mxsfb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c index b189419..411d356 100644 --- a/drivers/video/mxsfb.c +++ b/drivers/video/mxsfb.c @@ -137,7 +137,7 @@ void *video_hw_init(void) /* Suck display configuration from videomode variable */ penv = getenv(videomode); if (!penv) { -printf(MXSFB: 'videomode' variable not set!); +printf(MXSFB: 'videomode' variable not set!\n); puts() ... and you might want to fix it in all drivers ;-) That is correct - as it is a very small change, I fix it myself by applying the patch. Applied to u-boot-imx, thanks ! 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] [PATCH v5 2/2] vf610twr: Remove SoC name from U-Boot prompt
On 28/06/2013 14:53, Otavio Salvador wrote: We've been dropping SoC name from U-Boot prompt as it increase complexity for automatic testing and makes line longer for no good reason. Signed-off-by: Otavio Salvador ota...@ossystems.com.br --- Applied to u-boot-imx, thanks ! 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] [PATCH v5 1/2] vf610twr: Add default environment in line with other Freescale boards
On 28/06/2013 14:52, Otavio Salvador wrote: This adds a default environment which should be able to support both 3.0.15 from Timesys and upcoming 3.11. Signed-off-by: Otavio Salvador ota...@ossystems.com.br --- Applied to u-boot-imx, thanks ! 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
[U-Boot] [PULL] : Please pull u-boot-imx
Hi Albert, some fixes and pending patches. Please pull from u-boot-imx, thanks ! The following changes since commit 4a1c7b13ae104d4526d3176793b7f6b06694df15: vf610twr: Drop unneeded 'status' variable (2013-06-06 17:52:08 +0200) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to d6c6d127c5b948ec381fad5b24a2bc5497720644: vf610twr: Remove SoC name from U-Boot prompt (2013-06-28 16:59:08 +0200) Dirk Behme (2): spi: mxc_spi: Fix pre and post divider calculation spi: mxc_spi: Update pre and post divider algorithm Eric Nelson (1): dwc_ahsata: Allow use with dcache enabled Fabio Estevam (8): README: mx28_common: Keep the text within 80 columns README: mx28_common: Do not hardcode the SSP port README: mx28_common: Fix structure of sentence README: mxs: Introduce README.mxs mx28evk: Move README file inside board directory m28evk: Move README file inside board directory MAINTAINERS: Add an entry to the mx6q wandboard variant video: mxsfb: Break the line in videomode message Otavio Salvador (2): vf610twr: Add default environment in line with other Freescale boards vf610twr: Remove SoC name from U-Boot prompt Pierre Aubert (3): imx6: fix GPR2 wrong definition imx: Complete the pin definitions for the i.MX6DL / i.MX6Solo imx: Add support for the SabreSD shipped with i.MX6DL Robert Winkler (4): imx: nitrogen6x: Enabled data cache imx: nitrogen6x: Enable bootz imx: nitrogen6x: Enable raw initrd imx: nitrogen6x: Enable filesystem generic commands Tapani Utriainen (1): Add support for Wandboard Quad trem (2): mx27: add function enable_caches mx27: add i2c clock MAINTAINERS|4 +- arch/arm/cpu/arm926ejs/mx27/generic.c | 10 + arch/arm/include/asm/arch-mx27/clock.h |1 + arch/arm/include/asm/arch-mx6/imx-regs.h |2 +- arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 1591 +++- doc/README.m28 = board/denx/m28evk/README |4 +- .../freescale/mx28evk/README |3 +- .../freescale/{mx6qsabresd = mx6sabresd}/Makefile |2 +- .../mx6qsabresd.c = mx6sabresd/mx6sabresd.c} |7 +- board/wandboard/README |5 + board/wandboard/wandboard.c|2 +- boards.cfg |6 +- doc/README.mx28_common | 75 +- drivers/block/dwc_ahsata.c | 34 +- drivers/spi/mxc_spi.c | 28 +- drivers/video/mxsfb.c |2 +- include/configs/mx6qsabreauto.h|2 +- .../{mx6qsabre_common.h = mx6sabre_common.h} |1 - include/configs/{mx6qsabresd.h = mx6sabresd.h}|2 +- include/configs/nitrogen6x.h |6 +- include/configs/vf610twr.h | 93 +- include/configs/wandboard.h|2 + 22 files changed, 1776 insertions(+), 106 deletions(-) rename doc/README.m28 = board/denx/m28evk/README (75%) rename doc/README.mx28evk = board/freescale/mx28evk/README (93%) rename board/freescale/{mx6qsabresd = mx6sabresd}/Makefile (98%) rename board/freescale/{mx6qsabresd/mx6qsabresd.c = mx6sabresd/mx6sabresd.c} (98%) rename include/configs/{mx6qsabre_common.h = mx6sabre_common.h} (99%) rename include/configs/{mx6qsabresd.h = mx6sabresd.h} (97%) -- = 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] imx: Kernel not booting with fdt
Hi Matthias, Am 02/07/2013 17:26, schrieb Matthias Weißer: Hi I try to boot a current 3.11 kernel on a custom iMX25 board using DT. u-boot starts the kernel but it stops working just after the first eralyprintk lines are out. The u-boot/kernel output: bootm 0x8100 - 0x8080 Never tried with a imx25, but it looks correct and there is enough space between kernel and DT to avoid some corruption. ## Booting kernel from Legacy Image at 8100 ... Image Name: Linux-3.10.0 Image Type: ARM Linux Kernel Image (uncompressed) Data Size:3834336 Bytes = 3.7 MiB Load Address: 80008000 Entry Point: 80008000 Verifying Checksum ... OK ## Flattened Device Tree blob at 8080 Booting using the fdt blob at 0x8080 Loading Kernel Image ... OK OK Loading Device Tree to 8374f000, end 837545d4 ... OK Starting kernel ... Uncompressing Linux... done, booting the kernel. [0.00] Booting Linux on physical CPU 0x0 [0.00] Initializing cgroup subsys cpuset [0.00] Initializing cgroup subsys cpu [0.00] Initializing cgroup subsys cpuacct [0.00] Linux version 3.10.0 (mweisser@ubuntu) (gcc version 4.7.3 (Ubuntu/Linaro 4.7.3-1ubuntu1) ) #4 Tue Jul 2 1 7:13:13 CEST 2013 [0.00] CPU: ARM926EJ-S [41069264] revision 4 (ARMv5TEJ), cr=00053177 [0.00] CPU: VIVT data cache, VIVT instruction cache [0.00] Machine: Generic DT based system, model: Graf-Syteco zmx25 [0.00] bootconsole [earlycon0] enabled [0.00] Memory policy: ECC disabled, Data cache writeback As this is my first contact with DT I expect a trivial error on my side. Anyone with any hint? I cannot say a lot - it seems more an issue inside the dts file as how you start the kernel. Maybe you can look in the _log_buf if you get some more info. Best regards, Stefano -- = 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] [PATCH]mx6qsabresd: Add splash screen support via HDMI
Hi Pardeep, On 09/07/2013 23:58, Pardeep Kumar Singla wrote: Signed-off-by: Pardeep Kumar Singla b45...@freescale.com --- board/freescale/mx6qsabresd/mx6qsabresd.c | 92 - include/configs/mx6qsabre_common.h|3 +- include/configs/mx6qsabresd.h | 13 3 files changed, 106 insertions(+), 2 deletions(-) Your patch shares a lot of code with mx6qsabrelite. Can we factorize the common code ? diff --git a/board/freescale/mx6qsabresd/mx6qsabresd.c b/board/freescale/mx6qsabresd/mx6qsabresd.c index 2529826..301fd1b 100644 --- a/board/freescale/mx6qsabresd/mx6qsabresd.c +++ b/board/freescale/mx6qsabresd/mx6qsabresd.c @@ -31,6 +31,11 @@ #include fsl_esdhc.h #include miiphy.h #include netdev.h +#include asm/arch/crm_regs.h +#include asm/arch/crm_regs.h +#include ipu_pixfmt.h +#include linux/fb.h +#include asm/arch/mxc_hdmi.h DECLARE_GLOBAL_DATA_PTR; @@ -133,6 +138,80 @@ static void setup_iomux_uart(void) imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads)); } +#if defined(CONFIG_VIDEO_IPUV3) +static void enable_hdmi(void) +{ + struct hdmi_regs *hdmi = (struct hdmi_regs *)HDMI_ARB_BASE_ADDR; + u8 reg; + reg = readb(hdmi-phy_conf0); + reg |= HDMI_PHY_CONF0_PDZ_MASK; + writeb(reg, hdmi-phy_conf0); + udelay(3000); + reg |= HDMI_PHY_CONF0_ENTMDS_MASK; + writeb(reg, hdmi-phy_conf0); + udelay(3000); + reg |= HDMI_PHY_CONF0_GEN2_TXPWRON_MASK; + writeb(reg, hdmi-phy_conf0); + writeb(HDMI_MC_PHYRSTZ_ASSERT, hdmi-mc_phyrstz); +} + For example, enable:hdmi is really identical to the same function of the sabrelite. +static struct fb_videomode const hdmi = { + .name = HDMI, + .refresh= 60, + .xres = 1024, + .yres = 768, + .pixclock = 15385, + .left_margin= 220, + .right_margin = 40, + .upper_margin = 21, + .lower_margin = 7, + .hsync_len = 60, + .vsync_len = 10, + .sync = FB_SYNC_EXT, + .vmode = FB_VMODE_NONINTERLACED +}; + +int board_video_skip(void) +{ + int ret; + ret = ipuv3_fb_init(hdmi, 0, IPU_PIX_FMT_RGB24); + if (ret) + printf(HDMI cannot be configured: %d\n, ret); + enable_hdmi(); + return ret; +} + +static void setup_display(void) +{ + struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; + struct hdmi_regs *hdmi = (struct hdmi_regs *)HDMI_ARB_BASE_ADDR; + int reg; + + /* Turn on IPU clock */ + reg = readl(mxc_ccm-CCGR3); + reg |= MXC_CCM_CCGR3_IPU1_IPU_DI0_OFFSET; + writel(reg, mxc_ccm-CCGR3); + /* Turn on HDMI PHY clock */ + reg = readl(mxc_ccm-CCGR2); + reg |= MXC_CCM_CCGR2_HDMI_TX_IAHBCLK_MASK| + MXC_CCM_CCGR2_HDMI_TX_ISFRCLK_MASK; + writel(reg, mxc_ccm-CCGR2); + /* clear HDMI PHY reset */ + writeb(HDMI_MC_PHYRSTZ_DEASSERT, hdmi-mc_phyrstz); + reg = readl(mxc_ccm-chsccdr); + reg = ~(MXC_CCM_CHSCCDR_IPU1_DI0_PRE_CLK_SEL_MASK| + MXC_CCM_CHSCCDR_IPU1_DI0_PODF_MASK| + MXC_CCM_CHSCCDR_IPU1_DI0_CLK_SEL_MASK); + reg |= (CHSCCDR_CLK_SEL_LDB_DI0 + MXC_CCM_CHSCCDR_IPU1_DI0_CLK_SEL_OFFSET)| + (CHSCCDR_PODF_DIVIDE_BY_3 + MXC_CCM_CHSCCDR_IPU1_DI0_PODF_OFFSET) + | (CHSCCDR_IPU_PRE_CLK_540M_PFD + MXC_CCM_CHSCCDR_IPU1_DI0_PRE_CLK_SEL_OFFSET); + writel(reg, mxc_ccm-chsccdr); +} +#endif /* CONFIG_VIDEO_IPUV3 */ setup_display has also some common parts with the same function for sabrelite. Any way to factorize code ? 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] [PATCH] video: Allocate the MXSFB framebuffer aligned
On 10/07/2013 02:52, Marek Vasut wrote: Allocate the framebuffer aligned so it can be flushed and the flush_dcache_range() function won't complain. Signed-off-by: Marek Vasut ma...@denx.de Cc: Anatolij Gustschin ag...@denx.de Cc: Fabio Estevam fabio.este...@freescale.com Cc: Otavio Salvador ota...@ossystems.com.br Cc: Stefano Babic sba...@denx.de --- drivers/video/mxsfb.c |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c index a6d8ae9..35836e1 100644 --- a/drivers/video/mxsfb.c +++ b/drivers/video/mxsfb.c @@ -202,7 +202,8 @@ void *video_hw_init(void) panel.memSize = mode.xres * mode.yres * panel.gdfBytesPP; /* Allocate framebuffer */ - fb = malloc(panel.memSize); + fb = memalign(ARCH_DMA_MINALIGN, + roundup(panel.memSize, ARCH_DMA_MINALIGN)); if (!fb) { printf(MXSFB: Error allocating framebuffer!\n); return NULL; Acked-by: Stefano Babic sba...@denx.de 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] twister: usb host support
Hi Jeroen, On 09/07/2013 21:46, Jeroen Hofstee wrote: Hello Stefano, The twister always had a fragile usb support in u-boot in the past. Since some floating patches mentioned alternating success after usb hub resets, I had a look if these patches fixed the twister as well, they don't. Some fiddling around [1] makes the usb work however, by not attempting to reset the USB hub with gpio_25. I cannot find any document mentioning gpio_25 though. Any reason for this usage? That is right. There is no written documentation by Technexion about this pin. I have added in CC Tapani, maybe he can tell us something more. The GPIO is used internally on the TAM3517 SOM, and we have no schematics about it. We have to guess about its usage. The reason to have it is that the sources for the kernel provided by Technexion (an ancient 2.6.32 Version) set this pin to reset the EHCI. As I said, there is no further documentation and rather we can only make some supposition. The usage in U-Boot then reflects the usage made by Technexion. p.s. I found by sheer accidence that the usb is behaving completely normal (after the patch) on rev B1. It is broken on rev B without the patch and working buggy with it. On rev B1 + patch the USB to SATA converter is discovered as well, which I have never seen before. I can confirm issues with version B of the TAM3517-SOM. I am testing a B1 SOM with a B twister. I do not know the details about changelog between B and B1 version of the SOM, but I got both USB and Ethernet problems with TAM3517-B. The same image runs without the same problems on a B1. There is also this pending patch by Michael: http://patchwork.ozlabs.org/patch/250290/ It is applied to u-boot-ti, not yet to mainline. I have tested current mainline with Mihael's patch applied, and the recognition of the USB storage seens reliable to me. No case with 0 device found. === [1] patch to disable the usb reset The change to port_mode[1] is not needed, but since it is unused, MODE_UNUSED seems appropriate. Agree - as we do not use it, we can simply disable. diff --git a/board/technexion/twister/twister.c b/board/technexion/twister/twister.c index a28c704..31cf6c0 100644 --- a/board/technexion/twister/twister.c +++ b/board/technexion/twister/twister.c @@ -63,7 +63,7 @@ static const u32 gpmc_XR16L2751[] = { #ifdef CONFIG_USB_EHCI static struct omap_usbhs_board_data usbhs_bdata = { .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, -.port_mode[1] = OMAP_EHCI_PORT_MODE_PHY, +.port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED, .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED, }; @@ -92,9 +92,6 @@ int board_init(void) enable_gpmc_cs_config(gpmc_XR16L2751, gpmc_cfg-cs[3], XR16L2751_UART2_BASE, GPMC_SIZE_16M); -gpio_request(CONFIG_OMAP_EHCI_PHY1_RESET_GPIO, USB_PHY1_RESET); -gpio_direction_output(CONFIG_OMAP_EHCI_PHY1_RESET_GPIO, 1); - See my concerns above. Do not reset the hub in the kernel ? Best regards, Stefano -- = 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] twister: usb host support
Hi Jeroen, On 10/07/2013 18:04, Jeroen Hofstee wrote: @@ -92,9 +92,6 @@ int board_init(void) enable_gpmc_cs_config(gpmc_XR16L2751, gpmc_cfg-cs[3], XR16L2751_UART2_BASE, GPMC_SIZE_16M); -gpio_request(CONFIG_OMAP_EHCI_PHY1_RESET_GPIO, USB_PHY1_RESET); -gpio_direction_output(CONFIG_OMAP_EHCI_PHY1_RESET_GPIO, 1); - See my concerns above. Do not reset the hub in the kernel ? I don't get the last part, but feedback from Technexion is needed first to remove all the guess, maybe etc. If it has a valid function, not setting it's value might not be such a good idea... I think we could safe drop the two lines. In fact, this code is redundant and it is already called inside the omap_ehci_phy_reset() function. No changes in behavior if we remove this lines from board_init(). Regards, Stefano -- = 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
[U-Boot] [PATCH v1 0/7] The patchset fixes some issue in the generation of the imx image
(header for Freescale's i.MX processors) to allow the usage of Freescale's tools to sign the u-boot image and provide a secure boot. This has nothing to do with the Secure Boot extensions implemented by Simon Glass, that can be in any case used to boot later a secure image. Freescale's secure boot ensures that a signed bootloader is started only if it is verified with a key that is burned into the iMX fuses. Documentation about the Freescale's secure process can be read from the AN4591, available on the Freescale's Website. The patchset allows to add to the imx Header the CSF (command Sequence File) generated by the tools provided by Freescale. The CSF is then simply concatenated to the u-boot image, making a signed bootloader, that the processor can verify if the fuses for the keys are burned. The processor (i.MX53 / i.MX6x) will not start a bootloader that cannot be verified - further infos how to configure the SOC to verify the bootloader can be found in the User Manual of the specific SOC. Next step is to verify the kernel, that can be still done using Simon's patches for verified boot (CONFIG_OF_CONTROL must be set in the board configuarion file). Stefano Babic (7): tools: imx_header should not include flash_offset tools: rename mximage_flash_offset to imximage_ivt_offset tools: dynamically allocate imx_header in imximage tools: add variable padding of data image in mkimage tools: add padding of data image file for imximage tools: add support for setting the CSF into imximage imx: add status reporting for HAB status arch/arm/cpu/armv7/mx6/Makefile |2 +- arch/arm/cpu/armv7/mx6/hab.c | 127 ++ arch/arm/include/asm/arch-mx6/hab.h | 80 ++ arch/arm/include/asm/arch-mx6/imx-regs.h |8 +- doc/README.imximage | 18 +++- doc/README.mxc_hab | 48 + tools/imximage.c | 168 +++--- tools/imximage.h | 20 +++- tools/mkimage.c | 24 - tools/mkimage.h |5 +- 10 files changed, 471 insertions(+), 29 deletions(-) create mode 100644 arch/arm/cpu/armv7/mx6/hab.c create mode 100644 arch/arm/include/asm/arch-mx6/hab.h create mode 100644 doc/README.mxc_hab -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v1 3/7] tools: dynamically allocate imx_header in imximage
Change to dynamically allocate the imx_header to correctly allocate the IVT, Boot Data and DCD at correct locations depending on the boot media. Also check that the Image Vector Table Offset + IVT + Boot Data + DCD = Initial Load Region Size. Previously struct imx_header was always 4096 bytes and was not dealing correctly with the Image Vector Table Offset. Now, the memory allocation looks for e.g. SD boot like this Storage u-boot.imx RAM Device 177ff000 -- | 0400 d1 00 20 40 IVT.header 177ff400 --- | 0404 0004 00 00 80 17 IVT.entry177ff404 --- | 0408 0008 00 00 00 00 IVT.reserved1177ff408| | | 040C 000C 2c f4 7f 17 IVT.dcd 177ff40C -- | | | 0410 0010 20 f4 7f 17 IVT.boot 177ff410 | | | | 0414 0014 00 f4 7f 17 IVT.self 177ff414 | | 0418 0018 00 00 00 00 IVT.csf 177ff418| || | 041C 001C 00 00 00 00 IVT.reserved2177ff41C| || | 0420 0020 00 f0 7f 17 BootData.start 177ff420 --- || --- 0424 0024 00 60 03 00 BootData.length 177ff424 || 0428 0028 00 00 00 00 BootData.plugin 177ff428 || 042C 002C d2 03 30 40 DCD.header 177ff42C -| ... | 1000 0c00 13 00 00 ea U-Boot Start 1780 -- While at it also remove the unused #define HEADER_OFFSET. Signed-off-by: Stefano Babic sba...@denx.de --- tools/imximage.c | 44 +--- tools/imximage.h | 16 +--- 2 files changed, 50 insertions(+), 10 deletions(-) diff --git a/tools/imximage.c b/tools/imximage.c index d87e94d..984cb9b 100644 --- a/tools/imximage.c +++ b/tools/imximage.c @@ -47,7 +47,7 @@ static table_entry_t imximage_cmds[] = { * Supported Boot options for configuration file * this is needed to set the correct flash offset */ -static table_entry_t imximage_bootops[] = { +static table_entry_t imximage_boot_offset[] = { {FLASH_OFFSET_ONENAND, onenand, OneNAND Flash,}, {FLASH_OFFSET_NAND, nand, NAND Flash, }, {FLASH_OFFSET_NOR, nor, NOR Flash,}, @@ -58,6 +58,20 @@ static table_entry_t imximage_bootops[] = { }; /* + * Supported Boot options for configuration file + * this is needed to determine the initial load size + */ +static table_entry_t imximage_boot_loadsize[] = { + {FLASH_LOADSIZE_ONENAND,onenand, OneNAND Flash,}, + {FLASH_LOADSIZE_NAND, nand, NAND Flash, }, + {FLASH_LOADSIZE_NOR,nor, NOR Flash,}, + {FLASH_LOADSIZE_SATA, sata, SATA Disk,}, + {FLASH_LOADSIZE_SD, sd, SD Card, }, + {FLASH_LOADSIZE_SPI,spi, SPI Flash,}, + {-1,, Invalid, }, +}; + +/* * IMXIMAGE version definition for i.MX chips */ static table_entry_t imximage_versions[] = { @@ -70,6 +84,8 @@ static struct imx_header imximage_header; static uint32_t imximage_version; /* Image Vector Table Offset */ static uint32_t imximage_ivt_offset; +/* Initial Load Region Size */ +static uint32_t imximage_init_loadsize; static set_dcd_val_t set_dcd_val; static set_dcd_rst_t set_dcd_rst; @@ -211,7 +227,9 @@ static void set_imx_hdr_v1(struct imx_header *imxhdr, uint32_t dcd_len, /* Set magic number */ fhdr_v1-app_code_barker = APP_CODE_BARKER; - hdr_base = entry_point - sizeof(struct imx_header); + /* TODO: check i.MX image V1 handling, for now use 'old' style */ + /* hdr_base = entry_point - imximage_init_loadsize + flash_offset; */ + hdr_base = entry_point - 4096; fhdr_v1-app_dest_ptr = hdr_base - flash_offset; fhdr_v1-app_code_jump_vector = entry_point; @@ -238,12 +256,13 @@ static void set_imx_hdr_v2(struct imx_header *imxhdr, uint32_t dcd_len, fhdr_v2-entry = entry_point; fhdr_v2-reserved1 = fhdr_v2-reserved2 = 0; - fhdr_v2-self = hdr_base = entry_point - sizeof(struct imx_header); - + hdr_base = entry_point - imximage_init_loadsize + + flash_offset; + fhdr_v2-self = hdr_base; fhdr_v2-dcd_ptr = hdr_base + offsetof(imx_header_v2_t, dcd_table); fhdr_v2-boot_data_ptr = hdr_base + offsetof(imx_header_v2_t, boot_data); - hdr_v2-boot_data.start = hdr_base - flash_offset; + hdr_v2-boot_data.start = entry_point - imximage_init_loadsize; /* Security feature are not supported */ fhdr_v2-csf = 0; @@ -345,13 +364,24 @@ static void
[U-Boot] [PATCH v1 4/7] tools: add variable padding of data image in mkimage
Use previously unused return value of function vrec_header to return a padding size to generic mkimage. This padding size is used in copy_files to pad with zeros after copying the data image. Signed-off-by: Stefano Babic sba...@denx.de --- tools/mkimage.c | 24 +--- tools/mkimage.h |5 - 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/tools/mkimage.c b/tools/mkimage.c index d312844..d2f24e4 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -150,6 +150,7 @@ main (int argc, char **argv) char *ptr; int retval = 0; struct image_type_params *tparams = NULL; + int pad_len = 0; /* Init Freescale PBL Boot image generation/list support */ init_pbl_image_type(); @@ -404,7 +405,7 @@ NXTARG: ; * allocate memory for the header itself. */ if (tparams-vrec_header) - tparams-vrec_header(params, tparams); + pad_len = tparams-vrec_header(params, tparams); else memset(tparams-hdr, 0, tparams-header_size); @@ -476,7 +477,7 @@ NXTARG: ; /* PBL has special Image format, implements its' own */ pbl_load_uboot(ifd, params); } else { - copy_file (ifd, params.datafile, 0); + copy_file(ifd, params.datafile, pad_len); } } @@ -550,10 +551,19 @@ copy_file (int ifd, const char *datafile, int pad) unsigned char *ptr; int tail; int zero = 0; + uint8_t zeros[4096]; int offset = 0; int size; struct image_type_params *tparams = mkimage_get_type (params.type); + if (pad = sizeof(zeros)) { + fprintf(stderr, %s: Can't pad to %d\n, + params.cmdname, pad); + exit(EXIT_FAILURE); + } + + memset(zeros, 0, sizeof(zeros)); + if (params.vflag) { fprintf (stderr, Adding Image %s\n, datafile); } @@ -611,7 +621,8 @@ copy_file (int ifd, const char *datafile, int pad) exit (EXIT_FAILURE); } - if (pad ((tail = size % 4) != 0)) { + tail = size % 4; + if ((pad == 1) (tail != 0)) { if (write(ifd, (char *)zero, 4-tail) != 4-tail) { fprintf (stderr, %s: Write error on %s: %s\n, @@ -619,6 +630,13 @@ copy_file (int ifd, const char *datafile, int pad) strerror(errno)); exit (EXIT_FAILURE); } + } else if (pad 1) { + if (write(ifd, (char *)zeros, pad) != pad) { + fprintf(stderr, %s: Write error on %s: %s\n, + params.cmdname, params.imagefile, + strerror(errno)); + exit(EXIT_FAILURE); + } } (void) munmap((void *)ptr, sbuf.st_size); diff --git a/tools/mkimage.h b/tools/mkimage.h index 1d9984e..5b63ebf 100644 --- a/tools/mkimage.h +++ b/tools/mkimage.h @@ -145,7 +145,10 @@ struct image_type_params { /* * This callback function will be executed for variable size record * It is expected to build this header in memory and return its length -* and a pointer to it +* and a pointer to it by using image_type_params.header_size and +* image_type_params.hdr. The return value shall indicate if an +* additional padding should be used when copying the data image +* by returning the padding length. */ int (*vrec_header) (struct mkimage_params *, struct image_type_params *); -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v1 7/7] imx: add status reporting for HAB status
Add functions to report the HAB (High Assurance Boot) status of e.g. i.MX6 CPUs. This is taken from git://git.freescale.com/imx/uboot-imx.git branch imx_v2009.08_3.0.35_4.0.0 cpu/arm_cortexa8/mx6/generic.c include/asm-arm/arch-mx6/mx6_secure.h Signed-off-by: Stefano Babic sba...@denx.de --- arch/arm/cpu/armv7/mx6/Makefile |2 +- arch/arm/cpu/armv7/mx6/hab.c | 127 ++ arch/arm/include/asm/arch-mx6/hab.h | 80 +++ arch/arm/include/asm/arch-mx6/imx-regs.h |8 +- 4 files changed, 215 insertions(+), 2 deletions(-) create mode 100644 arch/arm/cpu/armv7/mx6/hab.c create mode 100644 arch/arm/include/asm/arch-mx6/hab.h diff --git a/arch/arm/cpu/armv7/mx6/Makefile b/arch/arm/cpu/armv7/mx6/Makefile index 4f9ca68..7c18f43 100644 --- a/arch/arm/cpu/armv7/mx6/Makefile +++ b/arch/arm/cpu/armv7/mx6/Makefile @@ -27,7 +27,7 @@ include $(TOPDIR)/config.mk LIB= $(obj)lib$(SOC).o -COBJS = soc.o clock.o +COBJS = soc.o clock.o hab.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) diff --git a/arch/arm/cpu/armv7/mx6/hab.c b/arch/arm/cpu/armv7/mx6/hab.c new file mode 100644 index 000..c3c273f --- /dev/null +++ b/arch/arm/cpu/armv7/mx6/hab.c @@ -0,0 +1,127 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include common.h +#include asm/io.h +#if defined(CONFIG_SECURE_BOOT) +#include asm/arch/hab.h + +#ifdef CONFIG_SECURE_BOOT +/* start of HAB API updates */ +#define hab_rvt_report_event ((hab_rvt_report_event_t *)HAB_RVT_REPORT_EVENT) +#define hab_rvt_report_status ((hab_rvt_report_status_t *)HAB_RVT_REPORT_STATUS) +#define hab_rvt_authenticate_image \ + ((hab_rvt_authenticate_image_t *)HAB_RVT_AUTHENTICATE_IMAGE) +#define hab_rvt_entry ((hab_rvt_entry_t *)HAB_RVT_ENTRY) +#define hab_rvt_exit ((hab_rvt_exit_t *)HAB_RVT_EXIT) +#define hab_rvt_clock_init HAB_RVT_CLOCK_INIT + + +bool is_hab_enabled(void) +{ + struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR; + struct fuse_bank *bank = ocotp-bank[0]; + struct fuse_bank0_regs *fuse = + (struct fuse_bank0_regs *)bank-fuse_regs; + uint32_t reg = readl(fuse-cfg5); + + return (reg 0x2) == 0x2; +} + + +void display_event(uint8_t *event_data, size_t bytes) +{ + uint32_t i; + + if ((event_data) (bytes 0)) { + for (i = 0; i bytes; i++) { + if (i == 0) + printf(\t0x%02x, event_data[i]); + else if ((i % 8) == 0) + printf(\n\t0x%02x, event_data[i]); + else + printf( 0x%02x, event_data[i]); + } + } +} + +int get_hab_status(void) +{ + uint32_t index = 0; /* Loop index */ + uint8_t event_data[128]; /* Event data buffer */ + size_t bytes = sizeof(event_data); /* Event size in bytes */ + hab_config_t config = 0; + hab_state_t state = 0; + + if (is_hab_enabled()) + printf(\nSecure boot enabled\n); + else + printf(\nSecure boot disabled\n); + + /* Check HAB status */ + if (hab_rvt_report_status(config, state) != HAB_SUCCESS) { + printf(\nHAB Configuration: 0x%02x, HAB State: 0x%02x\n, + config, state); + + /* Display HAB Error events */ + while (hab_rvt_report_event(HAB_FAILURE, index, event_data, + bytes) == HAB_SUCCESS) { + printf(\n); + printf(- HAB Event %d -\n, + index + 1); + printf(event data:\n); + display_event(event_data, bytes); + printf(\n); + bytes = sizeof(event_data); + index++; + } + } + /* Display message if no HAB events are found */ + else { + printf(\nHAB Configuration: 0x%02x, HAB State: 0x%02x\n
[U-Boot] [PATCH v1 6/7] tools: add support for setting the CSF into imximage
Add support for setting the CSF (Command Sequence File) pointer which is used for HAB (High Assurance Boot) in the imximage by adding e.g. CSF 0x2000 in the imximage.cfg file. This will set the CSF pointer accordingly just after the padded data image area. The boot_data.length is adjusted with the value from the imximage.cfg config file. The resulting u-boot.imx can be signed with the FSL HAB tooling. The generated CSF block needs to be appended to the u-boot.imx. Signed-off-by: Stefano Babic sba...@denx.de --- doc/README.imximage | 18 +++--- doc/README.mxc_hab | 48 tools/imximage.c| 30 +- tools/imximage.h|3 ++- 4 files changed, 94 insertions(+), 5 deletions(-) create mode 100644 doc/README.mxc_hab diff --git a/doc/README.imximage b/doc/README.imximage index 802eb90..c10684f 100644 --- a/doc/README.imximage +++ b/doc/README.imximage @@ -15,9 +15,6 @@ Booting from NOR flash does not require to use this image type. For more details refer Chapter 2 - System Boot and section 2.14 (flash header description) of the processor's manual. -This implementation does not use at the moment the secure boot feature -of the processor. The image is generated disabling all security fields. - Command syntax: -- ./tools/mkimage -l mx u-boot_file @@ -86,6 +83,21 @@ Configuration command line syntax: Example: BOOT_FROM spi + CSF value + + Total size of CSF (Command Sequence File) + used for Secure Boot/ High Assurance Boot + (HAB). + + Using this command will populate the IVT + (Initial Vector Table) CSF pointer and adjust + the length fields only. The CSF itself needs + to be generated with Freescale tools and + 'manually' appended to the u-boot.imx file. + + Example: + CSF 0x2000 + DATAtype address value type: word=4, halfword=2, byte=1 diff --git a/doc/README.mxc_hab b/doc/README.mxc_hab new file mode 100644 index 000..97f8b7d --- /dev/null +++ b/doc/README.mxc_hab @@ -0,0 +1,48 @@ +High Assurance Boot (HAB) for i.MX6 CPUs + +To authenticate U-Boot only by the CPU there is no code required in +U-Boot itself. However, the U-Boot image to be programmed into the +boot media needs to be properly constructed, i.e. it must contain a +proper Command Sequence File (CSF). + +The Initial Vector Table contains a pointer to the CSF. Please see +doc/README.imximage for how to prepare u-boot.imx. + +The CSF itself is being generated by Freescale HAB tools. + +mkimage will output additional information about HAB Blocks +which can be used in the Freescale tooling to authenticate U-Boot +(entries in the CSF file). + +Image Type: Freescale IMX Boot Image +Image Ver:2 (i.MX53/6 compatible) +Data Size:327680 Bytes = 320.00 kB = 0.31 MB +Load Address: 177ff420 +Entry Point: 1780 +HAB Blocks: 177ff400 0004dc00 + + | | | + | | (1) + | | + | --- (2) + | + --- (3) + +(1)Size of area in file u-boot.imx to sign + This area should include the IVT, the Boot Data the DCD + and U-Boot itself. +(2)Start of area in u-boot.imx to sign +(3)Start of area in RAM to authenticate + +CONFIG_SECURE_BOOT currently enables only an additional command +'hab_status' in U-Boot to retrieve the HAB status and events. This +can be useful while developing and testing HAB. + +Commands to generate a signed U-Boot using Freescale HAB tools: +cst --o U-Boot_CSF.bin U-Boot.CSF +objcopy -I binary -O binary --pad-to 0x2000 --gap-fill=0x00 \ + U-Boot_CSF.bin U-Boot_CSF_pad.bin +cat u-boot.imx U-Boot_CSF_pad.bin u-boot-signed.imx + +NOTE: U-Boot_CSF.bin needs to be padded to the value specified in +the imximage.cfg file. diff --git a/tools/imximage.c b/tools/imximage.c index 85cc619..3c4d0c1 100644 --- a/tools/imximage.c +++ b/tools/imximage.c @@ -39,6 +39,7 @@ static table_entry_t imximage_cmds[] = { {CMD_BOOT_FROM, BOOT_FROM,boot command, }, {CMD_BOOT_OFFSET, BOOT_OFFSET, Boot offset,}, {CMD_DATA, DATA, Reg Write Data, }, + {CMD_CSF, CSF, Command Sequence File, }, {CMD_IMAGE_VERSION, IMAGE_VERSION,image version, }, {-1
[U-Boot] [PATCH v1 5/7] tools: add padding of data image file for imximage
Implement function vrec_header to be able to pad the final data image file according the what has been calculated for boot_data.length. Signed-off-by: Stefano Babic sba...@denx.de --- tools/imximage.c | 82 -- 1 file changed, 80 insertions(+), 2 deletions(-) diff --git a/tools/imximage.c b/tools/imximage.c index 984cb9b..85cc619 100644 --- a/tools/imximage.c +++ b/tools/imximage.c @@ -588,18 +588,96 @@ int imximage_check_params(struct mkimage_params *params) (params-xflag) || !(strlen(params-imagename)); } +static int imximage_generate(struct mkimage_params *params, + struct image_type_params *tparams) +{ + struct imx_header *imxhdr; + size_t alloc_len; + int dfd; + struct stat sbuf; + char *datafile = params-datafile; + uint32_t pad_len; + + memset(imximage_header, 0, sizeof(imximage_header)); + + /* +* In order to not change the old imx cfg file +* by adding VERSION command into it, here need +* set up function ptr group to V1 by default. +*/ + imximage_version = IMXIMAGE_V1; + /* Be able to detect if the cfg file has no BOOT_FROM tag */ + imximage_ivt_offset = FLASH_OFFSET_UNDEFINED; + imximage_csf_size = 0; + set_hdr_func(imxhdr); + + /* Parse dcd configuration file */ + parse_cfg_file(imximage_header, params-imagename); + + /* TODO: check i.MX image V1 handling, for now use 'old' style */ + if (imximage_version == IMXIMAGE_V1) + alloc_len = 4096; + else + alloc_len = imximage_init_loadsize - imximage_ivt_offset; + + if (alloc_len sizeof(struct imx_header)) { + fprintf(stderr, %s: header error\n, + params-cmdname); + exit(EXIT_FAILURE); + } + + imxhdr = malloc(alloc_len); + + if (!imxhdr) { + fprintf(stderr, %s: malloc return failure: %s\n, + params-cmdname, strerror(errno)); + exit(EXIT_FAILURE); + } + + memset(imxhdr, 0, alloc_len); + + tparams-header_size = alloc_len; + tparams-hdr = imxhdr; + + /* determine data image file length */ + dfd = open(datafile, O_RDONLY|O_BINARY); + if (dfd 0) { + fprintf(stderr, %s: Can't open %s: %s\n, + params-cmdname, datafile, strerror(errno)); + exit(EXIT_FAILURE); + } + + if (fstat(dfd, sbuf) 0) { + fprintf(stderr, %s: Can't stat %s: %s\n, + params-cmdname, datafile, strerror(errno)); + exit(EXIT_FAILURE); + } + + pad_len = ROUND(sbuf.st_size, 4096) - sbuf.st_size; + + close(dfd); + + /* TODO: check i.MX image V1 handling, for now use 'old' style */ + if (imximage_version == IMXIMAGE_V1) + return 0; + else + return pad_len; +} + + /* * imximage parameters */ static struct image_type_params imximage_params = { .name = Freescale i.MX Boot Image support, - .header_size= sizeof(struct imx_header), - .hdr= (void *)imximage_header, + .header_size= 0, + .hdr= NULL, .check_image_type = imximage_check_image_types, .verify_header = imximage_verify_header, .print_header = imximage_print_header, .set_header = imximage_set_header, .check_params = imximage_check_params, + .vrec_header= imximage_generate, }; void init_imx_image_type(void) -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v1 2/7] tools: rename mximage_flash_offset to imximage_ivt_offset
This better reflects the naming from the Reference Manual as well as fits better since flash is not really applicabe for SATA. Signed-off-by: Stefano Babic sba...@denx.de --- tools/imximage.c | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/tools/imximage.c b/tools/imximage.c index 013fa80..d87e94d 100644 --- a/tools/imximage.c +++ b/tools/imximage.c @@ -68,7 +68,8 @@ static table_entry_t imximage_versions[] = { static struct imx_header imximage_header; static uint32_t imximage_version; -static uint32_t imximage_flash_offset; +/* Image Vector Table Offset */ +static uint32_t imximage_ivt_offset; static set_dcd_val_t set_dcd_val; static set_dcd_rst_t set_dcd_rst; @@ -344,9 +345,9 @@ static void parse_cfg_cmd(struct imx_header *imxhdr, int32_t cmd, char *token, set_hdr_func(imxhdr); break; case CMD_BOOT_FROM: - imximage_flash_offset = get_table_entry_id(imximage_bootops, + imximage_ivt_offset = get_table_entry_id(imximage_bootops, imximage boot option, token); - if (imximage_flash_offset == -1) { + if (imximage_ivt_offset == -1) { fprintf(stderr, Error: %s[%d] -Invalid boot device (%s)\n, name, lineno, token); exit(EXIT_FAILURE); @@ -355,7 +356,7 @@ static void parse_cfg_cmd(struct imx_header *imxhdr, int32_t cmd, char *token, cmd_ver_first = 0; break; case CMD_BOOT_OFFSET: - imximage_flash_offset = get_cfg_value(token, name, lineno); + imximage_ivt_offset = get_cfg_value(token, name, lineno); if (unlikely(cmd_ver_first != 1)) cmd_ver_first = 0; break; @@ -456,7 +457,7 @@ static uint32_t parse_cfg_file(struct imx_header *imxhdr, char *name) fclose(fd); /* Exit if there is no BOOT_FROM field specifying the flash_offset */ - if (imximage_flash_offset == FLASH_OFFSET_UNDEFINED) { + if (imximage_ivt_offset == FLASH_OFFSET_UNDEFINED) { fprintf(stderr, Error: No BOOT_FROM tag in %s\n, name); exit(EXIT_FAILURE); } @@ -514,14 +515,14 @@ static void imximage_set_header(void *ptr, struct stat *sbuf, int ifd, */ imximage_version = IMXIMAGE_V1; /* Be able to detect if the cfg file has no BOOT_FROM tag */ - imximage_flash_offset = FLASH_OFFSET_UNDEFINED; + imximage_ivt_offset = FLASH_OFFSET_UNDEFINED; set_hdr_func(imxhdr); /* Parse dcd configuration file */ dcd_len = parse_cfg_file(imxhdr, params-imagename); /* Set the imx header */ - (*set_imx_hdr)(imxhdr, dcd_len, params-ep, imximage_flash_offset); + (*set_imx_hdr)(imxhdr, dcd_len, params-ep, imximage_ivt_offset); /* * ROM bug alert @@ -532,7 +533,7 @@ static void imximage_set_header(void *ptr, struct stat *sbuf, int ifd, * * The remaining fraction of a block bytes would not be loaded! */ - *header_size_ptr = ROUND(sbuf-st_size + imximage_flash_offset, 4096); + *header_size_ptr = ROUND(sbuf-st_size + imximage_ivt_offset, 4096); } int imximage_check_params(struct mkimage_params *params) -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v1 1/7] tools: imx_header should not include flash_offset
Doing a make distclean; make mx6qsabresd_config; make and hexdump -C u-boot.imx | less ... 0360 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 || * 03f0 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00 00 || ^^^ 0400 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 || * 1000 13 00 00 ea 14 f0 9f e5 14 f0 9f e5 14 f0 9f e5 |...ê.ð.å.ð.å.ð.å| ... shows the flash_offset value being written into the final generated image, wich is not correct. Instead create flash_offset as static variable such that the generated image is clean. 0360 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 || * 1000 13 00 00 ea 14 f0 9f e5 14 f0 9f e5 14 f0 9f e5 |...ê.ð.å.ð.å.ð.å| Signed-off-by: Stefano Babic sba...@denx.de --- tools/imximage.c | 15 --- tools/imximage.h |1 - 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/imximage.c b/tools/imximage.c index 5e8e470..013fa80 100644 --- a/tools/imximage.c +++ b/tools/imximage.c @@ -68,6 +68,7 @@ static table_entry_t imximage_versions[] = { static struct imx_header imximage_header; static uint32_t imximage_version; +static uint32_t imximage_flash_offset; static set_dcd_val_t set_dcd_val; static set_dcd_rst_t set_dcd_rst; @@ -343,9 +344,9 @@ static void parse_cfg_cmd(struct imx_header *imxhdr, int32_t cmd, char *token, set_hdr_func(imxhdr); break; case CMD_BOOT_FROM: - imxhdr-flash_offset = get_table_entry_id(imximage_bootops, + imximage_flash_offset = get_table_entry_id(imximage_bootops, imximage boot option, token); - if (imxhdr-flash_offset == -1) { + if (imximage_flash_offset == -1) { fprintf(stderr, Error: %s[%d] -Invalid boot device (%s)\n, name, lineno, token); exit(EXIT_FAILURE); @@ -354,7 +355,7 @@ static void parse_cfg_cmd(struct imx_header *imxhdr, int32_t cmd, char *token, cmd_ver_first = 0; break; case CMD_BOOT_OFFSET: - imxhdr-flash_offset = get_cfg_value(token, name, lineno); + imximage_flash_offset = get_cfg_value(token, name, lineno); if (unlikely(cmd_ver_first != 1)) cmd_ver_first = 0; break; @@ -455,7 +456,7 @@ static uint32_t parse_cfg_file(struct imx_header *imxhdr, char *name) fclose(fd); /* Exit if there is no BOOT_FROM field specifying the flash_offset */ - if (imxhdr-flash_offset == FLASH_OFFSET_UNDEFINED) { + if (imximage_flash_offset == FLASH_OFFSET_UNDEFINED) { fprintf(stderr, Error: No BOOT_FROM tag in %s\n, name); exit(EXIT_FAILURE); } @@ -513,14 +514,14 @@ static void imximage_set_header(void *ptr, struct stat *sbuf, int ifd, */ imximage_version = IMXIMAGE_V1; /* Be able to detect if the cfg file has no BOOT_FROM tag */ - imxhdr-flash_offset = FLASH_OFFSET_UNDEFINED; + imximage_flash_offset = FLASH_OFFSET_UNDEFINED; set_hdr_func(imxhdr); /* Parse dcd configuration file */ dcd_len = parse_cfg_file(imxhdr, params-imagename); /* Set the imx header */ - (*set_imx_hdr)(imxhdr, dcd_len, params-ep, imxhdr-flash_offset); + (*set_imx_hdr)(imxhdr, dcd_len, params-ep, imximage_flash_offset); /* * ROM bug alert @@ -531,7 +532,7 @@ static void imximage_set_header(void *ptr, struct stat *sbuf, int ifd, * * The remaining fraction of a block bytes would not be loaded! */ - *header_size_ptr = ROUND(sbuf-st_size + imxhdr-flash_offset, 4096); + *header_size_ptr = ROUND(sbuf-st_size + imximage_flash_offset, 4096); } int imximage_check_params(struct mkimage_params *params) diff --git a/tools/imximage.h b/tools/imximage.h index 5c929e4..da1c4ff 100644 --- a/tools/imximage.h +++ b/tools/imximage.h @@ -163,7 +163,6 @@ struct imx_header { imx_header_v1_t hdr_v1; imx_header_v2_t hdr_v2; } header; - uint32_t flash_offset; } __attribute__((aligned(4096))); typedef void (*set_dcd_val_t)(struct imx_header *imxhdr, -- 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] net: fec: Avoid MX28 bus sync issue
Hi Marek, hi Albert, On 12/07/2013 07:57, Albert ARIBAUD wrote: This being a bugfix patch, and having been tested twice, I suggest that it go in 2013.07, maybe with the commit message reduced to its first paragraph above -- although of course I do appreciate the second one, except it tends to minimize Marek's own contribution to the fix, which is by far the most important. Well, a big thank to both of you ! I merge this into u-boot-imx and I will send soon my PR. Regards, Stefano -- = 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] [PATCH 2/2] phy: smsc: LAN8710/8720 are not Gbit PHYs
On 12/07/2013 07:06, Fabio Estevam wrote: On Fri, Jul 12, 2013 at 2:00 AM, Joe Hershberger joe.hershber...@gmail.com wrote: On second thought, it's delegated in patchwork to Stefano and it's marked rejected. Why is that Stefano? Ok, I think I understand the reason. I asked him to reject the 1/2 patch of the series (it was a mx28evk related patch). This one (2/2) is fine. Sorry for the confusion. Yes, I confirm this - I rejected on Fabio's request. Regards, Stefano -- = 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] [PATCH] m28evk: add trimffs to nand command
On 07/07/2013 20:20, Marek Vasut wrote: this is usefull when writing an UBI image which contains and UBIFS volume (check README.nand and UBI FAQ for more details) Signed-off-by: Marek Vasut ma...@denx.de Cc: Stefano Babic sba...@denx.de --- Applied to u-boot-imx (fix), thanks ! 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] [PATCH] net: fec: Remove bogus flush_dcache_range() call
On 11/07/2013 17:23, Marek Vasut wrote: Remove incorrectly called and duplicate flush_dcache_range() call from fec_mxc driver. The call is not needed, since the caches are already flushed in fec_tbd_init(), moreover the second argument should be the ending address, not size. Signed-off-by: Marek Vasut ma...@denx.de Reported-by: Albert Aribaud albert.u.b...@aribaud.net Cc: Stefano Babic sba...@denx.de Cc: Tom Rini tr...@ti.com --- drivers/net/fec_mxc.c |1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index da95e28..97bf8fe 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -560,7 +560,6 @@ static int fec_init(struct eth_device *dev, bd_t* bd) } memset(fec-tbd_base, 0, size); fec_tbd_init(fec); - flush_dcache_range((unsigned)fec-tbd_base, size); } /* Applied to u-boot-imx (fix), thanks ! 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] [PATCH] net: fec: Avoid MX28 bus sync issue
On 12/07/2013 01:03, Marek Vasut wrote: The MX28 multi-layer AHB bus can be too slow and trigger the FEC DMA too early, before all the data hit the DRAM. This patch ensures the data are written in the RAM before the DMA starts. Please see the comment in the patch for full details. This patch was produced with an amazing help from Albert Aribaud, who pointed out it can possibly be such a bus synchronisation issue. Signed-off-by: Marek Vasut ma...@denx.de Cc: Albert ARIBAUD albert.u.b...@aribaud.net Cc: Fabio Estevam fabio.este...@freescale.com Cc: Stefano Babic sba...@denx.de --- Applied to u-boot-imx (fix), thanks ! 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] [PATCH 5/6] mx51evk: Change default environment to cope with OE changes
On 28/06/2013 23:52, Otavio Salvador wrote: OpenEmbedded has change partitioning layout of generated image so it does not raise warnings during the boot regarding unkown partition being used for U-Boot. Signed-off-by: Otavio Salvador ota...@ossystems.com.br --- include/configs/mx51evk.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 13d1839..4383375d 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -162,8 +162,8 @@ boot_fdt=try\0 \ ip_dyn=yes\0 \ mmcdev=0\0 \ - mmcpart=2\0 \ - mmcroot=/dev/mmcblk0p3 rootwait rw\0 \ + mmcpart=1\0 \ + mmcroot=/dev/mmcblk0p2 rootwait rw\0 \ mmcargs=setenv bootargs console=ttymxc0,${baudrate} \ root=${mmcroot}\0 \ loadbootscript= \ Acked-by: Stefano Babic sba...@denx.de 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] [PATCH 0/6] Upstream environment changes being used in Yocto/OE
Hi Fabio, hi Jason, On 28/06/2013 23:52, Otavio Salvador wrote: This changes were being done in every version of U-Boot and it makes sense to try to merge them upstream. Please review them and ack/nack them. these are small fixes in the default environment and I have no problem to merge them for 2013.07, but I have not seen yet ACK or NACk for them. If you think these should flow into the release, please send your ACK. Thanks, Stefano -- = 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] [PATCH v1 7/7] imx: add status reporting for HAB status
Hi Fabio, On 11/07/2013 19:17, Fabio Estevam wrote: Hi Stefano, On Thu, Jul 11, 2013 at 10:06 AM, Stefano Babic sba...@denx.de wrote: --- a/arch/arm/cpu/armv7/mx6/Makefile +++ b/arch/arm/cpu/armv7/mx6/Makefile @@ -27,7 +27,7 @@ include $(TOPDIR)/config.mk LIB= $(obj)lib$(SOC).o Whole series looks good. Only a minor comment: -COBJS = soc.o clock.o +COBJS = soc.o clock.o hab.o What about: COBJS-y += soc.o clock.o COBJS-$(CONFIG_SECURE_BOOT) += hab.o Correct, fix in V2. ,and then you remove this 'if defined' ? Agree. Best regards, Stefano -- = 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] [PATCH v1 7/7] imx: add status reporting for HAB status
Hi Marek, On 11/07/2013 20:31, Marek Vasut wrote: +void display_event(uint8_t *event_data, size_t bytes) +{ +uint32_t i; + +if ((event_data) (bytes 0)) { if (!cond) return; The loop goes here Fix in V2, thanks. +if (is_hab_enabled()) +printf(\nSecure boot enabled\n); +else +printf(\nSecure boot disabled\n); Use puts() instead of printf() with no args. Right, and I will fix also other similar cases in this file. Regards, Stefano -- = 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] [PATCH v1 6/7] tools: add support for setting the CSF into imximage
Hi Wolfgang, On 11/07/2013 20:14, Wolfgang Denk wrote: Dear Stefano Babic, In message 1373548001-19728-7-git-send-email-sba...@denx.de you wrote: Add support for setting the CSF (Command Sequence File) pointer which is used for HAB (High Assurance Boot) in the imximage by adding e.g. This patch throws a checkpatch error that needs to be fixed: WARNING: quoted string split across lines #265: FILE: tools/imximage.c:412: + fprintf(stderr, Error: %s[%d] - + CSF only supported for IMAGE_VERSION 2(%s)\n, Fixed in V2. 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
[U-Boot] [PULL] : Please pull u-boot-imx
Hi Alber, please pull these fixes from u-boot-imx, thanks. The following changes since commit d6c6d127c5b948ec381fad5b24a2bc5497720644: vf610twr: Remove SoC name from U-Boot prompt (2013-06-28 16:59:08 +0200) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to ab94cd491faf3e7b0a3b934f5817b15997bcb315: net: fec: Avoid MX28 bus sync issue (2013-07-12 09:29:32 +0200) Marek Vasut (3): m28evk: add trimffs to nand command net: fec: Remove bogus flush_dcache_range() call net: fec: Avoid MX28 bus sync issue drivers/net/fec_mxc.c| 23 ++- include/configs/m28evk.h |1 + 2 files changed, 23 insertions(+), 1 deletion(-) -- = 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] [PULL] : Updated: Please pull u-boot-imx
Hi Albert, some more small fixes, sorry. Please pull from u-boot-imx, thanks. The following changes since commit d6c6d127c5b948ec381fad5b24a2bc5497720644: vf610twr: Remove SoC name from U-Boot prompt (2013-06-28 16:59:08 +0200) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to a3f170cdbf7ae0bd24c94c2f46725699bbd69f05: mx53ard: Change default environment to cope with OE changes (2013-07-12 13:05:42 +0200) Marek Vasut (3): m28evk: add trimffs to nand command net: fec: Remove bogus flush_dcache_range() call net: fec: Avoid MX28 bus sync issue Otavio Salvador (6): mx53loco: Change default environment to cope with OE changes mx6qsabrelite: Change default environment to cope with OE changes mx6slevk: Change default environment to cope with OE changes wandboard: Change default environment to cope with OE changes mx51evk: Change default environment to cope with OE changes mx53ard: Change default environment to cope with OE changes drivers/net/fec_mxc.c | 23 ++- include/configs/m28evk.h|1 + include/configs/mx51evk.h |4 ++-- include/configs/mx53ard.h |4 ++-- include/configs/mx53loco.h |4 ++-- include/configs/mx6qsabrelite.h |4 ++-- include/configs/mx6slevk.h |4 ++-- include/configs/wandboard.h |4 ++-- 8 files changed, 35 insertions(+), 13 deletions(-) -- = 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] [PATCH 0/6] Upstream environment changes being used in Yocto/OE
On 28/06/2013 23:52, Otavio Salvador wrote: This changes were being done in every version of U-Boot and it makes sense to try to merge them upstream. Please review them and ack/nack them. Whole series applied to u-boot-imx (fix), thanks ! 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
[U-Boot] [PATCH] tools: fix FIT image with ramdisk
Booting a FIT image containing a ramdisk, the ramdisk is loaded at address 0x0 that causes bus errors for architectures that do not have RAM starting at address zero. Signed-off-by: Stefano Babic sba...@denx.de --- common/image.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/image.c b/common/image.c index 1be384f..08f712a 100644 --- a/common/image.c +++ b/common/image.c @@ -910,7 +910,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images, fit_uname_config, arch, IH_TYPE_RAMDISK, BOOTSTAGE_ID_FIT_RD_START, - FIT_LOAD_REQUIRED, rd_data, rd_len); + FIT_LOAD_IGNORED, rd_data, rd_len); if (rd_noffset 0) return 1; -- 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] tools: fix FIT image with ramdisk
Am 12/07/2013 23:24, schrieb Tom Rini: On Fri, Jul 12, 2013 at 03:09:23PM +0200, Stefano Babic wrote: Booting a FIT image containing a ramdisk, the ramdisk is loaded at address 0x0 that causes bus errors for architectures that do not have RAM starting at address zero. Signed-off-by: Stefano Babic sba...@denx.de I've re-worded this as: common/image.c: Fix regression with ramdisk load/entry points in FIT A FIT image with a ramdisk that sets the entry or load points to 0x0 must be treated as meaning leave in place and NOT relocate to 0x0. This regression was introduced in a51ec63. Great ! And applied to u-boot/master, thanks! Thanks ! Stefano -- = 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] Patman failure on Linux Mint 14
Hi Gerhard, On 14/07/2013 12:18, Gerhard Sittig wrote: Hi there! Patman for some reason doesn't work for me. It won't find commits from the sandbox/repo, but wants me to specify -c manually. Then it won't detect or cannot grok subject prefixes and fails to determine email addresses. From the documentation I see how useful the tool is and feel how great and desirable it is to have such a tool at hand when iterating a series through review. It's a pity that it won't run here. Since it works for others, the problem must be in my setup. The git history suggests that Python 2.7.4 is required, while my distribution (Linux Mint 14, derived from Ubuntu 12.10) ships with 2.7.3. It is not definetly a problem. It works on Ubuntu 12.04 LTS (python 2.7.3), as well as on later versions. One point could be your ~/.patman file. You should define an alias for each pattern in the subject line. Let's take as example the commit 7d47d1caa01682fd7b12631409927139f09ba041, it has a subject line: arm: omap4: panda: Add reading of the board revision patman tries to resolv an e-mail address for each pattern, and I have in my ~/.patman an entry for each of them (arm--Albert, omap and panda -- Tom). The other question is if you have set up the toolchain when you run patman. If you set up ELDK, some tools are taken from the toolchain instead from the PC, and patman fails - sometimes with weird errors. I usually run patman in a shell where I have not set the environment for the cross-compiler. OTOH this very Python version works for others, and a local installation of 2.7.5 (default configure except for --prefix $HOME) doesn't help either. The unit test output is rather lengthy, yet apparently condenses into just two spots and a lot of followup errors: The testIndent() case in test.py won't pass (succeeds although it's supposed to fail). Changing 'tab' in GetData() from a verbatim tab in quotes into an explicit '\t' doesn't help (but visually more clearly reflects the specific type of whitespace). Running the script under 'env LC_ALL=C' didn't help either. Is this some language or locale specific stuff that can be overcome from outside, or do I have a more severe problem with the Python runtime where string operation and whitespace handling isn't dependable? It seems to me too much and an indication that your environment could be responsible for this issue. I do not think that your Ubuntu derivative is the problem. Have you tried with a fresh shell or by logging with another user if you have the same errors ? Am I missing some external dependencies or proper configuration (either in the system, in Python, in git, or in patman)? IMHO you get in python an error by import if something is missing, and this is not your case. By the way, I have not set up anything, and patman works flawlessly. What can I do to better diagnose the issue or make patman work here as well? It's so great a tool! My first suggestion should be to try to check your environment, or try with another user if you have not changed for some reason /etc/profile. Regards, Stefano -- = 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] [PATCH] mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6x
Hi Fabio, On 15/07/2013 04:40, Fabio Estevam wrote: From: Fabio Estevam fabio.este...@freescale.com mx6qsabrelite and nitrogen6q boards are hardware compatible, so let's avoid the code duplication and only use the nitrogen6x source code to make board code maintainance easier. Tested booting a mainline device tree kernel on a mx6qsabrelite board. Signed-off-by: Fabio Estevam fabio.este...@freescale.com --- .../nitrogen6x/README.mx6qsabrelite} | 0 .../nitrogen6x/{README = README.nitrogen6x} | 0 board/freescale/mx6qsabrelite/Makefile | 41 - board/freescale/mx6qsabrelite/mx6qsabrelite.c | 848 - boards.cfg | 2 +- include/configs/mx6qsabrelite.h| 297 include/configs/nitrogen6x.h | 80 +- Should we update the MAINTAINERS, too ? It is weird that we have two maintainers for the same code. Best regards, Stefano -- = 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] [PATCH] mxc_gpio: Correct the GPIO handling in gpio_direction_output()
On 15/07/2013 15:58, Dirk Behme wrote: Setting the direction and an output value should be done by First, set the desired output value. Then, switch to output. If this is done in the inverse order, like at the moment, there can be a glitch on the GPIO line while switching first the old output value and aftwards the new one. Fix this by inverting the order of the direction/set_value calls. Right, thanks to fix this ! Signed-off-by: Dirk Behme dirk.be...@de.bosch.com --- drivers/gpio/mxc_gpio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c index a388064..1d820d4 100644 --- a/drivers/gpio/mxc_gpio.c +++ b/drivers/gpio/mxc_gpio.c @@ -143,10 +143,10 @@ int gpio_direction_input(unsigned gpio) int gpio_direction_output(unsigned gpio, int value) { - int ret = mxc_gpio_direction(gpio, MXC_GPIO_DIRECTION_OUT); + int ret = gpio_set_value(gpio, value); if (ret 0) return ret; - return gpio_set_value(gpio, value); + return mxc_gpio_direction(gpio, MXC_GPIO_DIRECTION_OUT); } Acked-by: Stefano Babic sba...@denx.de 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] [PATCH] fsl_esdhc: Touch only relevant sys ctrl bits
On 15/07/2013 15:44, Dirk Behme wrote: Dealing with the sys ctrl register should touch only the relevant bits and not accidently the whole register. On i.MX6, the sys control register contains bits which shouldn't be reset to 0, e.g. SYS_CTRL[3-0] and IPP_RST_N (SYS_CTRL[23]). Do this by read/modify/write instead of just a 32bit write. Signed-off-by: Dirk Behme dirk.be...@de.bosch.com --- drivers/mmc/fsl_esdhc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index 973b19f..431dac2 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -470,7 +470,7 @@ static int esdhc_init(struct mmc *mmc) int timeout = 1000; /* Reset the entire host controller */ - esdhc_write32(regs-sysctl, SYSCTL_RSTA); + esdhc_setbits32(regs-sysctl, SYSCTL_RSTA); /* Wait until the controller is available */ while ((esdhc_read32(regs-sysctl) SYSCTL_RSTA) --timeout) @@ -481,7 +481,7 @@ static int esdhc_init(struct mmc *mmc) esdhc_write32(regs-scr, 0x0040); #endif - esdhc_write32(regs-sysctl, SYSCTL_HCKEN | SYSCTL_IPGEN); + esdhc_setbits32(regs-sysctl, SYSCTL_HCKEN | SYSCTL_IPGEN); /* Set the initial clock speed */ mmc_set_clock(mmc, 40); @@ -515,7 +515,7 @@ static void esdhc_reset(struct fsl_esdhc *regs) unsigned long timeout = 100; /* wait max 100 ms */ /* reset the controller */ - esdhc_write32(regs-sysctl, SYSCTL_RSTA); + esdhc_setbits32(regs-sysctl, SYSCTL_RSTA); /* hardware clears the bit when it is done */ while ((esdhc_read32(regs-sysctl) SYSCTL_RSTA) --timeout) Acked-by: Stefano Babic sba...@denx.de 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] [PATCH v2] mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6x
Hi Albert, On 17/07/2013 09:42, Albert ARIBAUD wrote: Hi Fabio, On Mon, 15 Jul 2013 14:29:28 -0300, Fabio Estevam fabio.este...@freescale.com wrote: mx6qsabrelite and nitrogen6q boards are hardware compatible, so let's avoid the code duplication and only use the nitrogen6x source code to make board code maintainance easier. Tested booting a mainline device tree kernel on a mx6qsabrelite board. Signed-off-by: Fabio Estevam fabio.este...@freescale.com --- Hmm, why does this patch not show on Patchwork? Only its V1 does. I am struggling for finding it, too. I have already seen a similar case in the past. Otavio remarked that when there is a rename, patchwork is not able to track it (bug in patchwork). Stefano -- = 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] [PATCH v2] mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6x
On 17/07/2013 11:10, Albert ARIBAUD wrote: Hi Stefano, On Wed, 17 Jul 2013 10:04:29 +0200, Stefano Babic sba...@denx.de wrote: Hi Albert, On 17/07/2013 09:42, Albert ARIBAUD wrote: Hi Fabio, On Mon, 15 Jul 2013 14:29:28 -0300, Fabio Estevam fabio.este...@freescale.com wrote: mx6qsabrelite and nitrogen6q boards are hardware compatible, so let's avoid the code duplication and only use the nitrogen6x source code to make board code maintainance easier. Tested booting a mainline device tree kernel on a mx6qsabrelite board. Signed-off-by: Fabio Estevam fabio.este...@freescale.com --- Hmm, why does this patch not show on Patchwork? Only its V1 does. I am struggling for finding it, too. I have already seen a similar case in the past. Otavio remarked that when there is a rename, patchwork is not able to track it (bug in patchwork). Since we have a clear example (and on the patchwork site where the patchwork folks can dig as deep as they need), we could bring this up to the patchwork list, with the M-IDs of the V1 and V2 patches. A second example was : [PATCH 5/6] mx28evk: Move README file inside board directory This can be found in the ML, but I never found it in patchworks. This patch renamed only a file: diff --git a/doc/README.mx28evk b/board/freescale/mx28evk/README similarity index 100% rename from doc/README.mx28evk rename to board/freescale/mx28evk/README For this reason the disappearing of mx6qsabrelite can be related, because also this patch renames a file. Regards, Stefano -- = 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] [PATCH] README.mx28_common: Rename it to README.mxs
Hi Fabio, On 16/07/2013 17:38, Fabio Estevam wrote: Hi Stefano, On Fri, Jul 12, 2013 at 8:49 AM, Marek Vasut ma...@denx.de wrote: Dear Fabio Estevam, From: Fabio Estevam fabio.este...@freescale.com commit 54965b61360 (README: mxs: Introduce README.mxs) should have changed the file name to README.mxs, as it covers both mx23 and mx28 now. Signed-off-by: Fabio Estevam fabio.este...@freescale.com --- doc/{README.mx28_common = README.mxs} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename doc/{README.mx28_common = README.mxs} (100%) diff --git a/doc/README.mx28_common b/doc/README.mxs similarity index 100% rename from doc/README.mx28_common rename to doc/README.mxs Acked-by: Marek Vasut ma...@denx.de Could we have this one applied into 2013.07? I am not sure why the file rename didn't take effect, as the original patch handled it: http://patchwork.ozlabs.org/patch/241363/ mmhh..I think we are too late for it, Tom is putting the release out. Albert, do you still plan a PR and if yes could you pick up directly this fix to the documentation ? Thanks, Stefano -- = 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] [PATCH 1/1] ddr cfg: DRAM_RESET needs 0x00020030
Hi Tom, Am 19/07/2013 23:50, schrieb Tom Rini: On Fri, Jul 19, 2013 at 02:34:55PM -0700, Troy Kisky wrote: On 7/19/2013 2:00 PM, Fabio Estevam wrote: Hi Troy, On Wed, Jul 17, 2013 at 4:46 PM, Troy Kisky troy.ki...@boundarydevices.com wrote: The old value of 0x000e0030 will cause ethernet timeout issues on the sabrelite and possibly other boards using the KSZ9021. I have no explanation as to why. But this is a correct change, the TRM will be updated to show that 00b is the only valid setting for bits 19-18 of DRAM_RESET. My thanks go to Liu Hui(Jason) for this information. Signed-off-by: Troy Kisky troy.ki...@boundarydevices.com Should this go into 2013.07? If not too late. It only affect Nitrogen6x, at least until Sabrelite is combined with it. And Sabrelite is already using this value. Whose acks should I wait for on this? Acked-by: Stefano Babic sba...@denx.de From the i.MX point of view, the patch is a fix for the RAM configuration and does not affects other boards but only the nitrogen. I had merged this in u-boot-imx, but it is too late for PR. If it is not too late, please merge it for release. Many thanks, Stefano -- = 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] [PATCH] mxc_gpio: Correct the GPIO handling in gpio_direction_output()
On 15/07/2013 15:58, Dirk Behme wrote: Setting the direction and an output value should be done by First, set the desired output value. Then, switch to output. If this is done in the inverse order, like at the moment, there can be a glitch on the GPIO line while switching first the old output value and aftwards the new one. Fix this by inverting the order of the direction/set_value calls. Signed-off-by: Dirk Behme dirk.be...@de.bosch.com --- Applied to u-boot-imx, thanks ! Best regards, SWtefano 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] [PATCH v2] imx: nitrogen6x: mx6qsabrelite: Add support for DVI monitors
Hi Robert, On 24/07/2013 01:15, Robert Winkler wrote: Incidentally, I just grepped for CONFIG_CMD_HDMIDETECT and I don't see it documented anywhere. It should probably be added to the README Right - but let's do it in a separate patch. For this one: Acked-by: Stefano Babic sba...@denx.de Regards, Stefano -- = 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] [PATCH] wandboard: Use splash image at screen center by default
On 20/07/2013 22:21, Otavio Salvador wrote: Signed-off-by: Otavio Salvador ota...@ossystems.com.br --- Applied to u-boot-imx, thanks. 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] [PATCH v2] mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6x
Hi Fabio, On 15/07/2013 19:29, Fabio Estevam wrote: mx6qsabrelite and nitrogen6q boards are hardware compatible, so let's avoid the code duplication and only use the nitrogen6x source code to make board code maintainance easier. Tested booting a mainline device tree kernel on a mx6qsabrelite board. Signed-off-by: Fabio Estevam fabio.este...@freescale.com --- I get several corrupt patch even if it was sent as usual with git-send-email. Checking in e-mail source, seevral spaces are replaced by =20. I do not know if they are the cause: even trying to fix them, I cannot simply apply the patch. It seems that the mail server did some evil.. Could you be so kind to repush the patch ? Thanks, Stefano -- = 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] [RFC] Remove static display data
Hi Robert, Anatolji, On 26/07/2013 09:50, Anatolij Gustschin wrote: I realize that there's already the FDT and CONFIG_OF_CONTROL functionality and device trees sort of cover the passing to Linux part so maybe before handing it off, converting the relevant data into a device tree that Linux can already use/parse would work. Devicetree bindings for describing display timings info exist in recent Linux kernel versions (since v3.9 I think) and are documented under Documentation/devicetree/bindings/video/display-timing.txt. In Linux there are also DT helpers to parse display timings nodes and read the timing values into fb_videomode structure (of_get_display_timings, of_get_fb_videomode). Code for adding such display timings nodes to the device tree under U-Boot doesn't exist yet. IMHO adopting DT looks very interesting, as it can really simplify sharing configuration between u-boot and kernel. On i.MX6 we have not yet started to use DT to configure u-boot as it is already done on other SOCs (Tegra), but it seems to me the right way to do. 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] [PATCH] ARM: mxs: rename function that sets AUTO_RESTART flag
Hi Hector, On 24/07/2013 18:08, Hector Palacios wrote: Why? The comment seems fully valid to me. The comment is confusing for a number of reasons: - It says for revision A of the EVK the flag must be enabled but the code is common for all platforms and there is no distinction about the platform where it runs. The flag must be enabled for any platform. - The flag is set by the function in any case (except if it is already set) so the comment superfluous. - The comment doesn't even say what the problem is on EVK_A or why the setting of the bit helps. Right, I see the same. The comment hides some information, because we do not know which is the issue and in any case code does the opposite, setting the bit in any case. I think it is better to drop it. -static void mxs_power_clear_auto_restart(void) +static void mxs_power_set_auto_restart(void) { struct mxs_rtc_regs *rtc_regs = (struct mxs_rtc_regs *)MXS_RTC_BASE; @@ -65,10 +65,7 @@ static void mxs_power_clear_auto_restart(void) while (readl(rtc_regs-hw_rtc_ctrl) RTC_CTRL_CLKGATE) ; -/* - * Due to the hardware design bug of mx28 EVK-A - * we need to set the AUTO_RESTART bit. - */ +/* Do nothing if flag already set */ You're changing the behavior here and it's not documented. I see no point in this change while at it. I'm not changing the behavior. I just renamed the function to reflect what the function does, which is set the flag, not clear it. Apart from the renaming, I didn't touch a line of real code. I see also no changes in behavior, it is only a rename. 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] [RFC] Remove static display data
Hi Eric, On 26/07/2013 16:04, Eric Nelson wrote: The real question we have regarding DT is the timing. We're shipping DT files on secondary storage (SATA/SD card), and want/need something local (i.e. env in SPI-NOR) to present a U/I if either no storage available or if something goes wrong. ok, understood. A secondary need/desire is to have something simple for configuring a new display. The process of tuning some of the parameters (esp margins) can sometimes be iterative because the data sheets aren't always clear and clock options are often imprecise. Since this iteration and configuration is often done by EEs in a lab who don't have an easy way to recompile a DTS, our inclination is to do something locally. ok, I understand the point. Maybe it should be even more simple for the EEs if the would be such kind of special u-boot commands, able to set the timing and reload the framebuffer. Can be a solution using the u-boot's fdt library enough ? With fdt get and fdt set it is possible to read and modify a DT in memory, and then the modified DT can be stored back - avoiding to compile directly the DTS. Is Tegra somehow using DT to configure U-Boot display? I'm not finding the code. ./board/compal/dts/tegra20-paz00.dts seems doing that, but I have no experience with it ;( My thoughts are more related by comparing what the kernel does and how the timing is configured. There are several examples (I am seeing the imx23-dts, but it is not the only one) where the complete timing for a panel is done inside the DT. As you have already checked, using a U-Boot variable has some limitations, because it does not contain all parameters that are needed. And I think it could be quite difficult to get it general for all SOCs because some SOCs need some specialties (VRAM for OMAP could be an example). No matter how we end up doing this, passing U-Boot's display setup to the kernel via DT is the **right thing**, so that there aren't two bits to maintain. Yes, I think we do not need to discuss how to pass to the kernel - but I am checking if it is a suitable way to configure the u-boot display,too. Anyway, I agree that using a U-Boot variable is much more simple to implement.. Best regards, Stefano -- = 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] [PATCH] [PATCH v3] mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6x
Hi Fabio, On 26/07/2013 16:37, Fabio Estevam wrote: From: Fabio Estevam fabio.este...@freescale.com mx6qsabrelite and nitrogen6q boards are hardware compatible, so let's avoid the code duplication and only use the nitrogen6x source code to make board code maintainance easier. Tested booting a mainline device tree kernel on a mx6qsabrelite board. Signed-off-by: Fabio Estevam fabio.este...@freescale.com --- Thanks, no corruption at all - and as the new version differs only for the mail format, there is no need to wait for inclusion. Applied to u-boot-imx, thanks ! 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] [PATCH v4 1/2] mx6: Factor out common HDMI setup code
Hi Pardeep, On 25/07/2013 19:12, Pardeep Kumar Singla wrote: - +void enable_ipu_clock(); This generates a warning: warning: function declaration isn't a prototype [-Wstrict-prototypes] I fix it myself. 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] [PATCH] imx: Add documentation for imx specific commands
On 25/07/2013 02:57, Robert Winkler wrote: CONFIG_CMD_HDMIDETECT CONFIG_CMD_BMODE Signed-off-by: Robert Winkler robert.wink...@boundarydevices.com --- Applied to u-boot-imx, thanks. 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] [PATCH v2] imx: nitrogen6x: mx6qsabrelite: Add support for DVI monitors
On 24/07/2013 00:07, Robert Winkler wrote: A little background is probably appropriate for this patch. Since the beginning of usage of the SABRE Lite and Nitrogen6x boards, DVI detection has been somewhat broken. Some (most) DVI monitors don't produce the HPD bit in the PHY_STAT0 register, but do show proper toggling of the RX_SENSE0..3 bits. Creating a new the bit-mask to include all five bits and modifying the 'hdmidet' command and internal detection routines allows these monitors to function properly in U-Boot. A related patch to our kernels allows things to work under Linux: https://github.com/boundarydevices/linux-imx6/commit/7d8752905c118af9063738a533227de0b2f6ecd4 Signed-off-by: Robert Winkler robert.wink...@boundarydevices.com --- Applied to u-boot-imx, thanks. 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] [PATCH v4 1/2] mx6: Factor out common HDMI setup code
On 25/07/2013 19:12, Pardeep Kumar Singla wrote: Instead of duplicating HDMI setup code for every mx6 board, factor out the common code Signed-off-by: Pardeep Kumar Singla b45...@freescale.com --- Applied to u-boot-imx, thanks. 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] [PATCH v4 2/2] mx6qsabresd: Add splash screen support via HDMI
On 25/07/2013 19:12, Pardeep Kumar Singla wrote: Signed-off-by: Pardeep Kumar Singla b45...@freescale.com --- Applied to u-boot-imx, thanks. 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] [PATCH] [PATCH v3] mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6x
Hi Eric, On 26/07/2013 18:12, Eric Nelson wrote: Thanks Stefano, On 07/26/2013 07:46 AM, Stefano Babic wrote: Hi Fabio, On 26/07/2013 16:37, Fabio Estevam wrote: From: Fabio Estevam fabio.este...@freescale.com mx6qsabrelite and nitrogen6q boards are hardware compatible, so let's avoid the code duplication and only use the nitrogen6x source code to make board code maintainance easier. Tested booting a mainline device tree kernel on a mx6qsabrelite board. Signed-off-by: Fabio Estevam fabio.este...@freescale.com --- Thanks, no corruption at all - and as the new version differs only for the mail format, there is no need to wait for inclusion. Applied to u-boot-imx, thanks ! Do we now need updated patches from Pardeep and Robert, who have patches pending that include changes to board/freescale/mx6qsabrelite/? No need - I fixed it myself and applied. Regards, Stefano -- = 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] [PATCH v4 1/4] mx27: add missing constant for mx27
On 28/07/2013 22:16, Philippe Reynes wrote: Add some missing constant (chip select, ...) Signed-off-by: Philippe Reynes trem...@yahoo.fr Signed-off-by: Eric Jarrige eric.jarr...@armadeus.org --- arch/arm/cpu/arm926ejs/mx27/asm-offsets.c |5 + arch/arm/include/asm/arch-mx27/imx-regs.h |2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/arch/arm/cpu/arm926ejs/mx27/asm-offsets.c b/arch/arm/cpu/arm926ejs/mx27/asm-offsets.c index f3a8d7b..215c562 100644 --- a/arch/arm/cpu/arm926ejs/mx27/asm-offsets.c +++ b/arch/arm/cpu/arm926ejs/mx27/asm-offsets.c @@ -41,5 +41,10 @@ int main(void) DEFINE(ESDCFG1_ROF, offsetof(struct esdramc_regs, esdcfg1)); DEFINE(ESDMISC_ROF, offsetof(struct esdramc_regs, esdmisc)); + DEFINE(GPCR, IMX_SYSTEM_CTL_BASE + + offsetof(struct system_control_regs, gpcr)); + DEFINE(FMCR, IMX_SYSTEM_CTL_BASE + + offsetof(struct system_control_regs, fmcr)); + return 0; } diff --git a/arch/arm/include/asm/arch-mx27/imx-regs.h b/arch/arm/include/asm/arch-mx27/imx-regs.h index 8867e9f..51257a8 100644 --- a/arch/arm/include/asm/arch-mx27/imx-regs.h +++ b/arch/arm/include/asm/arch-mx27/imx-regs.h @@ -185,7 +185,7 @@ struct iim_regs { struct fuse_bank { u32 fuse_regs[0x20]; u32 fuse_rsvd[0xe0]; - } bank[1]; + } bank[2]; }; struct fuse_bank0_regs { Acked-by: Stefano Babic sba...@denx.de 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] [PATCH v2] mxc_ipuv3: fix memory alignment of framebuffer
On 27/07/2013 02:53, Eric Nelson wrote: The frame-buffer on i.MX boards needs to be aligned for DMA. Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks. 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] Falcon Mode implemented version
Hi Rajdeep, On 29/07/2013 14:04, Rajdeep Vaghasia wrote: Hi all, I have the following queries. 1) Can anyone suggest me the exact version of u-boot in which falcon mode is implemented? There is no exact version - falcon mode was merged more as one year ago. Take simply 2013.07 or u-boot TOT. I also wanted to know, if is there any readme available for that implementation. doc/README.falcon Please also tell me, where exactly in the u-boot code it is implemented. There is no exact the code - to speed up the boot, several parts were changed. You can check for code surrounded by CONFIG_CMD_SPL and CONFIG_SPL_OS_BOOT. 2) The u-boot version in which SPL for NOR flash is implemented. There is at least a couple of boards supporting SPL and booting form NOR: woodburn (MX35) and a3m071(MPC 5200). 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] Falcon Mode implemented version
Hi Rajdeep, On 30/07/2013 08:16, Rajdeep Vaghasia wrote: Hi Stefano, As in the case of NAND, u-boot_spl.bin is generated in u-boot/spl_nand/ directory, You're wrong: spl_nand is the old legacy spl. It is maintained for old boards, but it should not be used for new projects. Setting CONFIG_SPL, u-boot is generated into the spl/ directory. Please try to compile the boards I have mentioned - you can then check how production runs. In case of NOR, where exactly the separate spl image will be generated? or Will u-boot.bin contain the whole spl + secondary u-boot? No, but there is an option to concatenate automatically SPL and u-boot if desired. 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] [PATCH 03/11] video: Add System-Mode configuration hook into mxsfb
Hi Marek, On 30/07/2013 23:37, Marek Vasut wrote: Add hook that allow configuring SmartLCD attached the MXS LCDIF controller operating in System-Mode. This hook can be overriden by a platform-specific SmartLCD programming routine, which writes the SmartLCD specific values into it's registers. Also, this patch makes sure the SYNC signals are off for the SmartLCD case. Signed-off-by: Marek Vasut ma...@denx.de Cc: Anatolij Gustschin ag...@denx.de Cc: Fabio Estevam fabio.este...@freescale.com Cc: Otavio Salvador ota...@ossystems.com.br Cc: Stefano Babic sba...@denx.de --- drivers/video/mxsfb.c | 16 1 file changed, 16 insertions(+) diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c index dbc63a6..78709dd 100644 --- a/drivers/video/mxsfb.c +++ b/drivers/video/mxsfb.c @@ -34,6 +34,17 @@ static GraphicDevice panel; +/** + * mxsfb_system_setup() - Fine-tune LCDIF configuration + * + * This function is used to adjust the LCDIF configuration. This is usually + * needed when driving the controller in System-Mode to operate an 8080 or + * 6800 connected SmartLCD. + */ +__weak void mxsfb_system_setup(void) +{ +} + We have no easy way to know if a function is declared weak, but generally a lot of weak functions are board specific. Try to use the same naming schema, and rename this one as board_mxfb_setup() (or something like that). Or better: why cannot we use board_video_init(), as this name is already used by other SOCs ? /* * DENX M28EVK: * setenv videomode @@ -88,6 +99,9 @@ static void mxs_lcd_init(GraphicDevice *panel, writel(valid_data LCDIF_CTRL1_BYTE_PACKING_FORMAT_OFFSET, regs-hw_lcdif_ctrl1); + + mxsfb_system_setup(); + writel((mode-yres LCDIF_TRANSFER_COUNT_V_COUNT_OFFSET) | mode-xres, regs-hw_lcdif_transfer_count); @@ -115,8 +129,10 @@ static void mxs_lcd_init(GraphicDevice *panel, /* Flush FIFO first */ writel(LCDIF_CTRL1_FIFO_CLEAR, regs-hw_lcdif_ctrl1_set); +#ifndef CONFIG_VIDEO_MXS_MODE_SYSTEM /* Sync signals ON */ setbits_le32(regs-hw_lcdif_vdctrl4, LCDIF_VDCTRL4_SYNC_SIGNALS_ON); +#endif Question: is there anything wrong to move it into mxsfb_system_setup() ? I would prefer to avoid adding a new not documented CONFIG_ only to set a bit... 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] [PATCH 05/11] ARM: mxs: Add Creative ZEN XFi3 board
Hi Marek, On 30/07/2013 23:37, Marek Vasut wrote: Add STMP3780-based XFi3 board. This board is a small PMP device sporting a CPU which was later rebranded to i.MX233 . Currently supported is USB gadget mode and both external SD and internal Phison SD-NAND bridge . Signed-off-by: Marek Vasut ma...@denx.de Cc: Fabio Estevam fabio.este...@freescale.com Cc: Otavio Salvador ota...@ossystems.com.br Cc: Stefano Babic sba...@denx.de --- MAINTAINERS|1 + board/creative/xfi3/Makefile | 47 + board/creative/xfi3/spl_boot.c | 150 +++ board/creative/xfi3/xfi3.c | 221 boards.cfg |1 + include/configs/xfi3.h | 82 +++ 6 files changed, 502 insertions(+) create mode 100644 board/creative/xfi3/Makefile create mode 100644 board/creative/xfi3/spl_boot.c create mode 100644 board/creative/xfi3/xfi3.c create mode 100644 include/configs/xfi3.h diff --git a/MAINTAINERS b/MAINTAINERS index 0a900dc..84c1f61 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -968,6 +968,7 @@ Marek Vasut marek.va...@gmail.com vpac270 xscale/pxa zipitz2 xscale/pxa mx23_olinuxino i.MX23 + xfi3i.MX23 m28evk i.MX28 sc_sps_1i.MX28 m53evk i.MX53 diff --git a/board/creative/xfi3/Makefile b/board/creative/xfi3/Makefile new file mode 100644 index 000..c793bfb --- /dev/null +++ b/board/creative/xfi3/Makefile @@ -0,0 +1,47 @@ +# +# (C) Copyright 2000-2006 +# Wolfgang Denk, DENX Software Engineering, w...@denx.de. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# Please use new licence style with SPDX identifier. Fix it globally. +++ b/board/creative/xfi3/spl_boot.c @@ -0,0 +1,150 @@ +/* + * Creative ZEN X-Fi3 setup + * + * Copyright (C) 2013 Marek Vasut ma...@denx.de + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include common.h +#include config.h +#include asm/io.h +#include asm/arch/iomux-mx23.h +#include asm/arch/imx-regs.h +#include asm/arch/sys_proto.h + +#define MUX_CONFIG_EMI (MXS_PAD_1V8 | MXS_PAD_12MA | MXS_PAD_PULLUP) +#define MUX_CONFIG_SSP (MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP) +#define MUX_CONFIG_LCD (MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL) + +const iomux_cfg_t iomux_setup[] = { + /* EMI */ + MX23_PAD_EMI_D00__EMI_D00 | MUX_CONFIG_EMI, + MX23_PAD_EMI_D01__EMI_D01 | MUX_CONFIG_EMI, + MX23_PAD_EMI_D02__EMI_D02 | MUX_CONFIG_EMI, + MX23_PAD_EMI_D03__EMI_D03 | MUX_CONFIG_EMI, + MX23_PAD_EMI_D04__EMI_D04 | MUX_CONFIG_EMI, + MX23_PAD_EMI_D05__EMI_D05 | MUX_CONFIG_EMI, + MX23_PAD_EMI_D06__EMI_D06 | MUX_CONFIG_EMI, + MX23_PAD_EMI_D07__EMI_D07 | MUX_CONFIG_EMI, + MX23_PAD_EMI_D08__EMI_D08 | MUX_CONFIG_EMI, + MX23_PAD_EMI_D09__EMI_D09 | MUX_CONFIG_EMI, + MX23_PAD_EMI_D10__EMI_D10 | MUX_CONFIG_EMI, + MX23_PAD_EMI_D11__EMI_D11 | MUX_CONFIG_EMI, + MX23_PAD_EMI_D12__EMI_D12 | MUX_CONFIG_EMI, + MX23_PAD_EMI_D13__EMI_D13 | MUX_CONFIG_EMI, + MX23_PAD_EMI_D14__EMI_D14 | MUX_CONFIG_EMI, + MX23_PAD_EMI_D15__EMI_D15 | MUX_CONFIG_EMI, + MX23_PAD_EMI_DQM0__EMI_DQM0 | MUX_CONFIG_EMI, + MX23_PAD_EMI_DQM1__EMI_DQM1 | MUX_CONFIG_EMI, + MX23_PAD_EMI_DQS0__EMI_DQS0 | MUX_CONFIG_EMI
Re: [U-Boot] [PATCH 10/11] ARM: mxs: Enable 4x6 font for X-Fi3
On 30/07/2013 23:38, Marek Vasut wrote: This device has a very small screen and thus can benefit from using smaller font. Enable it. Signed-off-by: Marek Vasut ma...@denx.de Cc: Fabio Estevam fabio.este...@freescale.com Cc: Otavio Salvador ota...@ossystems.com.br Cc: Stefano Babic sba...@denx.de --- include/configs/xfi3.h |1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/xfi3.h b/include/configs/xfi3.h index 10facd9..18467f6 100644 --- a/include/configs/xfi3.h +++ b/include/configs/xfi3.h @@ -58,6 +58,7 @@ /* LCD */ #ifdef CONFIG_VIDEO +#define CONFIG_VIDEO_FONT_4X6 #define CONFIG_VIDEO_MXS_MODE_SYSTEM #define CONFIG_SYS_BLACK_IN_WRITE #define LCD_BPP LCD_COLOR16 This patch should be squashed with 5/11 because you add a new file. 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] [PATCH 03/11] video: Add System-Mode configuration hook into mxsfb
Hi Marek, On 31/07/2013 15:22, Marek Vasut wrote: Question: is there anything wrong to move it into mxsfb_system_setup() ? I would prefer to avoid adding a new not documented CONFIG_ only to set a bit... Yes, the order in which the LCD is configured must be preserved as-is. Ok, understood - sometimes is not possible to suimplify. 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] [PATCH] wandboard: add pxe support, set default boot command like highbank
Hi Dennis, On 01/08/2013 01:27, Robert Nelson wrote: kernel_boot=echo Trying kernel...; ${fs}load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}vmlinuz ${fs}load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}initrd.img bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr} script_boot=echo Trying script images...; for script in ${boot_scripts}; do ${fs}load ${devtype} ${devnum} ${script_addr} ${prefix}${script} echo Executing ${prefix}${script}... source ${script_addr}; done; env_boot=echo Trying environment file...; ${fs}load ${devtype} ${devnum} ${script_addr} ${prefix}uEnv.txt Executing ${prefix}uEnv.txt... env import -t ${script_addr} ${filesize}}; Guys, this is just silly.. Your using both uEnv.txt/boot.scr scripts by default, which you could use to hide all this extra stuff in a text file on the boot drive, that way mainline u-boot doesn't have to be patched for every little change. ;) I know it's bikeshedding, but most boards can be converted to just: #define CONFIG_BOOTCOMMAND \ mmc dev ${mmcdev}; \ if mmc rescan; then \ echo SD/MMC found on device ${mmcdev}; \ if run loadbootenv; then \ run importbootenv; \ fi; \ if test -n $uenvcmd; then \ echo Running uenvcmd ...; \ run uenvcmd; \ fi; \ if run loadsomefailsafedefault; then \ run mmcboot; \ fi; \ fi; #endif Right - the meaning of CONFIG_EXTRA_ENV_SETTINGS is to have a minimal default environment, allowing the user to extend it to a full blown adding whatever he wants. However, in the last times I see that the meaning is moving to *the environment*. There is something wrong, also because, as Robert says, each small change require to patch u-boot. But then, why do you need the environment at all ? And the setup is then suitable for a strict range of applications, but not all. 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] [PATCH] wandboard: add pxe support, set default boot command like highbank
Hi Rob, Dennis, On 01/08/2013 19:19, Rob Herring wrote: You both are missing the point. This patch doesn't address the problem, but does highlight it. I am aware of it - I have already pointed out that we get many patches that have increased the default environment to something hard to maintain. This patch makes it more obvious. The distros want to get out of having to know the u-boot environment details for every single board and need some level of standardization across platforms. The distros should only have to specify boot the kernel at path/name X on device Y. They should not need to know what address to load the kernel to, but only that $kernel_addr_r is already setup. Variables are the first step. The second step is standardizing the boot commands. I understand the point - but is the way to hard code together with u-boot the right way ? Do we have some other possibilities to do this ? Maybe can be mkenvimage a solution (tools/mkenvimage) ? It creates an environment image from a simple ASCII text. The resulting image could be concatenated together with u-boot and in CONFIG_EXTRA_ENV_SETTINGS we could have for all boards a way to load it. Only a first idea, but as we recognize the issue, any idea to solve it ? 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] [PATCH] wandboard: add pxe support, set default boot command like highbank
Hi Dennis, On 01/08/2013 19:06, Dennis Gilmore wrote: ultimately I want to have a standard way to boot any system that just works and does not need the installer to know or care what the target system is. using boot.scr and uEnv.txt does not work for my goals. Let's go away from the concrete scripts u-boot.scr and env.txt. What I find sick is that even the smallest change in a variable requires a new u-boot image, while the environment itself is thought from the beginning to be independent from the code. I know it's bikeshedding, but most boards can be converted to just: #define CONFIG_BOOTCOMMAND \ mmc dev ${mmcdev}; \ if mmc rescan; then \ echo SD/MMC found on device ${mmcdev}; \ if run loadbootenv; then \ run importbootenv; \ fi; \ if test -n $uenvcmd; then \ echo Running uenvcmd ...; \ run uenvcmd; \ fi; \ if run loadsomefailsafedefault; then \ run mmcboot; \ fi; \ fi; #endif ultimately for Fedora we do not want to use uEnv.txt or boot.scr at all we want to use a extlinux.conf file and sysboot provided by cmd_pxe the rest is to provide flexibility and options to users to choose different ways to boot. the above is not at all suitable. This is already an example where the dafult environment is perfectly suitable for someone but not for everybody. And of course, there are a wide range of storage device where scripts are stored: not all boards have MMC. I am thinking if we can have in the CONFIG_EXTRA_ENV_SETTINGS a general command to load the whole environment, letting the whole logic with scripts outside of the code. 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] [PATCH v4 2/4] apf27: add support for the armadeus APF27 board
Hi Philippe, On 01/08/2013 19:12, trem wrote: Ok, this must be done in assembly - normally is part of lowelevel_init, while board_init_f() is already written in C. Really I was waiting that general code is called, that is spl_nand_load_image() and then the driver function. You are pushing a parallel way that is, at the end, still the old way to boot (nand_spl). This board boot from nand, so the SPL should be lower than 2KB. The SPL start from NFC (nand) buffer, and It has to : - initialize the ram - copy itself to another location (ram) - jump to this another location - copy u-boot from nand to ram - jump to ram We have tried to use SPL framework (with nand driver), but the result is a SPL bigger than 2 KB, so we can't use it. To have a SPL smaller than 2 KB, we have written everything in assembler. Ok, sorry - I am now used with current i.MX where there is not this constraint. I reread the boot part of i.MX27 manual and I got the point. I understand there is no other way for the i.MX27. I would like you add your useful explanation why you add an assembly NAND driver (so what you have written here in the lines above) to the commit message, so that is clear why you were forced to use this way instead of the SPL framework. Are you agree with this solution for the SPL ? I understand there is no other solution ;-) Best regards, Stefano -- = 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] bootstopkey reason behind it
On 02/08/2013 07:58, paavaanan_...@dell.com wrote: Hi, To stop autoboot we have 2 ifdef (CONFIG_AUTOBOOT_STOP_ [STR2 || STR1] ). Which is very easy and straightforward to implement. Halting a boot with single Keystroke is having its own advantages to the user. But, why multiple key support is ignored say like [ctrl + anykey ] combination. Especially, BIOS vendors prefer at least simultaneous pressing of 2 or more keys to halt the boot. Any specific reasons to avoid this. Other than simplicity is there any specific reason to stick on this. I mean why simultaneous two key press support is avoided and implemented a secondary bootstopkey to halt the boot say like CONFIG_AUTOBOOT_STOP_STR2. But does not the keyboard send a single key code ? Maybe it is enough you put in CONFIG_AUTOBOOT_STOP_STR1 the keycode of your CTRL+key. 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] [PATCH v4 2/4] apf27: add support for the armadeus APF27 board
Hi Fabio, On 02/08/2013 14:49, Fabio Estevam wrote: On Fri, Aug 2, 2013 at 8:12 AM, Stefano Babic sba...@denx.de wrote: I would like you add your useful explanation why you add an assembly NAND driver (so what you have written here in the lines above) to the commit message, so that is clear why you were forced to use this way instead of the SPL framework. Are you agree with this solution for the SPL ? I understand there is no other solution ;-) mx31 also has the same 2kB limitation and we don't use the NAND driver in assembly there, right? You're absolutely right, thanks for pointing out ! And it uses the generic framework. Philippe, could you take a look at the mx31pdk implementation ? SPL is less thn 2KB (and you can set CONFIG_SPL_MAX_SIZE in your config file): 1756 0 01756 6dc ./spl/u-boot-spl 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] Mac address warning
Hi Eric, On 02/08/2013 01:28, Eric Nelson wrote: Hi all, While testing Troy's usbnet patches, I was reminded of this mysterious warning issued when the environment has no mac address stored, but the device provides one: printf(\nWarning: %s using MAC address from net device\n, dev-name); Why is this a warning? It's the out-of-the box default for new boards who haven't saved a mac address to the persistent environment. Well, I have found it very useful in case I set explicitely the ethaddr variable, so I know where the MAC address comes from. Do you find it disturbing ? Maybe we could replace warning with info. Best regards, Stefano -- = 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] Mac address warning
Hi Tom, On 02/08/2013 16:16, Tom Rini wrote: Well, I have found it very useful in case I set explicitely the ethaddr variable, so I know where the MAC address comes from. Do you find it disturbing ? Maybe we could replace warning with info. On am335x the message we use is: ethaddr not set. Validating first E-fuse MAC And then validate it, and setenv. ..but the code is common as it is located in net/eth.c. The warning does not depend on the SOC. Regards, Stefano -- = 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] [PATCH V3 00/20] Make mv_udc work for i.mx6
Hi Troy, On 02/08/2013 01:27, Troy Kisky wrote: Hi Marek, Stefano This series is based on u-boot-usb/master branch. After this series, nitrogen6x works with tftpboot to transfer files over usb. V2 was dropped to my bad posting of it and should be ignored. This V3 is a rebase and most patches had to be changed slightly. I also ran a ./MAKEALL -a arm and fixed the errors that the V1 series had. The most noticeable change is the addition of usb: gadget: mv_udc: fix hardware udc address for i.MX6 Let me know if you want to go back to a udc variable to store the address instead of using hcor. Stefano, would you like to take patches 1-5 ? I'll likely need a V3, but maybe the early ones will be approved. Fine with me - I merge the first 5 patches. Regards, Stefano -- = 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
[U-Boot] [PULL] : Please pull u-boot-imx
Hi Albert, please pull from u-boot-imx, thanks. The following changes since commit fdce7b633a1de24456226b18527cc7900c34282a: gpio: omap5-uevm: Configure the tca6424 gpio expander (2013-07-30 09:21:42 -0400) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to 326ea986ac150acdc7656d57fca647db80b50158: Merge git://git.denx.de/u-boot-arm (2013-07-31 11:30:38 +0200) Dirk Behme (1): mxc_gpio: Correct the GPIO handling in gpio_direction_output() Eric Nelson (1): mxc_ipuv3: fix memory alignment of framebuffer Fabio Estevam (1): mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6x Marek Vasut (1): ARM: mxs: Consolidate configuration options Otavio Salvador (1): wandboard: Use splash image at screen center by default Pardeep Kumar Singla (2): mx6: Factor out common HDMI setup code mx6qsabresd: Add splash screen support via HDMI Robert Winkler (2): imx: Add documentation for imx specific commands imx: nitrogen6x: mx6qsabrelite: Add support for DVI monitors Stefano Babic (1): Merge git://git.denx.de/u-boot-arm MAINTAINERS|2 +- README | 15 + arch/arm/cpu/armv7/mx6/clock.c |8 + arch/arm/cpu/armv7/mx6/soc.c | 43 + arch/arm/imx-common/cmd_hdmidet.c |3 +- arch/arm/include/asm/arch-mx6/clock.h |2 +- arch/arm/include/asm/arch-mx6/mxc_hdmi.h |8 + .../nitrogen6x/README.mx6qsabrelite} |0 board/boundary/nitrogen6x/nitrogen6x.c | 46 +- board/freescale/mx6qsabrelite/Makefile | 28 - board/freescale/mx6qsabrelite/mx6qsabrelite.c | 832 board/freescale/mx6sabresd/mx6sabresd.c| 64 +- board/wandboard/wandboard.c| 44 +- boards.cfg |2 +- drivers/gpio/mxc_gpio.c|4 +- drivers/video/mxc_ipuv3_fb.c |5 +- include/configs/apx4devkit.h | 120 +-- include/configs/m28evk.h | 192 + include/configs/mx23_olinuxino.h | 142 +--- include/configs/mx23evk.h | 115 +-- include/configs/mx28evk.h | 173 +--- include/configs/mx6qsabrelite.h| 284 --- include/configs/mx6sabre_common.h |3 +- include/configs/mx6sabresd.h | 19 + include/configs/mxs.h | 191 + include/configs/nitrogen6x.h | 81 +- include/configs/sc_sps_1.h | 139 +--- include/configs/wandboard.h|2 + 28 files changed, 601 insertions(+), 1966 deletions(-) rename board/{freescale/mx6qsabrelite/README = boundary/nitrogen6x/README.mx6qsabrelite} (100%) delete mode 100644 board/freescale/mx6qsabrelite/Makefile delete mode 100644 board/freescale/mx6qsabrelite/mx6qsabrelite.c delete mode 100644 include/configs/mx6qsabrelite.h create mode 100644 include/configs/mxs.h -- = 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