August 2015 - U-Boot

[U-Boot] [PATCH] arm: imx-common: init: rework wdog settings for imx6/imx7
by Adrian Alonso 29 Aug '15

29 Aug '15

Rework imx_set_wdog_powerdown to be reused by imx6 and imx7 wdog4 is only supported in imx7. Signed-off-by: Adrian Alonso <aalonso(a)freescale.com> --- arch/arm/cpu/armv7/mx6/soc.c | 14 -------------- arch/arm/imx-common/init.c | 22 ++++++++++++++++++++++ arch/arm/include/asm/arch-mx6/sys_proto.h | 1 + 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index 06f63da..282302b 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -250,20 +250,6 @@ static int set_ldo_voltage(enum ldo_reg ldo, u32 mv) return 0; } -static void imx_set_wdog_powerdown(bool enable) -{ - struct wdog_regs *wdog1 = (struct wdog_regs *)WDOG1_BASE_ADDR; - struct wdog_regs *wdog2 = (struct wdog_regs *)WDOG2_BASE_ADDR; - struct wdog_regs *wdog3 = (struct wdog_regs *)WDOG3_BASE_ADDR; - - if (is_cpu_type(MXC_CPU_MX6SX) || is_cpu_type(MXC_CPU_MX6UL)) - writew(enable, &wdog3->wmcr); - - /* Write to the PDE (Power Down Enable) bit */ - writew(enable, &wdog1->wmcr); - writew(enable, &wdog2->wmcr); -} - static void set_ahb_rate(u32 val) { struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; diff --git a/arch/arm/imx-common/init.c b/arch/arm/imx-common/init.c index c3ac98f..e50b129 100644 --- a/arch/arm/imx-common/init.c +++ b/arch/arm/imx-common/init.c @@ -66,6 +66,28 @@ void init_aips(void) } } +void imx_set_wdog_powerdown(bool enable) +{ + struct wdog_regs *wdog1 = (struct wdog_regs *)WDOG1_BASE_ADDR; + struct wdog_regs *wdog2 = (struct wdog_regs *)WDOG2_BASE_ADDR; + struct wdog_regs *wdog3 = (struct wdog_regs *)WDOG3_BASE_ADDR; +#ifdef CONFIG_MX7D + struct wdog_regs *wdog4 = (struct wdog_regs *)WDOG4_BASE_ADDR; +#endif + + /* Write to the PDE (Power Down Enable) bit */ + writew(enable, &wdog1->wmcr); + writew(enable, &wdog2->wmcr); + + if (is_cpu_type(MXC_CPU_MX6SX) || is_cpu_type(MXC_CPU_MX6UL) || + is_soc_type(MXC_SOC_MX7)) + writew(enable, &wdog3->wmcr); + +#ifdef CONFIG_MX7D + writew(enable, &wdog4->wmcr); +#endif +} + #define SRC_SCR_WARM_RESET_ENABLE 0 void init_src(void) diff --git a/arch/arm/include/asm/arch-mx6/sys_proto.h b/arch/arm/include/asm/arch-mx6/sys_proto.h index e13aacd..0b7db99 100644 --- a/arch/arm/include/asm/arch-mx6/sys_proto.h +++ b/arch/arm/include/asm/arch-mx6/sys_proto.h @@ -35,6 +35,7 @@ void set_chipselect_size(int const); void init_aips(void); void init_src(void); +void imx_set_wdog_powerdown(bool enable); #define is_mx6dqp() (is_cpu_type(MXC_CPU_MX6QP) || is_cpu_type(MXC_CPU_MX6DP)) -- 2.1.4

1 0

[U-Boot] [PATCH 1/5] arm: spear: Fix booting - relocate vector table to 0 (low-vector)
by Stefan Roese 28 Aug '15

28 Aug '15

Booting SPEAr600 eval board doesn't work with current mainline U-Boot. With this patch the low-vector bit is left to '0'. Resulting in the common relocation of the vectors to 0 (SDRAM) to work correctly. Tested on the SPEAr600 EVB. Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Viresh Kumar <viresh.kumar(a)linaro.org> Cc: Vipin Kumar <vk.vipin(a)gmail.com> --- board/spear/common/spr_lowlevel_init.S | 5 ----- 1 file changed, 5 deletions(-) diff --git a/board/spear/common/spr_lowlevel_init.S b/board/spear/common/spr_lowlevel_init.S index 23a0369..6494883 100644 --- a/board/spear/common/spr_lowlevel_init.S +++ b/board/spear/common/spr_lowlevel_init.S @@ -14,11 +14,6 @@ */ .globl lowlevel_init lowlevel_init: - /* By default, U-Boot switches CPU to low-vector */ - /* Revert this as we work in high vector even in U-Boot */ - mrc p15, 0, r0, c1, c0, 0 - orr r0, r0, #0x00002000 - mcr p15, 0, r0, c1, c0, 0 mov pc, lr /* void setfreq(unsigned int device, unsigned int frequency) */ -- 2.4.8

4 12

Re: [U-Boot] [PATCH v2 1/2] tools/atmelimage.c: Fix warning when debug is enabled
by Andreas Bießmann 28 Aug '15

28 Aug '15

+u-boot ML On 08/27/2015 07:54 PM, Tom Rini wrote: > Otherwise we get: > tools/atmelimage.c:134:3: warning: format ‘%d’ expects argument of type ‘int’, but argument 2 has type ‘size_t’ [-Wformat=] > debug("atmelimage: interrupt vector #%d is 0x%08X\n", pos+1, > ^ > > Cc: Andreas Bießmann <andreas.devel(a)googlemail.com> > Signed-off-by: Tom Rini <trini(a)konsulko.com> Reviewed-by: Andreas Bießmann <andreas.devel(a)googlemail.com> > > --- > Changes in v2: > - Use %zu not %ld as noted by Andreas Bießmann > --- > tools/atmelimage.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/atmelimage.c b/tools/atmelimage.c > index 5b72ac5..6b5603e 100644 > --- a/tools/atmelimage.c > +++ b/tools/atmelimage.c > @@ -131,7 +131,7 @@ static int atmel_verify_header(unsigned char *ptr, int image_size, > > /* check the seven interrupt vectors of binary */ > for (pos = 0; pos < 7; pos++) { > - debug("atmelimage: interrupt vector #%d is 0x%08X\n", pos+1, > + debug("atmelimage: interrupt vector #%zu is 0x%08X\n", pos+1, > ints[pos]); > /* > * all vectors except the 6'th one must contain valid >

2 1

[U-Boot] [PATCH v2 1/1] lib/display_options: Fix print_freq
by Suriyan Ramasami 28 Aug '15

28 Aug '15

Build without CONFIG_SPL_SERIAL_SUPPORT does not print the cpu freq. Booting an odroid U3 board, one sees this: CPU: Exynos4412 @ GHz instead of: CPU: Exynos4412 @ 1 GHz This change was done to get rid of compiler warnings related to the unused variable 'n' when CONFIG_SPL_SERIAL_SUPPORT is not defined in an SPL build. Example board: smartweb Signed-off-by: Suriyan Ramasami <suriyan.r(a)gmail.com> --- v2: * Get rid of variable 'n' altogether v1: * Remove #ifdef CONFIG_SPL_SERIAL_SUPPORT lib/display_options.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lib/display_options.c b/lib/display_options.c index df134cd..83ea4de 100644 --- a/lib/display_options.c +++ b/lib/display_options.c @@ -26,9 +26,6 @@ int display_options (void) void print_freq(uint64_t freq, const char *s) { unsigned long m = 0; -#if defined(CONFIG_SPL_SERIAL_SUPPORT) - unsigned long n; -#endif uint32_t f; static const char names[] = {'G', 'M', 'K'}; unsigned long d = 1e9; @@ -48,9 +45,6 @@ void print_freq(uint64_t freq, const char *s) } f = do_div(freq, d); -#if defined(CONFIG_SPL_SERIAL_SUPPORT) - n = freq; -#endif /* If there's a remainder, show the first few digits */ if (f) { @@ -63,9 +57,7 @@ void print_freq(uint64_t freq, const char *s) m = (m / 10) + (m % 100 >= 50); } -#if defined(CONFIG_SPL_SERIAL_SUPPORT) - printf("%lu", n); -#endif + printf("%lu", (unsigned long) freq); if (m) printf(".%ld", m); printf(" %cHz%s", c, s); -- 1.9.1

4 3

[U-Boot] [PATCH v2 0/4] ti: dwc3: Enable USB clocks on-demand
by Kishon Vijay Abraham I 28 Aug '15

28 Aug '15

Patch series adds APIs to enable/disable USB clocks and then uses these APIs to enable clocks when dwc3 is used and disable clocks when it is inactive. Changes from v1: *) Rebased to latest u-boot *) removed #ifdef's in header files This patch series is split from [1] to contain only enabling and disabling clocks. [1] -> http://permalink.gmane.org/gmane.comp.boot-loaders.u-boot/229188 Kishon Vijay Abraham I (4): ARM: OMAP5: Add functions to enable and disable USB clocks ARM: AM43xx: Add functions to enable and disable USB clocks board: ti: invoke clock API to enable and disable clocks ARM: OMAP5/AM43xx: remove enabling USB clocks from enable_basic_clocks() arch/arm/cpu/armv7/am33xx/clock_am43xx.c | 82 ++++++++++++++--- arch/arm/cpu/armv7/omap5/hw_data.c | 127 ++++++++++++++++++++------ arch/arm/include/asm/arch-am33xx/sys_proto.h | 3 + arch/arm/include/asm/omap_common.h | 4 + board/ti/am43xx/board.c | 2 + board/ti/beagle_x15/board.c | 4 + board/ti/dra7xx/evm.c | 2 + board/ti/omap5_uevm/evm.c | 2 + 8 files changed, 184 insertions(+), 42 deletions(-) -- 1.7.9.5

2 11

[U-Boot] [PATCH 0/3] ti: add usb peripheral support for omap5 and beagle x15
by Kishon Vijay Abraham I 28 Aug '15

28 Aug '15

Add dwc3 peripheral support for omap5 and beagle x15 and enable DFU for these platforms. This patch series is split from [1] to contain only adding peripheral support for omap5 and beagle x15. [1] -> http://permalink.gmane.org/gmane.comp.boot-loaders.u-boot/229188 Kishon Vijay Abraham I (3): board: ti: beagle_x15: added USB initializtion code board: ti: OMAP5: added USB initializtion code include: configs: Enable DWC3 and DFU in ti_omap5_common arch/arm/include/asm/arch-omap5/omap.h | 8 ++- board/ti/beagle_x15/board.c | 111 ++++++++++++++++++++++++++++++++ board/ti/omap5_uevm/evm.c | 75 +++++++++++++++++++++ include/configs/dra7xx_evm.h | 63 ------------------ include/configs/ti_omap5_common.h | 67 ++++++++++++++++++- 5 files changed, 257 insertions(+), 67 deletions(-) -- 1.7.9.5

2 10

[U-Boot] [PATCH 0/5] ti: usb (dwc3) peripheral mode fixes
by Kishon Vijay Abraham I 28 Aug '15

28 Aug '15

Patch series enables the 2nd PHY present in DRA7 SoC so that the 2nd instance of USB DWC3 can be used in peripheral mode. It also contains minor fixes and cleanups. This patch series is split from [1] to contain only fixes specific to TI platforms. [1] -> http://permalink.gmane.org/gmane.comp.boot-loaders.u-boot/229188 Kishon Vijay Abraham I (5): usb: dwc3: dwc3-omap: Use the clear register inorder to clear the interrupts ARM: DRA7: Enable clocks for USB OTGSS2 and USB PHY2 TI PHY: Add support to control 2nd USB PHY in DRA7xx/AM57xx board: ti: remove duplicate initialization of vbus_id_status include: configs: am43xx_evm: add 'usb stop' in usbboot env arch/arm/cpu/armv7/omap5/hw_data.c | 16 +++++++++++ arch/arm/cpu/armv7/omap5/prcm-regs.c | 2 ++ arch/arm/include/asm/arch-omap5/clock.h | 3 ++ arch/arm/include/asm/omap_common.h | 2 ++ board/ti/am43xx/board.c | 2 -- board/ti/dra7xx/evm.c | 2 -- drivers/usb/dwc3/dwc3-omap.c | 46 +++++++++++++++++++------------ drivers/usb/dwc3/ti_usb_phy.c | 15 +++++++--- include/configs/am43xx_evm.h | 2 ++ 9 files changed, 64 insertions(+), 26 deletions(-) -- 1.7.9.5

2 15

[U-Boot] [PATCH] picosam9g45: adopt CONFIG_SYS_PROMPT
by Andreas Bießmann 28 Aug '15

28 Aug '15

Commit 181bd9dc61d2da88b78f1c1138a685dae39354d6 introduced Kconfig selection for SYS_PROMPT. When applying the new picosam9g45 board this change slipped through, adopt it. Signed-off-by: Andreas Bießmann <andreas.devel(a)googlemail.com> --- configs/picosam9g45_defconfig | 1 + include/configs/picosam9g45.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/picosam9g45_defconfig b/configs/picosam9g45_defconfig index 4128193..ccca1ca 100644 --- a/configs/picosam9g45_defconfig +++ b/configs/picosam9g45_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y CONFIG_TARGET_PICOSAM9G45=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_MMC" +CONFIG_SYS_PROMPT="U-Boot> " # CONFIG_CMD_BDI is not set # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h index e3039c2..9e9b1d0 100644 --- a/include/configs/picosam9g45.h +++ b/include/configs/picosam9g45.h @@ -156,7 +156,6 @@ #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_PROMPT "U-Boot> " #define CONFIG_SYS_CBSIZE 256 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \ -- 2.1.4

2 1

[U-Boot] [PATCH] at91sam9260ek: add missing files to MAINTAINERS
by Andreas Bießmann 28 Aug '15

28 Aug '15

This fixes the following genboardscfg.py warnings: ---8<--- WARNING: no status for 'at91sam9g20ek_2mmc' WARNING: no maintainers for 'at91sam9g20ek_2mmc' --->8--- Signed-off-by: Andreas Bießmann <andreas.devel(a)googlemail.com> --- board/atmel/at91sam9260ek/MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/board/atmel/at91sam9260ek/MAINTAINERS b/board/atmel/at91sam9260ek/MAINTAINERS index 0c7c721..aa7898e 100644 --- a/board/atmel/at91sam9260ek/MAINTAINERS +++ b/board/atmel/at91sam9260ek/MAINTAINERS @@ -10,6 +10,7 @@ F: configs/at91sam9g20ek_2mmc_nandflash_defconfig F: configs/at91sam9g20ek_dataflash_cs0_defconfig F: configs/at91sam9g20ek_dataflash_cs1_defconfig F: configs/at91sam9g20ek_mmc_defconfig +F: configs/at91sam9g20ek_2mmc_defconfig F: configs/at91sam9g20ek_nandflash_defconfig F: configs/at91sam9xeek_dataflash_cs0_defconfig F: configs/at91sam9xeek_dataflash_cs1_defconfig -- 2.1.4

2 1

[U-Boot] [PATCH] at91sam9rlek: add missing files to MAINTAINERS
by Andreas Bießmann 28 Aug '15

28 Aug '15

This fixes following genboardscfg.py warning: ---8<--- WARNING: no status for 'at91sam9rlek_mmc' WARNING: no maintainers for 'at91sam9rlek_mmc' --->8--- Signed-off-by: Andreas Bießmann <andreas.devel(a)googlemail.com> --- board/atmel/at91sam9rlek/MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/board/atmel/at91sam9rlek/MAINTAINERS b/board/atmel/at91sam9rlek/MAINTAINERS index 7dd8ef7..ca8c0b1 100644 --- a/board/atmel/at91sam9rlek/MAINTAINERS +++ b/board/atmel/at91sam9rlek/MAINTAINERS @@ -5,3 +5,4 @@ F: board/atmel/at91sam9rlek/ F: include/configs/at91sam9rlek.h F: configs/at91sam9rlek_dataflash_defconfig F: configs/at91sam9rlek_nandflash_defconfig +F: configs/at91sam9rlek_mmc_defconfig -- 2.1.4

2 1