May 2015 - U-Boot

[U-Boot] [PATCH] include: introcude include/linux/io.h as a wrapper of asm/io.h
by Masahiro Yamada 15 May '15

15 May '15

In Linux coding style, <linux/io.h> should be included rather than <asm/io.h>. To follow this style in U-boot, add include/linux/io.h. Currently, it just includes <asm/io.h>. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- include/linux/io.h | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 include/linux/io.h diff --git a/include/linux/io.h b/include/linux/io.h new file mode 100644 index 0000000..1803edb --- /dev/null +++ b/include/linux/io.h @@ -0,0 +1,10 @@ +/* + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef _LINUX_IO_H +#define _LINUX_IO_H + +#include <asm/io.h> + +#endif /* _LINUX_IO_H */ -- 1.9.1

1 0

[U-Boot] [patch] socfpga: move configuration options to config file
by Pavel Machek 15 May '15

15 May '15

Setting configuration options in header file leads to incosistency between .config user sees, and .config he has. What is worse, a lot of compile warnings is presented for any such config option user sets in .config. Signed-off-by: Pavel Machek <pavel(a)denx.de> diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig index 0ebfbfc..762b937 100644 --- a/configs/socfpga_cyclone5_defconfig +++ b/configs/socfpga_cyclone5_defconfig @@ -6,3 +6,19 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk" CONFIG_DM=y CONFIG_DM_SPI=y CONFIG_DM_SPI_FLASH=y +CONFIG_CMD_ASKENV=y +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_DFU=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_CMD_GREPENV=y +CONFIG_CMD_MII=y +CONFIG_CMD_MMC=y +CONFIG_CMD_PING=y +CONFIG_CMD_SETEXPR=y +CONFIG_CMD_USB=y +CONFIG_CMD_USB_MASS_STORAGE=y diff --git a/include/configs/socfpga_cyclone5.h b/include/configs/socfpga_cyclone5.h index 2e3a8b6..171ddf4 100644 --- a/include/configs/socfpga_cyclone5.h +++ b/include/configs/socfpga_cyclone5.h @@ -18,24 +18,6 @@ #define CONFIG_FAT_WRITE #define CONFIG_HW_WATCHDOG -#define CONFIG_CMD_ASKENV -#define CONFIG_CMD_BOOTZ -#define CONFIG_CMD_CACHE -#define CONFIG_CMD_DFU -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_EXT4_WRITE -#define CONFIG_CMD_FAT -#define CONFIG_CMD_FPGA -#define CONFIG_CMD_FS_GENERIC -#define CONFIG_CMD_GREPENV -#define CONFIG_CMD_MII -#define CONFIG_CMD_MMC -#define CONFIG_CMD_NET -#define CONFIG_CMD_PING -#define CONFIG_CMD_SETEXPR -#define CONFIG_CMD_USB -#define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_REGEX /* Enable regular expression support */ -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

3 13

[U-Boot] mxs: Possible in bug in mxs_enable_4p2_dcdc_input
by Stefan Wahren 15 May '15

15 May '15

Hi, during the study of DC-DC handling in u-boot i noticed a possible bug. In case the DC-DC is already enabled the function returns without reenabling brown out detection. I don't think that's okay. A possible fix would be to do the check if DC-DC is already enabled before disabling brown out detection. This idea is attached as a draft. If it's acceptable i will send a proper patch. Best regards Stefan -------------------%<------------------------------------------------------------------------- diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c index c342217..42f3df2 100644 --- a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c +++ b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c @@ -332,6 +332,11 @@ static void mxs_enable_4p2_dcdc_input(int xfer) debug("SPL: %s 4P2 DC-DC Input\n", xfer ? "Enabling" : "Disabling"); + if (xfer && (readl(&power_regs->hw_power_5vctrl) & + POWER_5VCTRL_ENABLE_DCDC)) { + return; + } + prev_5v_brnout = readl(&power_regs->hw_power_5vctrl) & POWER_5VCTRL_PWDN_5VBRNOUT; prev_5v_droop = readl(&power_regs->hw_power_ctrl) & @@ -343,11 +348,6 @@ static void mxs_enable_4p2_dcdc_input(int xfer) clrbits_le32(&power_regs->hw_power_ctrl, POWER_CTRL_ENIRQ_VDD5V_DROOP); - if (xfer && (readl(&power_regs->hw_power_5vctrl) & - POWER_5VCTRL_ENABLE_DCDC)) { - return; - } - /* * Recording orignal values that will be modified temporarlily * to handle a chip bug. See chip errata for CQ ENGR00115837

3 4

[U-Boot] [PATCH] warp: README: Fix typo
by Fabio Estevam 15 May '15

15 May '15

Fix the spelling of 'successful'. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- board/warp/README | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/warp/README b/board/warp/README index 0e1f076..db3100e 100644 --- a/board/warp/README +++ b/board/warp/README @@ -43,8 +43,8 @@ Transfer u-boot.imx that will be flashed into the eMMC: $ sudo dfu-util -D u-boot.imx -a boot -Then on the U-boot prompt the following message should be seen after a succesful -upgrade: +Then on the U-boot prompt the following message should be seen after a +successful upgrade: #DOWNLOAD ... OK Ctrl+C to exit ... -- 1.9.1

2 1

[U-Boot] [PATCH 0/2 v3] arm: socfpga: Add Cadence QSPI support
by Stefan Roese 15 May '15

15 May '15

Hi! So this is my 3rd posting regarding the Candence SPI driver on SoCFPGA. The current status is, that SPI NOR flash works now without problems. And dcache is still enabled. The previous disabling was not needed. And only caused problems while booting into Linux. No cache flush or invalidate is needed. As no DMA engine is involved in this transfer. The "solution" I used to get SPI NOR flash support working now is implemented in patch 0004 (still marked as RFC). Here a software reset is issued on the Micron N25Q256A SPI NOR flash. This seems to solve all problems and reading / writing to the SPI NOR flash seems to work now just fine. Even rebooting via pushbutton-reset or reset command works. I think this version is now in much better state. Thats why I removed the WIP from the subject lines. Again, this is tested on the EBV SoCrates eval board. Thanks, Stefan Cc: Chin Liang See <clsee(a)altera.com> Cc: Dinh Nguyen <dinguyen(a)altera.com> Cc: Vince Bridgers <vbridger(a)altera.com> Cc: Marek Vasut <marex(a)denx.de> Cc: Pavel Machek <pavel(a)denx.de> Cc: Michael Trimarchi <michael(a)amarulasolutions.com> Cc: Jagannadha Sutradharudu Teki <jagannadh.teki(a)gmail.com>

5 45

[U-Boot] [PATCH] imx: dek_blob: Add explicit include for mapmem
by Ulises.Cardenas＠freescale.com 15 May '15

15 May '15

From: Ulises Cardenas <Ulises.Cardenas(a)freescale.com> Boards such as imx6q_sabresd might not have mapmem.h as part of their common library. This causes a build error if the DEK blob command is enabled. Fix: make explicit the include of mapmem.h Signed-off-by: Ulises Cardenas <Ulises.Cardenas(a)freescale.com> --- arch/arm/imx-common/cmd_dek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/imx-common/cmd_dek.c b/arch/arm/imx-common/cmd_dek.c index d93d5fb..ada8adf 100644 --- a/arch/arm/imx-common/cmd_dek.c +++ b/arch/arm/imx-common/cmd_dek.c @@ -14,6 +14,7 @@ #include <linux/compiler.h> #include <fsl_sec.h> #include <asm/arch/clock.h> +#include <mapmem.h> DECLARE_GLOBAL_DATA_PTR; -- 2.3.2

4 3

[U-Boot] [PATCH] u-boot: adjust config_cmd_default.h not to raise ton of warnings
by Pavel Machek 15 May '15

15 May '15

If there's duplicty between config system and config_cmd_default, a ton of warnings is raised, because one uses plain defines, and other defines it to 1. Adjust config_cmd_default.h not to provoke the warnings. Signed-off-by: Pavel Machek <pavel(a)denx.de> diff --git a/include/config_cmd_default.h b/include/config_cmd_default.h index e79a13b..2f60d63 100644 --- a/include/config_cmd_default.h +++ b/include/config_cmd_default.h @@ -16,29 +16,29 @@ * hardware, not fully tested, etc.). */ -#define CONFIG_CMD_BDI /* bdinfo */ -#define CONFIG_CMD_BOOTD /* bootd */ -#define CONFIG_CMD_CONSOLE /* coninfo */ -#define CONFIG_CMD_ECHO /* echo arguments */ -#define CONFIG_CMD_EDITENV /* editenv */ -#define CONFIG_CMD_ENV_EXISTS /* query whether env variables exists */ -#define CONFIG_CMD_FPGA /* FPGA configuration Support */ -#define CONFIG_CMD_IMI /* iminfo */ -#define CONFIG_CMD_ITEST /* Integer (and string) test */ +#define CONFIG_CMD_BDI 1 /* bdinfo */ +#define CONFIG_CMD_BOOTD 1 /* bootd */ +#define CONFIG_CMD_CONSOLE 1 /* coninfo */ +#define CONFIG_CMD_ECHO 1 /* echo arguments */ +#define CONFIG_CMD_EDITENV 1 /* editenv */ +#define CONFIG_CMD_ENV_EXISTS 1 /* query whether env variables exists */ +#define CONFIG_CMD_FPGA 1 /* FPGA configuration Support */ +#define CONFIG_CMD_IMI 1 /* iminfo */ +#define CONFIG_CMD_ITEST 1 /* Integer (and string) test */ #ifndef CONFIG_SYS_NO_FLASH -#define CONFIG_CMD_FLASH /* flinfo, erase, protect */ -#define CONFIG_CMD_IMLS /* List all found images */ +#define CONFIG_CMD_FLASH 1 /* flinfo, erase, protect */ +#define CONFIG_CMD_IMLS 1 /* List all found images */ #endif -#define CONFIG_CMD_LOADB /* loadb */ -#define CONFIG_CMD_LOADS /* loads */ -#define CONFIG_CMD_MEMORY /* md mm nm mw cp cmp crc base loop */ -#define CONFIG_CMD_MISC /* Misc functions like sleep etc*/ -#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ -#define CONFIG_CMD_NFS /* NFS support */ -#define CONFIG_CMD_RUN /* run command in env variable */ -#define CONFIG_CMD_SAVEENV /* saveenv */ -#define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */ -#define CONFIG_CMD_SOURCE /* "source" command support */ -#define CONFIG_CMD_XIMG /* Load part of Multi Image */ +#define CONFIG_CMD_LOADB 1 /* loadb */ +#define CONFIG_CMD_LOADS 1 /* loads */ +#define CONFIG_CMD_MEMORY 1 /* md mm nm mw cp cmp crc base loop */ +#define CONFIG_CMD_MISC 1 /* Misc functions like sleep etc*/ +#define CONFIG_CMD_NET 1 /* bootp, tftpboot, rarpboot */ +#define CONFIG_CMD_NFS 1 /* NFS support */ +#define CONFIG_CMD_RUN 1 /* run command in env variable */ +#define CONFIG_CMD_SAVEENV 1 /* saveenv */ +#define CONFIG_CMD_SETGETDCR 1 /* DCR support on 4xx */ +#define CONFIG_CMD_SOURCE 1 /* "source" command support */ +#define CONFIG_CMD_XIMG 1 /* Load part of Multi Image */ #endif /* _CONFIG_CMD_DEFAULT_H */ -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

3 6

[U-Boot] [PATCH v1 0/4] Add SHA256 encrypted stop string for autobooting
by Stefan Roese 15 May '15

15 May '15

The main task for this patch series is to add the new feature to abort autobooting via a SHA256 encrypted password. For this, some of the old autobooting related config macros have been moved to Kconfig. This was a bit more complicated, since Kconfig currently apparently doesn't support using escape characters '\' as used in printf format strings like "foo %s bar\n". And this is needed for some of these new Kconfig options. So I needed to make some changes to the Kconfig sources as well. If nobody complains about these Kconfig stuff, I'll try to push this into the Linux Kconfig source as well. There should be no functional change introduced. Please let me know if you find any problems. Thanks, Stefan Stefan Roese (4): Kconfig: Enable usage of escape char '\' in string values autoboot.c: Remove CONFIG_AUTOBOOT_STOP_STR2 and CONFIG_AUTOBOOT_DELAY_STR2 autoboot.c: Move config options to Kconfig autoboot.c: Add feature to stop autobooting via SHA256 encrypted password README | 2 - common/Kconfig | 78 ++++++++++++++++++++++++++ common/autoboot.c | 94 ++++++++++++++++++++++++++------ configs/CPCI4052_defconfig | 3 + configs/O2DNT2_RAMBOOT_defconfig | 3 + configs/O2DNT2_defconfig | 3 + configs/PLU405_defconfig | 3 + configs/PMC405DE_defconfig | 3 + configs/PMC440_defconfig | 3 + configs/UCP1020_SPIFLASH_defconfig | 3 + configs/UCP1020_defconfig | 3 + configs/a4m072_defconfig | 3 + configs/atngw100_defconfig | 4 ++ configs/atngw100mkii_defconfig | 4 ++ configs/atstk1002_defconfig | 4 ++ configs/atstk1003_defconfig | 4 ++ configs/atstk1004_defconfig | 4 ++ configs/atstk1006_defconfig | 4 ++ configs/calimain_defconfig | 2 + configs/cpuat91_defconfig | 4 ++ configs/cpuat91_ram_defconfig | 3 + configs/digsy_mtc_RAMBOOT_defconfig | 3 + configs/digsy_mtc_defconfig | 3 + configs/digsy_mtc_rev5_RAMBOOT_defconfig | 3 + configs/digsy_mtc_rev5_defconfig | 3 + configs/dlvision-10g_defconfig | 2 + configs/draco_defconfig | 3 + configs/dxr2_defconfig | 3 + configs/favr-32-ezkit_defconfig | 4 ++ configs/gdppc440etx_defconfig | 2 + configs/grasshopper_defconfig | 4 ++ configs/hammerhead_defconfig | 4 ++ configs/highbank_defconfig | 3 + configs/hrcon_defconfig | 2 + configs/ids8313_defconfig | 3 + configs/intip_defconfig | 2 + configs/io64_defconfig | 2 + configs/io_defconfig | 2 + configs/iocon_defconfig | 2 + configs/ip04_defconfig | 1 + configs/motionpro_defconfig | 3 + configs/nokia_rx51_defconfig | 1 + configs/omap3_mvblx_defconfig | 2 + configs/ph1_ld4_defconfig | 4 ++ configs/ph1_pro4_defconfig | 4 ++ configs/ph1_sld8_defconfig | 4 ++ configs/pm9263_defconfig | 1 + configs/pxm2_defconfig | 3 + configs/rut_defconfig | 3 + configs/spear600_defconfig | 3 + configs/stv0991_defconfig | 3 + configs/x600_defconfig | 3 + configs/zmx25_defconfig | 4 ++ doc/README.autoboot | 10 ---- include/configs/CPCI4052.h | 6 -- include/configs/PLU405.h | 9 --- include/configs/PMC405DE.h | 6 -- include/configs/PMC440.h | 6 -- include/configs/UCP1020.h | 11 ---- include/configs/a4m072.h | 4 -- include/configs/atngw100.h | 10 ---- include/configs/atngw100mkii.h | 10 ---- include/configs/atstk1002.h | 10 ---- include/configs/atstk1003.h | 10 ---- include/configs/atstk1004.h | 10 ---- include/configs/atstk1006.h | 10 ---- include/configs/bf537-stamp.h | 4 -- include/configs/calimain.h | 2 - include/configs/cpuat91.h | 6 -- include/configs/digsy_mtc.h | 4 -- include/configs/dlvision-10g.h | 2 - include/configs/favr-32-ezkit.h | 10 ---- include/configs/gdppc440etx.h | 2 - include/configs/grasshopper.h | 10 ---- include/configs/hammerhead.h | 10 ---- include/configs/highbank.h | 4 +- include/configs/hrcon.h | 2 - include/configs/ids8313.h | 4 -- include/configs/intip.h | 2 - include/configs/io.h | 2 - include/configs/io64.h | 2 - include/configs/iocon.h | 2 - include/configs/ip04.h | 1 - include/configs/motionpro.h | 6 -- include/configs/nokia_rx51.h | 1 - include/configs/o2dnt-common.h | 12 ---- include/configs/omap3_mvblx.h | 2 - include/configs/pm9263.h | 1 - include/configs/siemens-am33x-common.h | 6 -- include/configs/spear-common.h | 4 -- include/configs/stv0991.h | 4 -- include/configs/uniphier.h | 5 -- include/configs/x600.h | 4 -- include/configs/zmx25.h | 4 -- scripts/kconfig/confdata.c | 20 +++---- scripts/kconfig/symbol.c | 43 --------------- 96 files changed, 315 insertions(+), 301 deletions(-) -- 2.4.0

7 28

[U-Boot] [PATCH] bugfix i.mx6 pwm: prevent overflow of period_c * duty_ns
by Brecht Neyrinck 15 May '15

15 May '15

Prevent overflow by casting duty_ns to ull first. This bug came up when trying to create a 200 Hz PWM Signed-off-by: Brecht Neyrinck <bnrn(a)psicontrol.com> --- drivers/pwm/pwm-imx-util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pwm/pwm-imx-util.c b/drivers/pwm/pwm-imx-util.c index f1d0b35..79d86028 100644 --- a/drivers/pwm/pwm-imx-util.c +++ b/drivers/pwm/pwm-imx-util.c @@ -56,7 +56,7 @@ int pwm_imx_get_parms(int period_ns, int duty_ns, unsigned long *period_c, *prescale = *period_c / 0x10000 + 1; *period_c /= *prescale; - c = (unsigned long long)(*period_c * duty_ns); + c = *period_c * (unsigned long long)duty_ns; do_div(c, period_ns); *duty_c = c; -- 1.8.2.3 **** DISCLAIMER **** The contents of this e-mail are intended for the named addressee only. It contains information which may be confidential and which may also be privileged. Unless you are the named addressee (or authorised to receive for the addressee) you may not copy or use it, or disclose it to anyone else. If you received it in error please notify us immediately and then destroy it. Further, we make every effort to keep our network free from viruses. However, you do need to verify that this email and any attachments are free of viruses as we can take no responsibility for any computer virus which might be transferred by way of this e-mail.

3 2

[U-Boot] [PATCH v2 0/4] arm: mvebu: Allow DB-88F6820-GP to boot Linux
by Kevin Smith 15 May '15

15 May '15

Changes needed to allow the DB-88F6820-GP development board to successfully boot a Linux kernel. Changes in v2: - Correct address written to CBAR to be the SCU address instead of the internal registers address Kevin Smith (3): arm: mvebu: Update CBAR with SOC regs base mv-common.h: Include support for device trees db-88f6820-gp.h: Load data blobs into lower memory Stefan Roese (1): arm: mvebu: Disable L2 cache before enabling d-cache arch/arm/mach-mvebu/cpu.c | 15 +++++++++++++++ include/configs/db-88f6820-gp.h | 5 +++++ include/configs/mv-common.h | 2 ++ 3 files changed, 22 insertions(+) -- 2.3.2

2 7