May 2017 - U-Boot

[U-Boot] Please pull u-boot-video/master
by Anatolij Gustschin 16 May '17

16 May '17

Hi Tom, The following changes since commit 22f3368e71321db1e0e15dfbf54b052367890ec7: Merge branch 'master' of git://git.denx.de/u-boot-mips (2017-05-13 16:45:35 -0400) are available in the git repository at: git://git.denx.de/u-boot-video.git master for you to fetch changes up to 940aed8f6bacfc8c0dbaf9da0008e0a6a76463a8: sunxi: Add clock support for TV encoder (2017-05-15 21:22:57 +0200) ---------------------------------------------------------------- Jernej Skrabec (5): edid: Set timings flags according to edid edid: Add HDMI flag to timing info video: dw_hdmi: Select HDMI mode only if monitor supports it sunxi: video: Split out TVE code sunxi: Add clock support for TV encoder Philipp Tomsich (2): rockchip: video: introduce VIDEO_DW_HDMI and select for Rockchip HDMI video: bmp: rename CONFIG_BMP_24BMP to CONFIG_BMP_24BPP arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 8 +- arch/arm/include/asm/arch-sunxi/display.h | 107 --------------------- arch/arm/include/asm/arch-sunxi/tve.h | 131 ++++++++++++++++++++++++++ common/edid.c | 56 +++++++++++ common/lcd.c | 4 +- drivers/video/Kconfig | 9 ++ drivers/video/Makefile | 1 + drivers/video/dw_hdmi.c | 31 +++--- drivers/video/rockchip/Kconfig | 1 + drivers/video/rockchip/Makefile | 2 +- drivers/video/sunxi/Makefile | 2 +- drivers/video/sunxi/sunxi_display.c | 73 +++----------- drivers/video/sunxi/tve.c | 86 +++++++++++++++++ drivers/video/video_bmp.c | 4 +- include/configs/brxre1.h | 2 +- include/edid.h | 14 +++ include/fdtdec.h | 1 + scripts/config_whitelist.txt | 1 - 18 files changed, 341 insertions(+), 192 deletions(-) create mode 100644 arch/arm/include/asm/arch-sunxi/tve.h create mode 100644 drivers/video/sunxi/tve.c Please pull. Thanks! Anatolij

2 1

[U-Boot] [PATCH 1/2] nand: arasan_nfc: Move common ecc struct initialization init routine
by Siva Durga Prasad Paladugu 16 May '17

16 May '17

Move common part of ecc structure initialization to arasan_nand_init() routine. Signed-off-by: Siva Durga Prasad Paladugu <sivadur(a)xilinx.com> --- drivers/mtd/nand/arasan_nfc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/mtd/nand/arasan_nfc.c b/drivers/mtd/nand/arasan_nfc.c index a8f795d..43a5707 100644 --- a/drivers/mtd/nand/arasan_nfc.c +++ b/drivers/mtd/nand/arasan_nfc.c @@ -1038,13 +1038,6 @@ static int arasan_nand_ecc_init(struct mtd_info *mtd) u32 regval, eccpos_start, i; struct nand_chip *nand_chip = mtd_to_nand(mtd); - nand_chip->ecc.mode = NAND_ECC_HW; - nand_chip->ecc.hwctl = NULL; - nand_chip->ecc.read_page = arasan_nand_read_page_hwecc; - nand_chip->ecc.write_page = arasan_nand_write_page_hwecc; - nand_chip->ecc.read_oob = arasan_nand_read_oob; - nand_chip->ecc.write_oob = arasan_nand_write_oob; - for (i = 0; i < ARRAY_SIZE(ecc_matrix); i++) { if ((ecc_matrix[i].pagesize == mtd->writesize) && (ecc_matrix[i].ecc_codeword_size >= @@ -1126,6 +1119,13 @@ static int arasan_nand_init(struct nand_chip *nand_chip, int devnum) goto fail; } + nand_chip->ecc.mode = NAND_ECC_HW; + nand_chip->ecc.hwctl = NULL; + nand_chip->ecc.read_page = arasan_nand_read_page_hwecc; + nand_chip->ecc.write_page = arasan_nand_write_page_hwecc; + nand_chip->ecc.read_oob = arasan_nand_read_oob; + nand_chip->ecc.write_oob = arasan_nand_write_oob; + if (arasan_nand_ecc_init(mtd)) { printf("%s: nand_ecc_init failed\n", __func__); goto fail; -- 2.7.4

1 1

[U-Boot] [PATCH] at91_udc.c: Fix unused variable warning
by Tom Rini 16 May '17

16 May '17

With gcc-6 and later we see warnings that at91sam9263_udc_caps and at91rm9200_udc_caps are unused. Fixes: 620197670a69 ("usb: gadget: at91_udc: add at91_udc into U-Boot") Cc: Lukasz Majewski <lukma(a)denx.de> Cc: Marek Vasut <marex(a)denx.de> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- drivers/usb/gadget/at91_udc.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index f5bc277fa6e0..01a59078b84a 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c @@ -1386,11 +1386,6 @@ static void at91rm9200_udc_pullup(struct at91_udc *udc, int is_on) gpio_set_value(udc->board.pullup_pin, !active); } -static const struct at91_udc_caps at91rm9200_udc_caps = { - .init = at91rm9200_udc_init, - .pullup = at91rm9200_udc_pullup, -}; - static int at91sam9260_udc_init(struct at91_udc *udc) { struct at91_ep *ep; @@ -1503,11 +1498,6 @@ static int at91sam9263_udc_init(struct at91_udc *udc) return 0; } -static const struct at91_udc_caps at91sam9263_udc_caps = { - .init = at91sam9263_udc_init, - .pullup = at91sam9260_udc_pullup, -}; - int usb_gadget_handle_interrupts(int index) { struct at91_udc *udc = controller; -- 1.9.1

3 2

Re: [U-Boot] [PATCH 2/3] armv8: layerscape: Adjust memory mapping for Flash/SD card on LS1043A
by Alison Wang 16 May '17

16 May '17

On 04/27/2017 01:08 AM, Alison Wang wrote: > This patch is to adjust the memory mapping for FLash/SD card on > LS1043AQDS and LS1043ARDB, such as PPA firmware load address, FMAN > firmware load address, QE firmware load address, U-Boot start address > on serial flash and environment address. > > Signed-off-by: Alison Wang <alison.wang(a)nxp.com> > --- > arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 8 ++++---- > include/configs/ls1043a_common.h | 10 +++++----- > include/configs/ls1043aqds.h | 10 +++++----- > include/configs/ls1043ardb.h | 8 ++++---- > 4 files changed, 18 insertions(+), 18 deletions(-) > > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > index 4c16c4c..82c76e2 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > @@ -163,11 +163,11 @@ endchoice > config SYS_LS_PPA_FW_ADDR > hex "Address of PPA firmware loading from" > depends on FSL_LS_PPA > - default 0x40500000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT > + default 0x40400000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT > default 0x580a00000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS2080A > - default 0x60500000 if SYS_LS_PPA_FW_IN_XIP > - default 0x500000 if SYS_LS_PPA_FW_IN_MMC > - default 0x500000 if SYS_LS_PPA_FW_IN_NAND > + default 0x60400000 if SYS_LS_PPA_FW_IN_XIP > + default 0x400000 if SYS_LS_PPA_FW_IN_MMC > + default 0x400000 if SYS_LS_PPA_FW_IN_NAND > > help > If the PPA firmware locate at XIP flash, such as NOR or diff --git > a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h > index e269248..155da92 100644 > --- a/include/configs/ls1043a_common.h > +++ b/include/configs/ls1043a_common.h > @@ -208,9 +208,9 @@ > #define CONFIG_SYS_FM_MURAM_SIZE 0x60000 > > #ifdef CONFIG_NAND_BOOT > -/* Store Fman ucode at offeset 0x160000(11 blocks). */ > +/* Store Fman ucode at offeset 0x900000(72 blocks). */ > #define CONFIG_SYS_QE_FMAN_FW_IN_NAND > -#define CONFIG_SYS_FMAN_FW_ADDR (11 * CONFIG_SYS_NAND_BLOCK_SIZE) > +#define CONFIG_SYS_FMAN_FW_ADDR (72 * CONFIG_SYS_NAND_BLOCK_SIZE) > #elif defined(CONFIG_SD_BOOT) > /* > * PBL SD boot image should stored at 0x1000(8 blocks), the size of > the image is @@ -218,10 +218,10 @@ > * 0x2000 (16 blocks), 8 + 2040 + 16 = 2064, enlarge it to 2080(0x820). > */ > #define CONFIG_SYS_QE_FMAN_FW_IN_MMC > -#define CONFIG_SYS_FMAN_FW_ADDR (512 * 0x820) > +#define CONFIG_SYS_FMAN_FW_ADDR (512 * 0x4800) Alison, Please update the comments. It still says 0x820. [Alison Wang] Yes, I will update. Thanks for reminding me. Best Regards, Alison Wang

1 0

[U-Boot] [PATCH v3] QE: add QE support on SD boot
by Zhao Qiang 16 May '17

16 May '17

modify u_qe_init to upload QE firmware from SD card when it is SD boot Signed-off-by: Zhao Qiang <qiang.zhao(a)nxp.com> --- Changes for v2: - fix issue of memory leak Changes for v3: - add CONFIG_SYS_QE_FMAN_FW_IN_NOR to ls1021a drivers/qe/qe.c | 37 ++++++++++++++++++++++++++++++++++++- include/configs/ls1021aqds.h | 1 + include/configs/ls1021atwr.h | 1 + include/configs/ls1043a_common.h | 2 ++ include/configs/ls1043ardb.h | 4 +--- 5 files changed, 41 insertions(+), 4 deletions(-) diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c index 4f0a278..52e4d7c 100644 --- a/drivers/qe/qe.c +++ b/drivers/qe/qe.c @@ -8,6 +8,7 @@ */ #include <common.h> +#include <malloc.h> #include <command.h> #include <linux/errno.h> #include <asm/io.h> @@ -17,6 +18,10 @@ #include <asm/arch/immap_ls102xa.h> #endif +#ifdef CONFIG_SYS_QE_FMAN_FW_IN_MMC +#include <mmc.h> +#endif + #define MPC85xx_DEVDISR_QE_DISABLE 0x1 qe_map_t *qe_immr = NULL; @@ -194,8 +199,38 @@ void u_qe_init(void) { qe_immr = (qe_map_t *)(CONFIG_SYS_IMMR + QE_IMMR_OFFSET); - u_qe_upload_firmware((const void *)CONFIG_SYS_QE_FW_ADDR); +#if defined(CONFIG_SYS_QE_FMAN_FW_IN_NOR) + void *addr = (void *)CONFIG_SYS_QE_FW_ADDR; +#elif defined(CONFIG_SYS_QE_FMAN_FW_IN_MMC) + int dev = CONFIG_SYS_MMC_ENV_DEV; + void *addr = malloc(CONFIG_SYS_QE_FMAN_FW_LENGTH); + u32 cnt = CONFIG_SYS_QE_FMAN_FW_LENGTH / 512; + u32 blk = CONFIG_SYS_QE_FW_ADDR / 512; + + if (mmc_initialize(gd->bd)) { + printf("%s: mmc_initialize() failed\n", __func__); + return; + } + struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV); + + if (!mmc) { + free(addr); + printf("\nMMC cannot find device for ucode\n"); + } else { + printf("\nMMC read: dev # %u, block # %u, count %u ...\n", + dev, blk, cnt); + mmc_init(mmc); + (void)mmc->block_dev.block_read(&mmc->block_dev, blk, cnt, + addr); + /* flush cache after read */ + flush_cache((ulong)addr, cnt * 512); + } +#endif + u_qe_upload_firmware(addr); out_be32(&qe_immr->iram.iready, QE_IRAM_READY); +#ifdef CONFIG_SYS_QE_FMAN_FW_IN_MMC + free(addr); +#endif } #endif diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index c3224c8..34e469e 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -125,6 +125,7 @@ unsigned long get_board_ddr_clk(void); #if !defined(CONFIG_SD_BOOT) && !defined(CONFIG_NAND_BOOT) && \ !defined(CONFIG_QSPI_BOOT) #define CONFIG_U_QE +#define CONFIG_SYS_QE_FMAN_FW_IN_NOR #endif /* diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 1d0b469..a652248 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -150,6 +150,7 @@ #if !defined(CONFIG_SD_BOOT) && !defined(CONFIG_NAND_BOOT) && \ !defined(CONFIG_QSPI_BOOT) #define CONFIG_U_QE +#define CONFIG_SYS_QE_FMAN_FW_IN_NOR #endif /* diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index e269248..80c508e 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -219,6 +219,7 @@ */ #define CONFIG_SYS_QE_FMAN_FW_IN_MMC #define CONFIG_SYS_FMAN_FW_ADDR (512 * 0x820) +#define CONFIG_SYS_QE_FW_ADDR (512 * 0x4a08) #elif defined(CONFIG_QSPI_BOOT) #define CONFIG_SYS_QE_FW_IN_SPIFLASH #define CONFIG_SYS_FMAN_FW_ADDR 0x400d0000 @@ -230,6 +231,7 @@ #define CONFIG_SYS_QE_FMAN_FW_IN_NOR /* FMan fireware Pre-load address */ #define CONFIG_SYS_FMAN_FW_ADDR 0x60300000 +#define CONFIG_SYS_QE_FW_ADDR 0x60600000 #endif #define CONFIG_SYS_QE_FMAN_FW_LENGTH 0x10000 #define CONFIG_SYS_FDT_PAD (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH) diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 5e570cd..ffa0dba 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -277,11 +277,9 @@ /* QE */ #ifndef SPL_NO_QE -#if !defined(CONFIG_SD_BOOT) && !defined(CONFIG_NAND_BOOT) && \ - !defined(CONFIG_QSPI_BOOT) +#if !defined(CONFIG_NAND_BOOT) && !defined(CONFIG_QSPI_BOOT) #define CONFIG_U_QE #endif -#define CONFIG_SYS_QE_FW_ADDR 0x60600000 #endif /* USB */ -- 2.1.0.27.g96db324

3 2

[U-Boot] [PATCH v2 00/71] dm: Add support for a 'live' device tree
by Simon Glass 16 May '17

16 May '17

(this is series 2 of 3 for live tree support - the final series will fully convert a real board and provide size comparisons) So far U-Boot uses a 'flat' device tree, which means that it is decoded on the fly as needed. This uses the libfdt library and avoids needing extra memory for additional tables. For some time there has been discussion about moving U-Boot to use a 'live' tree, where the device tree is decoded at start-up into a set of hierarchical structures with pointers. The advantages are: - It is somewhat faster to access (in particular scanning and looking for a parent) - It permits the device tree to be changed at run-time (this is not recommended with the flat device tree since devices store the offset of their device tree node and updating the tree may invalidate that). Enabling this feature could be useful for overlays, for example. - It allows nodes to be referenced by a single pointer, instead of the current device tree pointer plus offset The disadvantages are: - It requires more memory - It takes (a little) time to build the live tree - It adds more complexity under the hood, including an additional abstraction layer This series is an attempt to introduce a useful live tree feature into U-Boot. There are many options and trade-offs. This series is the culmination of quite a bit of thought and experimentation. The approach used in this series is: - Before relocation the flat tree is used, to avoid extra memory usage and time. In general, there is not much access before relocation since most drivers are not started up. So there is little benefit in having a live tree - After relocation the live tree is built. At this point the CPU should be running quickly and there is plenty of memory. All available devices will be bound so the overhead of building the live tree may be outweighed by its greater efficiency. As a simplification, this series supports only one tree or the other. When the live tree is active, the flat tree cannot be used. That makes it easy to know the current state and avoids confusion over mixing offset and node pointers. Some drivers will need to be used both before and after relocation. This means that they must support both the flat and the live tree. To support this, the concept of a node 'reference' is defined. A reference can hold either a node offset (for the flat tree) or a node pointer (for the live tree). This allows drivers to access values from the tree regardless of which tree is in use. In addition, since most device tree access happens in the context of a device (struct udevice), a new 'dev_read' layer is provided to read device tree configuration associated with a device. This encapsulates the details of exactly how this information is read. I have taken the view that code compatibility with Linux is desirable. So the of_access.c file brings in code from Linux with very little modification. As new access methods are needed we should be able to bring in more code and avoid writing it ourselves in U-Boot. Conversion of drivers and subsystems to support the live tree (as well as flat tree) is fairly easy. Patch are included to add support to subsystems for which tests exist, to ensure that 'make tests' still passes. Future work will enable the live device tree on a real board and include code size comparisons. For now here is a code size comparison for firefly (within inlining of ofnode which I intend to implement): arm: (for 1/1 boards) all +268.0 bss -24.0 data -4.0 spl/u-boot-spl:all +240.0 spl/u-boot-spl:text +240.0 text +296.0 firefly-rk3288 : all +268 bss -24 data -4 spl/u-boot-spl:all +240 spl/u-boot-spl:text +240 text +296 u-boot: add: 18/-4, grow: 2/-22 bytes: 764/-490 (274) function old new delta gpio_request_tail - 132 +132 ofnode_parse_phandle_with_args - 66 +66 uclass_find_device_by_ofnode - 64 +64 ofnode_pre_reloc - 64 +64 ofnode_read_string - 52 +52 fdt_support_default_count_cells - 52 +52 ofnode_read_u32 - 48 +48 gpio_request_by_name 32 72 +40 ofnode_read_size - 34 +34 uclass_get_device_by_ofnode - 28 +28 ofnode_read_u32_array - 28 +28 ofnode_read_bool - 26 +26 ofnode_read_prop - 24 +24 ofnode_get_addr_size - 24 +24 ofnode_read_u32_default - 22 +22 ofnode_find_subnode - 18 +18 ofnode_next_subnode - 14 +14 ofnode_first_subnode - 14 +14 ofnode_get_name - 12 +12 dm_init_and_scan 42 44 +2 uclass_get_device_by_phandle 106 104 -2 spi_child_post_bind 32 30 -2 i2c_child_post_bind 32 30 -2 spi_post_probe 36 32 -4 spi_flash_scan 520 516 -4 serial_init 212 208 -4 i2c_post_probe 48 44 -4 clk_fixed_rate_ofdata_to_platdata 36 32 -4 act8846_bind 48 44 -4 simple_bus_post_bind 60 52 -8 lists_bind_fdt 240 232 -8 i2c_chip_ofdata_to_platdata 64 56 -8 clk_get_by_index 108 100 -8 usb_child_post_bind 92 80 -12 regmap_init_mem 228 216 -12 fixed_regulator_ofdata_to_platdata 108 96 -12 pmic_bind_children 158 144 -14 spi_slave_ofdata_to_platdata 256 240 -16 pinconfig_post_bind 136 116 -20 led_gpio_bind 108 88 -20 regulator_post_bind 148 124 -24 gpio_request_by_name_nodev 28 - -28 fdtdec_get_uint 30 - -30 regulator_pre_probe 220 184 -36 of_bus_default_count_cells 52 - -52 _gpio_request_by_name_nodev 152 - -152 spl-u-boot-spl: add: 8/-1, grow: 1/-5 bytes: 300/-56 (244) function old new delta ofnode_parse_phandle_with_args - 66 +66 uclass_find_device_by_ofnode - 64 +64 ofnode_read_u32 - 48 +48 ofnode_read_size - 34 +34 uclass_get_device_by_ofnode - 28 +28 ofnode_read_prop - 24 +24 ofnode_read_u32_default - 22 +22 ofnode_get_name - 12 +12 dm_init_and_scan 42 44 +2 dm_scan_fdt_node 96 94 -2 clk_fixed_rate_ofdata_to_platdata 36 32 -4 lists_bind_fdt 224 216 -8 clk_get_by_index 108 100 -8 regmap_init_mem 220 208 -12 device_bind 22 - -22 (no errors to report) Changes in v2: - Rewrite based on testing and refining the v1 series - Convert various subsystems to enable sandbox tests to pass Simon Glass (71): dm: core: Set return value first in lists_bind_fdt() Update WARN_ON() to return a value dm: core: Add livetree definitions dm: core: Add livetree access functions dm: Add a function to create a 'live' device tree dm: Build a live tree after relocation dm: core: Rename of_device_is_compatible() dm: core: Add operations on device tree references dm: core: Add livetree address functions fdt: Update fdt_get_base_address() to use const dm: core: Add address operations on device tree references dm: core: Add a place to put extra device-tree reading functions dm: core: Add device-based 'read' functions to access DT dm: core: Implement live tree 'read' functions dm: core: Allow binding a device from a live tree dm: core: Update lists_bind_fdt() to use ofnode dm: core: Update device_bind_driver_to_node() to use ofnode dm: core: Scan the live tree when setting up driver model dm: core: Add a way to find a device by ofnode dm: regmap: Add support for livetree dm: simple-bus: Add support for livetree dm: core: Update uclass_find_device_by_phandle() for livetree sandbox: Add a way to reset sandbox state for tests dm: test: Move test running code into a separate function dm: test: Show the test filename when running dm: test: Add support for running tests with livetree dm: core: Run tests with both livetree and flat tree dm: gpio: Refactor to prepare for live tree support dm: gpio: Drop blank line in gpio_xlate_offs_flags() comment dm: gpio: sandbox: Use dev_read...() functions to access DT dm: gpio: Add live tree support cros_ec: Fix debug() statement in ec_command_inptr() cros_ec: Convert to support live tree sandbox: Add a new sandbox_flattree board test: Update 'make test' to run more tests fdt: Rename a few functions in fdt_support dm: Add more livetree helpers and definitions string: Add strchrnul() string: Add strcspn() dm: i2c: Convert uclass to livetree dm: pmic: Convert uclass to livetree sandbox: pmic: Convert pmic emulator to support livetree dm: regulator: Convert regulator uclass to support livetree dm: regulator: Update fixed regulator to support livetree. dm: mmc: Convert uclass to livetree dm: adc: Convert uclass to livetree dm: usb: Convert uclass to livetree sandbox: usb: Convert emulators to livetree clk: Modify xlate() method for livetree dm: clk: Update uclass to support livetree dm: clk: fixed: Update to support livetree dm: test: Separate out the bus DT offset test dm: test: Disable the fdt_offset test with livetree dm: phy: Update tests to use ut_asserteq() dm: mailbox: Update uclass to support livetree dm: phy: Update uclass to support livetree sandbox: phy: Update driver for livetree dm: power-domain: Update uclass to support livetree dm: reset: Update uclass to support livetree dm: pci: Update uclass to support livetree dm: Update the I2C eeprom driver for livetree cros_ec: Update the cros_ec keyboard driver to livetree dm: spi: Convert uclass to livetree dm: sandbox: i2c: Drop fdtdec.h header dm: sandbox: i2c_rtc: Drop fdtdec.h header dm: spi-flash: Convert uclass to livetree dm: sandbox: spi: Convert driver to support livetree dm: sandbox: sysreset: Convert driver to livetree dm: test: Fix nit with position of backslash dm: gpio: power: Convert pm8916 drivers to livetree sandbox: Move to use live tree arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 4 +- arch/arm/mach-tegra/tegra186/nvtboot_mem.c | 4 +- arch/sandbox/cpu/state.c | 14 +- arch/sandbox/include/asm/state.h | 7 + board/qualcomm/dragonboard410c/dragonboard410c.c | 12 +- board/samsung/common/board.c | 4 +- board/samsung/common/exynos5-dt.c | 2 +- board/sandbox/MAINTAINERS | 7 + common/board_r.c | 12 + common/fdt_support.c | 28 +- configs/sandbox_defconfig | 1 + configs/sandbox_flattree_defconfig | 179 ++++++ drivers/adc/adc-uclass.c | 14 +- drivers/clk/at91/pmc.c | 4 +- drivers/clk/at91/pmc.h | 2 +- drivers/clk/clk-uclass.c | 14 +- drivers/clk/clk_fixed_rate.c | 5 +- drivers/clk/clk_stm32f7.c | 3 +- drivers/core/Kconfig | 4 + drivers/core/Makefile | 5 + drivers/core/device.c | 20 +- drivers/core/lists.c | 29 +- drivers/core/of_access.c | 736 +++++++++++++++++++++++ drivers/core/of_addr.c | 359 +++++++++++ drivers/core/of_extra.c | 37 ++ drivers/core/ofnode.c | 579 ++++++++++++++++++ drivers/core/read.c | 140 +++++ drivers/core/regmap.c | 37 +- drivers/core/root.c | 60 +- drivers/core/simple-bus.c | 3 +- drivers/core/uclass.c | 42 +- drivers/cpu/cpu-uclass.c | 6 +- drivers/firmware/psci.c | 4 +- drivers/gpio/74x164_gpio.c | 2 +- drivers/gpio/gpio-uclass.c | 82 +-- drivers/gpio/pca953x_gpio.c | 2 +- drivers/gpio/pm8916_gpio.c | 8 +- drivers/gpio/sandbox.c | 12 +- drivers/gpio/sunxi_gpio.c | 2 +- drivers/gpio/tegra186_gpio.c | 2 +- drivers/gpio/tegra_gpio.c | 2 +- drivers/i2c/i2c-uclass.c | 28 +- drivers/i2c/muxes/i2c-mux-uclass.c | 11 +- drivers/i2c/mxc_i2c.c | 12 +- drivers/i2c/sandbox_i2c.c | 1 - drivers/input/cros_ec_keyb.c | 24 +- drivers/input/key_matrix.c | 19 +- drivers/input/tegra-kbc.c | 3 +- drivers/led/led_gpio.c | 13 +- drivers/mailbox/mailbox-uclass.c | 20 +- drivers/mailbox/tegra-hsp.c | 2 +- drivers/misc/cros_ec.c | 36 +- drivers/misc/cros_ec_sandbox.c | 23 +- drivers/misc/i2c_eeprom_emul.c | 7 +- drivers/misc/tegra186_bpmp.c | 6 +- drivers/misc/tegra_car.c | 4 +- drivers/mmc/fsl_esdhc.c | 6 +- drivers/mmc/mmc-uclass.c | 3 +- drivers/mmc/s5p_sdhci.c | 8 +- drivers/mmc/xenon_sdhci.c | 2 +- drivers/mtd/altera_qspi.c | 2 +- drivers/mtd/cfi_flash.c | 2 +- drivers/mtd/nand/sunxi_nand.c | 2 +- drivers/mtd/nand/tegra_nand.c | 4 +- drivers/mtd/pic32_flash.c | 2 +- drivers/mtd/spi/sandbox.c | 6 +- drivers/mtd/spi/spi_flash.c | 7 +- drivers/net/altera_tse.c | 2 +- drivers/net/cpsw-common.c | 4 +- drivers/net/keystone_net.c | 6 +- drivers/net/mvneta.c | 2 +- drivers/net/pic32_eth.c | 3 +- drivers/pci/pci-uclass.c | 26 +- drivers/phy/marvell/comphy_core.c | 4 +- drivers/phy/phy-uclass.c | 21 +- drivers/phy/sandbox-phy.c | 3 +- drivers/pinctrl/pinctrl-uclass.c | 15 +- drivers/power/domain/power-domain-uclass.c | 19 +- drivers/power/pmic/act8846.c | 8 +- drivers/power/pmic/i2c_pmic_emul.c | 6 +- drivers/power/pmic/lp873x.c | 12 +- drivers/power/pmic/max77686.c | 8 +- drivers/power/pmic/palmas.c | 16 +- drivers/power/pmic/pfuze100.c | 8 +- drivers/power/pmic/pm8916.c | 2 +- drivers/power/pmic/pmic-uclass.c | 22 +- drivers/power/pmic/rk808.c | 8 +- drivers/power/pmic/s5m8767.c | 7 +- drivers/power/pmic/sandbox.c | 2 +- drivers/power/pmic/tps65090.c | 8 +- drivers/power/regulator/fixed.c | 17 +- drivers/power/regulator/regulator-uclass.c | 39 +- drivers/reset/reset-uclass.c | 21 +- drivers/rtc/i2c_rtc_emul.c | 1 - drivers/serial/serial-uclass.c | 3 +- drivers/sound/max98095.c | 2 + drivers/sound/wm8994.c | 2 +- drivers/spi/pic32_spi.c | 2 +- drivers/spi/spi-uclass.c | 31 +- drivers/sysreset/sysreset_sandbox.c | 2 +- drivers/timer/timer-uclass.c | 3 +- drivers/usb/emul/sandbox_flash.c | 4 +- drivers/usb/emul/sandbox_hub.c | 3 +- drivers/usb/host/ehci-marvell.c | 2 +- drivers/usb/host/ehci-tegra.c | 7 +- drivers/usb/host/ehci-vf.c | 5 +- drivers/usb/host/usb-uclass.c | 8 +- drivers/usb/host/xhci-rockchip.c | 2 +- drivers/usb/musb-new/ti-musb.c | 2 +- dts/Kconfig | 11 + include/asm-generic/global_data.h | 3 + include/asm-generic/gpio.h | 17 +- include/clk-uclass.h | 5 +- include/cros_ec.h | 8 +- include/dm.h | 2 + include/dm/device-internal.h | 10 +- include/dm/device.h | 4 +- include/dm/lists.h | 9 +- include/dm/of.h | 139 +++++ include/dm/of_access.h | 347 +++++++++++ include/dm/of_addr.h | 64 ++ include/dm/of_extra.h | 46 ++ include/dm/ofnode.h | 487 ++++++++++++++- include/dm/read.h | 439 ++++++++++++++ include/dm/root.h | 3 +- include/dm/test.h | 2 + include/dm/uclass-internal.h | 16 + include/dm/uclass.h | 16 + include/fdt_support.h | 6 +- include/fdtdec.h | 34 -- include/generic-phy.h | 3 +- include/i2c.h | 3 +- include/key_matrix.h | 3 +- include/linux/compat.h | 8 +- include/linux/string.h | 28 + include/mailbox-uclass.h | 2 +- include/of_live.h | 24 + include/power-domain-uclass.h | 2 +- include/power/pmic.h | 2 +- include/reset-uclass.h | 4 +- include/spi.h | 2 +- include/test/test.h | 4 + include/test/ut.h | 2 +- lib/Makefile | 1 + lib/fdtdec.c | 33 +- lib/of_live.c | 333 ++++++++++ lib/string.c | 32 + test/dm/bus.c | 16 +- test/dm/phy.c | 15 +- test/dm/test-fdt.c | 3 +- test/dm/test-main.c | 105 +++- test/run | 8 +- 152 files changed, 4749 insertions(+), 662 deletions(-) create mode 100644 configs/sandbox_flattree_defconfig create mode 100644 drivers/core/of_access.c create mode 100644 drivers/core/of_addr.c create mode 100644 drivers/core/of_extra.c create mode 100644 drivers/core/ofnode.c create mode 100644 drivers/core/read.c create mode 100644 include/dm/of.h create mode 100644 include/dm/of_access.h create mode 100644 include/dm/of_addr.h create mode 100644 include/dm/of_extra.h create mode 100644 include/dm/read.h create mode 100644 include/of_live.h create mode 100644 lib/of_live.c -- 2.13.0.rc2.291.g57267f2277-goog

2 75

[U-Boot] [PATCH v3 1/2] env_mmc: configure environment offsets via device tree
by Philipp Tomsich 16 May '17

16 May '17

This introduces the ability to override the environment offets from the device tree by setting the following nodes in '/config': 'u-boot,mmc-env-offset' - overrides CONFIG_ENV_OFFSET 'u-boot,mmc-env-offset-redundant' - overrides CONFIG_ENV_OFFSET_REDUND To keep with the previous logic, the CONFIG_* defines still need to be available and the statically defined values become the defaults, when the corresponding properties are not set in the device-tree. Signed-off-by: Philipp Tomsich <philipp.tomsich(a)theobroma-systems.com> Acked-by: Simon Glass <sjg(a)chromium.org> --- Changes in v3: - changes the config-check to depend on CONFIG_OF_CONTROL to detect if 'fdtdec_get_config_int' is available Changes in v2: None common/env_mmc.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/common/env_mmc.c b/common/env_mmc.c index a5d14d4..c10eec5 100644 --- a/common/env_mmc.c +++ b/common/env_mmc.c @@ -10,6 +10,7 @@ #include <command.h> #include <environment.h> +#include <fdtdec.h> #include <linux/stddef.h> #include <malloc.h> #include <memalign.h> @@ -36,15 +37,37 @@ DECLARE_GLOBAL_DATA_PTR; #define CONFIG_ENV_OFFSET 0 #endif -__weak int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr) +#if defined(CONFIG_OF_CONTROL) +static inline s64 mmc_offset(int copy) { - s64 offset; + const char *propname = "u-boot,mmc-env-offset"; + s64 defvalue = CONFIG_ENV_OFFSET; - offset = CONFIG_ENV_OFFSET; -#ifdef CONFIG_ENV_OFFSET_REDUND +#if defined(CONFIG_ENV_OFFSET_REDUND) + if (copy) { + propname = "u-boot,mmc-env-offset-redundant"; + defvalue = CONFIG_ENV_OFFSET_REDUND; + } +#endif + + return fdtdec_get_config_int(gd->fdt_blob, propname, defvalue); +} +#else +static inline s64 mmc_offset(int copy) +{ + s64 offset = CONFIG_ENV_OFFSET; + +#if defined(CONFIG_ENV_OFFSET_REDUND) if (copy) offset = CONFIG_ENV_OFFSET_REDUND; #endif + return offset; +} +#endif + +__weak int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr) +{ + s64 offset = mmc_offset(copy); if (offset < 0) offset += mmc->capacity; -- 1.9.1

4 4

[U-Boot] [PATCH] kbuild: update DTC warning settings for bus and node/property name checks
by Masahiro Yamada 16 May '17

16 May '17

Recent commits of DTC introduced new warnings checking PCI and simple buses, unit address formatting, and stricter node and property name checking. Disable the new DTC warnings by default. As before, warnings are enabled with W=*. The strict node and property name checks are a bit subjective, so they are only enabled for W=2. (This policy reflects the commit 8654cb8d0371 of Linux.) Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- scripts/Makefile.extrawarn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/scripts/Makefile.extrawarn b/scripts/Makefile.extrawarn index 7b2cffc..90dc149 100644 --- a/scripts/Makefile.extrawarn +++ b/scripts/Makefile.extrawarn @@ -58,9 +58,23 @@ endif KBUILD_CFLAGS += $(warning) +dtc-warning-2 += $(call dtc-option,-Wnode_name_chars_strict) +dtc-warning-2 += $(call dtc-option,-Wproperty_name_chars_strict) + +dtc-warning := $(dtc-warning-$(findstring 1, $(KBUILD_ENABLE_EXTRA_GCC_CHECKS))) +dtc-warning += $(dtc-warning-$(findstring 2, $(KBUILD_ENABLE_EXTRA_GCC_CHECKS))) +dtc-warning += $(dtc-warning-$(findstring 3, $(KBUILD_ENABLE_EXTRA_GCC_CHECKS))) + +DTC_FLAGS += $(dtc-warning) + else # Disable noisy checks by default DTC_FLAGS += $(call dtc-option,-Wno-unit_address_vs_reg) +DTC_FLAGS += $(call dtc-option,-Wno-simple_bus_reg) +DTC_FLAGS += $(call dtc-option,-Wno-unit_address_format) +DTC_FLAGS += $(call dtc-option,-Wno-pci_bridge) +DTC_FLAGS += $(call dtc-option,-Wno-pci_device_bus_num) +DTC_FLAGS += $(call dtc-option,-Wno-pci_device_reg) endif -- 2.7.4

3 2

[U-Boot] [PATCH] omap3: omap3_logic: switch to using TI_COMMON_CMD_OPTION
by Adam Ford 16 May '17

16 May '17

Enable TI_COMMON_CMD_OPTIONS and remove similar options from the defconfig. Updated with savedefconfig CMD_USB isn't enabled yet. I have some testing to do with musb. Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/board/logicpd/omap3som/Kconfig b/board/logicpd/omap3som/Kconfig index 03d272a..68d40dc 100644 --- a/board/logicpd/omap3som/Kconfig +++ b/board/logicpd/omap3som/Kconfig @@ -9,4 +9,6 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "omap3_logic" +source "board/ti/common/Kconfig" + endif diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index 561bdfb..50450c9 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -1,11 +1,11 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y +CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_LOGIC=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_DEFAULT_DEVICE_TREE="logicpd-torpedo-37xx-devkit" -CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="NAND" CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y @@ -16,29 +16,14 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="OMAP Logic # " -CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set -CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set -CONFIG_CMD_MMC=y -CONFIG_CMD_PART=y -CONFIG_CMD_SPI=y -CONFIG_CMD_I2C=y +# CONFIG_CMD_USB is not set # CONFIG_CMD_FPGA is not set -CONFIG_CMD_GPIO=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y -CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y -CONFIG_EFI_PARTITION=y CONFIG_OF_CONTROL=y # CONFIG_BLK is not set CONFIG_DM_I2C=y -- 2.7.4

2 2

[U-Boot] [PATCH] power: twl4030: Add imply CMD_POWEROFF when TWL4030 is enabled
by Adam Ford 16 May '17

16 May '17

Now that CMD_POWEROFF can turn off the twl4030, let's imply that just incase someone wants to disable it. Signed-off-by: Adam Ford <aford173(a)gmail.com> --- drivers/power/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index a7d56e6..d8c107e 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -311,6 +311,7 @@ config SY8106A_VOUT1_VOLT config TWL4030_POWER depends on OMAP34XX bool "Enable driver for TI TWL4030 power management chip" + imply CMD_POWEROFF ---help--- The TWL4030 in a combination audio CODEC/power management with GPIO and it is commonly used with the OMAP3 family of processors -- 2.7.4

2 2