March 2015 - U-Boot

[U-Boot] [PATCH v2] common/board_f.c: Enable IMX watchdog in init_func_watchdog_init()
by Stefan Roese 13 Mar '15

13 Mar '15

Without this patch, the IMX watchdog will not be initialized. And therefor not active. This patch fixes this by calling hw_watchdog_init() also when CONFIG_IMX_WATCHDOG is defined. Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Simon Glass <sjg(a)chromium.org> Cc: Fabio Estevam <fabio.estevam(a)freescale.com> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Heiko Schocher <hs(a)denx.de> --- v2: - Move closing parenthesis to include all "||" parts common/board_f.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/board_f.c b/common/board_f.c index 4d8b8a6..89ce795 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -111,7 +111,8 @@ static int init_func_watchdog_init(void) { # if defined(CONFIG_HW_WATCHDOG) && (defined(CONFIG_BLACKFIN) || \ defined(CONFIG_M68K) || defined(CONFIG_MICROBLAZE) || \ - defined(CONFIG_SH) || defined(CONFIG_AT91SAM9_WATCHDOG)) + defined(CONFIG_SH) || defined(CONFIG_AT91SAM9_WATCHDOG) || \ + defined(CONFIG_IMX_WATCHDOG)) hw_watchdog_init(); # endif puts(" Watchdog enabled\n"); -- 2.3.2

3 2

[U-Boot] [PATCH] imx:mx6 remove duplicated includes
by Peng Fan 13 Mar '15

13 Mar '15

There is no need to include asm/bootm.h twice, so remove one. Signed-off-by: Peng Fan <Peng.Fan(a)freescale.com> --- arch/arm/cpu/armv7/mx6/soc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index ef02972..b354f70 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -21,7 +21,6 @@ #include <stdbool.h> #include <asm/arch/mxc_hdmi.h> #include <asm/arch/crm_regs.h> -#include <asm/bootm.h> #include <dm.h> #include <imx_thermal.h> -- 1.8.4

2 1

[U-Boot] [PATCH] mx6sabre_common.h: remove deprecated mmc open/close
by Maxin B. John 13 Mar '15

13 Mar '15

Replace "mmc open/close" with "mmc dev" in mx6sabre_common.h as those commands were removed with this commit: 614b2bf1c9bf80dbad24f5e5ce1d115bf24a831d cmd_mmc.c: Drop open/close mmc sub-commands Signed-off-by: Maxin B. John <maxin.john(a)enea.com> --- include/configs/mx6sabre_common.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 4aa8101..ea39a1c 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -109,12 +109,10 @@ "setenv get_cmd tftp; " \ "fi; " \ "if ${get_cmd} ${update_sd_firmware_filename}; then " \ - "if mmc dev ${emmcdev} && " \ - "mmc open ${emmcdev} 1; then " \ + "if mmc dev ${emmcdev} 1; then " \ "setexpr fw_sz ${filesize} / 0x200; " \ "setexpr fw_sz ${fw_sz} + 1; " \ "mmc write ${loadaddr} 0x2 ${fw_sz}; " \ - "mmc close ${emmcdev} 1; " \ "fi; " \ "fi\0" #else -- 1.9.1

3 2

[U-Boot] [PATCH v2] warp: Add a README file
by Fabio Estevam 13 Mar '15

13 Mar '15

Provide instructions on how to upgrade U-boot in the eMMC. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes since v1: - Use Boundary Device's tree for imx_usb_loader - Pass u-boot.imx as an argument of imx_usb board/warp/README | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 board/warp/README diff --git a/board/warp/README b/board/warp/README new file mode 100644 index 0000000..d315140 --- /dev/null +++ b/board/warp/README @@ -0,0 +1,56 @@ +How to Update U-boot on Warp board +---------------------------------- + +Required software on the host PC: + +- imx_usb_loader: https://github.com/boundarydevices/imx_usb_loader + +- dfu-util: http://dfu-util.sourceforge.net/releases/ + +Build U-boot for Warp: + +$ make mrproper +$ make warp_config +$ make + +This will generate the U-boot binary called u-boot.imx. + +Put warp board in USB download mode + +Connect a USB to serial adapter between the host PC and warp + +Connect a USB cable between the OTG warp port and the host PC + +Open a terminal program such as minicom + +Copy u-boot.imx to the imx_usb_loader folder. + +Load u-boot.imx via USB: + +$ sudo ./imx_usb u-boot.imx + +Then U-boot should start and its messages will appear in the console program. + +Use the default environment variables: + +=> env default -f -a +=> save + +Run the DFU command: +=> dfu 0 mmc 0 + +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: + +#DOWNLOAD ... OK +Ctrl+C to exit ... + +Remove power from the warp board. + +Put warp board into normal boot mode + +Power up the board and the new updated U-boot should boot from eMMC -- 1.9.1

4 7

[U-Boot] [PATCH] warp: Add Device Firmware Upgrade support
by Fabio Estevam 13 Mar '15

13 Mar '15

Device Firmware Upgrade (DFU) is a very convenient mechanism to upgrade U-boot on the eMMC. Add support for it. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- include/configs/warp.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/configs/warp.h b/include/configs/warp.h index bcdd112..babcda5 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -28,7 +28,7 @@ #define CONFIG_REVISION_TAG /* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M) +#define CONFIG_SYS_MALLOC_LEN (35 * SZ_1M) /* Increase due to DFU */ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT @@ -150,6 +150,12 @@ #define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5 #define CONFIG_G_DNL_MANUFACTURER "FSL" +#define CONFIG_CMD_DFU +#define CONFIG_DFU_FUNCTION +#define CONFIG_DFU_MMC +#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M +#define DFU_DEFAULT_POLL_TIMEOUT 300 + #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ @@ -164,6 +170,7 @@ "mmcdev=0\0" \ "mmcpart=1\0" \ "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ + "dfu_alt_info=boot raw 0x2 0x400 mmcpart 1\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=${mmcroot}\0" \ "loadbootscript=" \ -- 1.9.1

3 2

[U-Boot] [PATCH 01/14] mx6sxsabresd: Use the default CONFIG_SYS_PBSIZE
by Fabio Estevam 13 Mar '15

13 Mar '15

Entering the maximum number of characters defined by CONFIG_SYS_CBSIZE into the console and hitting enter afterwards, causes a hang in the system because CONFIG_SYS_PBSIZE is not capable of storing the extra characters of the error message: "Unknown command '' - try 'help'". Use the default CONFIG_SYS_PBSIZE definition from config_fallbacks.h to solve this problem. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- include/configs/mx6sxsabresd.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index a290129..a29d62f 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -134,8 +134,6 @@ #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 1024 -/* Print Buffer Size */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_SYS_MAXARGS 256 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -- 1.9.1

6 23

[U-Boot] [PATCH v2] T2080QDS/PCIe: Soft Reset PCIe for down-training issue
by Zhao Qiang 13 Mar '15

13 Mar '15

T2080QDS PEX1/Slot#1 will down-train from x4 to x2, Soft reset PCIe can fix this issue, this is a workaround. Signed-off-by: Zhao Qiang <B45475(a)freescale.com> --- changes for v2 - modify the commit message drivers/pci/fsl_pci_init.c | 17 +++++++++++++++++ include/configs/T208xQDS.h | 1 + 2 files changed, 18 insertions(+) diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c index 231b075..327fa7d 100644 --- a/drivers/pci/fsl_pci_init.c +++ b/drivers/pci/fsl_pci_init.c @@ -481,6 +481,23 @@ void fsl_pci_init(struct pci_controller *hose, struct fsl_pci_info *pci_info) #endif } +#ifdef CONFIG_FSL_PCIE_T2080QDS_RESET + int i; + /* assert PCIe reset */ + setbits_be32(&pci->pdb_stat, 0x08000000); + (void) in_be32(&pci->pdb_stat); + udelay(1000); + /* clear PCIe reset */ + clrbits_be32(&pci->pdb_stat, 0x08000000); + asm("sync;isync"); + for (i = 0; i < 100 && ltssm < PCI_LTSSM_L0; i++) { + pci_hose_read_config_word(hose, dev, PCI_LTSSM, + &ltssm); + udelay(1000); + } + +#endif + #ifdef CONFIG_SYS_P4080_ERRATUM_PCIE_A003 if (enabled == 0) { serdes_corenet_t *srds_regs = (void *)CONFIG_SYS_FSL_CORENET_SERDES_ADDR; diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 395472b..851b4f9 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -558,6 +558,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_PCIE2 /* PCIE controler 2 */ #define CONFIG_PCIE3 /* PCIE controler 3 */ #define CONFIG_PCIE4 /* PCIE controler 4 */ +#define CONFIG_FSL_PCIE_T2080QDS_RESET #define CONFIG_FSL_PCI_INIT /* Use common FSL init code */ #define CONFIG_SYS_PCI_64BIT /* enable 64-bit PCI resources */ /* controller 1, direct to uli, tgtid 3, Base address 20000 */ -- 2.1.0.27.g96db324

3 3

[U-Boot] [PATCH] Odroid-XU3: Undefine TRACE CONFIGs in Odroid XU3
by Inha Song 13 Mar '15

13 Mar '15

This patch undefines Trace configs in Odroidx XU3. Trace configs are defined in exynos5-common.h Signed-off-by: Inha Song <ideal.song(a)samsung.com> --- include/configs/odroid_xu3.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index c395020..f427fe2 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -23,6 +23,11 @@ #define TZPC_BASE_OFFSET 0x10000 +/* TRACE configs are defined in exynos5-common */ +#undef CONFIG_TRACE +#undef CONFIG_CMD_TRACE +#undef CONFIG_TRACE_EARLY + #define CONFIG_CMD_MMC #define CONFIG_NR_DRAM_BANKS 8 -- 2.0.0.390.gcb682f8

3 3

[U-Boot] Clearing silent environment variable not taking affect at boot
by Chris Packham 12 Mar '15

12 Mar '15

Hi, I have a board using SPI flash for it's boot-loader and environment, I'm currently based of u-boot 2014.01. In my boards config file I have the following #define CONFIG_SILENT_CONSOLE #define CONFIG_SILENT_U_BOOT_ONLY #define CONFIG_SILENT_CONSOLE_UPDATE_ON_RELOC #define CONFIG_BOARD_EXTRA_ENV_SETTINGS "silent=1" By default I want u-boot to be silent, and that's what I get. But for debugging I do want to be able to run "setenv silent; saveenv; reset" to enable non-silent mode. Unfortunately this doesn't work for me. I _think_ the problem is that when console_init_f() is called the environment can't be read from SPI flash so I get the default silent=1 behaviour (and that's OK). After relocation the environment is read from SPI flash for some reason the on_silent() callback isn't called I'm not sure why but I'm guessing that hdelete_r() is bypassed (possibly because the whole default environment is dropped) thus the callback for silent being deleted is not invoked. Is my thinking along the right lines? Would there be any objection to doing something like this: diff --git a/common/console.c b/common/console.c index 29560c3..6719019 100644 --- a/common/console.c +++ b/common/console.c @@ -808,6 +808,11 @@ int console_init_r(void) struct list_head *pos; struct stdio_dev *dev; +#ifdef CONFIG_SILENT_CONSOLE + if (getenv("silent") == NULL) + gd->flags &= ~GD_FLG_SILENT; +#endif + #ifdef CONFIG_SPLASH_SCREEN /* * suppress all output if splash screen is enabled and we have Thanks, Chris

2 1

[U-Boot] Wrong clocks computed when PCI_HOST disabled on MPC8313
by ir. Tjeerd Pinkert 12 Mar '15

12 Mar '15

Hello, I'm doing some work on the MPC8313, while not using the PCI bus. In order to compute the correct clocks I must set HRCWH_PCI_HOST in my configuration in order to compute the correct clock values (U-Boot clocks command, and startup message). I can live with PCI_HOST, so I will leave this on, but it might be nice to fix it in case someone wants to use this processor as PCI Agent... Best regards, Tjeerd Pinkert

1 0