November 2016 - U-Boot

[U-Boot] [PATCH 01/97] tools/env: Correct include kconfig
by York Sun 24 Nov '16

24 Nov '16

While we move some config macros to Kconfig, kconfig header is needed to avoid compiling error if not already included. Signed-off-by: York Sun <york.sun(a)nxp.com> --- common/env_embedded.c | 2 ++ tools/envcrc.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/common/env_embedded.c b/common/env_embedded.c index 56a13cb..b368fda 100644 --- a/common/env_embedded.c +++ b/common/env_embedded.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: GPL-2.0+ */ +#include <linux/kconfig.h> + #ifndef __ASSEMBLY__ #define __ASSEMBLY__ /* Dirty trick to get only #defines */ #endif diff --git a/tools/envcrc.c b/tools/envcrc.c index a9d9b48..e9fd088 100644 --- a/tools/envcrc.c +++ b/tools/envcrc.c @@ -12,6 +12,8 @@ #include <string.h> #include <unistd.h> +#include <linux/kconfig.h> + #ifndef __ASSEMBLY__ #define __ASSEMBLY__ /* Dirty trick to get only #defines */ #endif -- 2.7.4

1 0

[U-Boot] [PATCH 1/2] armv8:ls2080a: Reorganise NAND_BOOT code in config flag
by Priyanka Jain 24 Nov '16

24 Nov '16

Add CONFIG_NAND_BOOT config flag to organise NAND_BOOT specific code in config flag like -nand-boot specfic errata errata_rcw_src() -CONFIG_SYS_NAND_U_BOOT_DST,etc Signed-off-by: Priyanka Jain <priyanka.jain(a)nxp.com> Signed-off-by: Abhimanyu <abhimanyu(a)nxp.com> --- arch/arm/cpu/armv8/fsl-layerscape/soc.c | 2 +- configs/ls2080aqds_nand_defconfig | 2 +- configs/ls2080ardb_nand_defconfig | 2 +- include/configs/ls2080a_common.h | 4 ++++ include/configs/ls2080aqds.h | 4 +++- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c index d43361f..73a751d 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c @@ -134,7 +134,7 @@ void erratum_a009635(void) static void erratum_rcw_src(void) { -#if defined(CONFIG_SPL) +#if defined(CONFIG_SPL) && defined(CONFIG_NAND_BOOT) u32 __iomem *dcfg_ccsr = (u32 __iomem *)DCFG_BASE; u32 __iomem *dcfg_dcsr = (u32 __iomem *)DCFG_DCSR_BASE; u32 val; diff --git a/configs/ls2080aqds_nand_defconfig b/configs/ls2080aqds_nand_defconfig index 2161815..5e7bea5 100644 --- a/configs/ls2080aqds_nand_defconfig +++ b/configs/ls2080aqds_nand_defconfig @@ -12,7 +12,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, NAND, LS2080A" +CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, NAND, NAND_BOOT, LS2080A" CONFIG_BOOTDELAY=10 CONFIG_SPL=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y diff --git a/configs/ls2080ardb_nand_defconfig b/configs/ls2080ardb_nand_defconfig index e40152e..d6633c3 100644 --- a/configs/ls2080ardb_nand_defconfig +++ b/configs/ls2080ardb_nand_defconfig @@ -12,7 +12,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, NAND, LS2080A" +CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, NAND, NAND_BOOT, LS2080A" CONFIG_BOOTDELAY=10 CONFIG_SPL=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 2cae966..3828058 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -250,6 +250,7 @@ unsigned long long get_qixis_addr(void); #define CONFIG_PANIC_HANG /* do not reset board on panic */ +#ifdef CONFIG_SPL #define CONFIG_SPL_BSS_START_ADDR 0x80100000 #define CONFIG_SPL_BSS_MAX_SIZE 0x00100000 #define CONFIG_SPL_FRAMEWORK @@ -259,11 +260,14 @@ unsigned long long get_qixis_addr(void); #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_TEXT_BASE 0x1800a000 +#ifdef CONFIG_NAND_BOOT #define CONFIG_SYS_NAND_U_BOOT_DST 0x80400000 #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_NAND_U_BOOT_DST +#endif #define CONFIG_SYS_SPL_MALLOC_SIZE 0x00100000 #define CONFIG_SYS_SPL_MALLOC_START 0x80200000 #define CONFIG_SYS_MONITOR_LEN (640 * 1024) +#endif #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index 838568f..a87d13a 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -202,7 +202,8 @@ unsigned long get_board_ddr_clk(void); FTIM2_GPCM_TWP(0x3E)) #define CONFIG_SYS_CS3_FTIM3 0x0 -#if defined(CONFIG_SPL) && defined(CONFIG_NAND) +#if defined(CONFIG_SPL) +#if defined(CONFIG_NAND_BOOT) #define CONFIG_SYS_CSPR1_EXT CONFIG_SYS_NOR0_CSPR_EXT #define CONFIG_SYS_CSPR1 CONFIG_SYS_NOR0_CSPR_EARLY #define CONFIG_SYS_CSPR1_FINAL CONFIG_SYS_NOR0_CSPR @@ -238,6 +239,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SPL_PAD_TO 0x20000 #define CONFIG_SYS_NAND_U_BOOT_OFFS (256 * 1024) #define CONFIG_SYS_NAND_U_BOOT_SIZE (640 * 1024) +#endif #else #define CONFIG_SYS_CSPR0_EXT CONFIG_SYS_NOR0_CSPR_EXT #define CONFIG_SYS_CSPR0 CONFIG_SYS_NOR0_CSPR_EARLY -- 1.7.4.1

1 1

[U-Boot] New UCLASS_PINCTRL driver - probe is not called for all nodes
by Konstantin Porotchkin 24 Nov '16

24 Nov '16

Hi, All, I am currently porting the Marvell (mvebu) pin control driver for Armada-8K family to the current u-boot sources. The Armada 8K SoC is a hybrid chip that contains several interconnected dies in a single package. Each such device (AP, CP0, CP1) has an independent pin controller with different memory mapping. The DTS for such configuration looks like the following: / { ap806 { config-space { pinctl: pinctl@6F4000 { ... }; }; }; cp110-master { config-space { cpm_pinctl: pinctl@44000 { ... }; }; }; cp110-slave { config-space { cps_pinctl: pinctl@44000 { ... }; }; }; }; I expect that my driver "probe" method will be called 3 times - one for every controller. However, according to my test, only the first controller is probed (pinctl@6F4000). Two others are listed in the DM tree, but are not active (not probed). I can do a trick and sequentially call uclass_get_device() function for the UCLASS_PINCTRL type, causing all 3 controller to be probed and activated. However I think this is not the way it should work. Is my assumption wrong and such hybrid devices should use the above trick for bringing up all controllers in the package? Thank you beforehand for your help Konstantin

2 3

[U-Boot] [RFC PATCH 1/2] dm: Add support for scsi/sata based devices
by Michal Simek 24 Nov '16

24 Nov '16

All sata based drivers are bind and corresponding block device is created. Based on this find_scsi_device() is able to get back block device based on scsi_curr_dev pointer. intr_scsi() is commented now but it can be replaced by calling find_scsi_device() and scsi_scan(). scsi_dev_desc[] is commented out but common/scsi.c heavily depends on it. That's why CONFIG_SYS_SCSI_MAX_DEVICE is hardcoded to 1 and symbol is reassigned to a block description allocated by uclass. There is only one block description by device now but it doesn't need to be correct when more devices are present. scsi_bind() ensures corresponding block device creation. uclass post_probe (scsi_post_probe()) is doing low level init. SCSI/SATA DM based drivers requires to have 64bit base address as the first entry in platform data structure to setup mmio_base. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- cmd/scsi.c | 38 ++++++++++++++++++++++++++++++++++++++ common/board_r.c | 4 ++-- common/scsi.c | 17 ++++++++++++++++- drivers/block/ahci-uclass.c | 38 ++++++++++++++++++++++++++++++++++++++ drivers/block/ahci.c | 30 ++++++++++++++++++++++-------- include/ahci.h | 2 +- include/sata.h | 3 +++ include/scsi.h | 15 ++++++++++++++- 8 files changed, 134 insertions(+), 13 deletions(-) diff --git a/cmd/scsi.c b/cmd/scsi.c index 387ca1a262ab..dc1176610672 100644 --- a/cmd/scsi.c +++ b/cmd/scsi.c @@ -10,6 +10,7 @@ */ #include <common.h> #include <command.h> +#include <dm.h> #include <scsi.h> static int scsi_curr_dev; /* current device */ @@ -25,6 +26,23 @@ int do_scsiboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) /* * scsi command intepreter */ +#ifdef CONFIG_DM_SATA +struct udevice *find_scsi_device(int dev_num) +{ + struct udevice *bdev; + int ret; + + ret = blk_get_device(IF_TYPE_SCSI, dev_num, &bdev); + + if (ret) { + printf("SCSI Device %d not found\n", dev_num); + return NULL; + } + + return bdev; +} +#endif + int do_scsi(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) { switch (argc) { @@ -35,7 +53,18 @@ int do_scsi(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) if (strncmp(argv[1], "res", 3) == 0) { printf("\nReset SCSI\n"); scsi_bus_reset(); + +#if defined(CONFIG_DM_SATA) + struct udevice *bdev; + + bdev = find_scsi_device(scsi_curr_dev); + if (!bdev) + return CMD_RET_FAILURE; + + scsi_scan(1, bdev); +#else scsi_scan(1); +#endif return 0; } if (strncmp(argv[1], "inf", 3) == 0) { @@ -51,7 +80,16 @@ int do_scsi(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) return 0; } if (strncmp(argv[1], "scan", 4) == 0) { +#if defined(CONFIG_DM_SATA) + struct udevice *bdev; + + bdev = find_scsi_device(scsi_curr_dev); + if (!bdev) + return CMD_RET_FAILURE; + scsi_scan(1, bdev); +#else scsi_scan(1); +#endif return 0; } if (strncmp(argv[1], "part", 4) == 0) { diff --git a/common/board_r.c b/common/board_r.c index d959ad3c6f90..f3ea457507de 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -620,7 +620,7 @@ static int initr_ambapp_print(void) } #endif -#if defined(CONFIG_SCSI) +#if defined(CONFIG_SCSI) && !defined(CONFIG_DM_SATA) static int initr_scsi(void) { puts("SCSI: "); @@ -923,7 +923,7 @@ init_fnc_t init_sequence_r[] = { initr_ambapp_print, #endif #endif -#ifdef CONFIG_SCSI +#if defined(CONFIG_SCSI) && !defined(CONFIG_DM_SATA) INIT_FUNC_WATCHDOG_RESET initr_scsi, #endif diff --git a/common/scsi.c b/common/scsi.c index dbbf4043b22a..1726898b06e2 100644 --- a/common/scsi.c +++ b/common/scsi.c @@ -26,7 +26,7 @@ #define SCSI_VEND_ID 0x10b9 #define SCSI_DEV_ID 0x5288 -#elif !defined(CONFIG_SCSI_AHCI_PLAT) +#elif !defined(CONFIG_SCSI_AHCI_PLAT) && !defined(CONFIG_DM_SATA) #error no scsi device defined #endif #define SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID} @@ -43,7 +43,13 @@ static int scsi_max_devs; /* number of highest available scsi device */ static int scsi_curr_dev; /* current device */ +#if !defined(CONFIG_DM_SATA) static struct blk_desc scsi_dev_desc[CONFIG_SYS_SCSI_MAX_DEVICE]; +#else +#undef CONFIG_SYS_SCSI_MAX_DEVICE +#define CONFIG_SYS_SCSI_MAX_DEVICE 1 +#define CONFIG_SYS_SCSI_MAX_LUN 1 +#endif /* almost the maximum amount of the scsi_ext command.. */ #define SCSI_MAX_READ_BLK 0xFFFF @@ -160,6 +166,7 @@ static ulong scsi_read(struct blk_desc *block_dev, lbaint_t blknr, { #ifdef CONFIG_BLK struct blk_desc *block_dev = dev_get_uclass_platdata(dev); + struct blk_desc *scsi_dev_desc = block_dev; #endif int device = block_dev->devnum; lbaint_t start, blks; @@ -235,6 +242,7 @@ static ulong scsi_write(struct blk_desc *block_dev, lbaint_t blknr, { #ifdef CONFIG_BLK struct blk_desc *block_dev = dev_get_uclass_platdata(dev); + struct blk_desc *scsi_dev_desc = block_dev; #endif int device = block_dev->devnum; lbaint_t start, blks; @@ -462,13 +470,20 @@ void scsi_setup_test_unit_ready(ccb *pccb) * (re)-scan the scsi bus and reports scsi device info * to the user if mode = 1 */ +#ifdef CONFIG_DM_SATA +void scsi_scan(int mode, struct udevice *bdev) +#else void scsi_scan(int mode) +#endif { unsigned char i, perq, modi, lun; lbaint_t capacity; unsigned long blksz; ccb *pccb = (ccb *)&tempccb; +#if defined(CONFIG_DM_SATA) + struct blk_desc *scsi_dev_desc = dev_get_uclass_platdata(bdev); +#endif if (mode == 1) printf("scanning bus for devices...\n"); for (i = 0; i < CONFIG_SYS_SCSI_MAX_DEVICE; i++) { diff --git a/drivers/block/ahci-uclass.c b/drivers/block/ahci-uclass.c index 7b8c32699f53..f25b1bd336ae 100644 --- a/drivers/block/ahci-uclass.c +++ b/drivers/block/ahci-uclass.c @@ -1,14 +1,52 @@ /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> + * Copyright (c) 2016 Xilinx, Inc + * Written by Michal Simek * * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <dm.h> +#include <scsi.h> + +#if defined(CONFIG_DM_SATA) +int scsi_bind(struct udevice *dev) +{ + struct udevice *bdev; + struct blk_desc *bdesc; + int ret; + + /* + * FIXME - maybe loop over CONFIG_SYS_SCSI_MAX_SCSI_ID + * here to support more ports + */ + ret = blk_create_devicef(dev, "scsi_blk", "blk", IF_TYPE_SCSI, -1, 512, + 0, &bdev); + if (ret) { + printf("Cannot create block device\n"); + return ret; + } + bdesc = dev_get_uclass_platdata(bdev); + debug("device %p, block device %p, block description %p\n", + dev, bdev, bdesc); + + return 0; +} + +static int scsi_post_probe(struct udevice *dev) +{ + debug("%s: device %p\n", __func__, dev); + scsi_low_level_init(0, dev); + return 0; +} +#endif UCLASS_DRIVER(ahci) = { .id = UCLASS_AHCI, .name = "ahci", +#if defined(CONFIG_DM_SATA) + .post_probe = scsi_post_probe, +#endif }; diff --git a/drivers/block/ahci.c b/drivers/block/ahci.c index e3e783a74cfd..03a95179eaa4 100644 --- a/drivers/block/ahci.c +++ b/drivers/block/ahci.c @@ -168,7 +168,7 @@ int ahci_reset(void __iomem *base) static int ahci_host_init(struct ahci_probe_ent *probe_ent) { -#ifndef CONFIG_SCSI_AHCI_PLAT +#if !defined(CONFIG_SCSI_AHCI_PLAT) && !defined(CONFIG_DM_SATA) # ifdef CONFIG_DM_PCI struct udevice *dev = probe_ent->dev; struct pci_child_platdata *pplat = dev_get_parent_platdata(dev); @@ -198,7 +198,7 @@ static int ahci_host_init(struct ahci_probe_ent *probe_ent) writel(cap_save, mmio + HOST_CAP); writel_with_flush(0xf, mmio + HOST_PORTS_IMPL); -#ifndef CONFIG_SCSI_AHCI_PLAT +#if !defined(CONFIG_SCSI_AHCI_PLAT) && !defined(CONFIG_DM_SATA) # ifdef CONFIG_DM_PCI if (pplat->vendor == PCI_VENDOR_ID_INTEL) { u16 tmp16; @@ -327,6 +327,7 @@ static int ahci_host_init(struct ahci_probe_ent *probe_ent) writel(tmp | HOST_IRQ_EN, mmio + HOST_CTL); tmp = readl(mmio + HOST_CTL); debug("HOST_CTL 0x%x\n", tmp); +#if !defined(CONFIG_DM_SATA) #ifndef CONFIG_SCSI_AHCI_PLAT # ifdef CONFIG_DM_PCI dm_pci_read_config16(dev, PCI_COMMAND, &tmp16); @@ -338,14 +339,15 @@ static int ahci_host_init(struct ahci_probe_ent *probe_ent) pci_write_config_word(pdev, PCI_COMMAND, tmp16); # endif #endif +#endif return 0; } static void ahci_print_info(struct ahci_probe_ent *probe_ent) { -#ifndef CONFIG_SCSI_AHCI_PLAT -# ifdef CONFIG_DM_PCI +#if !defined(CONFIG_SCSI_AHCI_PLAT) && !defined(CONFIG_DM_SATA) +# if defined(CONFIG_DM_PCI) || defined(CONFIG_DM_SATA) struct udevice *dev = probe_ent->dev; # else pci_dev_t pdev = probe_ent->dev; @@ -372,7 +374,7 @@ static void ahci_print_info(struct ahci_probe_ent *probe_ent) else speed_s = "?"; -#ifdef CONFIG_SCSI_AHCI_PLAT +#if defined(CONFIG_SCSI_AHCI_PLAT) || defined(CONFIG_DM_SATA) scc_s = "SATA"; #else # ifdef CONFIG_DM_PCI @@ -424,13 +426,15 @@ static void ahci_print_info(struct ahci_probe_ent *probe_ent) } #ifndef CONFIG_SCSI_AHCI_PLAT -# ifdef CONFIG_DM_PCI +# if defined(CONFIG_DM_PCI) || defined(CONFIG_DM_SATA) static int ahci_init_one(struct udevice *dev) # else static int ahci_init_one(pci_dev_t dev) # endif { +#if defined(CONFIG_DM_PCI) u16 vendor; +#endif int rc; probe_ent = malloc(sizeof(struct ahci_probe_ent)); @@ -450,6 +454,7 @@ static int ahci_init_one(pci_dev_t dev) probe_ent->pio_mask = 0x1f; probe_ent->udma_mask = 0x7f; /*Fixme,assume to support UDMA6 */ +#if !defined(CONFIG_DM_SATA) #ifdef CONFIG_DM_PCI probe_ent->mmio_base = dm_pci_map_bar(dev, PCI_BASE_ADDRESS_5, PCI_REGION_MEM); @@ -473,6 +478,10 @@ static int ahci_init_one(pci_dev_t dev) if (vendor == 0x197b) pci_write_config_byte(dev, 0x41, 0xa1); #endif +#else + struct scsi_platdata *plat = dev_get_platdata(dev); + probe_ent->mmio_base = (void *)plat->base; +#endif debug("ahci mmio_base=0x%p\n", probe_ent->mmio_base); /* initialize adapter */ @@ -954,14 +963,17 @@ int scsi_exec(ccb *pccb) } - +#if defined(CONFIG_DM_SATA) +void scsi_low_level_init(int busdevfunc, struct udevice *dev) +#else void scsi_low_level_init(int busdevfunc) +#endif { int i; u32 linkmap; #ifndef CONFIG_SCSI_AHCI_PLAT -# ifdef CONFIG_DM_PCI +# if defined(CONFIG_DM_PCI) struct udevice *dev; int ret; @@ -969,6 +981,8 @@ void scsi_low_level_init(int busdevfunc) if (ret) return; ahci_init_one(dev); +# elif defined(CONFIG_DM_SATA) + ahci_init_one(dev); # else ahci_init_one(busdevfunc); # endif diff --git a/include/ahci.h b/include/ahci.h index a956c6ff5df7..e740273de804 100644 --- a/include/ahci.h +++ b/include/ahci.h @@ -145,7 +145,7 @@ struct ahci_ioports { }; struct ahci_probe_ent { -#ifdef CONFIG_DM_PCI +#if defined(CONFIG_DM_PCI) || defined(CONFIG_DM_SATA) struct udevice *dev; #else pci_dev_t dev; diff --git a/include/sata.h b/include/sata.h index b35359aa5a19..26c8de730399 100644 --- a/include/sata.h +++ b/include/sata.h @@ -2,6 +2,8 @@ #define __SATA_H__ #include <part.h> +#if !defined(CONFIG_DM_SATA) + int init_sata(int dev); int reset_sata(int dev); int scan_sata(int dev); @@ -15,5 +17,6 @@ int __sata_stop(void); int sata_port_status(int dev, int port); extern struct blk_desc sata_dev_desc[]; +#endif #endif diff --git a/include/scsi.h b/include/scsi.h index 7e3759140b34..22d6bd0d02a7 100644 --- a/include/scsi.h +++ b/include/scsi.h @@ -166,14 +166,27 @@ typedef struct SCSI_cmd_block{ void scsi_print_error(ccb *pccb); int scsi_exec(ccb *pccb); void scsi_bus_reset(void); +#if !defined(CONFIG_DM_SATA) void scsi_low_level_init(int busdevfunc); - +#else +void scsi_low_level_init(int busdevfunc, struct udevice *dev); +#endif /*************************************************************************** * functions residing inside cmd_scsi.c */ void scsi_init(void); +#if !defined(CONFIG_DM_SATA) void scsi_scan(int mode); +#else + +struct scsi_platdata { + unsigned long base; +}; + +void scsi_scan(int mode, struct udevice *bdev); +int scsi_bind(struct udevice *dev); +#endif /** @return the number of scsi disks */ int scsi_get_disk_count(void); -- 1.9.1

2 9

[U-Boot] [PATCH v2 0/1] cmd: pci: add option to parse and display BAR information
by yehuday＠marvell.com 24 Nov '16

24 Nov '16

From: Yehuda Yitschak <yehuday(a)marvell.com> Updates to initial patch following comments from Stephan Rose I don't have access to a board with DM_PCI support so I tested only on non DM_PCI. Appreciate if someone can test on DM_PCI v1->v2: - Added support for DM_PCI - Added print of memory type and prefetchable flag - Skipped printing of disabled BARs Yehuda Yitschak (1): cmd: pci: add option to parse and display BAR information cmd/pci.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) -- 1.9.1

4 5

[U-Boot] [RFC PATCH v1 3/3] sandbox: GPT over MTD test
by Patrick Delaunay 24 Nov '16

24 Nov '16

From: Patrick Delaunay <patrick.delaunay(a)st.com> activate needed feature in sandbox to allow test GPT over MTD - EFI_PARTITION_MTD - SPI_FLASH_MTD - CMD_MTDPARTS - MTD_PARTITIONS - MTD_DEVICE activate 2 features useful for test - RANDOM_UUID - PARTITION_TYPE_GUID Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> Signed-off-by: Patrick Delaunay <patrick.delaunay73(a)gmail.com> --- configs/sandbox_defconfig | 2 ++ include/configs/sandbox.h | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 380d4fe..1ba8d2a 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y +CONFIG_EFI_PARTITION_MTD=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_BOOTSTAGE_USER_COUNT=0x20 @@ -110,6 +111,7 @@ CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_SST=y CONFIG_SPI_FLASH_WINBOND=y +CONFIG_SPI_FLASH_MTD=y CONFIG_DM_ETH=y CONFIG_PCI=y CONFIG_DM_PCI=y diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 2daf02d..66707e3 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -49,13 +49,20 @@ #define CONFIG_CMD_MD5SUM #define CONFIG_CMD_GPT +#define CONFIG_RANDOM_UUID #define CONFIG_PARTITION_UUIDS +#define CONFIG_PARTITION_TYPE_GUID #define CONFIG_AMIGA_PARTITION #define CONFIG_DOS_PARTITION #define CONFIG_EFI_PARTITION #define CONFIG_ISO_PARTITION #define CONFIG_MAC_PARTITION +/* Dynamic MTD partition support */ +#define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_PARTITIONS +#define CONFIG_MTD_DEVICE + /* * Size of malloc() pool, before and after relocation */ -- 1.9.1

2 1

[U-Boot] [PATCH] mmc: add bkops-enable command
by Tomas Melin 24 Nov '16

24 Nov '16

Add new command for enabling the background operations handshake functionality (BKOPS_EN, EXT_CSD byte [163]) on eMMC devices. This is an optional feature of eMMCs, the setting is write-once. Signed-off-by: Tomas Melin <tomas.melin(a)vaisala.com> --- cmd/mmc.c | 26 ++++++++++++++++++++++++++ drivers/mmc/mmc.c | 30 ++++++++++++++++++++++++++++++ include/mmc.h | 4 ++++ 3 files changed, 60 insertions(+) diff --git a/cmd/mmc.c b/cmd/mmc.c index b2761e9..3ae9682 100644 --- a/cmd/mmc.c +++ b/cmd/mmc.c @@ -729,6 +729,29 @@ static int do_mmc_setdsr(cmd_tbl_t *cmdtp, int flag, return ret; } +static int do_mmc_bkops_enable(cmd_tbl_t *cmdtp, int flag, + int argc, char * const argv[]) +{ + int dev; + struct mmc *mmc; + + if (argc != 2) + return CMD_RET_USAGE; + + dev = simple_strtoul(argv[1], NULL, 10); + + mmc = init_mmc_device(dev, false); + if (!mmc) + return CMD_RET_FAILURE; + + if (IS_SD(mmc)) { + puts("BKOPS_EN only exists on eMMC\n"); + return CMD_RET_FAILURE; + } + + return mmc_set_bkops_enable(mmc); +} + static cmd_tbl_t cmd_mmc[] = { U_BOOT_CMD_MKENT(info, 1, 0, do_mmcinfo, "", ""), U_BOOT_CMD_MKENT(read, 4, 1, do_mmc_read, "", ""), @@ -749,6 +772,7 @@ static cmd_tbl_t cmd_mmc[] = { U_BOOT_CMD_MKENT(rpmb, CONFIG_SYS_MAXARGS, 1, do_mmcrpmb, "", ""), #endif U_BOOT_CMD_MKENT(setdsr, 2, 0, do_mmc_setdsr, "", ""), + U_BOOT_CMD_MKENT(bkops-enable, 2, 0, do_mmc_bkops_enable, "", ""), }; static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) @@ -813,6 +837,8 @@ U_BOOT_CMD( "mmc rpmb counter - read the value of the write counter\n" #endif "mmc setdsr <value> - set DSR register value\n" + "mmc bkops-enable <dev> - enable background operations handshake on device\n" + " WARNING: This is a write-once setting.\n" ); /* Old command kept for compatibility. Same as 'mmc info' */ diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 0cec02c..d6f40cc 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1810,3 +1810,33 @@ int mmc_initialize(bd_t *bis) mmc_do_preinit(); return 0; } + +int mmc_set_bkops_enable(struct mmc *mmc) +{ + int err; + ALLOC_CACHE_ALIGN_BUFFER(u8, ext_csd, MMC_MAX_BLOCK_LEN); + + err = mmc_send_ext_csd(mmc, ext_csd); + if (err) { + puts("Could not get ext_csd register values\n"); + return err; + } + + if (!(ext_csd[EXT_CSD_BKOPS_SUPPORT] & 0x1)) { + puts("Background operations not supported on device\n"); + return -EMEDIUMTYPE; + } + + if (ext_csd[EXT_CSD_BKOPS_EN] & 0x1) { + puts("Background operations already enabled\n"); + return 0; + } + + err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_BKOPS_EN, 1); + if (err) { + puts("Failed to enable background operations\n"); + return err; + } + + return 0; +} diff --git a/include/mmc.h b/include/mmc.h index 5ef37d3..0772d53 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -175,6 +175,7 @@ #define EXT_CSD_MAX_ENH_SIZE_MULT 157 /* R */ #define EXT_CSD_PARTITIONING_SUPPORT 160 /* RO */ #define EXT_CSD_RST_N_FUNCTION 162 /* R/W */ +#define EXT_CSD_BKOPS_EN 163 /* R/W */ #define EXT_CSD_WR_REL_PARAM 166 /* R */ #define EXT_CSD_WR_REL_SET 167 /* R/W */ #define EXT_CSD_RPMB_MULT 168 /* RO */ @@ -189,6 +190,7 @@ #define EXT_CSD_HC_WP_GRP_SIZE 221 /* RO */ #define EXT_CSD_HC_ERASE_GRP_SIZE 224 /* RO */ #define EXT_CSD_BOOT_MULT 226 /* RO */ +#define EXT_CSD_BKOPS_SUPPORT 502 /* RO */ /* * EXT_CSD field definitions @@ -541,6 +543,8 @@ int mmc_rpmb_read(struct mmc *mmc, void *addr, unsigned short blk, unsigned short cnt, unsigned char *key); int mmc_rpmb_write(struct mmc *mmc, void *addr, unsigned short blk, unsigned short cnt, unsigned char *key); +int mmc_set_bkops_enable(struct mmc *mmc); + /** * Start device initialization and return immediately; it does not block on * polling OCR (operation condition register) status. Then you should call -- 2.1.4

3 9

[U-Boot] [PATCH] armv7: ls1021aiot: Fixing SPL compiling issues
by York Sun 24 Nov '16

24 Nov '16

To align with SPL change 38fed8ab and 693d4c9f, add Kconfig option CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR to defconfig, and remove CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS. Signed-off-by: York Sun <york.sun(a)nxp.com> CC: Feng Li <feng.li_2(a)nxp.com> --- configs/ls1021aiot_sdcard_defconfig | 2 ++ include/configs/ls1021aiot.h | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/ls1021aiot_sdcard_defconfig b/configs/ls1021aiot_sdcard_defconfig index 4b082ab..a5a391d 100644 --- a/configs/ls1021aiot_sdcard_defconfig +++ b/configs/ls1021aiot_sdcard_defconfig @@ -1,6 +1,8 @@ CONFIG_ARM=y CONFIG_TARGET_LS1021AIOT=y CONFIG_SPL=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xe8 CONFIG_DEFAULT_DEVICE_TREE="ls1021a-iot-duart" CONFIG_DM_SPI=y CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT,SD_BOOT_QSPI" diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 182a003..7af4bc4 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -96,7 +96,6 @@ #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0xe8 -#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x400 #define CONFIG_SPL_TEXT_BASE 0x10000000 #define CONFIG_SPL_MAX_SIZE 0x1a000 -- 2.7.4

2 2

[U-Boot] [PULL] u-boot-pxa/master
by Marek Vasut 23 Nov '16

23 Nov '16

The following changes since commit 543bd27353d2c5679057fe09aa2d02259687ff32: MAINTAINERS: SUNXI: Update maintainership (2016-11-22 09:07:26 -0500) are available in the git repository at: git://git.denx.de/u-boot-pxa.git master for you to fetch changes up to 136179bec19f4bc84227cba138214ea392a723ea: colibri_pxa270: transition to driver model for serial (2016-11-23 13:53:20 +0100) ---------------------------------------------------------------- Marcel Ziswiler (4): serial: pxa: use kconfig for serial configuration serial: pxa: integrate optional driver model handling colibri_pxa270: drop edit, elf, fpga, hush, regex et al. for space reason colibri_pxa270: transition to driver model for serial board/toradex/colibri_pxa270/colibri_pxa270.c | 18 ++++++++- configs/colibri_pxa270_defconfig | 9 ++++- configs/h2200_defconfig | 1 + configs/zipitz2_defconfig | 1 + drivers/serial/Kconfig | 6 +++ drivers/serial/serial_pxa.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------- include/configs/colibri_pxa270.h | 7 +--- include/configs/h2200.h | 2 - include/configs/zipitz2.h | 1 - include/dm/platform_data/serial_pxa.h | 56 ++++++++++++++++++++++++++++ scripts/config_whitelist.txt | 1 - 11 files changed, 203 insertions(+), 82 deletions(-) create mode 100644 include/dm/platform_data/serial_pxa.h

2 1

[U-Boot] U-Boot x86 QEMU: Error on boot
by Eric Neblock 23 Nov '16

23 Nov '16

Hello, I'm trying to get u-boot working on QEMU so I understand how it works before moving to an embedded system. After following the instructions here: https://lists.nongnu.org/archive/html/qemu-devel/2015-05/msg04835.html U-Boot is always crashing, even when omitting the network stuff. Below is how I'm currently trying to boot: qemu-system-i386 -nographic -bios u-boot.rom And here is the ending result: U-Boot 2016.11 (Nov 21 2016 - 14:03:23 -0600) CPU: x86, vendor Intel, device 663h DRAM: 128 MiB Using default environment Video: General Protection EIP: 0010:[<07f685e4>] EFLAGS: 00000046 Original EIP :[<fff005e4>] EAX: 00000012 EBX: 00000010 ECX: 00000000 EDX: 07d643cf ESI: 07fad1dc EDI: 07d643e0 EBP: 07fcf564 ESP: 07d64384 DS: 0018 ES: 0018 FS: 0020 GS: 0018 SS: 0018 CR0: 00000033 CR2: 00000000 CR3: 00000000 CR4: 00000000 DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000 DR6: ffff0ff0 DR7: 00000400 Stack: 0x07d643c4 : 0x0000001c 0x07d643c0 : 0x7acd6388 0x07d643bc : 0x00000111 0x07d643b8 : 0x000c0000 0x07d643b4 : 0x00000000 0x07d643b0 : 0x074a7205 0x07d643ac : 0x07f87d87 0x07d643a8 : 0x7acd6388 0x07d643a4 : 0x3b9aca00 0x07d643a0 : 0x00000000 0x07d6439c : 0x07f8dbe9 0x07d64398 : 0x07d67720 0x07d64394 : 0x00000002 0x07d64390 : 0xc0010001 0x07d6438c : 0x00000246 0x07d64388 : 0x00000010 --->0x07d64384 : 0x07f6a997 0x07d64380 : 0x00000046 0x07d6437c : 0x00000010 0x07d64378 : 0x07f685e4 ### ERROR ### Please RESET the board ### I think I'm on the bleeding edge branch, but even then when reverting to the v2016.09.01 tag, I still crash. If there is any additional information that I can provide please let me know. Regards, Eric Neblock

2 4