October 2015 - U-Boot

[U-Boot] [PATCH] ls1021atwr: sdboot: change serdes 0x20 to 0x30
by Yuan Yao 14 Oct '15

14 Oct '15

For LS1021ATWR board in order to support SATA(Gen 3), SerDes Lan B will be connect to SATA directly. So SerDes 0x20 can't support 2SGMII at the same time. In order to support two SGMII and one RGMII at the same time, we used 0x30 to replace 0x20. Signed-off-by: Yuan Yao <yao.yuan(a)freescale.com> --- board/freescale/ls1021atwr/ls102xa_rcw_sd.cfg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/board/freescale/ls1021atwr/ls102xa_rcw_sd.cfg b/board/freescale/ls1021atwr/ls102xa_rcw_sd.cfg index 9c3e3b0..3d40528 100644 --- a/board/freescale/ls1021atwr/ls102xa_rcw_sd.cfg +++ b/board/freescale/ls1021atwr/ls102xa_rcw_sd.cfg @@ -3,12 +3,12 @@ aa55aa55 01ee0100 #enable IFC, disable QSPI and DSPI 0608000a 00000000 00000000 00000000 -20000000 00407900 60040a00 21046000 -00000000 00000000 00000000 00038000 +30000000 00407900 60040a00 21046000 +00000000 00000000 00000000 20038000 00080000 881b7340 00000000 00000000 #disable IFC, enable QSPI and DSPI #0608000a 00000000 00000000 00000000 -#20000000 00407900 60040a00 21046000 -#00000000 00000000 00000000 00038000 +#30000000 00407900 60040a00 21046000 +#00000000 00000000 00000000 20038000 #20084800 881b7340 00000000 00000000 -- 2.1.0.27.g96db324

2 1

[U-Boot] [Patch V4 00/17] Add LS1043A platform support
by Gong Qianyu 14 Oct '15

14 Oct '15

Hi All, This patchset consilidated the ls1043a platform andls2085 platform into fsl-layerscape. Please help to review the version 4 patchset. Sorry for the delayed response due to one week China National holiday. [Patch V4 01/17] armv7/ls1021a: move ns_access to common file [Patch V4 02/17] common/board_f.c: modify the macro to use [Patch V4 03/17] net/fm: Fix the endian issue to support both [Patch V4 04/17] net/fm/eth: Use mb() to be compatible for both ARM [Patch V4 05/17] net/fm: Add support for 64-bit platforms [Patch V4 06/17] net/fm: Make the return value logic consistent with [Patch V4 07/17] net/fm: bug fix when CONFIG_PHYLIB not defined [Patch V4 08/17] net: Move some header files to include/ [Patch V4 09/17] net/fm: Add QSGMII PCS init [Patch V4 10/17] net/fm: fix MDIO controller base on FMAN2 [Patch V4 11/17] armv8/fsl_lsch3: Change arch to fsl-layerscape [Patch V4 12/17] armv8/fsl_lsch2: Add fsl_lsch2 SoC [Patch V4 13/17] armv8/ls1043ardb: Add LS1043ARDB board support [Patch V4 14/17] armv8/ls1043ardb: Add nand boot support [Patch V4 15/17] armv8/ls1043a: Add Fman support [Patch V4 16/17] armv8/ls1043ardb: esdhc: Add esdhc support for [Patch V4 17/17] armv8/ls1043ardb: Add sd boot support

2 19

[U-Boot] [PATCH] arm: vf610: move device tree after kernel image
by Stefan Agner 14 Oct '15

14 Oct '15

Since the device tree relocation is disabled (fdt_high set to 0xffffffff), U-Boot keeps the device tree at its load address 0x81000000. The kernel uncompresses itself to 0x80008000 by default, hence this limits the maximum (uncompressed) kernel size to somewhat below 16MiB, otherwise the device tree gets overwritten by the kernel data... Move the device tree load address to 0x84000000 to avoid that the device tree being overwritten by the kernel. Signed-off-by: Stefan Agner <stefan(a)agner.ch> --- include/configs/vf610twr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index 324ba8f..1d15f35 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -129,7 +129,7 @@ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdt_file=vf610-twr.dtb\0" \ - "fdt_addr=0x81000000\0" \ + "fdt_addr=0x84000000\0" \ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ -- 2.6.1

3 7

[U-Boot] Command to create a partition table?
by Masahiro Yamada 14 Oct '15

14 Oct '15

Hi guys, I am searching for a command to create a partition table (like fdisk command). I can create a partition table by PC for removable devics such as SD card, but I want U-boot to do that for on-board devices such as eMMC. Does U-boot have one? -- Best Regards Masahiro Yamada

3 4

[U-Boot] [PATCH] colibri_vf: Fix typo in DRAM init
by Stefan Agner 14 Oct '15

14 Oct '15

From: Stefan Agner <stefan.agner(a)toradex.com> This commit fixes the same typo found in vf610twr DRAM init also for colibri_vf DRAM init. This typo was introduced in commit 3f353cecc (vf610: refactor DDRMC code). Signed-off-by: Stefan Agner <stefan(a)agner.ch> --- board/toradex/colibri_vf/colibri_vf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c index 39bf0ac..a6d1c5b 100644 --- a/board/toradex/colibri_vf/colibri_vf.c +++ b/board/toradex/colibri_vf/colibri_vf.c @@ -119,7 +119,7 @@ int dram_init(void) .trcd_int = 6, .tras_lockout = 0, .tdal = 12, - .bstlen = 0, + .bstlen = 3, .tdll = 512, .trp_ab = 6, .tref = 3120, -- 2.6.1

1 0

[U-Boot] [PATCH] vf610twr: Enable all masks of CCGRx registers.
by Anthony Felice 13 Oct '15

13 Oct '15

The CCGRx registers, or clock gating registers, can be set to disable or enable clocks for devices on the vf610twr platform. Enabling masks for all CCGRx registers allows Linux drivers, like snvs_rtc, and also MQX applications, to work out-of-the-box. There are no real downsides to enabling all clocks, and this has been done in previous Freescale releases of U-Boot for the Vybrid Tower. Signed-off-by: Anthony Felice <tony.felice(a)timesys.com> --- arch/arm/include/asm/arch-vf610/crm_regs.h | 1 + board/freescale/vf610twr/vf610twr.c | 22 +++++++++------------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/arch/arm/include/asm/arch-vf610/crm_regs.h b/arch/arm/include/asm/arch-vf610/crm_regs.h index a46e396..11b87ec 100644 --- a/arch/arm/include/asm/arch-vf610/crm_regs.h +++ b/arch/arm/include/asm/arch-vf610/crm_regs.h @@ -187,6 +187,7 @@ struct anadig_reg { #define CCM_CSCMR2_RMII_CLK_SEL(v) (((v) & 0x3) << 4) #define CCM_REG_CTRL_MASK 0xffffffff +#define CCM_CCGRX_ENABLE_ALL_CTRL_MASK (0xffffffff) #define CCM_CCGR0_UART0_CTRL_MASK (0x3 << 14) #define CCM_CCGR0_UART1_CTRL_MASK (0x3 << 16) #define CCM_CCGR0_DSPI0_CTRL_MASK (0x3 << 24) diff --git a/board/freescale/vf610twr/vf610twr.c b/board/freescale/vf610twr/vf610twr.c index 7834931..a78e9e6 100644 --- a/board/freescale/vf610twr/vf610twr.c +++ b/board/freescale/vf610twr/vf610twr.c @@ -272,27 +272,23 @@ static void clock_init(void) struct anadig_reg *anadig = (struct anadig_reg *)ANADIG_BASE_ADDR; clrsetbits_le32(&ccm->ccgr0, CCM_REG_CTRL_MASK, - CCM_CCGR0_UART1_CTRL_MASK); + CCM_CCGRX_ENABLE_ALL_CTRL_MASK); clrsetbits_le32(&ccm->ccgr1, CCM_REG_CTRL_MASK, - CCM_CCGR1_PIT_CTRL_MASK | CCM_CCGR1_WDOGA5_CTRL_MASK); + CCM_CCGRX_ENABLE_ALL_CTRL_MASK); clrsetbits_le32(&ccm->ccgr2, CCM_REG_CTRL_MASK, - CCM_CCGR2_IOMUXC_CTRL_MASK | CCM_CCGR2_PORTA_CTRL_MASK | - CCM_CCGR2_PORTB_CTRL_MASK | CCM_CCGR2_PORTC_CTRL_MASK | - CCM_CCGR2_PORTD_CTRL_MASK | CCM_CCGR2_PORTE_CTRL_MASK | - CCM_CCGR2_QSPI0_CTRL_MASK); + CCM_CCGRX_ENABLE_ALL_CTRL_MASK); clrsetbits_le32(&ccm->ccgr3, CCM_REG_CTRL_MASK, - CCM_CCGR3_ANADIG_CTRL_MASK | CCM_CCGR3_SCSC_CTRL_MASK); + CCM_CCGRX_ENABLE_ALL_CTRL_MASK); clrsetbits_le32(&ccm->ccgr4, CCM_REG_CTRL_MASK, - CCM_CCGR4_WKUP_CTRL_MASK | CCM_CCGR4_CCM_CTRL_MASK | - CCM_CCGR4_GPC_CTRL_MASK | CCM_CCGR4_I2C0_CTRL_MASK); + CCM_CCGRX_ENABLE_ALL_CTRL_MASK); clrsetbits_le32(&ccm->ccgr6, CCM_REG_CTRL_MASK, - CCM_CCGR6_OCOTP_CTRL_MASK | CCM_CCGR6_DDRMC_CTRL_MASK); + CCM_CCGRX_ENABLE_ALL_CTRL_MASK); clrsetbits_le32(&ccm->ccgr7, CCM_REG_CTRL_MASK, - CCM_CCGR7_SDHC1_CTRL_MASK); + CCM_CCGRX_ENABLE_ALL_CTRL_MASK); clrsetbits_le32(&ccm->ccgr9, CCM_REG_CTRL_MASK, - CCM_CCGR9_FEC0_CTRL_MASK | CCM_CCGR9_FEC1_CTRL_MASK); + CCM_CCGRX_ENABLE_ALL_CTRL_MASK); clrsetbits_le32(&ccm->ccgr10, CCM_REG_CTRL_MASK, - CCM_CCGR10_NFC_CTRL_MASK); + CCM_CCGRX_ENABLE_ALL_CTRL_MASK); clrsetbits_le32(&anadig->pll2_ctrl, ANADIG_PLL2_CTRL_POWERDOWN, ANADIG_PLL2_CTRL_ENABLE | ANADIG_PLL2_CTRL_DIV_SELECT); -- 1.9.1

3 2

[U-Boot] [PATCH 3/3] uuid: add shorcut for known GUID
by Patrick Delaunay 13 Oct '15

13 Oct '15

guid shorcut can be used in gpt command with guid parameter partitions = name=boot,size=0x6bc00,guid=data; \ name=root,size=0x7538ba00,guid=linux; gpt write mmc 0 $partitions and they are used to display the type of partition in "part list" command Partition Map for MMC device 0 -- Partition Type: EFI Part Start LBA End LBA Name Attributes Type GUID Partition GUID 1 0x00000022 0x0000037f "boot" attrs: 0x0000000000000000 type: ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 type: data guid: d117f98e-6f2c-d04b-a5b2-331a19f91cb2 2 0x00000380 0x003a9fdc "root" attrs: 0x0000000000000000 type: 0fc63daf-8483-4772-8e79-3d69d8477de4 type: linux guid: 25718777-d0ad-7443-9e60-02cb591c9737 Signed-off-by: Patrick Delaunay <patrick.delaunay73(a)gmail.com> --- disk/part_efi.c | 4 ++++ include/uuid.h | 4 ++++ lib/uuid.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 68 insertions(+), 2 deletions(-) diff --git a/disk/part_efi.c b/disk/part_efi.c index 25bf8f9..9118be0 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -223,6 +223,10 @@ void print_part_efi(block_dev_desc_t * dev_desc) uuid_bin = (unsigned char *)gpt_pte[i].partition_type_guid.b; uuid_bin_to_str(uuid_bin, uuid, UUID_STR_FORMAT_GUID); printf("\ttype:\t%s\n", uuid); +#ifdef CONFIG_PARTITION_TYPE_GUID + if (!uuid_guid_get_str(uuid_bin, uuid)) + printf("\ttype:\t%s\n", uuid); +#endif uuid_bin = (unsigned char *)gpt_pte[i].unique_partition_guid.b; uuid_bin_to_str(uuid_bin, uuid, UUID_STR_FORMAT_GUID); printf("\tguid:\t%s\n", uuid); diff --git a/include/uuid.h b/include/uuid.h index 93027c1..15a14cd 100644 --- a/include/uuid.h +++ b/include/uuid.h @@ -36,6 +36,10 @@ enum { int uuid_str_valid(const char *uuid); int uuid_str_to_bin(char *uuid_str, unsigned char *uuid_bin, int str_format); void uuid_bin_to_str(unsigned char *uuid_bin, char *uuid_str, int str_format); +#ifdef CONFIG_PARTITION_TYPE_GUID +int uuid_guid_get_bin(char *uuid_str, unsigned char *uuid_bin); +int uuid_guid_get_str(unsigned char *uuid_bin, char *uuid_str); +#endif void gen_rand_uuid(unsigned char *uuid_bin); void gen_rand_uuid_str(char *uuid_str, int str_format); #endif diff --git a/lib/uuid.c b/lib/uuid.c index f6b4423..9805aa0 100644 --- a/lib/uuid.c +++ b/lib/uuid.c @@ -80,10 +80,63 @@ int uuid_str_valid(const char *uuid) return 1; } +#ifdef CONFIG_PARTITION_TYPE_GUID +const struct { + char *string; + efi_guid_t guid; +} shorcut_guid[8] = { + {"system", PARTITION_SYSTEM_GUID}, + {"mbr", LEGACY_MBR_PARTITION_GUID}, + {"msft", PARTITION_MSFT_RESERVED_GUID}, + {"data", PARTITION_BASIC_DATA_GUID}, + {"linux", PARTITION_LINUX_FILE_SYSTEM_DATA_GUID}, + {"raid", PARTITION_LINUX_RAID_GUID}, + {"swap", PARTITION_LINUX_SWAP_GUID}, + {"lvm", PARTITION_LINUX_LVM_GUID} +}; + +/* + * uuid_guid_get_bin() - this function get GUID bin for GUID shorcut string + * + * @param uuid_str - pointer to allocated array [7B] + * @param uuid_bin - pointer to allocated array for big endian output [16B] + */ +int uuid_guid_get_bin(char *uuid_str, unsigned char *uuid_bin) +{ + int i; + for (i = 0; i < 8; i++) { + if (!strcmp(shorcut_guid[i].string, uuid_str)) { + memcpy(uuid_bin, &shorcut_guid[i].guid, 16); + return 0; + } + } + return -ENODEV; +} + +/* + * uuid_guid_get_str() - this function get GUID shortcut string for GUID. + * + * @param uuid_bin - pointer to allocated array for big endian output [16B] + * @param uuid_str - pointer to allocated array [7B] + */ +int uuid_guid_get_str(unsigned char *uuid_bin, char *uuid_str) +{ + int i; + *uuid_str = 0; + for (i = 0; i < 8; i++) { + if (!memcmp(shorcut_guid[i].guid.b, uuid_bin, 16)) { + strcpy(uuid_str, shorcut_guid[i].string); + return 0; + } + } + return -ENODEV; +} +#endif + /* * uuid_str_to_bin() - convert string UUID or GUID to big endian binary data. * - * @param uuid_str - pointer to UUID or GUID string [37B] + * @param uuid_str - pointer to UUID or GUID string [37B] or GUID shorcut * @param uuid_bin - pointer to allocated array for big endian output [16B] * @str_format - UUID string format: 0 - UUID; 1 - GUID */ @@ -93,8 +146,13 @@ int uuid_str_to_bin(char *uuid_str, unsigned char *uuid_bin, int str_format) uint32_t tmp32; uint64_t tmp64; - if (!uuid_str_valid(uuid_str)) + if (!uuid_str_valid(uuid_str)) { +#ifdef CONFIG_PARTITION_TYPE_GUID + if (!uuid_guid_get_bin(uuid_str, uuid_bin)) + return 0; +#endif return -EINVAL; + } if (str_format == UUID_STR_FORMAT_STD) { tmp32 = cpu_to_be32(simple_strtoul(uuid_str, NULL, 16)); -- 1.9.1

1 0

[U-Boot] [PATCH 1/3] part:efi: add GUID for linux file system data
by Patrick Delaunay 13 Oct '15

13 Oct '15

>From f8bb9413dfb4252f203cc1f2013266b155208128 Mon Sep 17 00:00:00 2001 From: Patrick Delaunay <patrick.delaunay73(a)gmail.com> Date: Tue, 13 Oct 2015 15:55:54 +0200 Subject: [PATCH 1/3] part:efi: add GUID for linux file system data Previously, Linux used the same GUID for the data partitions as Windows (Basic data partition: EBD0A0A2-B9E5-4433-87C0-68B6B72699C7). This created problems when dual-booting Linux and Windows in UEFI-GPT Setup, so a new GUID (Linux filesystem data: 0FC63DAF-8483-4772-8E79-3D69D8477DE4) was defined jointly by GPT fdisk and GNU Parted developers. Signed-off-by: Patrick Delaunay <patrick.delaunay73(a)gmail.com> --- see https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs and nota 9 include/part_efi.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/part_efi.h b/include/part_efi.h index 3012b91..c8fc873 100644 --- a/include/part_efi.h +++ b/include/part_efi.h @@ -43,6 +43,9 @@ #define PARTITION_BASIC_DATA_GUID \ EFI_GUID( 0xEBD0A0A2, 0xB9E5, 0x4433, \ 0x87, 0xC0, 0x68, 0xB6, 0xB7, 0x26, 0x99, 0xC7) +#define PARTITION_LINUX_FILE_SYSTEM_DATA_GUID \ + EFI_GUID(0x0FC63DAF, 0x8483, 0x4772, \ + 0x8E, 0x79, 0x3D, 0x69, 0xD8, 0x47, 0x7D, 0xE4) #define PARTITION_LINUX_RAID_GUID \ EFI_GUID( 0xa19d880f, 0x05fc, 0x4d3b, \ 0xa0, 0x06, 0x74, 0x3f, 0x0f, 0x84, 0x91, 0x1e) -- 1.9.1

1 0

Re: [U-Boot] [PATCH] mmc: omap_hsmmc: fix initialization order of mmc block devices
by Nishanth Menon 13 Oct '15

13 Oct '15

On Tue, Oct 13, 2015 at 3:03 AM, Lokesh Vutla <a0131933(a)ti.com> wrote: > > > On Tuesday 13 October 2015 01:14 PM, Heiko Schocher wrote: >> Hello Lokesh, >> >> Am 13.10.2015 um 08:46 schrieb Lokesh Vutla: >>> +Nishanth, >>> >>> On Tuesday 13 October 2015 10:59 AM, Heiko Schocher wrote: >>>> On embedded devices, often there is a combination of >>>> removable mmc devices (e.g. MMC/SD cards) and hard >>>> wired ones (e.g. eMMC). Depending on the hardware >>>> configuration, the 'mmcblkN' node might change if >>>> the removable device is available or not at boot time. >>>> >>>> E.g. if the removable device is attached at boot time, >>>> it might become mmxblk0. And the hard wired one mmcblk1. >>>> But if the removable device isn't there at boot time, >>>> the hard wired one will become mmcblk0. This makes it >>>> somehow difficult to hard code the root device to the >>>> non-removable device and boot fast. >>> >>> Why not use "root=PARTUUID=${uuid}" option instead of relying on >>> mmcblk no? >>> U-Boot can easily detect your partuuid. Refer to [1] on how TI platforms >>> does this in u-boot. >> >> Good tip ... I do not know, if it is possible to update U-Boot >> on this boards... >> >> Current U-Boot says: >> U-Boot 2013.01.01_heads/master-gc7900a0 (2015-05-06 - 20:37:15) >> >> I2C: ready >> DRAM: 512 MiB >> [...] >> U-Boot# mmc rescan >> U-Boot# mmc part >> >> Partition Map for MMC device 0 -- Partition Type: DOS >> >> Part Start Sector Num Sectors UUID Type >> 1 63 144522 000ce343-01 0e Boot >> 2 144585 659861 000ce343-02 83 >> U-Boot# part uuid mmc 0:2 uuid >> Unknown command 'part' - try 'help' >> U-Boot# >> >> So, if this patch has no chance for mainline, please let me >> know it, thanks! >> > > IIRC, Nishanth had posted a patch something similar but got rejected for > some reason. Probably Nishanth can comment more here. > overall the feedback I received was for block devices, there is already an unique method(PARTUUID/uuid) of referencing required device and mmcxblky aliasing was not really needed - hence dropped my patch and switched over to partuuid. CC Tom and u-boot list as well. for reference the current thread: http://marc.info/?t=144471421700002&r=1&w=2 -- --- Regards, Nishanth Menon

2 1

[U-Boot] [PATCH v3] pci: pcie_imx: Fix hang on mx6qp
by Fabio Estevam 13 Oct '15

13 Oct '15

PCI driver currently hangs on mx6qp. Toggle the reset bit with the appropriate timings to fix the issue. Based on the FSL kernel driver implementation. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes since v2: - Remove unneeded blank line (Bin) arch/arm/include/asm/arch-mx6/iomux.h | 2 ++ drivers/pci/pcie_imx.c | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/arch/arm/include/asm/arch-mx6/iomux.h b/arch/arm/include/asm/arch-mx6/iomux.h index 9b3a91f..907cb40 100644 --- a/arch/arm/include/asm/arch-mx6/iomux.h +++ b/arch/arm/include/asm/arch-mx6/iomux.h @@ -18,6 +18,8 @@ #define IOMUXC_GPR1_REF_SSP_EN (1 << 16) #define IOMUXC_GPR1_TEST_POWERDOWN (1 << 18) +#define IOMUXC_GPR1_PCIE_SW_RST (1 << 29) + /* * IOMUXC_GPR5 bit fields */ diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c index 1568f20..f1e189e 100644 --- a/drivers/pci/pcie_imx.c +++ b/drivers/pci/pcie_imx.c @@ -19,6 +19,7 @@ #include <asm/io.h> #include <linux/sizes.h> #include <errno.h> +#include <asm/arch/sys_proto.h> #define PCI_ACCESS_READ 0 #define PCI_ACCESS_WRITE 1 @@ -430,6 +431,10 @@ static int imx_pcie_write_config(struct pci_controller *hose, pci_dev_t d, static int imx6_pcie_assert_core_reset(void) { struct iomuxc *iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR; + + if (is_mx6dqp()) + setbits_le32(&iomuxc_regs->gpr[1], IOMUXC_GPR1_PCIE_SW_RST); + #if defined(CONFIG_MX6SX) struct gpc *gpc_regs = (struct gpc *)GPC_BASE_ADDR; @@ -536,6 +541,9 @@ static int imx6_pcie_deassert_core_reset(void) enable_pcie_clock(); + if (is_mx6dqp()) + clrbits_le32(&iomuxc_regs->gpr[1], IOMUXC_GPR1_PCIE_SW_RST); + /* * Wait for the clock to settle a bit, when the clock are sourced * from the CPU, we need about 30 ms to settle. -- 1.9.1

1 0