December 2014 - U-Boot

[U-Boot] [PATCH 1/2] mmc: sh_mmcif: Use DIV_ROUND_UP and fls instead of calculation loop
by Nobuhiro Iwamatsu 03 Dec '14

03 Dec '14

Use DIV_ROUND_UP and fls to simplify the code. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> --- drivers/mmc/sh_mmcif.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/sh_mmcif.c b/drivers/mmc/sh_mmcif.c index ed83a14..8f386e2 100644 --- a/drivers/mmc/sh_mmcif.c +++ b/drivers/mmc/sh_mmcif.c @@ -103,20 +103,18 @@ static int mmcif_wait_interrupt_flag(struct sh_mmcif_host *host) static void sh_mmcif_clock_control(struct sh_mmcif_host *host, unsigned int clk) { - int i; - sh_mmcif_bitclr(CLK_ENABLE, &host->regs->ce_clk_ctrl); sh_mmcif_bitclr(CLK_CLEAR, &host->regs->ce_clk_ctrl); if (!clk) return; - if (clk == CLKDEV_EMMC_DATA) { + + if (clk == CLKDEV_EMMC_DATA) sh_mmcif_bitset(CLK_PCLK, &host->regs->ce_clk_ctrl); - } else { - for (i = 1; (unsigned int)host->clk / (1 << i) >= clk; i++) - ; - sh_mmcif_bitset((i - 1) << 16, &host->regs->ce_clk_ctrl); - } + else + sh_mmcif_bitset((fls(DIV_ROUND_UP(host->clk, + clk) - 1) - 1) << 16, + &host->regs->ce_clk_ctrl); sh_mmcif_bitset(CLK_ENABLE, &host->regs->ce_clk_ctrl); } -- 2.1.3

1 1

[U-Boot] [PATCH 1/2] i2c: Fix deselection of muxes
by Mark Tomlinson 03 Dec '14

03 Dec '14

Due to an uninitialised variable, when muxes were deselected, any value could be written to the mux control register. On the PCA9548, this could result in multiple channels being selected, thus enabling multiple pull-up resistors, and much bus capacitance. The fix is simply to initialise the written value to zero. Signed-off-by: Mark Tomlinson <mark.tomlinson(a)alliedtelesis.co.nz> --- drivers/i2c/i2c_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/i2c_core.c b/drivers/i2c/i2c_core.c index d34b749..4539667 100644 --- a/drivers/i2c/i2c_core.c +++ b/drivers/i2c/i2c_core.c @@ -178,7 +178,7 @@ static int i2c_mux_disconnet_all(void) { struct i2c_bus_hose *i2c_bus_tmp = &i2c_bus[I2C_BUS]; int i; - uint8_t buf; + uint8_t buf = 0; if (I2C_ADAP->init_done == 0) return 0; -- 1.9.1

2 3

[U-Boot] [PATCH v3 0/8] Add SD/NAND boot support for LS1021AQDS/TWR board
by Alison Wang 03 Dec '14

03 Dec '14

This series contain SD boot support for LS1021AQDS/TWR board and NAND boot support for LS1021AQDS board.SPL framework is used. PBL initialize the internal RAM and copy SPL to it, then SPL initialize DDR using SPD and copy u-boot from SD card or NAND flash to DDR, finally SPL transfer control to u-boot. The patches are based on the previous 5 patches, [U-Boot,v2,5/5] arm: ls102xa: Select ge2_clk125 for eTSEC clock muxing [U-Boot,v2,4/5] arm: ls102xa: Add SystemID EEPROM support for LS1021ATWR board [U-Boot,v2,3/5] ls102xa: ifc: nor: fix the write issue when bytes unaligned [U-Boot,v2,2/5] arm: ls102xa: Remove bit reversing for SCFG registers [U-Boot,v2,1/5] arm: ls102xa: Add snoop disable for slave port 0, 1 and 2 Change log: v3: Change the Copyright year. Gave more explaination in the commit. Update MAINTAINERS files. Update PBI and RCW for SD boot. v2: Remove the definition of CONFIG_SPL_MAX_SIZE. Pad the variable u-boot size to 64 byte boundary in pblimage tool. Use pblimage_check_params() insteady of basing on the file name. Use generic u-boot-spl.lds. ---------------------------------------------------------------- Alison Wang (8): ls102xa: pblimage: Add pblimage tool support for LS102xA spl: Use u-boot.img instead of u-boot.bin arm: spl: Add I2C linker list in generic .lds common: spl: Add interactive DDR debugger support for SPL image ls102xa: qixis: Add CONFIG_QIXIS_I2C_ACCESS macro arm: ls102xa: Add SD boot support for LS1021AQDS board arm: ls102xa: Add SD boot support for LS1021ATWR board arm: ls102xa: Add NAND boot support for LS1021AQDS board Makefile | 11 +++++- arch/arm/cpu/armv7/ls102xa/Makefile | 1 + arch/arm/cpu/armv7/ls102xa/spl.c | 33 +++++++++++++++++ arch/arm/cpu/u-boot-spl.lds | 3 ++ arch/arm/include/asm/arch-ls102xa/config.h | 1 + arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h | 2 + arch/arm/include/asm/arch-ls102xa/spl.h | 20 ++++++++++ board/freescale/common/qixis.h | 7 ++++ board/freescale/ls1021aqds/MAINTAINERS | 2 + board/freescale/ls1021aqds/ddr.c | 5 ++- board/freescale/ls1021aqds/ls1021aqds.c | 47 +++++++++++++++++++++++ board/freescale/ls1021aqds/ls102xa_pbi.cfg | 12 ++++++ board/freescale/ls1021aqds/ls102xa_rcw_nand.cfg | 7 ++++ board/freescale/ls1021aqds/ls102xa_rcw_sd.cfg | 14 +++++++ board/freescale/ls1021atwr/MAINTAINERS | 1 + board/freescale/ls1021atwr/ls1021atwr.c | 30 +++++++++++++++ board/freescale/ls1021atwr/ls102xa_pbi.cfg | 12 ++++++ board/freescale/ls1021atwr/ls102xa_rcw_sd.cfg | 14 +++++++ common/Makefile | 20 +++++----- configs/ls1021aqds_nand_defconfig | 4 ++ configs/ls1021aqds_sdcard_defconfig | 4 ++ configs/ls1021atwr_sdcard_defconfig | 4 ++ drivers/mtd/nand/fsl_ifc_spl.c | 8 ++++ include/configs/ls1021aqds.h | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/configs/ls1021atwr.h | 51 +++++++++++++++++++++++++ tools/pblimage.c | 108 ++++++++++++++++++++++++++++++++++++----------------- 26 files changed, 508 insertions(+), 47 deletions(-) create mode 100644 arch/arm/cpu/armv7/ls102xa/spl.c create mode 100644 arch/arm/include/asm/arch-ls102xa/spl.h create mode 100644 board/freescale/ls1021aqds/ls102xa_pbi.cfg create mode 100644 board/freescale/ls1021aqds/ls102xa_rcw_nand.cfg create mode 100644 board/freescale/ls1021aqds/ls102xa_rcw_sd.cfg create mode 100644 board/freescale/ls1021atwr/ls102xa_pbi.cfg create mode 100644 board/freescale/ls1021atwr/ls102xa_rcw_sd.cfg create mode 100644 configs/ls1021aqds_nand_defconfig create mode 100644 configs/ls1021aqds_sdcard_defconfig create mode 100644 configs/ls1021atwr_sdcard_defconfig

4 14

[U-Boot] Bare x86 support is merged to u-boot-x86
by Simon Glass 03 Dec '14

03 Dec '14

Hi Bin (and others interested in U-Boot on x86), I've applied the remaining x86 patches to u-boot-x86. It runs on chromebook_link (Pixel) with support for most hardware relevant to a boot loader: SDRAM, SPI, PCI, USB (and USB Ethernet), SATA (internal 32GB SSD), SD card, LCD, UART, keyboard, EC. Bin this should be a good base for you to send patches for your Atom platform and I have no major work pending now so should not get in your way. Instructions on how to build and run are here: http://www.denx.de/wiki/U-Boot/X86 For this platform 4 binary blobs are needed. This is an unavoidable feature of the platform at present. The blobs cover flash descriptor, SDRAM init, video init and Management Engine. Instructions on how to get these are on the same page. Here is a list of some missing features: - README.x86 in the source (mostly the content from the Wiki page would be a good start) - MTRR support (for performance) - Audio - Chrome OS verified boot (only a rough rebase has been done, I'm not sure how to track mainline anyway) - SMI and ACPI support, to provide platform info and facilities to Linux Regards, Simon

5 9

[U-Boot] [PATCH] tools: env: fix build error
by Masahiro Yamada 03 Dec '14

03 Dec '14

Since CONFIG_SYS_ARCH, CONFIG_SYS_CPU, ... were moved to Kconfig, tools/env/fw_printenv fails to build if CONFIG_ENV_VARS_UBOOT_CONFIG is defined. (I do not think this is the right way to fix the problem, but for now I do not have enough time to take a close look.) Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> Reported-by: Denys Dmytriyenko <denys(a)ti.com> --- tools/env/fw_env.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 1173eea..698fe51 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -8,6 +8,9 @@ * SPDX-License-Identifier: GPL-2.0+ */ +/* FIXME: Do not include this */ +#include <linux/kconfig.h> + #include <errno.h> #include <env_flags.h> #include <fcntl.h> -- 1.9.1

1 0

[U-Boot] [PATCH] powerpc/mpc85xx: SECURE BOOT- Add secure boot target for P5040DS
by Gaurav Rana 02 Dec '14

02 Dec '14

From: Gaurav Kumar Rana <gaurav.rana(a)freescale.com> Secure boot target is added for P5040DS platform. Signed-off-by: Gaurav Kumar Rana <gaurav.rana(a)freescale.com> --- configs/P5040DS_SECURE_BOOT_defconfig | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 configs/P5040DS_SECURE_BOOT_defconfig diff --git a/configs/P5040DS_SECURE_BOOT_defconfig b/configs/P5040DS_SECURE_BOOT_defconfig new file mode 100644 index 0000000..8e21ca5 --- /dev/null +++ b/configs/P5040DS_SECURE_BOOT_defconfig @@ -0,0 +1,4 @@ +CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT" +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P5040DS=y -- 1.8.1.4

2 1

[U-Boot] [PATCH 1/2] blackfin: spi: move spi max chip select to spi.h
by Scott Jiang 02 Dec '14

02 Dec '14

This macro is only related to spi. So it's better to place it in spi.h. Signed-off-by: Scott Jiang <scott.jiang.linux(a)gmail.com> --- arch/blackfin/include/asm/config-pre.h | 3 --- arch/blackfin/include/asm/mach-common/bits/spi.h | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/blackfin/include/asm/config-pre.h b/arch/blackfin/include/asm/config-pre.h index 2d8b293..189cb05 100644 --- a/arch/blackfin/include/asm/config-pre.h +++ b/arch/blackfin/include/asm/config-pre.h @@ -70,9 +70,6 @@ static inline const char *get_bfin_boot_mode(int bfin_boot) # define BFIN_BOOT_SPI_SSEL 1 #endif -/* Define to get a GPIO CS with the Blackfin SPI controller */ -#define MAX_CTRL_CS 8 - /* There is no Blackfin/NetBSD port */ #undef CONFIG_BOOTM_NETBSD diff --git a/arch/blackfin/include/asm/mach-common/bits/spi.h b/arch/blackfin/include/asm/mach-common/bits/spi.h index 869dcb0..180cfaa 100644 --- a/arch/blackfin/include/asm/mach-common/bits/spi.h +++ b/arch/blackfin/include/asm/mach-common/bits/spi.h @@ -64,4 +64,5 @@ #define RXS 0x0020 /* SPI_RDBR Data Buffer Status (Full/Empty*) */ #define TXCOL 0x0040 /* Transmit Collision Error (Corrupt Data May Have Been Sent) */ +#define MAX_CTRL_CS 7 #endif -- 1.7.9.5

2 8

[U-Boot] [PATCH 1/3] sf: stmicro: Add support for N25Q32
by Michal Simek 02 Dec '14

02 Dec '14

From: Jagannadha Sutradharudu Teki <jagannadha.sutradharudu-teki(a)xilinx.com> Add support for Numonyx N25Q32 SPI flash. Signed-off-by: Jagannadha Sutradharudu Teki <jaganna(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/mtd/spi/stmicro.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/drivers/mtd/spi/stmicro.c b/drivers/mtd/spi/stmicro.c index 32df827..09a3d68 100644 --- a/drivers/mtd/spi/stmicro.c +++ b/drivers/mtd/spi/stmicro.c @@ -93,6 +93,12 @@ static const struct stmicro_spi_flash_params stmicro_spi_flash_table[] = { .name = "M25P128", }, { + .id = 0xba16, + .pages_per_sector = 256, + .nr_sectors = 64, + .name = "N25Q32", + }, + { .id = 0xba17, .pages_per_sector = 256, .nr_sectors = 128, -- 1.7.0.4

3 4

[U-Boot] [PATCH V2 00/12] cleanup and refactor lcd.c
by Nikita Kiryanov 02 Dec '14

02 Dec '14

This series is a first step towards an end goal of merging all CONFIG_LCD related functionality into CONFIG_VIDEO code. My plan is to start by refactoring lcd.c into something cleaner (less ifdefs) and more modular (split code into multiple files), then possibly refactor CONFIG_VIDEO code if needed, and then finally: move CONFIG_LCD related functionality over to CONFIG_VIDEO code, replacing as much CONFIG_LCD related code with CONFIG_VIDEO related code as possible. This specific step eliminates some unused code and refactors lcd console stuff into its own file. In V2 I broke the last patch of the original series ("lcd: refactor lcd console stuff into its own file") into multiple patches to make it clear what changes had to be done in order to refactor the lcd console code into its own file. These preparatory patches ("lcd: rename console_(row|col)" to "lcd: make lcd_drawchars() independant of lcd_base") are meant to illustrate exactly what changed and where in the transition from lcd.c to lcd_console.c, and are not necesserily code improvements when viewed out of context. Additional changes in V2: - Added documentation for the new functions. The whole series was rebased over current mainline, and compile tested for arm and powerpc. Cc: Anatolij Gustschin <agust(a)denx.de> Cc: Wolfgang Denk <wd(a)denx.de> Cc: Lukasz Majewski <l.majewski(a)samsung.com> Cc: Marek Vasut <marek.vasut(a)gmail.com> Cc: Stephen Warren <swarren(a)wwwdotorg.org> Cc: Josh Wu <josh.wu(a)atmel.com> Cc: Alban Bedel <alban.bedel(a)avionic-design.de> Cc: Bo Shen <voice.shen(a)atmel.com> Cc: Tom Warren <twarren(a)nvidia.com> Cc: Alban Bedel <alban.bedel(a)avionic-design.de> Cc: Jens Scharsig <esw(a)bus-elektronik.de> Cc: TsiChung Liew <Tsi-Chung.Liew(a)freescale.com> Cc: Przemyslaw Marczak <p.marczak(a)samsung.com> Cc: Cliff Brake <cliff.brake(a)gmail.com> Cc: Sergey Yanovich <ynvich(a)gmail.com> Cc: Akshay Saraswat <akshay.s(a)samsung.com> Cc: Stephen Warren <swarren(a)nvidia.com> Cc: Daniel Gorsulowski <daniel.gorsulowski(a)esd.eu> Cc: Stelian Pop <stelian(a)popies.net> Nikita Kiryanov (12): lcd: remove CONFIG_SYS_INVERT_COLORS lcd: cleanup lcd_drawchars mpc8xx_lcd: get rid of CONFIG_EDT32F10 lcd: remove LCD_MONOCHROME lcd: rename console_(row|col) lcd: replace CONSOLE_(ROWS|COLS) with variables lcd: expand console api lcd: get rid of COLOR_MASK lcd: introduce getters for bg/fg color lcd: make lcd_drawchars() independant of lcd_base lcd: refactor lcd console stuff into its own file lcd_console: remove unused defines common/Makefile | 2 +- common/lcd.c | 308 +++++---------------------------------------- common/lcd_console.c | 208 ++++++++++++++++++++++++++++++ drivers/video/mpc8xx_lcd.c | 49 +------- drivers/video/pxa_lcd.c | 15 --- include/configs/R360MPI.h | 1 - include/lcd.h | 25 ++-- include/lcd_console.h | 85 +++++++++++++ 8 files changed, 340 insertions(+), 353 deletions(-) create mode 100644 common/lcd_console.c create mode 100644 include/lcd_console.h -- 1.9.1

3 23

[U-Boot] Incomplete type declarations in arch/Kconfig (U-Boot-2014.10)
by Guilhem Malichier 02 Dec '14

02 Dec '14

Hi, I'm quite new to U-Boot as well as to the whole Kconfig system, so this may be a dumb question, in which case please forgive my ignorance. I noticed that the type declarations of several items in the file arch/Kconfig are actually incomplete, lacking the "prompt" parameter: config SYS_ARCH string help (...) config SYS_CPU string help (...) etc. (same for SYS_SOC, SYS_VENDOR, SYS_BOARD and SYS_CONFIG_NAME) If I'm not mistaken, the string type declaration in Kconfig is supposed to look like either of the following: string "something" or string prompt "something" In this case, again if I'm not mistaken, these incomplete declarations seem to prevent the items from being "created" at this step, thus preventing any possibility of overriding the default values directly in a _defconfig file. So my question is: is this intentional (in which case I would probably recommend using comments for that purpose instead of incomplete declarations)? Or is this a bug (in which case I would be happy to submit a fix simply adding the prompt strings)? Here is a bit of context if need be: I'm trying to find a way to compile a variant of U-Boot for an existing board (basically just overriding a few lines in <board>.h), but I would like to do it without _modifying_ any file in the U-Boot distribution, nor fiddling with .config, but rather by only adding files (namely configs/<myvariant>_defconfig, and configs/<board-myvariant>.h), so that there will be nothing to merge to support later U-Boot versions. I've been struggling with this today, assuming that overriding CONFIG_SYS_CONFIG_NAME in my _defconfig would be enough (as it is for CONFIG_SYS_EXTRA_OPTIONS)... but I couldn't get it to work, as only the default value got from arch/<arch>/<board>/Kconfig was used, and I couldn't find any way to add my configuration without actually modifying something in U-Boot's core (either some Kconfig files, or the original <board>.h) or manually editing the generated .config. This was until I noticed that type declaration problem. As soon as I added the prompt parameters, I was able to successfully build a .config with the desired CONFIG_SYS values, and then compile everything as expected. Hence the aforementioned question... Thanks a lot for reading, and congratulations for all the work on Das U-Boot... This is a really amazing system. GMal

2 2