April 2016 - U-Boot

[U-Boot] [PATCH v2] mx6ul_evk: Remove CONFIG_SUPPORT_EMMC_BOOT
by Fabio Estevam 03 May '16

03 May '16

From: Fabio Estevam <fabio.estevam(a)nxp.com> mx6ul_evk does not come with a eMMC populated, so we should not define CONFIG_SUPPORT_EMMC_BOOT as it causes SPL to not be able to boot some brands of SD cards, such as SanDisk microSD HC - 8GB: U-Boot SPL 2016.05-rc1-28384-g108f841 (Apr 19 2016 - 11:19:11) Trying to boot from MMC1 spl: mmc block read error SPL: failed to boot from all boot devices ### ERROR ### Please RESET the board ### When CONFIG_SUPPORT_EMMC_BOOT is defined spl_boot_mode() returns MMCSD_MODE_EMMCBOOT, so remove this option to have a reliable boot via SD card. Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- Changes since v1: - Keep using SPL. Fix the boot issue by removing CONFIG_SUPPORT_EMMC_BOOT include/configs/mx6ul_14x14_evk.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 2fff34a..76929ac 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -46,7 +46,6 @@ #define CONFIG_SYS_FSL_USDHC_NUM 2 #endif -#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ #endif /* I2C configs */ -- 1.9.1

3 7

[U-Boot] [PATCH v2] fs: ext4: fix symlink read function
by Stefan Roese 03 May '16

03 May '16

From: Ronald Zachariah <rozachar(a)cisco.com> The function ext4fs_read_symlink was unable to handle a symlink which had target name of exactly 60 characters. Signed-off-by: Ronald Zachariah <rozachar(a)cisco.com> Signed-off-by: Stefan Roese <sr(a)denx.de> Reviewed-by: Stephen Warren <swarren(a)nvidia.com> Cc: Tom Rini <trini(a)konsulko.com> --- v2: - Change '60' to sizeof(diro->inode.b.symlink) as suggested by Stephen fs/ext4/ext4_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index 84fba76..40b798a 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -2040,7 +2040,7 @@ static char *ext4fs_read_symlink(struct ext2fs_node *node) if (!symlink) return 0; - if (__le32_to_cpu(diro->inode.size) <= 60) { + if (__le32_to_cpu(diro->inode.size) < sizeof(diro->inode.b.symlink)) { strncpy(symlink, diro->inode.b.symlink, __le32_to_cpu(diro->inode.size)); } else { -- 2.8.1

2 1

[U-Boot] [PATCH] Revert "rockchip: rk3288: correct sdram setting"
by Vagrant Cascadian 03 May '16

03 May '16

This reverts commit b5788dc0dd9570e98552833767f4373db965985d. Ram size is incorrectly reported as 512MB on a firefly-rk3288 board with 2GB of ram. Reverting this patch displays the full amount of ram. Signed-off-by: Vagrant Cascadian <vagrant(a)debian.org> --- arch/arm/mach-rockchip/rk3288/sdram_rk3288.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-rockchip/rk3288/sdram_rk3288.c b/arch/arm/mach-rockchip/rk3288/sdram_rk3288.c index 71330cb..2e21282 100644 --- a/arch/arm/mach-rockchip/rk3288/sdram_rk3288.c +++ b/arch/arm/mach-rockchip/rk3288/sdram_rk3288.c @@ -561,14 +561,14 @@ static void dram_all_config(const struct dram_info *dram, &sdram_params->ch[chan]; sys_reg |= info->row_3_4 << SYS_REG_ROW_3_4_SHIFT(chan); - sys_reg |= 1 << SYS_REG_CHINFO_SHIFT(chan); + sys_reg |= chan << SYS_REG_CHINFO_SHIFT(chan); sys_reg |= (info->rank - 1) << SYS_REG_RANK_SHIFT(chan); sys_reg |= (info->col - 9) << SYS_REG_COL_SHIFT(chan); - sys_reg |= info->bk == 3 ? 0 : 1 << SYS_REG_BK_SHIFT(chan); + sys_reg |= info->bk == 3 ? 1 << SYS_REG_BK_SHIFT(chan) : 0; sys_reg |= (info->cs0_row - 13) << SYS_REG_CS0_ROW_SHIFT(chan); sys_reg |= (info->cs1_row - 13) << SYS_REG_CS1_ROW_SHIFT(chan); - sys_reg |= (2 >> info->bw) << SYS_REG_BW_SHIFT(chan); - sys_reg |= (2 >>info->dbw) << SYS_REG_DBW_SHIFT(chan); + sys_reg |= info->bw << SYS_REG_BW_SHIFT(chan); + sys_reg |= info->dbw << SYS_REG_DBW_SHIFT(chan); dram_cfg_rbc(&dram->chan[chan], chan, sdram_params); } @@ -720,13 +720,13 @@ size_t sdram_size_mb(struct rk3288_pmu *pmu) rank = 1 + (sys_reg >> SYS_REG_RANK_SHIFT(ch) & SYS_REG_RANK_MASK); col = 9 + (sys_reg >> SYS_REG_COL_SHIFT(ch) & SYS_REG_COL_MASK); - bk = 3 - ((sys_reg >> SYS_REG_BK_SHIFT(ch)) & SYS_REG_BK_MASK) ; + bk = sys_reg & (1 << SYS_REG_BK_SHIFT(ch)) ? 3 : 0; cs0_row = 13 + (sys_reg >> SYS_REG_CS0_ROW_SHIFT(ch) & SYS_REG_CS0_ROW_MASK); cs1_row = 13 + (sys_reg >> SYS_REG_CS1_ROW_SHIFT(ch) & SYS_REG_CS1_ROW_MASK); - bw = (2 >> (sys_reg >> SYS_REG_BW_SHIFT(ch)) & - SYS_REG_BW_MASK); + bw = (sys_reg >> SYS_REG_BW_SHIFT(ch)) & + SYS_REG_BW_MASK; row_3_4 = sys_reg >> SYS_REG_ROW_3_4_SHIFT(ch) & SYS_REG_ROW_3_4_MASK; -- 2.1.4

3 3

[U-Boot] [PATCH v2] kbuild: Do not append dtb for OF_EMBED case
by Michal Simek 03 May '16

03 May '16

dtb is already included in binary that's why there is no need to replace u-boot-spl.bin with u-boot-spl-dtb.bin. This is only needed for OF_SEPARATE is enabled. Only copy -nodtb.bin version which is straight output from objcopy -O binary. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- Changes in v2: - Refactor based on Masahiro comments scripts/Makefile.spl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 33f1a3f3939c..5df860e7ed11 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -174,7 +174,7 @@ cmd_cat = cat $(filter-out $(PHONY), $^) > $@ quiet_cmd_copy = COPY $@ cmd_copy = cp $< $@ -ifeq ($(CONFIG_SPL_OF_CONTROL),y) +ifeq ($(CONFIG_SPL_OF_CONTROL)$(CONFIG_OF_SEPARATE),yy) $(obj)/$(SPL_BIN)-dtb.bin: $(obj)/$(SPL_BIN)-nodtb.bin $(obj)/$(SPL_BIN)-pad.bin \ $(obj)/$(SPL_BIN).dtb FORCE $(call if_changed,cat) -- 1.9.1

4 3

[U-Boot] pull request: u-boot-uniphier/master
by Masahiro Yamada 03 May '16

03 May '16

Hi Tom, Please pull some more fixes for v2016.05. The following changes since commit fccdb287f5f5f2349d3ca1c7cdf972015417d46d: Merge branch 'master' of git://git.denx.de/u-boot-video (2016-04-28 13:15:52 -0400) are available in the git repository at: git://git.denx.de/u-boot-uniphier.git master for you to fetch changes up to bef4b024e9839ea7afe689b050fc95118eeb0b01: ARM: uniphier: move pin-mux code into pin_init function (2016-05-01 01:13:45 +0900) ---------------------------------------------------------------- Masahiro Yamada (4): ARM: uniphier: fix boot mode table of PH1-LD20 ARM: uniphier: enable Peripherl clock to use UART in SPL ARM: uniphier: allow to use System Bus for ROM boot mode of PH1-LD20 ARM: uniphier: move pin-mux code into pin_init function arch/arm/mach-uniphier/boot-mode/boot-mode-ld20.c | 2 +- arch/arm/mach-uniphier/early-clk/early-clk-ld20.c | 4 ++++ arch/arm/mach-uniphier/early-pinctrl/Makefile | 1 + arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-ld20.c | 32 ++++++++++++++++++++++++++++++++ arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-sld3.c | 2 ++ arch/arm/mach-uniphier/init.h | 7 +------ arch/arm/mach-uniphier/init/init-ld20.c | 2 ++ arch/arm/mach-uniphier/init/init-sld3.c | 5 ++--- arch/arm/mach-uniphier/sbc/Makefile | 4 ++-- arch/arm/mach-uniphier/sbc/sbc-sld3.c | 17 ----------------- 10 files changed, 47 insertions(+), 29 deletions(-) create mode 100644 arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-ld20.c delete mode 100644 arch/arm/mach-uniphier/sbc/sbc-sld3.c -- Best Regards Masahiro Yamada

2 1

[U-Boot] [verified-boot] Compile 'key store' DTB without mkimage and private key
by Teddy Reed 03 May '16

03 May '16

Hi all, I'm curious if anyone has a script (or if I've missed something within the verified-boot documentation) to compile a DTB given only public keying information, i.e., a x509 certificate. I have build/test bots that need to build a u-boot with an extra/embedded DTB containing a signing public key. I do not want the private key on those hosts and the only way I've found to build the documented/required nodes in /signature/key-KEYNAME/ ('rsa,r-squared','rsa,modulus', 'rsa,n0-inverse' and 'rsa-num-bits') is by using mkimage on a FIT with the -K switch. That requires a private key to do the actual signing. I'm happy to write something, just want to ask first! Thanks! -- Teddy Reed V

2 5

[U-Boot] [PATCH] spl_mmc: allow to load raw image
by Masahiro Yamada 02 May '16

02 May '16

The function spl_parse_image_header() falls back to a raw image if the U-Boot header is missing and CONFIG_SPL_PANIC_ON_RAW_IMAGE is undefined. While, the bad magic checking here makes the spl_parse_image_header() unreachable in case of the missing header. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- common/spl/spl_mmc.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index c27a250..df406e3 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -33,11 +33,6 @@ static int mmc_load_image_raw_sector(struct mmc *mmc, unsigned long sector) if (count == 0) goto end; - if (image_get_magic(header) != IH_MAGIC) { - puts("bad magic\n"); - return -1; - } - spl_parse_image_header(header); /* convert size to sectors - round up */ -- 1.9.1

6 26

[U-Boot] [PATCH v7 1/7] drivers: net: cpsw: Add reading of DT phy-handle node
by Dan Murphy 02 May '16

02 May '16

Add the ability to read the phy-handle node of the cpsw slave. Upon reading this handle the phy-id can be stored based on the reg node in the DT. The phy-handle also needs to be stored and passed to the phy to access any phy data that is available. Signed-off-by: Dan Murphy <dmurphy(a)ti.com> --- v7 - Fixed checkpatch issues - https://patchwork.ozlabs.org/patch/610946/ Checkpatch LTL issues still remain and resolving will break readability WARNING: line over 80 characters #47: FILE: drivers/net/cpsw.c:1230: WARNING: line over 80 characters #50: FILE: drivers/net/cpsw.c:1233: drivers/net/cpsw.c | 23 +++++++++++++++++++++-- include/cpsw.h | 1 + 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/drivers/net/cpsw.c b/drivers/net/cpsw.c index 7104754..a2d9527 100644 --- a/drivers/net/cpsw.c +++ b/drivers/net/cpsw.c @@ -965,6 +965,11 @@ static int cpsw_phy_init(struct cpsw_priv *priv, struct cpsw_slave *slave) phydev->supported &= supported; phydev->advertising = phydev->supported; +#ifdef CONFIG_DM_ETH + if (slave->data->phy_of_handle) + phydev->dev->of_offset = slave->data->phy_of_handle; +#endif + priv->phydev = phydev; phy_config(phydev); @@ -1217,8 +1222,22 @@ static int cpsw_eth_ofdata_to_platdata(struct udevice *dev) if (phy_mode) priv->data.slave_data[slave_index].phy_if = phy_get_interface_by_name(phy_mode); - fdtdec_get_int_array(fdt, subnode, "phy_id", phy_id, 2); - priv->data.slave_data[slave_index].phy_addr = phy_id[1]; + + priv->data.slave_data[slave_index].phy_of_handle = + fdtdec_lookup_phandle(fdt, subnode, + "phy-handle"); + + if (priv->data.slave_data[slave_index].phy_of_handle >= 0) { + priv->data.slave_data[slave_index].phy_addr = + fdtdec_get_int(gd->fdt_blob, + priv->data.slave_data[slave_index].phy_of_handle, + "reg", -1); + } else { + fdtdec_get_int_array(fdt, subnode, "phy_id", + phy_id, 2); + priv->data.slave_data[slave_index].phy_addr = + phy_id[1]; + } slave_index++; } diff --git a/include/cpsw.h b/include/cpsw.h index cf1d30b..ff95cd8 100644 --- a/include/cpsw.h +++ b/include/cpsw.h @@ -21,6 +21,7 @@ struct cpsw_slave_data { u32 sliver_reg_ofs; int phy_addr; int phy_if; + int phy_of_handle; }; enum { -- 2.8.1.116.g7b0d47b

3 11

[U-Boot] [RFC] SPL -> U-Boot Chain of Trust
by Andreas Dannenberg 02 May '16

02 May '16

On Mon, Mar 28, 2016 at 03:32:40PM -0400, Tom Rini wrote: > I'm interested in getting secure device support going, but it seems > like we should need more than that, ie something to keep the chain of > trust going. Tom et al., I just saw your reply to Vitaly's email and I'm actually just looking into something along the lines you brought up but I didn't want to hijack that discussion so here's a new thread. As for the chain of trust for ARMv7, my understanding is that when using a combination of SPL and U-Boot there will always be a vendor- specific initial boot (ROM) code that authenticates SPL, and then there will need to be some code inserted into SPL that authenticates U-Boot after it's loaded (for example by using some secure ROM API call and such). So I was looking into if there is already some generic framework for this in U-Boot but didn't see anything obvious. One "easy" way would be to add a simple call to an authentication routine to board_init_r (u-boot/common/spl/spl.c) but let's say we add such a call for TI or other vendor's stuff I suppose this would not scale very well. But what about adding one generic call to a default authentication function declared as __weak for spl_image that doesn't do anything, but can be overwritten in vendor-specific files to provide means of authenticating spl_image. Would this be a good approach? Beyond that I was reviewing some of the awesome work from the Chromium team and I think on ARMv7 after we get MLO to authenticate U-Boot everything beyond that is already looking very solid and thorough (with FIT, DTB/Kernel and initramfs authentication). Thanks and Regards, -- Andreas Dannenberg Texas Instruments Inc

2 6

[U-Boot] [PATCH] arm: dra7xx: Extend bootloader partition
by Sam Protsenko 02 May '16

02 May '16

With FIT images support enabled, u-boot.img size increases up to 612 KiB. Extend "bootloader" partition size accordingly. With extended "bootloader" partition there is no gap between "misc" and "efs" partitions anymore. Keep "efs" partition alignment intact anyway (start=1280K), so that Android partitions addresses are compatible with older versions of u-boot, while size of rest partitions can be adjusted. Signed-off-by: Sam Protsenko <semen.protsenko(a)linaro.org> --- include/configs/dra7xx_evm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 79b6c09..92373ac 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -56,7 +56,7 @@ "partitions_android=" \ "uuid_disk=${uuid_gpt_disk};" \ "name=xloader,start=128K,size=128K,uuid=${uuid_gpt_xloader};" \ - "name=bootloader,size=384K,uuid=${uuid_gpt_bootloader};" \ + "name=bootloader,size=768K,uuid=${uuid_gpt_bootloader};" \ "name=environment,size=128K,uuid=${uuid_gpt_environment};" \ "name=misc,size=128K,uuid=${uuid_gpt_misc};" \ "name=efs,start=1280K,size=16M,uuid=${uuid_gpt_efs};" \ -- 2.8.0.rc3

3 2