August 2016 - U-Boot

[U-Boot] [PATCH 0/5] Enabling multi port ethernet support for keystone net
by Mugunthan V N 10 Aug '16

10 Aug '16

Keystone net has multiple slave ethernets, register each slave as individual ethernet so that tftp can be used on any of the ethernet ports. Tested the series on K2HK, K2L, K2E (logs [1]). Also pushed a branch for testing [2] With the patch series there is a checkpatch warning and it can be ignored as it is error log which helps to grep the text. [1] - http://pastebin.ubuntu.com/21861232/ [2] - git://git.ti.com/~mugunthanvnm/ti-u-boot/mugunth-ti-u-boot.git k2net-multi-slave WARNING: line over 80 characters #143: FILE: drivers/net/keystone_net.c:1011: + error("ks2_net - not able to bind slave interfaces\n"); total: 0 errors, 1 warnings, 0 checks, 276 lines checked NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE NETWORKING_BLOCK_COMMENT_STYLE PREFER_ETHER_ADDR_COPY USLEEP_RANGE patches/multi-port-support/v1.00/0002-drivers-net-keystone_net-add-support-for-multi-slave.patch has style problems, please review. Mugunthan V N (5): drivers: net: keystone_net: fix line termination with semi-colon drivers: net: keystone_net: add support for multi slave ethernet configs: k2hk_evm: add random eth address support configs: k2e_evm: add random eth address support configs: k2l_evm: add random eth address support configs/k2e_evm_defconfig | 2 + configs/k2hk_evm_defconfig | 2 + configs/k2l_evm_defconfig | 2 + drivers/net/keystone_net.c | 228 +++++++++++++++++++++++++++++++++++---------- 4 files changed, 186 insertions(+), 48 deletions(-) -- 2.9.2.517.gf8f7adc

2 15

[U-Boot] [PATCH v3 0/5] Add support for TI PCF8575 I2C GPIO expander
by Vignesh R 10 Aug '16

10 Aug '16

This series adds support for TI's PCF8575 I2C GPIO expander[1] based on Linux Kernel driver for the same. Also adds support for ethernet to use new PCF8575 driver to select appropriate cpsw slaves on dra72. Tested on DRA72 EVM. [1]http://www.ti.com/lit/ds/symlink/pcf8575.pdf Vignesh R (5): gpio: Add driver for TI PCF8575 I2C GPIO expander ARM: dra7xx_evm: Enable support for TI PCF8575 ARM: dts: dra7xx: Add u-boot specific property for PCF8575 nodes net: cpsw: Add support to drive gpios for ethernet to be functional ARM: dts: dra72-evm: Add mode-gpios entry for mac node arch/arm/dts/dra7-evm.dts | 1 + arch/arm/dts/dra72-evm.dts | 4 +- configs/dra7xx_evm_defconfig | 1 + configs/dra7xx_hs_evm_defconfig | 1 + doc/device-tree-bindings/gpio/gpio-pcf857x.txt | 71 ++++++++++ drivers/gpio/Kconfig | 7 + drivers/gpio/Makefile | 1 + drivers/gpio/pcf8575_gpio.c | 180 +++++++++++++++++++++++++ drivers/net/cpsw.c | 12 ++ 9 files changed, 277 insertions(+), 1 deletion(-) create mode 100644 doc/device-tree-bindings/gpio/gpio-pcf857x.txt create mode 100644 drivers/gpio/pcf8575_gpio.c -- 2.9.2

3 17

[U-Boot] [PATCH v2] spl_nor.c: Support devicetree sizes different from 16k
by Mike Looijmans 10 Aug '16

10 Aug '16

The devicetrees for various platforms already exceed 16k. Add a define CONFIG_SYS_FDT_SIZE to specify the FDT size, and set to 16k for the two boards that define this CONFIG_SYS_FDT_BASE parameter. This allows platforms with larger devicetree blobs to boot from NOR. Signed-off-by: Mike Looijmans <mike.looijmans(a)topic.nl> --- v2: Instead of a default, just specify the value for the two boards that use it. common/spl/spl_nor.c | 4 ++-- include/configs/a3m071.h | 1 + include/configs/microblaze-generic.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c index da2422f..8ea874c 100644 --- a/common/spl/spl_nor.c +++ b/common/spl/spl_nor.c @@ -40,11 +40,11 @@ int spl_nor_load_image(void) /* * Copy DT blob (fdt) to SDRAM. Passing pointer to - * flash doesn't work (16 KiB should be enough for DT) + * flash doesn't work */ memcpy((void *)CONFIG_SYS_SPL_ARGS_ADDR, (void *)(CONFIG_SYS_FDT_BASE), - (16 << 10)); + CONFIG_SYS_FDT_SIZE); return 0; } else { diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h index 8f17dd1..ab2477c 100644 --- a/include/configs/a3m071.h +++ b/include/configs/a3m071.h @@ -334,6 +334,7 @@ #define CONFIG_SYS_OS_BASE 0xfc200000 #define CONFIG_SYS_FDT_BASE 0xfc1e0000 +#define CONFIG_SYS_FDT_SIZE (16<<10) #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 047e756..e5bf700 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -305,6 +305,7 @@ 0x60000) #define CONFIG_SYS_FDT_BASE (CONFIG_SYS_FLASH_BASE + \ 0x40000) +#define CONFIG_SYS_FDT_SIZE (16<<10) #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_TEXT_BASE + \ 0x1000000) -- 1.9.1

2 4

[U-Boot] [RFC PATCH] i2c: i2c-uclass-compat: avoid any BSS usage
by Vignesh R 10 Aug '16

10 Aug '16

As I2C can be used before DRAM initialization for reading EEPROM, avoid using static variables stored in BSS, since BSS is in DRAM, which may not have been initialised yet. Explicitly mark "static global" variables as belonging to the .data section. Signed-off-by: Vignesh R <vigneshr(a)ti.com> --- drivers/i2c/i2c-uclass-compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/i2c-uclass-compat.c b/drivers/i2c/i2c-uclass-compat.c index 5606d1f807f6..de78db6a887f 100644 --- a/drivers/i2c/i2c-uclass-compat.c +++ b/drivers/i2c/i2c-uclass-compat.c @@ -9,7 +9,7 @@ #include <errno.h> #include <i2c.h> -static int cur_busnum; +static int cur_busnum __attribute__((section(".data"))); static int i2c_compat_get_device(uint chip_addr, int alen, struct udevice **devp) -- 2.9.2

4 5

[U-Boot] Please pull u-boot-ppc4xx/master
by Stefan Roese 10 Aug '16

10 Aug '16

Hi Tom, please pull the following ppc4xx fix from Dirk: The following changes since commit 5405817a6e7a6538c4bcb1c3076ddc83fe5d03f9: spi: cadence_qspi_apb: Ensure baudrate doesn't exceed max value (2016-08-07 21:54:21 +0200) are available in the git repository at: git://www.denx.de/git/u-boot-ppc4xx.git for you to fetch changes up to 54a0eb7a18b5120d609188e46a1b71e98d6af44b: ppc4xx: Fix platform support (2016-08-09 09:25:36 +0200) ---------------------------------------------------------------- Dirk Eibach (1): ppc4xx: Fix platform support arch/powerpc/cpu/ppc4xx/start.S | 66 ++++++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 21 deletions(-)

2 1

[U-Boot] [PATCH 3/4] test/fs: strip carriage-return from sandbox output
by Stefan Brüns 10 Aug '16

10 Aug '16

DM added carriage-returns to every newline. Strip everything after the 32 character long mdsum. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- test/fs/fs-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/fs/fs-test.sh b/test/fs/fs-test.sh index 043e5d0..171b1de 100755 --- a/test/fs/fs-test.sh +++ b/test/fs/fs-test.sh @@ -402,7 +402,7 @@ check_md5() { # the 7th field is the actual md5 md5_src=`grep -A3 "$1" "$2" | grep "md5 for"` md5_src=($md5_src) - md5_src=${md5_src[6]} + md5_src=${md5_src[6]:0:32} # The md5 list, each line is of the form: # - <md5> -- 2.9.2

1 0

[U-Boot] [PATCH 0/4] Some additions for sandbox and fs tests
by Stefan Brüns 10 Aug '16

10 Aug '16

Add some documentation for the sandbox block device emulation and fix some issues for the fs test script. Stefan Brüns (4): Sandbox: document support of block device emulation sandbox: Add "host size" hostfs command for fs test test/fs: strip carriage-return from sandbox output test/fs: replace deprecated "sb" command with "host" board/sandbox/README.sandbox | 19 +++++++++++++++++++ cmd/host.c | 8 ++++++++ test/fs/fs-test.sh | 42 +++++++++++++++++++++--------------------- 3 files changed, 48 insertions(+), 21 deletions(-) -- 2.9.2

1 0

[U-Boot] [PATCH v2 20/22] sf: Remove legacy idcode detection code
by Jagan Teki 09 Aug '16

09 Aug '16

Since flash detection code is more mature to detect even with 6 bytes id length devices removed old code and related references. Cc: Yunhui Cui <yunhui.cui(a)nxp.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Bin Meng <bmeng.cn(a)gmail.com> Cc: York Sun <york.sun(a)nxp.com> Cc: Vignesh R <vigneshr(a)ti.com> Cc: Mugunthan V N <mugunthanvnm(a)ti.com> Cc: Michal Simek <michal.simek(a)xilinx.com> Cc: Michael Trimarchi <michael(a)amarulasolutions.com> Cc: Siva Durga Prasad Paladugu <sivadur(a)xilinx.com> Signed-off-by: Jagan Teki <jteki(a)openedev.com> --- drivers/mtd/spi/sf_internal.h | 6 ---- drivers/mtd/spi/spi_flash.c | 78 ------------------------------------------- 2 files changed, 84 deletions(-) diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h index 6be2121..1161652 100644 --- a/drivers/mtd/spi/sf_internal.h +++ b/drivers/mtd/spi/sf_internal.h @@ -99,12 +99,6 @@ int sst_write_bp(struct spi_flash *flash, u32 offset, size_t len, const void *buf); #endif -#ifdef CONFIG_SPI_FLASH_SPANSION -/* Used for Spansion S25FS-S family flash only. */ -#define CMD_SPANSION_RDAR 0x65 /* Read any device register */ -#define CMD_SPANSION_WRAR 0x71 /* Write any device register */ -#endif - #define JEDEC_MFR(info) ((info)->id[0]) #define JEDEC_ID(info) (((info)->id[1]) << 8 | ((info)->id[2])) #define JEDEC_EXT(info) (((info)->id[3]) << 8 | ((info)->id[4])) diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index d961ace..55c357e 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -999,94 +999,16 @@ int spi_flash_decode_fdt(const void *blob, struct spi_flash *flash) } #endif /* CONFIG_IS_ENABLED(OF_CONTROL) */ -#ifdef CONFIG_SPI_FLASH_SPANSION -static int spansion_s25fss_disable_4KB_erase(struct spi_slave *spi) -{ - u8 cmd[4]; - u32 offset = 0x800004; /* CR3V register offset */ - u8 cr3v; - int ret; - - cmd[0] = CMD_SPANSION_RDAR; - cmd[1] = offset >> 16; - cmd[2] = offset >> 8; - cmd[3] = offset >> 0; - - ret = spi_flash_cmd_read(spi, cmd, 4, &cr3v, 1); - if (ret) - return -EIO; - /* CR3V bit3: 4-KB Erase */ - if (cr3v & 0x8) - return 0; - - cmd[0] = CMD_SPANSION_WRAR; - cr3v |= 0x8; - ret = spi_flash_cmd_write(spi, cmd, 4, &cr3v, 1); - if (ret) - return -EIO; - - cmd[0] = CMD_SPANSION_RDAR; - ret = spi_flash_cmd_read(spi, cmd, 4, &cr3v, 1); - if (ret) - return -EIO; - if (!(cr3v & 0x8)) - return -EFAULT; - - return 0; -} -#endif - int spi_flash_scan(struct spi_flash *flash) { struct spi_slave *spi = flash->spi; const struct spi_flash_info *info = NULL; - u16 jedec, ext_jedec; - u8 idcode[5]; int ret; info = spi_flash_read_id(flash); if (IS_ERR_OR_NULL(info)) return -ENOENT; - jedec = idcode[1] << 8 | idcode[2]; - ext_jedec = idcode[3] << 8 | idcode[4]; - -#ifdef CONFIG_SPI_FLASH_SPANSION - /* - * The S25FS-S family physical sectors may be configured as a - * hybrid combination of eight 4-kB parameter sectors - * at the top or bottom of the address space with all - * but one of the remaining sectors being uniform size. - * The Parameter Sector Erase commands (20h or 21h) must - * be used to erase the 4-kB parameter sectors individually. - * The Sector (uniform sector) Erase commands (D8h or DCh) - * must be used to erase any of the remaining - * sectors, including the portion of highest or lowest address - * sector that is not overlaid by the parameter sectors. - * The uniform sector erase command has no effect on parameter sectors. - */ - if ((jedec == 0x0219 || (jedec == 0x0220)) && - (ext_jedec & 0xff00) == 0x4d00) { - int ret; - u8 id[6]; - - /* Read the ID codes again, 6 bytes */ - ret = spi_flash_cmd(flash->spi, CMD_READ_ID, id, sizeof(id)); - if (ret) - return -EIO; - - ret = memcmp(id, idcode, 5); - if (ret) - return -EIO; - - /* 0x81: S25FS-S family 0x80: S25FL-S family */ - if (id[5] == 0x81) { - ret = spansion_s25fss_disable_4KB_erase(spi); - if (ret) - return ret; - } - } -#endif /* Flash powers up read-only, so clear BP# bits */ if (JEDEC_MFR(info) == SPI_FLASH_CFI_MFR_ATMEL || JEDEC_MFR(info) == SPI_FLASH_CFI_MFR_MACRONIX || -- 2.7.4

1 2

[U-Boot] [PATCH v2 10/22] sf: Add JEDEC_MFR
by Jagan Teki 09 Aug '16

09 Aug '16

Instead using idcode[0] for detecting manufacture id add JEDEC_MFR macro for code simplicity and undesirability. Cc: Simon Glass <sjg(a)chromium.org> Cc: Bin Meng <bmeng.cn(a)gmail.com> Cc: York Sun <york.sun(a)nxp.com> Cc: Vignesh R <vigneshr(a)ti.com> Cc: Mugunthan V N <mugunthanvnm(a)ti.com> Cc: Michal Simek <michal.simek(a)xilinx.com> Cc: Siva Durga Prasad Paladugu <sivadur(a)xilinx.com> Signed-off-by: Jagan Teki <jteki(a)openedev.com> --- drivers/mtd/spi/sf_internal.h | 1 + drivers/mtd/spi/spi_flash.c | 30 +++++++++++++++++------------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h index 4e9ae34..26ada3b 100644 --- a/drivers/mtd/spi/sf_internal.h +++ b/drivers/mtd/spi/sf_internal.h @@ -104,6 +104,7 @@ int sst_write_bp(struct spi_flash *flash, u32 offset, size_t len, #define CMD_SPANSION_WRAR 0x71 /* Write any device register */ #endif +#define JEDEC_MFR(info) ((info)->id[0]) #define JEDEC_ID(info) (((info)->id[1]) << 8 | ((info)->id[2])) #define JEDEC_EXT(info) (((info)->id[3]) << 8 | ((info)->id[4])) diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index 80c96f9..7bb8775 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -165,7 +165,8 @@ bar_end: return flash->bank_curr; } -static int spi_flash_read_bar(struct spi_flash *flash, u8 idcode0) +static int spi_flash_read_bar(struct spi_flash *flash, + const struct spi_flash_info *info) { u8 curr_bank = 0; int ret; @@ -173,7 +174,7 @@ static int spi_flash_read_bar(struct spi_flash *flash, u8 idcode0) if (flash->size <= SPI_FLASH_16MB_BOUN) goto bar_end; - switch (idcode0) { + switch (JEDEC_MFR(info)) { case SPI_FLASH_CFI_MFR_SPANSION: flash->bank_read_cmd = CMD_BANKADDR_BRRD; flash->bank_write_cmd = CMD_BANKADDR_BRWR; @@ -949,9 +950,10 @@ static const struct spi_flash_info *spi_flash_read_id(struct spi_flash *flash) return ERR_PTR(-ENODEV); } -static int set_quad_mode(struct spi_flash *flash, u8 idcode0) +static int set_quad_mode(struct spi_flash *flash, + const struct spi_flash_info *info) { - switch (idcode0) { + switch (JEDEC_MFR(info)) { #ifdef CONFIG_SPI_FLASH_MACRONIX case SPI_FLASH_CFI_MFR_MACRONIX: return macronix_quad_enable(flash); @@ -966,7 +968,8 @@ static int set_quad_mode(struct spi_flash *flash, u8 idcode0) return micron_quad_enable(flash); #endif default: - printf("SF: Need set QEB func for %02x flash\n", idcode0); + printf("SF: Need set QEB func for %02x flash\n", + JEDEC_MFR(info)); return -1; } } @@ -1085,9 +1088,9 @@ int spi_flash_scan(struct spi_flash *flash) } #endif /* Flash powers up read-only, so clear BP# bits */ - if (idcode[0] == SPI_FLASH_CFI_MFR_ATMEL || - idcode[0] == SPI_FLASH_CFI_MFR_MACRONIX || - idcode[0] == SPI_FLASH_CFI_MFR_SST) + if (JEDEC_MFR(info) == SPI_FLASH_CFI_MFR_ATMEL || + JEDEC_MFR(info) == SPI_FLASH_CFI_MFR_MACRONIX || + JEDEC_MFR(info) == SPI_FLASH_CFI_MFR_SST) write_sr(flash, 0); /* Assign spi data */ @@ -1115,7 +1118,7 @@ int spi_flash_scan(struct spi_flash *flash) #endif /* lock hooks are flash specific - assign them based on idcode0 */ - switch (idcode[0]) { + switch (JEDEC_MFR(info)) { #if defined(CONFIG_SPI_FLASH_STMICRO) || defined(CONFIG_SPI_FLASH_SST) case SPI_FLASH_CFI_MFR_STMICRO: case SPI_FLASH_CFI_MFR_SST: @@ -1125,7 +1128,7 @@ int spi_flash_scan(struct spi_flash *flash) #endif break; default: - debug("SF: Lock ops not supported for %02x flash\n", idcode[0]); + debug("SF: Lock ops not supported for %02x flash\n", JEDEC_MFR(info)); } /* Compute the flash size */ @@ -1185,9 +1188,10 @@ int spi_flash_scan(struct spi_flash *flash) if ((flash->read_cmd == CMD_READ_QUAD_OUTPUT_FAST) || (flash->read_cmd == CMD_READ_QUAD_IO_FAST) || (flash->write_cmd == CMD_QUAD_PAGE_PROGRAM)) { - ret = set_quad_mode(flash, idcode[0]); + ret = set_quad_mode(flash, info); if (ret) { - debug("SF: Fail to set QEB for %02x\n", idcode[0]); + debug("SF: Fail to set QEB for %02x\n", + JEDEC_MFR(info)); return -EINVAL; } } @@ -1218,7 +1222,7 @@ int spi_flash_scan(struct spi_flash *flash) /* Configure the BAR - discover bank cmds and read current bank */ #ifdef CONFIG_SPI_FLASH_BAR - ret = spi_flash_read_bar(flash, idcode[0]); + ret = spi_flash_read_bar(flash, info); if (ret < 0) return ret; #endif -- 2.7.4

1 9

[U-Boot] u-boot efi
by scott.iveland＠calix.com 09 Aug '16

09 Aug '16

I am trying to use u-boot-efi on a board that has an Intel D-1500 series processor and 64-bit UEFI ROM. As per the information in doc/README.efi I built a u-boot-payload.efi with CONFIG_EFI_STUB_64BIT and installed it onto a USB drive I am booting with. The UEFI loads/runs the u-boot but quickly goes into the weeds. I have very limited debug facilities as this is a 3rd party board. I was able to track down the failure to the following using calls to post_code(): lib/efi/efi_stub.c:efi_main() lib/efi/efi_stub.c:jump_to_uboot() arch/x86/cpu/call32.S:cpu_call32() arch/x86/cpu/start.S:start() common/init/board_init.c:board_init_f_alloc_reserve() -> fails upon return. This is the first "call" instruction after control is transferred to the start() of the 32-bit u-boot image. I also tried adding a call to a do-nothing function and the results were the same (failure upon return). The CPU goes the weeds and I guess it is in some exception code (no JTAG debugger available). This is the first time I have used u-boot in this mode and my first time working with the x86 architecture. Any suggestions would be most appreciated. Thanks, Scott

1 0