October 2014 - U-Boot

[U-Boot] [PATCH 1/1] imx: iomux: fix incorrect reference of pad names in macros
by Edward Lin 17 Oct '14

17 Oct '14

MX6 reference pad names MX6Q_PAD_xx/MX6DL_PAD_xx when CONFIG_MX6QDL, while other cases reference MX6_PAD_xx only. Cc: Tim Harvey <tharvey(a)gateworks.com> Signed-off-by: Edward Lin <tungyilin1127(a)gmail.com> --- arch/arm/include/asm/imx-common/iomux-v3.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/arm/include/asm/imx-common/iomux-v3.h b/arch/arm/include/asm/imx-common/iomux-v3.h index 70ee86c..00c7eeb 100644 --- a/arch/arm/include/asm/imx-common/iomux-v3.h +++ b/arch/arm/include/asm/imx-common/iomux-v3.h @@ -192,16 +192,17 @@ if (is_cpu_type(MXC_CPU_MX6Q)) { \ } #define SETUP_IOMUX_PADS(x) \ imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x)/2) -#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6D) -#define IOMUX_PADS(x) MX6Q_##x +#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6D) \ + || defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) +#define IOMUX_PADS(x) MX6_##x #define SETUP_IOMUX_PAD(def) \ - imx_iomux_v3_setup_pad(MX6Q_##def); + imx_iomux_v3_setup_pad(MX6_##def); #define SETUP_IOMUX_PADS(x) \ imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x)) #else -#define IOMUX_PADS(x) MX6DL_##x +#define IOMUX_PADS(x) MX6_##x #define SETUP_IOMUX_PAD(def) \ - imx_iomux_v3_setup_pad(MX6DL_##def); + imx_iomux_v3_setup_pad(MX6_##def); #define SETUP_IOMUX_PADS(x) \ imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x)) #endif -- 1.9.1

1 0

[U-Boot] [PATCH] sunxi: Add CONFIG_MACH_TYPE defines to sun4i, sun5i and sun7i
by Hans de Goede 16 Oct '14

16 Oct '14

Many people are still using old linux-sunxi-3.4 kernels on sunxi devices, adding the proper MACH_TYPE defines for this allows people to switch to upstream u-boot, so that we can stop maintaining the linux-sunxi u-boot fork. These machine-ids are all properly registered at: http://www.arm.linux.org.uk/developer/machines/ Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- include/configs/sun4i.h | 1 + include/configs/sun5i.h | 1 + include/configs/sun7i.h | 1 + 3 files changed, 3 insertions(+) diff --git a/include/configs/sun4i.h b/include/configs/sun4i.h index 5611ecc..d0191a3 100644 --- a/include/configs/sun4i.h +++ b/include/configs/sun4i.h @@ -15,6 +15,7 @@ #define CONFIG_CLK_FULL_SPEED 1008000000 #define CONFIG_SYS_PROMPT "sun4i# " +#define CONFIG_MACH_TYPE 4104 #ifdef CONFIG_USB_EHCI #define CONFIG_USB_EHCI_SUNXI diff --git a/include/configs/sun5i.h b/include/configs/sun5i.h index 6066371..7b683e9 100644 --- a/include/configs/sun5i.h +++ b/include/configs/sun5i.h @@ -15,6 +15,7 @@ #define CONFIG_CLK_FULL_SPEED 1008000000 #define CONFIG_SYS_PROMPT "sun5i# " +#define CONFIG_MACH_TYPE 4138 #ifdef CONFIG_USB_EHCI #define CONFIG_USB_EHCI_SUNXI diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h index a902b84..966cbd8 100644 --- a/include/configs/sun7i.h +++ b/include/configs/sun7i.h @@ -16,6 +16,7 @@ #define CONFIG_CLK_FULL_SPEED 912000000 #define CONFIG_SYS_PROMPT "sun7i# " +#define CONFIG_MACH_TYPE 4283 #ifdef CONFIG_USB_EHCI #define CONFIG_USB_EHCI_SUNXI -- 2.1.0

4 5

[U-Boot] [PATCH 1/2] x86: Fix rom version build with CONFIG_X86_RESET_VECTOR
by Bin Meng 16 Oct '14

16 Oct '14

When building U-Boot with CONFIG_X86_RESET_VECTOR, the linking process misses the resetvec.o and start16.o so it cannot generate the rom version of U-Boot. The top level Makefile is updated to pull them into the final linking process. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 8657417..b23a3a1 100644 --- a/Makefile +++ b/Makefile @@ -598,6 +598,7 @@ c_flags := $(KBUILD_CFLAGS) $(cpp_flags) head-y := $(CPUDIR)/start.o head-$(CONFIG_4xx) += arch/powerpc/cpu/ppc4xx/resetvec.o head-$(CONFIG_MPC85xx) += arch/powerpc/cpu/mpc85xx/resetvec.o +head-$(CONFIG_X86_RESET_VECTOR) += arch/x86/cpu/resetvec.o arch/x86/cpu/start16.o HAVE_VENDOR_COMMON_LIB = $(if $(wildcard $(srctree)/board/$(VENDOR)/common/Makefile),y,n) -- 1.8.2.1

2 2

[U-Boot] Hi all, Can not start the latest version of uboot on Foundation platform on ARM v8 (vexpress_aemv8a_config)
by Duxiaoqiang 16 Oct '14

16 Oct '14

Hi all This week I downloaded the latest version of U-Boot and tested on ARM v8 platform, My boot environment was based on ARM trusted firmware: arm trusted firmware + Uboot + Linux. Few weeks ago I did the same job on old U-Boot version, and it worked well. I even tried FIT image on old version with verified boot, it also success. I checked my operation steps and configure many times, and I can't find any problem within it. For I still have the old version of U-boot, So I checked the same operation and configures on old version again, it's fine! So I think there may exist some problems with vexpress_aemv8a_config and vexpress_aemv8a_semi_config in the latest version of U-Boot, or my operation need to do some adjustment on new version. Can anyone give me some suggestions? Below is my configure and operations. 1) Build Uboot >For arm trusted firmware's default address for BL33(U-boot) 0x88000000, so macro CONFIG_SYS_TEXT_BASE which locate in file <vexpress_aemv8a.h> should be modified from 0x80000000 to 0x88000000 Compile Uboot as bellow: $cd uboot $make vexpress_aemv8a_config $ make CROSS_COMPILE= all 2) Make uImage $cd <linux_kernel_path>/arch/arm64/boot $/<uboot_path>/tools/mkimage -A arm64 -O linux -T kernel -C none -a 0x80080000 -e 0x80080000 -n 'linux-3.15' -d Image uImage Both load address and link address are 0x80080000. 3) Make firmware Package >Firmware package includes: bl1.bin/ bl2.bin/ bl31.bin/ bl33.bin(uboot.bin) >Set variable BL33 as <path>/uboot.bin $cd <firmware_path> $make CROSS_COMPILE=<path>/bin/aarch64-none-elf- PLAT=fvp BL33=<path_bl33>/uboot.bin all fip 4) Running system Copy all of the images to a directory and start FVP as $/<path_to_fvp>/Foundation_v8 \ --cores=4 \ --no-secure-memory \ --visualization \ --gicv3 \ --data=bl1.bin@0x0<mailto:--data=bl1.bin@0x0> \ --data=fip.bin@0x8000000<mailto:--data=fip.bin@0x8000000> \ --data=uImage@0x90000000 \ --data=ramdisk_file@0xa1000000 \ --data=fdt.dtb@0xa0000000<mailto:--data=fdt.dtb@0xa0000000> 0x90000000 is kernel's address, 0xa0000000 is device tree dtb's address, and 0xa1000000 is ramdisk's address, we also need to fill in ramdisk's size Once firmware successfully started, System will stop at uboot's shell environment. But there seems system halted before enter Uboot. Logs as below: Connected to localhost. Escape character is '^]'. NOTICE: Booting Trusted Firmware NOTICE: BL1: v1.0(release): NOTICE: BL1: Built : 16:00:48, Oct 16 2014 NOTICE: BL1: Booting BL2 NOTICE: BL2: v1.0(release): NOTICE: BL2: Built : 16:00:49, Oct 16 2014 NOTICE: BL1: Booting BL3-1 NOTICE: BL3-1: v1.0(release): NOTICE: BL3-1: Built : 16:00:51, Oct 16 2014 System stopped here, may not enter Uboot. Thanks

2 1

[U-Boot] [PATCH 2/2] x86: Fix GDT limit in start16.S
by Bin Meng 16 Oct '14

16 Oct '14

GDT limit should be one less than an integral multiple of eight. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- arch/x86/cpu/start16.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/cpu/start16.S b/arch/x86/cpu/start16.S index 8b9b327..6968fda 100644 --- a/arch/x86/cpu/start16.S +++ b/arch/x86/cpu/start16.S @@ -70,7 +70,7 @@ idt_ptr: * GDT is setup in a safe location in RAM */ gdt_ptr: - .word 0x20 /* limit (32 bytes = 4 GDT entries) */ + .word 0x1f /* limit (31 bytes = 4 GDT entries - 1) */ .long BOOT_SEG + gdt /* base */ /* Some CPUs are picky about GDT alignment... */ -- 1.8.2.1

2 1

[U-Boot] [PATCH] ARM: bootm: Allow booting in secure mode on hyp capable systems
by Hans de Goede 16 Oct '14

16 Oct '14

Older Linux kernels will not properly boot in hype mode, add support for a bootm_boot_mode environment variable, which when set to "sec" will cause u-boot to boot in secure mode even when build with non-sec (and hyp) support. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- arch/arm/lib/bootm.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 39fe7a1..037fc8d 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -235,6 +235,18 @@ static void boot_prep_linux(bootm_headers_t *images) } } +#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT) +static bool boot_nonsec(void) +{ + char *s = getenv("bootm_boot_mode"); + + if (s && !strcmp(s, "sec")) + return false; + + return true; +} +#endif + /* Subcommand: GO */ static void boot_jump_linux(bootm_headers_t *images, int flag) { @@ -283,12 +295,13 @@ static void boot_jump_linux(bootm_headers_t *images, int flag) if (!fake) { #if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT) - armv7_init_nonsec(); - secure_ram_addr(_do_nonsec_entry)(kernel_entry, - 0, machid, r2); -#else - kernel_entry(0, machid, r2); + if (boot_nonsec()) { + armv7_init_nonsec(); + secure_ram_addr(_do_nonsec_entry)(kernel_entry, + 0, machid, r2); + } #endif + kernel_entry(0, machid, r2); } #endif } -- 2.1.0

5 13

[U-Boot] U-Boot Sunxi breaks LCD output on Olimex Lime A10
by Hendrik 16 Oct '14

16 Oct '14

I have always been using the sunxi u-boot from 'https://github.com/linux-sunxi/u-boot-sunxi' and that works fine, but now I want to boot the kernel from USB. That is not possible in that u-boot branch. Therefore I switched to the latest U-Boot 'git://git.denx.de/u-boot.git' for the Olimex Allwinner A10 Lime as this one does have a working USB mass storage implementation. But when the kernel and root filesystem is booted and my application (using DirectFB) starts, the LCD screen is flickering between a correct image and an incorrect image as if sometimes random image data is displayed to the screen. Although it looks more like a clock or timing issue because the colors of the faulty screen resemble the colors of the correct screen. Also: when the cpu is inactive the screen is more or less ok but when doing a lot of work the screen starts to flicker. Then it is stable for a while and after some time it starts flickering again. I am using the exact same kernel, root filesystem, U-boot environment, SD-card and 'script.bin' (which defines the hardware layout, I am not using a device tree file). The only difference is the version (and origin) of U-boot. Can anybody shine some light on this? Maybe Hans de Goede? I have seen his name pop-up a lot of times with the Sunxi branch. Regards, Hendrik

3 6

[U-Boot] [PATCH] lcd: Fix build error with CONFIG_LCD_BMP_RLE8
by Simon Glass 16 Oct '14

16 Oct '14

Add a block to avoid a build error with the variable declaration. Enable the option on sandbox to prevent an error being introduced in future. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- common/lcd.c | 4 ++-- include/configs/sandbox.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/lcd.c b/common/lcd.c index 217ec9d..689d30e 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -1023,7 +1023,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) switch (bmp_bpix) { case 1: /* pass through */ - case 8: + case 8: { #ifdef CONFIG_LCD_BMP_RLE8 u32 compression = get_unaligned_le32(&bmp->header.compression); if (compression == BMP_BI_RLE8) { @@ -1056,7 +1056,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) fb -= byte_width + lcd_line_length; } break; - + } #if defined(CONFIG_BMP_16BPP) case 16: for (i = 0; i < height; ++i) { diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 6972643..022629f 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -172,6 +172,7 @@ #define CONFIG_CONSOLE_MUX #define CONFIG_SYS_CONSOLE_IS_IN_ENV #define LCD_BPP LCD_COLOR16 +#define CONFIG_LCD_BMP_RLE8 #define CONFIG_CROS_EC_KEYB #define CONFIG_KEYBOARD -- 2.1.0.rc2.206.gedb03e5

2 1

[U-Boot] [PATCH 1/2] video: ipo: fix debug and comment
by Jeroen Hofstee 16 Oct '14

16 Oct '14

- fix debug pixel clk display and add unit - fix some comments Cc: Stefano Babic <sbabic(a)denx.de> Signed-off-by: Jeroen Hofstee <jeroen(a)myspectrum.nl> --- drivers/video/ipu_disp.c | 2 +- drivers/video/mxc_ipuv3_fb.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/video/ipu_disp.c b/drivers/video/ipu_disp.c index 948e1fc..e97a204 100644 --- a/drivers/video/ipu_disp.c +++ b/drivers/video/ipu_disp.c @@ -887,7 +887,7 @@ int32_t ipu_init_sync_panel(int disp, uint32_t pixel_clk, v_total = height + v_sync_width + v_start_width + v_end_width; /* Init clocking */ - debug("pixel clk = %d\n", pixel_clk); + debug("pixel clk = %dHz\n", pixel_clk); if (sig.ext_clk) { if (!(g_di1_tvout && (disp == 1))) { /*not round div for tvout*/ diff --git a/drivers/video/mxc_ipuv3_fb.c b/drivers/video/mxc_ipuv3_fb.c index f75d770..b20c19c 100644 --- a/drivers/video/mxc_ipuv3_fb.c +++ b/drivers/video/mxc_ipuv3_fb.c @@ -258,8 +258,7 @@ static int mxcfb_set_par(struct fb_info *fbi) if (fbi->var.sync & FB_SYNC_CLK_IDLE_EN) sig_cfg.clkidle_en = 1; - debug("pixclock = %ul Hz\n", - (u32) (PICOS2KHZ(fbi->var.pixclock) * 1000UL)); + debug("pixclock = %lu Hz\n", PICOS2KHZ(fbi->var.pixclock) * 1000UL); if (ipu_init_sync_panel(mxc_fbi->ipu_di, (PICOS2KHZ(fbi->var.pixclock)) * 1000UL, @@ -486,7 +485,7 @@ static struct fb_info *mxcfb_init_fbinfo(void) /* * Probe routine for the framebuffer driver. It is called during the - * driver binding process. The following functions are performed in + * driver binding process. The following functions are performed in * this routine: Framebuffer initialization, Memory allocation and * mapping, Framebuffer registration, IPU initialization. * @@ -542,7 +541,7 @@ static int mxcfb_probe(u32 interface_pix_fmt, uint8_t disp, mxcfb_set_fix(fbi); - /* alocate fb first */ + /* allocate fb first */ if (mxcfb_map_video_memory(fbi) < 0) return -ENOMEM; -- 2.1.0

2 4

[U-Boot] [PATCH 1/2] buildman: Fix repeating board list with -l
by Simon Glass 16 Oct '14

16 Oct '14

Ensure that we don't print duplicate board names when -l is used. Signed-off-by: Simon Glass <sjg(a)chromium.org> Reported-by: Albert Aribaud <albert.u.boot(a)aribaud.net> --- tools/buildman/builder.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py index 8155c16..7002034 100644 --- a/tools/buildman/builder.py +++ b/tools/buildman/builder.py @@ -918,7 +918,8 @@ class Builder: if self._list_error_boards: names = [] for board in line_boards[line]: - names.append(board.target) + if not board.target in names: + names.append(board.target) names_str = '(%s) ' % ','.join(names) else: names_str = '' -- 2.1.0.rc2.206.gedb03e5

1 1