July 2015 - U-Boot

[U-Boot] [PATCH 02/11] x86: bios: Synchronize stack between real and protected mode
by Bin Meng 02 Jul '15

02 Jul '15

From: Jian Luo <jian.luo4(a)boschrexroth.de> PCI option rom may use different SS during its execution, so it is not safe to assume esp pointed to the same location in the protected mode. Signed-off-by: Jian Luo <jian.luo4(a)boschrexroth.de> Reviewed-by: Bin Meng <bmeng.cn(a)gmail.com> Tested-by: Bin Meng <bmeng.cn(a)gmail.com> --- arch/x86/lib/bios_asm.S | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/x86/lib/bios_asm.S b/arch/x86/lib/bios_asm.S index 4faa70e..a29fe0e 100644 --- a/arch/x86/lib/bios_asm.S +++ b/arch/x86/lib/bios_asm.S @@ -246,6 +246,8 @@ __interrupt_handler_16bit = PTR_TO_REAL_MODE(.) push %fs push %gs + movw %ss, %cs:__realmode_ss + /* Clear DF to not break ABI assumptions */ cld @@ -258,12 +260,22 @@ __interrupt_handler_16bit = PTR_TO_REAL_MODE(.) enter_protected_mode + movzwl %cs:__realmode_ss, %ecx + shll $4, %ecx + addl %ecx, %esp + /* Call the C interrupt handler */ movl $interrupt_handler, %eax call *%eax + movzwl %cs:__realmode_ss, %ecx + shll $4, %ecx + subl %ecx, %esp + enter_real_mode + movw %cs:__realmode_ss, %ss + /* * Restore all registers, including those manipulated by the C * handler @@ -276,6 +288,9 @@ __interrupt_handler_16bit = PTR_TO_REAL_MODE(.) popal iret +__realmode_ss = PTR_TO_REAL_MODE(.) + .word 0 + .globl asm_realmode_code_size asm_realmode_code_size: .long . - asm_realmode_code -- 1.8.2.1

2 2

[U-Boot] [PATCH] arm: mvebu: db-88f6820-gp: Add MAINTAINERS file
by Stefan Roese 02 Jul '15

02 Jul '15

Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Luka Perkov <luka.perkov(a)sartura.hr> Cc: Albert Aribaud <albert.u.boot(a)aribaud.net> --- board/Marvell/db-88f6820-gp/MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 board/Marvell/db-88f6820-gp/MAINTAINERS diff --git a/board/Marvell/db-88f6820-gp/MAINTAINERS b/board/Marvell/db-88f6820-gp/MAINTAINERS new file mode 100644 index 0000000..f564940 --- /dev/null +++ b/board/Marvell/db-88f6820-gp/MAINTAINERS @@ -0,0 +1,6 @@ +DB_88F6820_GP BOARD +M: Stefan Roese <sr(a)denx.de> +S: Maintained +F: board/Marvell/db-88f6820-gp/ +F: include/configs/db-88f6820-gp.h +F: configs/db-88f6820-gp_defconfig -- 2.4.5

2 1

[U-Boot] [PATCH] keystone2: Add support for bootz
by Vitaly Andrianov 01 Jul '15

01 Jul '15

From: Lokesh Vutla <lokeshvutla(a)ti.com> Adding support for zImage loading. Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> Signed-off-by: Vitaly Andrianov <vitalya(a)ti.com> --- include/configs/ks2_evm.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/ks2_evm.h b/include/configs/ks2_evm.h index 26198db..f1517eb 100644 --- a/include/configs/ks2_evm.h +++ b/include/configs/ks2_evm.h @@ -309,6 +309,7 @@ #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x08000000) #define CONFIG_LINUX_BOOT_PARAM_ADDR (CONFIG_SYS_SDRAM_BASE + 0x100) +#define CONFIG_CMD_BOOTZ #define CONFIG_SUPPORT_RAW_INITRD /* Keystone2 Emif16 errata config */ -- 1.9.1

2 3

[U-Boot] Pull request: u-boot-spi/master
by Jagan Teki 01 Jul '15

01 Jul '15

Hi Tom, Please pull these series for Kconfig/defconfig updates for spi/sf subsystems. thanks! Jagan. The following changes since commit 8ee81b7f9b675cb675119a998b04ca843d24ddcd: mtd, spi: Check if flash pointer is used (2015-06-30 00:40:11 +0530) are available in the git repository at: git://git.denx.de/u-boot-spi.git master for you to fetch changes up to 8aa5f1d971df0f668144759991e19b5195606a32: spi: cf_qspi: fix clamp macro type check compilation warnings (2015-07-01 22:58:50 +0530) ---------------------------------------------------------------- Angelo Dureghello (1): spi: cf_qspi: fix clamp macro type check compilation warnings Haikun Wang (1): sf: update sst25wf040b flash params Jagan Teki (43): spi: Zap andes_spi driver spi: Zap ftssp010_spi driver spi: Zap oc_tiny_spi driver spi: xilinx_spi: Move header code to driver spi: xilinx_spi: Driver clean-up spi: davinci_spi: Move header code to driver spi: davinci_spi: Driver cleanup spi/sf: Minor cleanups dm: spi: zynq_spi: Convert to driver model zynq: Kconfig: Enable dm spi and spi_flash dts: zynq: Add zynq spi controller nodes spi: zynq_spi: Add fdt support in driver dts: zynq: Enable spi1 for zc770_xm010 board dm: spi: xilinx_spi: Convert to driver model spi: xilinx_spi: Add asm/io.h include file spi: Kconfig: Add Zynq SPI controller entry defconfig: Add CONFIG_OF_CONTROL in zynq_picozed zynq: defconfig: Move CONFIG_OF_* to Kconfig sf: dataflash: Rename to CONFIG_SPI_FLASH_DATAFLASH README: Add CONFIG_SPI_FLASH_DATAFLASH description sf: Add Kconfig menu entry common: Add CMD_SF Kconfig entry sf: Kconfig: Update SPI_FLASH entry sf: Kconfig: Add SPI_FLASH_MTD entry sf: Kconfig: Add SPI_FLASH_DATAFLASH entry spi: Add Kconfig menu entry spi: Kconfig: Add XILINX_SPI entry spi: Kconfig: Add TI_QSPI entry spi: Makefile: Use object file alphabetic order spi: Kconfig: Show dm-spi drivers if DM_SPI set spi: Kconfig: Add FSL_DSPI entry spi: Kconfig: Add FSL_ESPI entry spi: Kconfig: Add FSL_QSPI entry spi: Kconfig: Add EXYNOS_SPI entry spi: Kconfig: Add ICH_SPI entry spi: Kconfig: Add TEGRA114_SPI entry spi: Kconfig: Add TEGRA20_SFLASH entry spi: Kconfig: Add TEGRA20_SLINK entry README: Remove CONFIG_SPI_FLASH_MTD help text defconfig: Move CONFIG_SPI_FLASH_BAR from configs sf: Kconfig: Add SPI_FLASH_BAR entry README: Remove CONFIG_SPI_FLASH_BAR help text README: Remove CONFIG_SPI_FLASH_DATAFLASH help text README | 14 - arch/arm/Kconfig | 4 + arch/arm/dts/zynq-7000.dtsi | 26 ++ arch/arm/dts/zynq-zc770-xm010.dts | 5 + common/Kconfig | 5 + configs/alt_defconfig | 1 + configs/am43xx_evm_defconfig | 1 + configs/bg0900_defconfig | 1 + configs/dra7xx_evm_defconfig | 1 + configs/gose_defconfig | 1 + configs/koelsch_defconfig | 1 + configs/lager_defconfig | 1 + configs/maxbcm_defconfig | 1 + configs/mx6sxsabresd_defconfig | 1 + configs/porter_defconfig | 1 + configs/silk_defconfig | 1 + configs/zynq_microzed_defconfig | 2 - configs/zynq_zc702_defconfig | 1 - configs/zynq_zc706_defconfig | 1 - configs/zynq_zc70x_defconfig | 2 - configs/zynq_zc770_xm010_defconfig | 2 - configs/zynq_zc770_xm012_defconfig | 2 - configs/zynq_zc770_xm013_defconfig | 2 - configs/zynq_zed_defconfig | 2 - configs/zynq_zybo_defconfig | 2 - doc/device-tree-bindings/spi/spi-zynq.txt | 29 ++ drivers/mtd/spi/Kconfig | 55 +++- drivers/mtd/spi/Makefile | 2 +- drivers/mtd/spi/sf_dataflash.c | 10 - drivers/mtd/spi/sf_internal.h | 18 +- drivers/mtd/spi/sf_params.c | 2 +- drivers/spi/Kconfig | 112 ++++++- drivers/spi/Makefile | 13 +- drivers/spi/andes_spi.c | 284 ----------------- drivers/spi/andes_spi.h | 115 ------- drivers/spi/cf_qspi.c | 3 +- drivers/spi/davinci_spi.c | 369 ++++++++++++++-------- drivers/spi/davinci_spi.h | 121 -------- drivers/spi/ftssp010_spi.c | 498 ------------------------------ drivers/spi/oc_tiny_spi.c | 245 --------------- drivers/spi/xilinx_spi.c | 318 ++++++++++++------- drivers/spi/xilinx_spi.h | 138 --------- drivers/spi/zynq_spi.c | 300 ++++++++++-------- include/configs/alt.h | 1 - include/configs/am43xx_evm.h | 1 - include/configs/bg0900.h | 1 - include/configs/dra7xx_evm.h | 1 - include/configs/gose.h | 1 - include/configs/koelsch.h | 1 - include/configs/lager.h | 1 - include/configs/ls1021aqds.h | 2 +- include/configs/maxbcm.h | 1 - include/configs/mx6sxsabresd.h | 1 - include/configs/porter.h | 1 - include/configs/silk.h | 1 - include/spi.h | 2 +- include/spi_flash.h | 10 +- 57 files changed, 868 insertions(+), 1870 deletions(-) create mode 100644 doc/device-tree-bindings/spi/spi-zynq.txt delete mode 100644 drivers/spi/andes_spi.c delete mode 100644 drivers/spi/andes_spi.h delete mode 100644 drivers/spi/davinci_spi.h delete mode 100644 drivers/spi/ftssp010_spi.c delete mode 100644 drivers/spi/oc_tiny_spi.c delete mode 100644 drivers/spi/xilinx_spi.h

2 1

[U-Boot] Pull request: u-boot-uniphier/master
by Masahiro Yamada 01 Jul '15

01 Jul '15

Hi Tom, Some small changes for UniPhier SoCs. The following changes since commit 9c6b05cb724e18d1db3f9e1a75b2272572f06fbd: Prepare v2015.07-rc3 (2015-06-29 17:22:01 -0400) are available in the git repository at: git://git.denx.de/u-boot-uniphier.git master for you to fetch changes up to 8101b98298c4232175d0d7b4c73d94b66b97ef83: ARM: UniPhier: add IDs for PH1-Pro5, ProXstream2, PH1-LD6b (2015-07-02 01:07:25 +0900) ---------------------------------------------------------------- Masahiro Yamada (4): ARM: UniPhier: drop special CONFIG_AUTOBOOT_ settings ARM: dts: UniPhier: sync device trees with the Linux kernel ARM: dts: UniPhier: re-license device tree files under GPLv2+/X11 ARM: UniPhier: add IDs for PH1-Pro5, ProXstream2, PH1-LD6b arch/arm/dts/uniphier-ph1-ld4-ref.dts | 2 +- arch/arm/dts/uniphier-ph1-ld4.dtsi | 49 +++++++++++++++++++++++++++++--- arch/arm/dts/uniphier-ph1-pro4-ref.dts | 2 +- arch/arm/dts/uniphier-ph1-pro4.dtsi | 50 ++++++++++++++++++++++++++++++--- arch/arm/dts/uniphier-ph1-sld3-ref.dts | 2 +- arch/arm/dts/uniphier-ph1-sld3.dtsi | 50 ++++++++++++++++++++++++++++++--- arch/arm/dts/uniphier-ph1-sld8-ref.dts | 2 +- arch/arm/dts/uniphier-ph1-sld8.dtsi | 49 +++++++++++++++++++++++++++++--- arch/arm/dts/uniphier-ref-daughter.dtsi | 6 ++-- arch/arm/mach-uniphier/cpu_info.c | 9 ++++++ configs/ph1_ld4_defconfig | 4 --- configs/ph1_pro4_defconfig | 4 --- configs/ph1_sld8_defconfig | 4 --- 13 files changed, 197 insertions(+), 36 deletions(-) -- Best Regards Masahiro Yamada

2 1

[U-Boot] Please pull changes for ARC
by Alexey Brodkin 01 Jul '15

01 Jul '15

Hi Tom, The following changes since commit 9c6b05cb724e18d1db3f9e1a75b2272572f06fbd: Prepare v2015.07-rc3 (2015-06-29 17:22:01 -0400) are available in the git repository at: git://git.denx.de/u-boot-arc.git for you to fetch changes up to af6da69f47314e0e8efa3711ffadbfda8d2334aa: board: axs103 - add maintainer information (2015-07-01 17:19:33 +0300) ---------------------------------------------------------------- Alexey Brodkin (3): arc: implement slave cores kick-start for Linux kernel arc: significant cache rework board: axs103 - add maintainer information arch/arc/include/asm/arcregs.h | 5 +- arch/arc/include/asm/cache.h | 7 +- arch/arc/lib/bootm.c | 6 ++ arch/arc/lib/cache.c | 375 +++++++++++++++++++++++++++++++++++++++++++++++++++-------------------- ---- arch/arc/lib/cpu.c | 2 + arch/arc/lib/init_helpers.c | 10 +- arch/arc/lib/start.S | 46 ++++++++-- board/synopsys/axs101/MAINTAINERS | 1 + board/synopsys/axs101/axs101.c | 30 ++++++ 9 files changed, 337 insertions(+), 145 deletions(-) -Alexey

2 1

[U-Boot] [PATCH] x86: baytrail: Configure FSP UPD from device tree
by andrew＠bradfordembedded.com 01 Jul '15

01 Jul '15

From: Andrew Bradford <andrew.bradford(a)kodakalaris.com> Allow for configuration of FSP UPD from the device tree which will override any settings which the FSP was built with itself if the device tree settings exist, otherwise simply trust the FSP's defaults. Modifies the MinnowMax board to transfer the FSP UPD hard-coded settings to the MinnowMax dts. Signed-off-by: Andrew Bradford <andrew.bradford(a)kodakalaris.com> --- arch/x86/cpu/baytrail/fsp_configs.c | 183 +++++++++++++++++---- arch/x86/dts/minnowmax.dts | 27 +++ .../misc/intel,baytrail-fsp.txt | 113 +++++++++++++ include/fdtdec.h | 1 + lib/fdtdec.c | 1 + 5 files changed, 295 insertions(+), 30 deletions(-) create mode 100644 doc/device-tree-bindings/misc/intel,baytrail-fsp.txt diff --git a/arch/x86/cpu/baytrail/fsp_configs.c b/arch/x86/cpu/baytrail/fsp_configs.c index 86b6926..fd07eca 100644 --- a/arch/x86/cpu/baytrail/fsp_configs.c +++ b/arch/x86/cpu/baytrail/fsp_configs.c @@ -1,11 +1,13 @@ /* * Copyright (C) 2013, Intel Corporation * Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> + * Copyright (C) 2015, Kodak Alaris * * SPDX-License-Identifier: Intel */ #include <common.h> +#include <fdtdec.h> #include <asm/arch/fsp/azalia.h> #include <asm/fsp/fsp_support.h> @@ -116,41 +118,162 @@ const struct pch_azalia_config azalia_config = { .reset_wait_timer_us = 300 }; +/** + * Update the FSP's UPD. The FSP itself can be configured for defaults to + * store in UPD through Intel's GUI configurator but likely a specific board + * will want to update these from u-boot, so allow for that via device tree. + * If the device tree does not specify a setting, trust the FSP's default. + */ void update_fsp_upd(struct upd_region *fsp_upd) { struct memory_down_data *mem; + const void *blob = gd->fdt_blob; + int node; - /* - * Configure everything here to avoid the poor hard-pressed user - * needing to run Intel's binary configuration tool. It may also allow - * us to support the 1GB single core variant easily. - * - * TODO(sjg(a)chromium.org): Move to device tree - */ - fsp_upd->mrc_init_tseg_size = 8; - fsp_upd->mrc_init_mmio_size = 0x800; - fsp_upd->emmc_boot_mode = 0xff; - fsp_upd->enable_sdio = 1; - fsp_upd->enable_sdcard = 1; - fsp_upd->enable_hsuart0 = 1; fsp_upd->azalia_config_ptr = (uint32_t)&azalia_config; - fsp_upd->enable_i2_c0 = 0; - fsp_upd->enable_i2_c2 = 0; - fsp_upd->enable_i2_c3 = 0; - fsp_upd->enable_i2_c4 = 0; - fsp_upd->enable_xhci = 0; - fsp_upd->igd_render_standby = 1; + + node = fdtdec_next_compatible(blob, 0, COMPAT_INTEL_BAYTRAIL_FSP); + if (node < 0) { + debug("%s: Cannot find FSP node\n", __func__); + /* TODO: change return type for error indication */ + return; + } + + fsp_upd->mrc_init_tseg_size = fdtdec_get_int(blob, node, + "mrc_int_tseg_size", + fsp_upd->mrc_init_tseg_size); + fsp_upd->mrc_init_mmio_size = fdtdec_get_int(blob, node, + "mrc_init_mmio_size", + fsp_upd->mrc_init_mmio_size); + fsp_upd->mrc_init_spd_addr1 = fdtdec_get_int(blob, node, + "mrc_init_spd_addr1", + fsp_upd->mrc_init_spd_addr1); + fsp_upd->mrc_init_spd_addr2 = fdtdec_get_int(blob, node, + "mrc_init_spd_addr2", + fsp_upd->mrc_init_spd_addr2); + fsp_upd->emmc_boot_mode = fdtdec_get_int(blob, node, "emmc_boot_mode", + fsp_upd->emmc_boot_mode); + fsp_upd->enable_sdio = fdtdec_get_int(blob, node, "enable_sdio", + fsp_upd->enable_sdio); + fsp_upd->enable_sdcard = fdtdec_get_int(blob, node, "enable_sdcard", + fsp_upd->enable_sdcard); + fsp_upd->enable_hsuart0 = fdtdec_get_int(blob, node, "enable_hsuart0", + fsp_upd->enable_hsuart0); + fsp_upd->enable_hsuart1 = fdtdec_get_int(blob, node, "enable_hsuart1", + fsp_upd->enable_hsuart1); + fsp_upd->enable_spi = fdtdec_get_int(blob, node, "enable_spi", + fsp_upd->enable_spi); + fsp_upd->enable_sata = fdtdec_get_int(blob, node, "enable_sata", + fsp_upd->enable_sata); + fsp_upd->enable_azalia = fdtdec_get_int(blob, node, "enable_azalia", + fsp_upd->enable_azalia); + fsp_upd->enable_xhci = fdtdec_get_int(blob, node, "enable_xhci", + fsp_upd->enable_xhci); + fsp_upd->enable_lpe = fdtdec_get_int(blob, node, "enable_lpe", + fsp_upd->enable_lpe); + fsp_upd->lpss_sio_enable_pci_mode = fdtdec_get_int(blob, node, + "lpss_sio_enable_pci_mode", + fsp_upd->lpss_sio_enable_pci_mode); + fsp_upd->enable_dma0 = fdtdec_get_int(blob, node, "enable_dma0", + fsp_upd->enable_dma0); + fsp_upd->enable_dma1 = fdtdec_get_int(blob, node, "enable_dma1", + fsp_upd->enable_dma1); + fsp_upd->enable_i2_c0 = fdtdec_get_int(blob, node, "enable_i2_c0", + fsp_upd->enable_i2_c0); + fsp_upd->enable_i2_c1 = fdtdec_get_int(blob, node, "enable_i2_c1", + fsp_upd->enable_i2_c1); + fsp_upd->enable_i2_c2 = fdtdec_get_int(blob, node, "enable_i2_c2", + fsp_upd->enable_i2_c2); + fsp_upd->enable_i2_c3 = fdtdec_get_int(blob, node, "enable_i2_c3", + fsp_upd->enable_i2_c3); + fsp_upd->enable_i2_c4 = fdtdec_get_int(blob, node, "enable_i2_c4", + fsp_upd->enable_i2_c4); + fsp_upd->enable_i2_c5 = fdtdec_get_int(blob, node, "enable_i2_c5", + fsp_upd->enable_i2_c5); + fsp_upd->enable_i2_c6 = fdtdec_get_int(blob, node, "enable_i2_c6", + fsp_upd->enable_i2_c6); + fsp_upd->enable_pwm0 = fdtdec_get_int(blob, node, "enable_pwm0", + fsp_upd->enable_pwm0); + fsp_upd->enable_pwm1 = fdtdec_get_int(blob, node, "enable_pwm1", + fsp_upd->enable_pwm1); + fsp_upd->enable_hsi = fdtdec_get_int(blob, node, "enable_hsi", + fsp_upd->enable_hsi); + fsp_upd->igd_dvmt50_pre_alloc = fdtdec_get_int(blob, node, + "igd_dvmt50_pre_alloc", + fsp_upd->igd_dvmt50_pre_alloc); + fsp_upd->aperture_size = fdtdec_get_int(blob, node, "aperture_size", + fsp_upd->aperture_size); + fsp_upd->gtt_size = fdtdec_get_int(blob, node, "gtt_size", + fsp_upd->gtt_size); + fsp_upd->serial_debug_port_address = fdtdec_get_int(blob, node, + "serial_debug_port_address", + fsp_upd->serial_debug_port_address); + fsp_upd->serial_debug_port_type = fdtdec_get_int(blob, node, + "serial_debug_port_type", + fsp_upd->serial_debug_port_type); + fsp_upd->mrc_debug_msg = fdtdec_get_int(blob, node, "mrc_debug_msg", + fsp_upd->mrc_debug_msg); + fsp_upd->isp_enable = fdtdec_get_int(blob, node, "isp_enable", + fsp_upd->isp_enable); + fsp_upd->scc_enable_pci_mode = fdtdec_get_int(blob, node, + "scc_enable_pci_mode", + fsp_upd->scc_enable_pci_mode); + fsp_upd->igd_render_standby = fdtdec_get_int(blob, node, + "igd_render_standby", + fsp_upd->igd_render_standby); + fsp_upd->txe_uma_enable = fdtdec_get_int(blob, node, "txe_uma_enable", + fsp_upd->txe_uma_enable); + fsp_upd->os_selection = fdtdec_get_int(blob, node, "os_selection", + fsp_upd->os_selection); + fsp_upd->emmc45_ddr50_enabled = fdtdec_get_int(blob, node, + "emmc45_ddr50_enabled", + fsp_upd->emmc45_ddr50_enabled); + fsp_upd->emmc45_hs200_enabled = fdtdec_get_int(blob, node, + "emmc45_hs200_enabled", + fsp_upd->emmc45_hs200_enabled); + fsp_upd->emmc45_retune_timer_value = fdtdec_get_int(blob, node, + "emmc45_retune_timer_value", + fsp_upd->emmc45_retune_timer_value); + fsp_upd->igd_render_standby = fdtdec_get_int(blob, node, + "igd_render_standby", + fsp_upd->igd_render_standby); mem = &fsp_upd->memory_params; - mem->enable_memory_down = 1; - mem->dram_speed = 1; - mem->dimm_width = 1; - mem->dimm_density = 2; - mem->dimm_tcl = 0xb; - mem->dimm_trpt_rcd = 0xb; - mem->dimm_twr = 0xc; - mem->dimm_twtr = 6; - mem->dimm_trrd = 6; - mem->dimm_trtp = 6; - mem->dimm_tfaw = 0x14; + mem->enable_memory_down = fdtdec_get_int(blob, node, + "enable_memory_down", + mem->enable_memory_down); + if (mem->enable_memory_down) { + mem->dram_speed = fdtdec_get_int(blob, node, "dram_speed", + mem->dram_speed); + mem->dram_type = fdtdec_get_int(blob, node, "dram_type", + mem->dram_type); + mem->dimm_0_enable = fdtdec_get_int(blob, node, "dimm_0_enable", + mem->dimm_0_enable); + mem->dimm_1_enable = fdtdec_get_int(blob, node, "dimm_1_enable", + mem->dimm_1_enable); + mem->dimm_width = fdtdec_get_int(blob, node, "dimm_width", + mem->dimm_width); + mem->dimm_density = fdtdec_get_int(blob, node, + "dimm_density", + mem->dimm_density); + mem->dimm_bus_width = fdtdec_get_int(blob, node, + "dimm_bus_width", + mem->dimm_bus_width); + mem->dimm_sides = fdtdec_get_int(blob, node, "dimm_sides", + mem->dimm_sides); + mem->dimm_tcl = fdtdec_get_int(blob, node, "dimm_tcl", + mem->dimm_tcl); + mem->dimm_trpt_rcd = fdtdec_get_int(blob, node, "dimm_trpt_rcd", + mem->dimm_trpt_rcd); + mem->dimm_twr = fdtdec_get_int(blob, node, "dimm_twr", + mem->dimm_twr); + mem->dimm_twtr = fdtdec_get_int(blob, node, "dimm_twtr", + mem->dimm_twtr); + mem->dimm_trrd = fdtdec_get_int(blob, node, "dimm_trrd", + mem->dimm_trrd); + mem->dimm_trtp = fdtdec_get_int(blob, node, "dimm_trtp", + mem->dimm_trtp); + mem->dimm_tfaw = fdtdec_get_int(blob, node, "dimm_tfaw", + mem->dimm_tfaw); + } } diff --git a/arch/x86/dts/minnowmax.dts b/arch/x86/dts/minnowmax.dts index bd21bfb..bb76e69 100644 --- a/arch/x86/dts/minnowmax.dts +++ b/arch/x86/dts/minnowmax.dts @@ -111,6 +111,33 @@ }; + fsp { + compatible = "intel,baytrail-fsp"; + mrc_init_tseg_size = <8>; + mrc_init_mmio_size = <0x800>; + emmc_boot_mode = <0xff>; + enable_sdio = <1>; + enable_sdcard = <1>; + enable_hsuart0 = <1>; + enable_i2_c0 = <0>; + enable_i2_c2 = <0>; + enable_i2_c3 = <0>; + enable_i2_c4 = <0>; + enable_xhci = <0>; + igd_render_standby = <1>; + enable_memory_down = <1>; + dram_speed = <1>; + dimm_width = <1>; + dimm_density = <2>; + dimm_tcl = <0xb>; + dimm_trpt_rcd = <0xb>; + dimm_twr = <0xc>; + dimm_twtr = <6>; + dimm_trrd = <6>; + dimm_trtp = <6>; + dimm_tfaw = <0x14>; + }; + spi { #address-cells = <1>; #size-cells = <0>; diff --git a/doc/device-tree-bindings/misc/intel,baytrail-fsp.txt b/doc/device-tree-bindings/misc/intel,baytrail-fsp.txt new file mode 100644 index 0000000..a9841e7 --- /dev/null +++ b/doc/device-tree-bindings/misc/intel,baytrail-fsp.txt @@ -0,0 +1,113 @@ +Intel Baytrail FSP UPD Binding +============================== + +The device tree node which describes the overriding of the Intel Baytrail FSP +UPD data for configuring the SoC. + +All properties are optional, if unspecified then the FSP's preconfigured choices +will be used. + +All properties can be found within the `upd_region` struct in +arch/x86/asm/arch-baytrail/fsp/fsp_vpd.h under the same names and in Intel's FSP +Binary Configuration Tool for Baytrail. + +Optional properties: + +- mrc_init_tseg_size +- mrc_init_mmio_size +- mrc_init_spd_addr1 +- mrc_init_spd_addr2 +- emmc_boot_mode +- enable_sdio +- enable_sdcard +- enable_hsuart0 +- enable_hsuart1 +- enable_spi +- enable_sata +- sata_mode +- enable_azalia +- enable_xhci +- enable_lpe +- lpss_sio_enable_pci_mode +- enable_dma0 +- enable_dma1 +- enable_i2_c0 +- enable_i2_c1 +- enable_i2_c2 +- enable_i2_c3 +- enable_i2_c4 +- enable_i2_c5 +- enable_i2_c6 +- enable_pwm0 +- enable_pwm1 +- enable_hsi +- igd_dvmt50_pre_alloc +- aperture_size +- gtt_size +- serial_debug_port_address +- serial_debug_port_type +- mrc_debug_msg +- isp_enable +- scc_enable_pci_mode +- igd_render_standby +- txe_uma_enable +- os_selection +- emmc45_ddr50_enabled +- emmc45_hs200_enabled +- emmc45_retune_timer_value +- enable_memory_down + + The following are only used if enable_memory_down is enabled, otherwise + the FSP will use the DIMM's SPD information to configure the memory: + - dram_speed + - dram_type + - dimm_0_enable + - dimm_1_enable + - dimm_width + - dimm_density + - dimm_bus_width + - dimm_sides + - dimm_tcl + - dimm_trpt_rcd + - dimm_twr + - dimm_twtr + - dimm_trrd + - dimm_trtp + - dimm_tfaw + + +Example (from MinnowMax Dual Core): +----------------------------------- + +/ { + ... + + fsp { + compatible = "intel,baytrail-fsp"; + mrc_init_tseg_size = <8>; + mrc_init_mmio_size = <0x800>; + emmc_boot_mode = <0xff>; + enable_sdio = <1>; + enable_sdcard = <1>; + enable_hsuart0 = <1>; + enable_i2_c0 = <0>; + enable_i2_c2 = <0>; + enable_i2_c3 = <0>; + enable_i2_c4 = <0>; + enable_xhci = <0>; + igd_render_standby = <1>; + enable_memory_down = <1>; + dram_speed = <1>; + dimm_width = <1>; + dimm_density = <2>; + dimm_tcl = <0xb>; + dimm_trpt_rcd = <0xb>; + dimm_twr = <0xc>; + dimm_twtr = <6>; + dimm_trrd = <6>; + dimm_trtp = <6>; + dimm_tfaw = <0x14>; + }; + + ... +}; diff --git a/include/fdtdec.h b/include/fdtdec.h index 2323603..2b09cce 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -183,6 +183,7 @@ enum fdt_compat_id { COMPAT_SOCIONEXT_XHCI, /* Socionext UniPhier xHCI */ COMPAT_INTEL_PCH, /* Intel PCH */ COMPAT_INTEL_IRQ_ROUTER, /* Intel Interrupt Router */ + COMPAT_INTEL_BAYTRAIL_FSP, /* Intel Baytrail FSP */ COMPAT_COUNT, }; diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 9877849..c7a27ac 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -76,6 +76,7 @@ static const char * const compat_names[COMPAT_COUNT] = { COMPAT(SOCIONEXT_XHCI, "socionext,uniphier-xhci"), COMPAT(COMPAT_INTEL_PCH, "intel,bd82x6x"), COMPAT(COMPAT_INTEL_IRQ_ROUTER, "intel,irq-router"), + COMPAT(COMPAT_INTEL_BAYTRAIL_FSP, "intel,baytrail-fsp"), }; const char *fdtdec_get_compatible(enum fdt_compat_id id) -- 1.9.1

4 7

[U-Boot] [PATCH] sunxi: Select a bunch of CONFIG_foo options from ARCH_SUNXI
by Hans de Goede 01 Jul '15

01 Jul '15

Select a bunch of CONFIG_foo options from ARCH_SUNXI, instead of having them set to y in every single sunxi defconfig. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- arch/arm/Kconfig | 3 +++ configs/A10-OLinuXino-Lime_defconfig | 3 --- configs/A10s-OLinuXino-M_defconfig | 3 --- configs/A13-OLinuXinoM_defconfig | 3 --- configs/A13-OLinuXino_defconfig | 3 --- configs/A20-OLinuXino-Lime2_defconfig | 3 --- configs/A20-OLinuXino-Lime_defconfig | 3 --- configs/A20-OLinuXino_MICRO_defconfig | 3 --- configs/Ainol_AW1_defconfig | 1 - configs/Ampe_A76_defconfig | 1 - configs/Auxtek-T004_defconfig | 3 --- configs/Bananapi_defconfig | 3 --- configs/Bananapro_defconfig | 3 --- configs/CSQ_CS908_defconfig | 3 --- configs/Chuwi_V7_CW0825_defconfig | 1 - configs/Colombus_defconfig | 3 --- configs/Cubieboard2_defconfig | 3 --- configs/Cubieboard_defconfig | 3 --- configs/Cubietruck_defconfig | 3 --- configs/Et_q8_v1_6_defconfig | 1 - configs/Hummingbird_A31_defconfig | 3 --- configs/Hyundai_A7HD_defconfig | 1 - configs/Ippo_q8h_v1_2_a33_1024x600_defconfig | 1 - configs/Ippo_q8h_v1_2_defconfig | 1 - configs/Ippo_q8h_v5_defconfig | 1 - configs/Linksprite_pcDuino3_Nano_defconfig | 3 --- configs/Linksprite_pcDuino3_defconfig | 3 --- configs/Linksprite_pcDuino_defconfig | 3 --- configs/MK808C_defconfig | 3 --- configs/MSI_Primo73_defconfig | 3 --- configs/MSI_Primo81_defconfig | 2 -- configs/Marsboard_A10_defconfig | 3 --- configs/Mele_A1000G_quad_defconfig | 3 --- configs/Mele_A1000_defconfig | 3 --- configs/Mele_I7_defconfig | 3 --- configs/Mele_M3_defconfig | 3 --- configs/Mele_M5_defconfig | 3 --- configs/Mele_M9_defconfig | 3 --- configs/Merrii_A80_Optimus_defconfig | 3 --- configs/Mini-X_defconfig | 3 --- configs/Orangepi_defconfig | 3 --- configs/Orangepi_mini_defconfig | 3 --- configs/Sinlinx_SinA33_defconfig | 3 --- configs/TZX-Q8-713B7_defconfig | 1 - configs/UTOO_P66_defconfig | 1 - configs/Wexler_TAB7200_defconfig | 3 --- configs/Wits_Pro_A20_DKT_defconfig | 3 --- configs/Yones_Toptech_BD1078_defconfig | 1 - configs/ba10_tv_box_defconfig | 3 --- configs/forfun_q88db_defconfig | 1 - configs/ga10h_v1_1_defconfig | 1 - configs/i12-tvbox_defconfig | 3 --- configs/iNet_3F_defconfig | 1 - configs/iNet_3W_defconfig | 1 - configs/iNet_86VS_defconfig | 1 - configs/jesurun_q5_defconfig | 3 --- configs/mixtile_loftq_defconfig | 3 --- configs/mk802_a10s_defconfig | 3 --- configs/mk802_defconfig | 3 --- configs/mk802ii_defconfig | 3 --- configs/r7-tv-dongle_defconfig | 3 --- configs/sunxi_Gemei_G9_defconfig | 3 --- 62 files changed, 3 insertions(+), 150 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 0829235..6c4d138 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -645,10 +645,13 @@ config ARCH_SOCFPGA config ARCH_SUNXI bool "Support sunxi (Allwinner) SoCs" select DM + select DM_ETH select DM_GPIO + select DM_USB if !USB_MUSB_SUNXI select OF_CONTROL select OF_SEPARATE select SPL_DISABLE_OF_CONTROL + select USB config TARGET_SNOWBALL bool "Support snowball" diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig index 87ade90..78e799f 100644 --- a/configs/A10-OLinuXino-Lime_defconfig +++ b/configs/A10-OLinuXino-Lime_defconfig @@ -11,7 +11,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_ # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/A10s-OLinuXino-M_defconfig b/configs/A10s-OLinuXino-M_defconfig index 5a450af..26fadcb 100644 --- a/configs/A10s-OLinuXino-M_defconfig +++ b/configs/A10s-OLinuXino-M_defconfig @@ -13,7 +13,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,SUNXI_EMAC,USB_EHCI" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig index 213ece6..2bce5c8 100644 --- a/configs/A13-OLinuXinoM_defconfig +++ b/configs/A13-OLinuXinoM_defconfig @@ -17,7 +17,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,USB_EHCI" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig index d71c11c..9f9dc2d 100644 --- a/configs/A13-OLinuXino_defconfig +++ b/configs/A13-OLinuXino_defconfig @@ -18,7 +18,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER,USB_EHCI" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig index 6445b25..c7cf48b 100644 --- a/configs/A20-OLinuXino-Lime2_defconfig +++ b/configs/A20-OLinuXino-Lime2_defconfig @@ -12,8 +12,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3 # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig index 650670f..aac3ab9 100644 --- a/configs/A20-OLinuXino-Lime_defconfig +++ b/configs/A20-OLinuXino-Lime_defconfig @@ -9,8 +9,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_ # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig index 3f92504..726b59b 100644 --- a/configs/A20-OLinuXino_MICRO_defconfig +++ b/configs/A20-OLinuXino_MICRO_defconfig @@ -13,8 +13,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_ # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/Ainol_AW1_defconfig b/configs/Ainol_AW1_defconfig index f94cd5a..ec1fc8e 100644 --- a/configs/Ainol_AW1_defconfig +++ b/configs/Ainol_AW1_defconfig @@ -19,5 +19,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y diff --git a/configs/Ampe_A76_defconfig b/configs/Ampe_A76_defconfig index 99aa141..c7cddf8 100644 --- a/configs/Ampe_A76_defconfig +++ b/configs/Ampe_A76_defconfig @@ -18,5 +18,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y diff --git a/configs/Auxtek-T004_defconfig b/configs/Auxtek-T004_defconfig index 016ccd9..7427bd7 100644 --- a/configs/Auxtek-T004_defconfig +++ b/configs/Auxtek-T004_defconfig @@ -10,7 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig index 3e186f6..4c2b4be 100644 --- a/configs/Bananapi_defconfig +++ b/configs/Bananapi_defconfig @@ -10,8 +10,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHC # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/Bananapro_defconfig b/configs/Bananapro_defconfig index 5bd2fd6..27c95ea 100644 --- a/configs/Bananapro_defconfig +++ b/configs/Bananapro_defconfig @@ -12,8 +12,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHC # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/CSQ_CS908_defconfig b/configs/CSQ_CS908_defconfig index 54f4846..d2e595d 100644 --- a/configs/CSQ_CS908_defconfig +++ b/configs/CSQ_CS908_defconfig @@ -11,10 +11,7 @@ CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_DM_SERIAL=y CONFIG_AXP221_DLDO1_VOLT=3300 CONFIG_AXP221_ALDO1_VOLT=3300 -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/Chuwi_V7_CW0825_defconfig b/configs/Chuwi_V7_CW0825_defconfig index 3a2a219..0c2ca9a 100644 --- a/configs/Chuwi_V7_CW0825_defconfig +++ b/configs/Chuwi_V7_CW0825_defconfig @@ -18,7 +18,6 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y CONFIG_VIDEO_LCD_SPI_CS="PA0" CONFIG_VIDEO_LCD_SPI_SCLK="PA1" diff --git a/configs/Colombus_defconfig b/configs/Colombus_defconfig index 9d84901..4c3312e 100644 --- a/configs/Colombus_defconfig +++ b/configs/Colombus_defconfig @@ -11,9 +11,6 @@ CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_DM_SERIAL=y CONFIG_AXP221_ALDO1_VOLT=3300 -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig index 0fbaa23..667b742 100644 --- a/configs/Cubieboard2_defconfig +++ b/configs/Cubieboard2_defconfig @@ -10,8 +10,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_ # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig index 0d0051e..243e8b7 100644 --- a/configs/Cubieboard_defconfig +++ b/configs/Cubieboard_defconfig @@ -9,7 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_ # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig index 57a3847..1857c34 100644 --- a/configs/Cubietruck_defconfig +++ b/configs/Cubietruck_defconfig @@ -11,8 +11,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(1 # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/Et_q8_v1_6_defconfig b/configs/Et_q8_v1_6_defconfig index e36895c..50b4da8 100644 --- a/configs/Et_q8_v1_6_defconfig +++ b/configs/Et_q8_v1_6_defconfig @@ -19,7 +19,6 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y CONFIG_AXP221_DLDO1_VOLT=3300 CONFIG_AXP221_ALDO1_VOLT=3000 diff --git a/configs/Hummingbird_A31_defconfig b/configs/Hummingbird_A31_defconfig index 02c657a..ee80c0d 100644 --- a/configs/Hummingbird_A31_defconfig +++ b/configs/Hummingbird_A31_defconfig @@ -13,9 +13,6 @@ CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPA(21)" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_DM_SERIAL=y CONFIG_AXP221_ALDO1_VOLT=3300 -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/Hyundai_A7HD_defconfig b/configs/Hyundai_A7HD_defconfig index 7800fa2..c4a566b 100644 --- a/configs/Hyundai_A7HD_defconfig +++ b/configs/Hyundai_A7HD_defconfig @@ -20,5 +20,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y diff --git a/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig b/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig index 63910c2..6af061e 100644 --- a/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig +++ b/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig @@ -19,7 +19,6 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y CONFIG_AXP221_DLDO1_VOLT=3300 CONFIG_AXP221_ALDO1_VOLT=3000 diff --git a/configs/Ippo_q8h_v1_2_defconfig b/configs/Ippo_q8h_v1_2_defconfig index ab62210..2d89512 100644 --- a/configs/Ippo_q8h_v1_2_defconfig +++ b/configs/Ippo_q8h_v1_2_defconfig @@ -19,7 +19,6 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y CONFIG_AXP221_DLDO1_VOLT=3300 CONFIG_AXP221_ALDO1_VOLT=3000 diff --git a/configs/Ippo_q8h_v5_defconfig b/configs/Ippo_q8h_v5_defconfig index 312a38c..e23fd6a 100644 --- a/configs/Ippo_q8h_v5_defconfig +++ b/configs/Ippo_q8h_v5_defconfig @@ -19,7 +19,6 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y CONFIG_AXP221_DLDO1_VOLT=3300 CONFIG_AXP221_ALDO1_VOLT=3000 diff --git a/configs/Linksprite_pcDuino3_Nano_defconfig b/configs/Linksprite_pcDuino3_Nano_defconfig index 04ec7ab..8b86fbb 100644 --- a/configs/Linksprite_pcDuino3_Nano_defconfig +++ b/configs/Linksprite_pcDuino3_Nano_defconfig @@ -12,8 +12,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(2 # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig index 6d7690d..4e0ed67 100644 --- a/configs/Linksprite_pcDuino3_defconfig +++ b/configs/Linksprite_pcDuino3_defconfig @@ -10,8 +10,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2),USB_ # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/Linksprite_pcDuino_defconfig b/configs/Linksprite_pcDuino_defconfig index ddd162f..836bb31 100644 --- a/configs/Linksprite_pcDuino_defconfig +++ b/configs/Linksprite_pcDuino_defconfig @@ -9,7 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,USB_EHCI" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/MK808C_defconfig b/configs/MK808C_defconfig index a6db139..22fd604 100644 --- a/configs/MK808C_defconfig +++ b/configs/MK808C_defconfig @@ -9,7 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/MSI_Primo73_defconfig b/configs/MSI_Primo73_defconfig index 6e0d246..9d6ca79 100644 --- a/configs/MSI_Primo73_defconfig +++ b/configs/MSI_Primo73_defconfig @@ -15,7 +15,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/MSI_Primo81_defconfig b/configs/MSI_Primo81_defconfig index 9787e34..c53256a 100644 --- a/configs/MSI_Primo81_defconfig +++ b/configs/MSI_Primo81_defconfig @@ -18,7 +18,6 @@ CONFIG_SPL=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y CONFIG_AXP221_DLDO1_VOLT=3300 CONFIG_VIDEO_LCD_SSD2828_TX_CLK=27 @@ -27,4 +26,3 @@ CONFIG_VIDEO_LCD_SPI_CS="PH9" CONFIG_VIDEO_LCD_SPI_SCLK="PH10" CONFIG_VIDEO_LCD_SPI_MOSI="PH11" CONFIG_VIDEO_LCD_SPI_MISO="PH12" -CONFIG_USB=y diff --git a/configs/Marsboard_A10_defconfig b/configs/Marsboard_A10_defconfig index ed41af6..7f4f12a 100644 --- a/configs/Marsboard_A10_defconfig +++ b/configs/Marsboard_A10_defconfig @@ -8,7 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,AHCI,USB_EHCI" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/Mele_A1000G_quad_defconfig b/configs/Mele_A1000G_quad_defconfig index 6e0a493..9c7bb48 100644 --- a/configs/Mele_A1000G_quad_defconfig +++ b/configs/Mele_A1000G_quad_defconfig @@ -11,12 +11,9 @@ CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_DM_SERIAL=y CONFIG_AXP221_DCDC1_VOLT=3300 CONFIG_AXP221_DLDO1_VOLT=3300 CONFIG_AXP221_DLDO4_VOLT=3300 CONFIG_AXP221_ALDO1_VOLT=3300 -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig index 983ffdc..df356d6 100644 --- a/configs/Mele_A1000_defconfig +++ b/configs/Mele_A1000_defconfig @@ -9,7 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_ # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/Mele_I7_defconfig b/configs/Mele_I7_defconfig index 7f083a7..65398d8 100644 --- a/configs/Mele_I7_defconfig +++ b/configs/Mele_I7_defconfig @@ -11,12 +11,9 @@ CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_DM_SERIAL=y CONFIG_AXP221_DCDC1_VOLT=3300 CONFIG_AXP221_DLDO1_VOLT=3300 CONFIG_AXP221_DLDO4_VOLT=3300 CONFIG_AXP221_ALDO1_VOLT=3300 -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/Mele_M3_defconfig b/configs/Mele_M3_defconfig index 73d87c3..8bfd32f 100644 --- a/configs/Mele_M3_defconfig +++ b/configs/Mele_M3_defconfig @@ -12,8 +12,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,USB_EHCI" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/Mele_M5_defconfig b/configs/Mele_M5_defconfig index 79c5901..300679a 100644 --- a/configs/Mele_M5_defconfig +++ b/configs/Mele_M5_defconfig @@ -11,8 +11,5 @@ CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,AHCI,USB_EHCI,STATUSLED=234" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/Mele_M9_defconfig b/configs/Mele_M9_defconfig index e017ad7..8bfd9b1 100644 --- a/configs/Mele_M9_defconfig +++ b/configs/Mele_M9_defconfig @@ -11,12 +11,9 @@ CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_DM_SERIAL=y CONFIG_AXP221_DCDC1_VOLT=3300 CONFIG_AXP221_DLDO1_VOLT=3300 CONFIG_AXP221_DLDO4_VOLT=3300 CONFIG_AXP221_ALDO1_VOLT=3300 -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/Merrii_A80_Optimus_defconfig b/configs/Merrii_A80_Optimus_defconfig index b02b1a3..23ab5dc 100644 --- a/configs/Merrii_A80_Optimus_defconfig +++ b/configs/Merrii_A80_Optimus_defconfig @@ -12,7 +12,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun9i-a80-optimus" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/Mini-X_defconfig b/configs/Mini-X_defconfig index da57711..aa3f5c4 100644 --- a/configs/Mini-X_defconfig +++ b/configs/Mini-X_defconfig @@ -8,7 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/Orangepi_defconfig b/configs/Orangepi_defconfig index ba89a25..325d9f8 100644 --- a/configs/Orangepi_defconfig +++ b/configs/Orangepi_defconfig @@ -13,8 +13,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHC # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig index 8f03815..c602533 100644 --- a/configs/Orangepi_mini_defconfig +++ b/configs/Orangepi_mini_defconfig @@ -15,8 +15,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHC # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig index e9e62da..0ba53c0 100644 --- a/configs/Sinlinx_SinA33_defconfig +++ b/configs/Sinlinx_SinA33_defconfig @@ -9,8 +9,5 @@ CONFIG_SPL=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y CONFIG_AXP221_ALDO1_VOLT=3000 -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/TZX-Q8-713B7_defconfig b/configs/TZX-Q8-713B7_defconfig index 68961fc..e398bc0 100644 --- a/configs/TZX-Q8-713B7_defconfig +++ b/configs/TZX-Q8-713B7_defconfig @@ -18,5 +18,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y diff --git a/configs/UTOO_P66_defconfig b/configs/UTOO_P66_defconfig index c3b13b7..59d5e4e 100644 --- a/configs/UTOO_P66_defconfig +++ b/configs/UTOO_P66_defconfig @@ -23,4 +23,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y diff --git a/configs/Wexler_TAB7200_defconfig b/configs/Wexler_TAB7200_defconfig index d9180c7..321226d 100644 --- a/configs/Wexler_TAB7200_defconfig +++ b/configs/Wexler_TAB7200_defconfig @@ -13,7 +13,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/Wits_Pro_A20_DKT_defconfig b/configs/Wits_Pro_A20_DKT_defconfig index bb8dd29..0a30ef8 100644 --- a/configs/Wits_Pro_A20_DKT_defconfig +++ b/configs/Wits_Pro_A20_DKT_defconfig @@ -15,8 +15,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,USB_EHCI" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/Yones_Toptech_BD1078_defconfig b/configs/Yones_Toptech_BD1078_defconfig index aab580e..40583d3 100644 --- a/configs/Yones_Toptech_BD1078_defconfig +++ b/configs/Yones_Toptech_BD1078_defconfig @@ -24,5 +24,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y diff --git a/configs/ba10_tv_box_defconfig b/configs/ba10_tv_box_defconfig index c84e82e..07e3540 100644 --- a/configs/ba10_tv_box_defconfig +++ b/configs/ba10_tv_box_defconfig @@ -11,7 +11,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,USB_EHCI" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/forfun_q88db_defconfig b/configs/forfun_q88db_defconfig index 85c807a..cc9391a 100644 --- a/configs/forfun_q88db_defconfig +++ b/configs/forfun_q88db_defconfig @@ -17,5 +17,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y diff --git a/configs/ga10h_v1_1_defconfig b/configs/ga10h_v1_1_defconfig index 315627d..3bc1a52 100644 --- a/configs/ga10h_v1_1_defconfig +++ b/configs/ga10h_v1_1_defconfig @@ -21,7 +21,6 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y CONFIG_AXP221_DLDO1_VOLT=3300 CONFIG_AXP221_ALDO1_VOLT=3000 diff --git a/configs/i12-tvbox_defconfig b/configs/i12-tvbox_defconfig index 3a69422..7477953 100644 --- a/configs/i12-tvbox_defconfig +++ b/configs/i12-tvbox_defconfig @@ -9,8 +9,5 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/iNet_3F_defconfig b/configs/iNet_3F_defconfig index 54de300..7b5948b 100644 --- a/configs/iNet_3F_defconfig +++ b/configs/iNet_3F_defconfig @@ -19,5 +19,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y diff --git a/configs/iNet_3W_defconfig b/configs/iNet_3W_defconfig index e1beac8..92a384c 100644 --- a/configs/iNet_3W_defconfig +++ b/configs/iNet_3W_defconfig @@ -19,5 +19,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y diff --git a/configs/iNet_86VS_defconfig b/configs/iNet_86VS_defconfig index 627e211..1f91e8f 100644 --- a/configs/iNet_86VS_defconfig +++ b/configs/iNet_86VS_defconfig @@ -17,5 +17,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y diff --git a/configs/jesurun_q5_defconfig b/configs/jesurun_q5_defconfig index 4b09a33..a4c7d1e 100644 --- a/configs/jesurun_q5_defconfig +++ b/configs/jesurun_q5_defconfig @@ -9,7 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,USB_EHCI,MACPWR=SUNXI_GPH(19)" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/mixtile_loftq_defconfig b/configs/mixtile_loftq_defconfig index a8c497c..48fe570 100644 --- a/configs/mixtile_loftq_defconfig +++ b/configs/mixtile_loftq_defconfig @@ -12,9 +12,6 @@ CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPA(21)" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_DM_SERIAL=y CONFIG_AXP221_ALDO1_VOLT=3300 -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/mk802_a10s_defconfig b/configs/mk802_a10s_defconfig index dc78fa4..ce308d9 100644 --- a/configs/mk802_a10s_defconfig +++ b/configs/mk802_a10s_defconfig @@ -11,7 +11,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/mk802_defconfig b/configs/mk802_defconfig index 31bde00..1098bd4 100644 --- a/configs/mk802_defconfig +++ b/configs/mk802_defconfig @@ -9,7 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/mk802ii_defconfig b/configs/mk802ii_defconfig index ffa7891..635273c 100644 --- a/configs/mk802ii_defconfig +++ b/configs/mk802ii_defconfig @@ -8,7 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/r7-tv-dongle_defconfig b/configs/r7-tv-dongle_defconfig index ac7928d..edf7b8a 100644 --- a/configs/r7-tv-dongle_defconfig +++ b/configs/r7-tv-dongle_defconfig @@ -10,7 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y diff --git a/configs/sunxi_Gemei_G9_defconfig b/configs/sunxi_Gemei_G9_defconfig index e95cbe4..5ee6fd9 100644 --- a/configs/sunxi_Gemei_G9_defconfig +++ b/configs/sunxi_Gemei_G9_defconfig @@ -15,7 +15,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y -CONFIG_USB=y -CONFIG_DM_USB=y -- 2.4.3

2 2

[U-Boot] [PATCH v2] spi: cf_qspi: fix clamp macro type check compilation warnings
by Angelo Dureghello 01 Jul '15

01 Jul '15

Fix compilation warnings for redefined 'clamp' macro and non-uniform clamp macro types. Signed-off-by: Angelo Dureghello <angelo(a)sysam.it> --- drivers/spi/cf_qspi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/spi/cf_qspi.c b/drivers/spi/cf_qspi.c index 834c5bd..e57e63e 100644 --- a/drivers/spi/cf_qspi.c +++ b/drivers/spi/cf_qspi.c @@ -19,7 +19,6 @@ DECLARE_GLOBAL_DATA_PTR; -#define clamp(x, low, high) (min(max(low, x), high)) #define to_cf_qspi_slave(s) container_of(s, struct cf_qspi_slave, slave) struct cf_qspi_slave { @@ -120,7 +119,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, dev->qmr = 2u; else /* Get the closest baud rate */ dev->qmr = clamp(((gd->bus_clk >> 2) + max_hz - 1)/max_hz, - 2u, 255u); + 2lu, 255lu); /* Map mode to QMR[CPOL] and QMR[CPHA] */ if (mode & SPI_CPOL) -- 2.1.4

2 5

[U-Boot] [PATCH 00/20] spi/sf: Kconfig updates
by Jagan Teki 01 Jul '15

01 Jul '15

Kconfig additions for spi/sf related drivers. thanks! Jagan. Jagan Teki (20): sf: dataflash: Rename to CONFIG_SPI_FLASH_DATAFLASH README: Add CONFIG_SPI_FLASH_DATAFLASH description sf: Add Kconfig menu entry common: Add CMD_SF Kconfig entry sf: Kconfig: Update SPI_FLASH entry sf: Kconfig: Add SPI_FLASH_MTD entry sf: Kconfig: Add SPI_FLASH_DATAFLASH entry spi: Add Kconfig menu entry spi: Kconfig: Add XILINX_SPI entry spi: Kconfig: Add TI_QSPI entry spi: Makefile: Use object file alphabetic order spi: Kconfig: Show dm-spi drivers if DM_SPI set spi: Kconfig: Add FSL_DSPI entry spi: Kconfig: Add FSL_ESPI entry spi: Kconfig: Add FSL_QSPI entry spi: Kconfig: Add EXYNOS_SPI entry spi: Kconfig: Add ICH_SPI entry spi: Kconfig: Add TEGRA114_SPI entry spi: Kconfig: Add TEGRA20_SFLASH entry spi: Kconfig: Add TEGRA20_SLINK entry README | 5 ++ common/Kconfig | 5 ++ drivers/mtd/spi/Kconfig | 41 +++++++++++++---- drivers/mtd/spi/Makefile | 2 +- drivers/spi/Kconfig | 106 +++++++++++++++++++++++++++++++++++++------ drivers/spi/Makefile | 10 ++-- include/configs/ls1021aqds.h | 2 +- 7 files changed, 143 insertions(+), 28 deletions(-) -- 1.9.1

5 37