February 2013 - U-Boot

[U-Boot] [PATCH] Add U_BOOT_TIMESTAMP definition
by Matt Sealey 05 Apr '13

05 Apr '13

This gives us a string like "20120822150855" which encodes the build time. This allows automated version checking and flashing of U-Boot to be performed, for example, in boot.scr files (or scripting in general). Signed-off-by: Matt Sealey <matt(a)genesi-usa.com> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Marek Vasut <marex(a)denx.de> --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 1df4c1d..c042206 100644 --- a/Makefile +++ b/Makefile @@ -664,6 +664,7 @@ $(TIMESTAMP_FILE): @mkdir -p $(dir $(TIMESTAMP_FILE)) @LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > $@.tmp @LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@.tmp + @LC_ALL=C date +'#define U_BOOT_TIMESTAMP "%Y%m%d%H%M%S"' >> $@.tmp @cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@ easylogo env gdb: -- 1.7.9.5

3 5

[U-Boot] [PATCH 0/6 V4] EXYNOS5: Add audio support for Snow
by Rajeshwari Shinde 05 Apr '13

05 Apr '13

Driver for MAX98095 is added and support for same is incorporated in sound driver and Snow Board. This patchset is based on top of "EXYNOS5: SNOW: Add initial dts and config file" Changes in V2: - Corrected multi-line comment style Changes in V3: - Removed non DT support for MAX98095 - Config for both MAX98095 and WM8994 added in exynos5 config file. Changes in V4: - Separated the patches to create initial dts and config file for Snow - Modified XXTI clock source function as per Exynos naming convention Rajeshwari Shinde (6): EXYNOS5: Add function to enable XXTI clock source Sound: MAX98095: Add the driver for codec Sound: Support for MAX98095 codec in driver EXYNOS5: GPIO to enable MAX98095 EXYNOS5: FDT: Add compatible strings for MAX98095 config: Snow: Enable MAX98095 codec arch/arm/cpu/armv7/exynos/power.c | 17 + arch/arm/include/asm/arch-exynos/power.h | 11 + board/samsung/smdk5250/smdk5250.c | 15 + drivers/sound/Makefile | 1 + drivers/sound/max98095.c | 550 ++++++++++++++++++++++++++++++ drivers/sound/max98095.h | 311 +++++++++++++++++ drivers/sound/sound.c | 9 +- include/configs/exynos5250-dt.h | 1 + include/fdtdec.h | 1 + include/sound.h | 1 + lib/fdtdec.c | 1 + 11 files changed, 916 insertions(+), 2 deletions(-) create mode 100644 drivers/sound/max98095.c create mode 100644 drivers/sound/max98095.h -- 1.7.4.4

5 12

[U-Boot] [PATCH v2] dts/Makefile: Build the user specified dts
by Jagannadha Sutradharudu Teki 03 Apr '13

03 Apr '13

This patch provides a support to build the user specified dts. Signed-off-by: Jagannadha Sutradharudu Teki <jaganna(a)xilinx.com> --- Changes for v2: - Update the logic for not giving an error if DEVICE_TREE defined - Documented the build steps doc/README.fdt-control | 8 ++++++++ dts/Makefile | 2 ++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/doc/README.fdt-control b/doc/README.fdt-control index 85bda03..8352835 100644 --- a/doc/README.fdt-control +++ b/doc/README.fdt-control @@ -156,6 +156,14 @@ To use this, put something like this in your board header file: #define CONFIG_EXTRA_ENV_SETTINGS "fdtcontroladdr=10000\0" +Build: + +After board configuration is done, fdt supported u-boot can be build in two ways: +1) build the default dts which is defined from CONFIG_DEFAULT_DEVICE_TREE + $ make +2) build the user specified dts file + $ make DEVICE_TREE=<dts-file-name> + Limitations ----------- diff --git a/dts/Makefile b/dts/Makefile index 785104e..01364d7 100644 --- a/dts/Makefile +++ b/dts/Makefile @@ -27,9 +27,11 @@ include $(TOPDIR)/config.mk LIB = $(obj)libdts.o +ifeq ($(DEVICE_TREE),) $(if $(CONFIG_DEFAULT_DEVICE_TREE),,\ $(error Please define CONFIG_DEFAULT_DEVICE_TREE in your board header file)) DEVICE_TREE = $(subst ",,$(CONFIG_DEFAULT_DEVICE_TREE)) +endif $(if $(CONFIG_ARCH_DEVICE_TREE),,\ $(error Your architecture does not have device tree support enabled. \ -- 1.7.4

3 2

[U-Boot] [PATCH 1/3] arm:goni: Adjustment of configuration for goni target
by a.wlodarczyk＠samsung.com 02 Apr '13

02 Apr '13

From: Arkadiusz Wlodarczyk <a.wlodarczyk(a)samsung.com> Signed-off-by: Arkadiusz Wlodarczyk <a.wlodarczyk(a)samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> Tested-by: Arkadiusz Wlodarczyk <a.wlodarczyk(a)samsung.com> Cc: Minkyu Kang <mk7.kang(a)samsung.com> --- Changes This change encompasses set of adjustments in the configuration of the u-boot in the include/configs/s5p_goni.h, particularly change of rootfs type, change in kernel booting method and added DFU support. All those changes are connected with adjusting of existing goni configuration to latest changes in kernel. --- board/samsung/goni/goni.c | 7 +++++++ include/configs/s5p_goni.h | 37 ++++++++++++++++++++++++++++++++----- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c index ff76963..3c53106 100644 --- a/board/samsung/goni/goni.c +++ b/board/samsung/goni/goni.c @@ -155,4 +155,11 @@ struct s3c_plat_otg_data s5pc110_otg_data = { .regs_otg = S5PC110_OTG_BASE, .usb_phy_ctrl = S5PC110_USB_PHY_CONTROL, }; + +void board_usb_init(void) +{ + debug("USB_udc_probe\n"); + s3c_udc_probe(&s5pc110_otg_data); +} + #endif diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 56e8347..8a824c7 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -86,6 +86,17 @@ #define CONFIG_CMD_ONENAND #define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_MMC +#define CONFIG_CMD_DFU + +/* USB Composite download gadget - g_dnl */ +#define CONFIG_USBDOWNLOAD_GADGET +#define CONFIG_DFU_FUNCTION +#define CONFIG_DFU_MMC + +/* USB Samsung's IDs */ +#define CONFIG_G_DNL_VENDOR_NUM 0x04E8 +#define CONFIG_G_DNL_PRODUCT_NUM 0x6601 +#define CONFIG_G_DNL_MANUFACTURER "Samsung" #define CONFIG_BOOTDELAY 1 #define CONFIG_ZERO_BOOTDELAY_CHECK @@ -105,9 +116,13 @@ ",60m(qboot)"\ ",-(UBI)\0" +#define CONFIG_DFU_ALT \ + "u-boot mmc 80 400;" \ + "uImage fat 0 2\0" \ + #define NORMAL_MTDPARTS_DEFAULT MTDPARTS_DEFAULT -#define CONFIG_BOOTCOMMAND "run ubifsboot" +#define CONFIG_BOOTCOMMAND "run mmcboot" #define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0" @@ -137,7 +152,7 @@ "onenand erase 0x01560000 0x1eaa0000;" \ "onenand write 0x32000000 0x1260000 0x8C0000\0" \ "bootk=" \ - "onenand read 0x30007FC0 0xc00000 0x600000;" \ + "run loaduimage;" \ "bootm 0x30007FC0\0" \ "flashboot=" \ "set bootargs root=/dev/mtdblock${bootblock} " \ @@ -156,21 +171,28 @@ "set bootargs " CONFIG_RAMDISK_BOOT \ " initrd=0x33000000,8M ramdisk=8192\0" \ "mmcboot=" \ - "set bootargs root=${mmcblk} rootfstype=${rootfstype}" \ + "set bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} " \ + "rootfstype=${rootfstype}" \ CONFIG_UBI_MTD " ${opts} ${lcdinfo} " \ CONFIG_COMMON_BOOT "; run bootk\0" \ "boottrace=setenv opts initcall_debug; run bootcmd\0" \ "bootchart=set opts init=/sbin/bootchartd; run bootcmd\0" \ "verify=n\0" \ - "rootfstype=cramfs\0" \ + "rootfstype=ext4\0" \ "console=" CONFIG_DEFAULT_CONSOLE \ "mtdparts=" MTDPARTS_DEFAULT \ "meminfo=mem=80M mem=256M@0x40000000 mem=128M@0x50000000\0" \ + "loaduimage=fatload mmc ${mmcdev}:${mmcbootpart} 0x30007FC0 uImage\0" \ + "mmcdev=0\0" \ + "mmcbootpart=2\0" \ + "mmcrootpart=5\0" \ "mmcblk=/dev/mmcblk1p1\0" \ "bootblock=9\0" \ "ubiblock=8\0" \ "ubi=enabled\0" \ - "opts=always_resume=1" + "opts=always_resume=1\0" \ + "dfu_alt_info=" CONFIG_DFU_ALT + /* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ @@ -211,6 +233,10 @@ #define CONFIG_DOS_PARTITION 1 +/* FAT */ +#define CONFIG_CMD_FAT +#define CONFIG_FAT_WRITE + #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000) #define CONFIG_SYS_CACHELINE_SIZE 64 @@ -233,5 +259,6 @@ #define CONFIG_USB_GADGET #define CONFIG_USB_GADGET_S3C_UDC_OTG #define CONFIG_USB_GADGET_DUALSPEED +#define CONFIG_USB_GADGET_VBUS_DRAW 2 #endif /* __CONFIG_H */ -- 1.7.1

3 5

[U-Boot] Patches for this merge window
by Simon Glass 01 Apr '13

01 Apr '13

[take 2, sorry] Hi Tom, I see quite a lot of non-x86 patches in my todo list - does that mean that I should pick them up if I am happy with them, or just assign them back to you once I've taken a look? I'm keen to get the sandbox fs and memory stuff in fairly early if possible, since I fear breakages and the longer people have to test the better. No one has screamed about map_sysmem() but I'm not sure if anyone noticed. So I could pull these in, build and send a pull if that suits? Perhaps one series at a time.... Also if Mike is having a break should I pull in the SPI ones assigned to me? There is also buildman, and I'm not sure what to do about that. It would be nice to have some feedback if people have tried it - I have had a few private emails only. I think it's a great help, but it still has some rough edges. Anyway, please let me know your expectations with the above. Re x86, I am going to start applying things this week once the board removable patch is sorted out. Generic board is also a big change, but since it is sort-of parallel to existing code and only turned on on a board-by-board basis the risk is lower - it just need some weeks of review time IMO. Regards, Simon

2 8

[U-Boot] [PATCH] video: Fix splash screen alignment
by Matthias Weisser 29 Mar '13

29 Mar '13

commit d484b52 "video: Skip bitmaps which do not fit into the screen in cfb_console" breaks splash screen alignment which is passed in as magic (BMP_ALIGN_CENTER) x/y coordinates. Moving the check after the alignment block fixes this. Signed-off-by: Matthias Weisser <weisserm(a)arcor.de> --- drivers/video/cfb_console.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index 26f673a..61e1058 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -1515,13 +1515,6 @@ int video_display_bitmap(ulong bmp_image, int x, int y) padded_line = (((width * bpp + 7) / 8) + 3) & ~0x3; - /* - * Just ignore elements which are completely beyond screen - * dimensions. - */ - if ((x >= VIDEO_VISIBLE_COLS) || (y >= VIDEO_VISIBLE_ROWS)) - return 0; - #ifdef CONFIG_SPLASH_SCREEN_ALIGN if (x == BMP_ALIGN_CENTER) x = max(0, (VIDEO_VISIBLE_COLS - width) / 2); @@ -1534,6 +1527,13 @@ int video_display_bitmap(ulong bmp_image, int x, int y) y = max(0, VIDEO_VISIBLE_ROWS - height + y + 1); #endif /* CONFIG_SPLASH_SCREEN_ALIGN */ + /* + * Just ignore elements which are completely beyond screen + * dimensions. + */ + if ((x >= VIDEO_VISIBLE_COLS) || (y >= VIDEO_VISIBLE_ROWS)) + return 0; + if ((x + width) > VIDEO_VISIBLE_COLS) width = VIDEO_VISIBLE_COLS - x; if ((y + height) > VIDEO_VISIBLE_ROWS) -- 1.7.9.5

3 2

[U-Boot] [PATCH] Fix bitmap offsets for non 8-bit LCDs
by Andre Renaud 29 Mar '13

29 Mar '13

Currently bitmap logos don't interpret the X coordinate correctly if the bpp is anything other than 8. Signed-off-by: Andre Renaud <andre(a)bluewatersys.com> --- common/lcd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/common/lcd.c b/common/lcd.c index 66d4f94..ee47712 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -589,15 +589,16 @@ void bitmap_plot(int x, int y) immap_t *immr = (immap_t *) CONFIG_SYS_IMMR; cpm8xx_t *cp = &(immr->im_cpm); #endif + unsigned bpix = NBITS(panel_info.vl_bpix); debug("Logo: width %d height %d colors %d cmap %d\n", BMP_LOGO_WIDTH, BMP_LOGO_HEIGHT, BMP_LOGO_COLORS, ARRAY_SIZE(bmp_logo_palette)); bmap = &bmp_logo_bitmap[0]; - fb = (uchar *)(lcd_base + y * lcd_line_length + x); + fb = (uchar *)(lcd_base + y * lcd_line_length + x * bpix / 8); - if (NBITS(panel_info.vl_bpix) < 12) { + if (bpix < 12) { /* Leave room for default color map * default case: generic system with no cmap (most likely 16bpp) * cmap was set to the source palette, so no change is done. @@ -648,7 +649,7 @@ void bitmap_plot(int x, int y) } else { /* true color mode */ u16 col16; - fb16 = (ushort *)(lcd_base + y * lcd_line_length + x); + fb16 = (ushort *)fb; for (i = 0; i < BMP_LOGO_HEIGHT; ++i) { for (j = 0; j < BMP_LOGO_WIDTH; j++) { col16 = bmp_logo_palette[(bmap[j]-16)]; -- 1.7.9.5

2 1

[U-Boot] [PATCH 00/10] common.lcd: remove globals and cleanup
by Jeroen Hofstee 29 Mar '13

29 Mar '13

As mentioned in http://lists.denx.de/pipermail/u-boot/2013-January/143459.html there does not seem to be a good reason why the frame buffer driver provide the variables for the lcd internal logic. So lets just remove it. If there is any good reason for a framebuffer driver to "call up" it should do so by a function call and not change the lcd its internal state (and there is actually none doing so at the moment). This patchset first removes unused drivers and places drivers useing common/lcd.c in drivers/video. Then removes the unneeded globals and thereafter finishes with some cleanups. This patch goes after http://patchwork.ozlabs.org/patch/209692/ "common/lcd.c: cleanup use of global variables" Jeroen Hofstee (10): lcd, amba: remove this frame buffer driver since it is not used lcd, tegra: remove unused cursor functions lcd, mpc8xx: move the mpc8xx frame buffer driver to drivers/video lcd, pxafb: move the pxafb to drivers/video common/lcd.c: cleanup use of global variables common/lcd.c: remove global lcd_base common/lcd: cosmetic: clean up a bit lcd, fb: cleanup, remove prototypes already in lcd.h and unused code api/api_display: use the getters for console size info common/lcd.c: move the macro's to the c file api/api_display.c | 4 +- arch/arm/cpu/pxa/Makefile | 1 - arch/arm/cpu/pxa/pxafb.c | 650 -------------------------------------- arch/powerpc/cpu/mpc8xx/Makefile | 1 - arch/powerpc/cpu/mpc8xx/lcd.c | 618 ------------------------------------ board/mcc200/lcd.c | 21 +- common/lcd.c | 117 ++++--- drivers/video/Makefile | 3 +- drivers/video/amba.c | 77 ----- drivers/video/atmel_hlcdfb.c | 8 - drivers/video/atmel_lcdfb.c | 8 - drivers/video/exynos_fb.c | 14 +- drivers/video/mpc8xx_lcd.c | 564 +++++++++++++++++++++++++++++++++ drivers/video/pxa_lcd.c | 609 +++++++++++++++++++++++++++++++++++ drivers/video/tegra.c | 64 +--- include/configs/R360MPI.h | 1 + include/configs/RBC823.h | 1 + include/configs/RPXlite_DW.h | 1 + include/configs/RRvision.h | 4 +- include/configs/TQM823L.h | 1 + include/configs/TQM823M.h | 1 + include/configs/lubbock.h | 1 + include/configs/lwmon.h | 1 + include/configs/palmld.h | 1 + include/configs/palmtc.h | 1 + include/configs/pxa255_idp.h | 1 + include/configs/svm_sc8xx.h | 1 + include/configs/v37.h | 1 + include/configs/zipitz2.h | 1 + include/lcd.h | 71 +---- 30 files changed, 1280 insertions(+), 1567 deletions(-) delete mode 100644 arch/arm/cpu/pxa/pxafb.c delete mode 100644 arch/powerpc/cpu/mpc8xx/lcd.c delete mode 100644 drivers/video/amba.c create mode 100644 drivers/video/mpc8xx_lcd.c create mode 100644 drivers/video/pxa_lcd.c -- 1.7.9.5

8 32

[U-Boot] global variables from comon/lcd.c
by Jeroen Hofstee 29 Mar '13

29 Mar '13

Hi, While looking at the common/lcd.c I fail to understand why it declares and uses global variables like lcd_color_fg, lcd_color_color_bg, lcd_base and relies on the drivers / boards to provide them, leading to code duplication. It also provides getters / setters for some of these variables. To me it seems more logical to have these variables in lcd.c itself. This construction has been around since at least 2004 though, so I tend to think I am missing something. Does someone know the reason why these variables are not part of lcd.c itself? Regards, Jeroen

4 9

[U-Boot] [PATCH 0/2] ANSI terminal Bootmenu
by Pali Rohár 29 Mar '13

29 Mar '13

This patch series adds ANSI terminal Bootmenu command. It use generic menu code for creating menu structures, but use own functions for drawing menu on ANSI terminal. First patch modify generic menu code for using other functions for printing and choosing menu entry, second patch is bootmenu command itself. Pali Rohár (2): menu: Added support to use user defined functions New command bootmenu: ANSI terminal Boot Menu support board/ait/cam_enc_4xx/cam_enc_4xx.c | 5 +- common/Makefile | 1 + common/cmd_bootmenu.c | 446 +++++++++++++++++++++++++++++++++++ common/cmd_pxe.c | 3 +- common/menu.c | 43 ++-- doc/README.bootmenu | 61 +++++ include/common.h | 20 ++ include/config_cmd_all.h | 1 + include/menu.h | 6 +- 9 files changed, 566 insertions(+), 20 deletions(-) create mode 100644 common/cmd_bootmenu.c create mode 100644 doc/README.bootmenu -- 1.7.9.5

5 36