August 2015 - U-Boot

[U-Boot] [PULL] u-boot-socfpga/master
by Marek Vasut 09 Aug '15

09 Aug '15

The following changes since commit ae27120c31d58b8bb694d9155bcffdcfae8552a6: Merge git://git.denx.de/u-boot-dm (2015-08-06 19:56:03 -0400) are available in the git repository at: git://git.denx.de/u-boot-socfpga.git HEAD for you to fetch changes up to bd48c0617b5c7212e5bf22169e716da878842da4: arm: socfpga: misc: Add support for printing FPGA type (2015-08-08 14:14:30 +0200) ---------------------------------------------------------------- Dinh Nguyen (6): driver/ddr/altera: Add DDR driver for Altera's SDRAM controller driver/ddr/altera: Add the sdram calibration portion arm: socfpga: enable the Altera SDRAM controller driver ddr: altera: sequencer: add RW_MGR_MEM_NUMBER_OF_RANKS arm: socfpga: scan: Add code to get FPGA ID arm: socfpga: misc: Add support for printing FPGA type Marek Vasut (223): arm: socfpga: Fix FPGA bitstream programming routine arm: dts: socfpga: Fix SPI aliases arm: dts: socfpga: Add mmc alias arm: socfpga: Move generated files into qts subdir net: designware: Add SoCFPGA GMAC DT compatible string net: designware: Rename the driver var name to eth_designware arm: socfpga: Move sdram_config.h to board dir ddr: altera: Move struct sdram_prot_rule prototype ddr: altera: Fix typo in mp_threshold1 programming ddr: altera: Fix debug message format in sequencer arm: socfpga: reset: Add missing reset manager regs arm: socfpga: reset: Start reworking the SoCFPGA reset manager arm: socfpga: reset: Implement unified function to toggle reset arm: socfpga: reset: Replace ad-hoc reset functions arm: socfpga: reset: Repair bridge reset handling arm: socfpga: reset: Add function to reset add peripherals arm: socfpga: reset: Add SDMMC, QSPI and DMA defines arm: socfpga: clock: Get rid of cm_config_t typedef arm: socfpga: clock: Clean up pll_config.h arm: socfpga: scan: Staticize scan_mgr_io_scan_chain_prg() arm: socfpga: scan: Zap redundant params in scan_mgr_io_scan_chain_prg() arm: socfpga: scan: Zap iocsr_scan_chain*_table() arm: socfpga: system: Rework sysmgr_enable_warmrstcfgio() arm: socfpga: system: Clean up pinmux_config.c arm: socfpga: spl: Toggle warm reset config I/O bit arm: socfpga: spl: Configure SCU and NIC-301 early arm: socfpga: spl: Add missing reset logic arm: socfpga: spl: Merge spl_board_init() into board_init_f() arm: socfpga: spl: Remove custom linker script arm: socfpga: spl: Add support for booting from SD/MMC arm: socfpga: spl: Add support for booting from QSPI arm: socfpga: spl: Add support for selecting boot device from BSEL arm: socfpga: misc: Fix warm reset arm: socfpga: misc: Add support for printing boot mode arm: socfpga: misc: Export bootmode into environment variable arm: socfpga: misc: Probe ethernet GMAC from OF arm: socfpga: misc: Reset ethernet from OF arm: socfpga: config: Move SPL GD and malloc to RAM arm: socfpga: config: Zap incorrect config options arm: socfpga: config: Exclude CONFIG_SPI_FLASH_MTD from SPL build arm: socfpga: config: Enable CONFIG_SPI_FLASH_BAR arm: socfpga: config: Fix LOADADDR arm: socfpga: config: Make CONFIG_SPI_FLASH_MTD useful Makefile: Add target for building bootable SPL image for SoCFPGA ddr: altera: Minor indent fix in set_rank_and_odt_mask() ddr: altera: Clean up ugly casts in sdram_calibration_full() ddr: altera: Zap invocation of sdr_get_addr((u32 *)BASE_RW_MGR)" ddr: altera: Dissolve invocation of sdr_get_addr(&sdr_reg_file->.*) ddr: altera: Dissolve invocation of sdr_get_addr(&sdr_scc_mgr->.*) ddr: altera: Dissolve invocation of sdr_get_addr(&sdr_rw_load.*->.*) ddr: altera: Dissolve invocation of sdr_get_addr(&sdr_mgr_.*->.*) ddr: altera: Pluck out remaining sdr_get_addr() calls ddr: altera: Wrap SOCFPGA_SDR_ADDRESS into SDR_PHYGRP.*ADDRESS ddr: altera: Stop using SDR_CTRLGRP_ADDRESS directly ddr: altera: Massage addr into I/O accessors ddr: altera: Clean up hc_initialize_rom_data() ddr: altera: Clean up initialize_reg_file() ddr: altera: Clean up initialize_hps_phy() ddr: altera: Clean up reg_file_set*() ddr: altera: Clean up scc manager function args ddr: altera: Reorder scc manager functions ddr: altera: Implement universal scc manager config function ddr: altera: Clean up scc_mgr_initialize() ddr: altera: Shuffle around scc_mgr_set_*all_ranks() ddr: altera: Implement universal scc_mgr_set_all_ranks() ddr: altera: Clean up scc_mgr_load_dqs_for_write_group() ddr: altera: Clean up scc_set_bypass_mode() ddr: altera: Clean up scc_mgr_set_oct_out1_delay() ddr: altera: Clean up scc_mgr_apply_group_dq_out1_delay() ddr: altera: Clean up scc_mgr_*_delay() args ddr: altera: Clean up scc_mgr_set_hhp_extras() ddr: altera: Extract scc_mgr_set_hhp_extras() ddr: altera: Clean up scc_mgr_zero_all() ddr: altera: Clean up scc_mgr_zero_group() ddr: altera: Internal scc_mgr_apply_group_all_out_delay_add() cleanup part 1 ddr: altera: Internal scc_mgr_apply_group_all_out_delay_add() cleanup part 2 ddr: altera: Clean up scc_mgr_apply_group_all_out_delay_add_all_ranks() ddr: altera: Factor out instruction loading from rw_mgr_mem_initialize() ddr: altera: Factor out common code ddr: altera: Minor clean up of set_jump_as_return() ddr: altera: Fix ad-hoc iterative division implementation ddr: altera: Rework initialize_tracking() ddr: altera: Init my_param and my_gbl ddr: altera: Rename initialize() to phy_mgr_initialize() ddr: altera: Clean up run_mem_calibrate() ddr: altera: Clean up phy_mgr_initialize() ddr: altera: Clean up mem_config() ddr: altera: Clean up mem_precharge_and_activate() ddr: altera: Clean up set_rank_and_odt_mask() part 1 ddr: altera: Clean up set_rank_and_odt_mask() part 2 ddr: altera: Clean up set_rank_and_odt_mask() part 3 ddr: altera: Minor clean up of mem_skip_calibrate() ddr: altera: Trivial mem_calibrate() indent cleanup ddr: altera: Internal mem_calibrate() cleanup part 1 ddr: altera: Internal mem_calibrate() cleanup part 2 ddr: altera: Internal mem_calibrate() cleanup part 3 ddr: altera: Internal mem_calibrate() cleanup part 4 ddr: altera: Internal mem_calibrate() cleanup part 5 ddr: altera: Internal mem_calibrate() cleanup part 6 ddr: altera: Minor clean up of rw_mgr_mem_initialize() ddr: altera: Internal rw_mgr_mem_calibrate_vfifo() cleanup part 1 ddr: altera: Internal rw_mgr_mem_calibrate_vfifo() cleanup part 2 ddr: altera: Internal rw_mgr_mem_calibrate_vfifo() cleanup part 3 ddr: altera: Internal rw_mgr_mem_calibrate_vfifo() cleanup part 4 ddr: altera: Internal rw_mgr_mem_calibrate_vfifo() cleanup part 5 ddr: altera: Internal rw_mgr_mem_calibrate_vfifo() cleanup part 6 ddr: altera: Internal rw_mgr_mem_calibrate_vfifo() cleanup part 7 ddr: altera: Extract guaranteed write from rw_mgr_mem_calibrate_vfifo() ddr: altera: Extract DQS enable calibration from rw_mgr_mem_calibrate_vfifo() ddr: altera: Extract Centering DQ/DQS from rw_mgr_mem_calibrate_vfifo() ddr: altera: Minor rw_mgr_mem_calibrate_read_load_patterns() cleanup ddr: altera: Zap rw_mgr_mem_calibrate_read_test_patterns_all_ranks() ddr: altera: Clean up rw_mgr_mem_calibrate_read_test_patterns() ddr: altera: Clean up rw_mgr_mem_calibrate_vfifo_find_dqs_en_phase_sweep_dq_in_delay() part 1 ddr: altera: Clean up rw_mgr_mem_calibrate_vfifo_find_dqs_en_phase_sweep_dq_in_delay() part 2 ddr: altera: Clean up rw_mgr_mem_calibrate_vfifo_find_dqs_en_phase_sweep_dq_in_delay() part 3 ddr: altera: Clean up rw_mgr_mem_calibrate_vfifo_find_dqs_en_phase_sweep_dq_in_delay() part 4 ddr: altera: Clean up sdr_find_window_centre() part 1 ddr: altera: Clean up sdr_find_window_centre() part 2 ddr: altera: Clean up sdr_find_window_centre() part 3 ddr: altera: Clean up sdr_*_phase() part 1 ddr: altera: Clean up sdr_*_phase() part 2 ddr: altera: Clean up sdr_*_phase() part 3 ddr: altera: Clean up sdr_*_phase() part 4 ddr: altera: Clean up sdr_*_phase() part 5 ddr: altera: Clean up sdr_*_phase() part 6 ddr: altera: Clean up sdr_*_phase() part 7 ddr: altera: Clean up sdr_*_phase() part 8 ddr: altera: Clean up sdr_*_phase() part 9 ddr: altera: Clean up sdr_*_phase() part 10 ddr: altera: Clean up rw_mgr_*_vfifo() part 1 ddr: altera: Clean up rw_mgr_*_vfifo() part 2 ddr: altera: Clean up find_vfifo_read() ddr: altera: Clean up rw_mgr_mem_calibrate_vfifo_find_dqs_en_phase() part 1 ddr: altera: Clean up rw_mgr_mem_calibrate_vfifo_find_dqs_en_phase() part 2 ddr: altera: Clean up rw_mgr_mem_calibrate_vfifo_find_dqs_en_phase() part 3 ddr: altera: Clean up rw_mgr_mem_calibrate_vfifo_find_dqs_en_phase() part 4 ddr: altera: Clean up rw_mgr_mem_calibrate_vfifo_find_dqs_en_phase() part 5 ddr: altera: Clean up rw_mgr_mem_calibrate_vfifo_find_dqs_en_phase() part 6 ddr: altera: Clean up rw_mgr_mem_calibrate_vfifo_find_dqs_en_phase() part 7 ddr: altera: Clean up rw_mgr_mem_calibrate_read_test_all_ranks() ddr: altera: Clean up rw_mgr_mem_calibrate_read_test() part 1 ddr: altera: Clean up rw_mgr_mem_calibrate_read_test() part 2 ddr: altera: Clean up rw_mgr_mem_calibrate_read_test() part 3 ddr: altera: Clean up rw_mgr_mem_calibrate_read_test() part 4 ddr: altera: Clean up rw_mgr_mem_calibrate_read_test() part 5 ddr: altera: Clean up rw_mgr_mem_calibrate_writes() ddr: altera: Clean up rw_mgr_mem_calibrate_vfifo_center() part 1 ddr: altera: Clean up rw_mgr_mem_calibrate_vfifo_center() part 2 ddr: altera: Clean up rw_mgr_mem_calibrate_vfifo_center() part 3 ddr: altera: Clean up rw_mgr_mem_calibrate_vfifo_center() part 4 ddr: altera: Clean up rw_mgr_mem_calibrate_vfifo_center() part 5 ddr: altera: Clean up rw_mgr_mem_calibrate_vfifo_center() part 6 ddr: altera: Clean up rw_mgr_mem_calibrate_vfifo_center() part 7 ddr: altera: Clean up rw_mgr_mem_calibrate_vfifo_center() part 8 ddr: altera: Clean up rw_mgr_mem_calibrate_vfifo_center() part 9 ddr: altera: Clean up rw_mgr_mem_calibrate_vfifo_center() part 10 ddr: altera: Clean up rw_mgr_mem_calibrate_vfifo_center() part 11 ddr: altera: Clean up rw_mgr_mem_calibrate_writes_center() part 1 ddr: altera: Clean up rw_mgr_mem_calibrate_writes_center() part 2 ddr: altera: Clean up rw_mgr_mem_calibrate_writes_center() part 3 ddr: altera: Clean up rw_mgr_mem_calibrate_writes_center() part 4 ddr: altera: Clean up rw_mgr_mem_calibrate_writes_center() part 5 ddr: altera: Clean up rw_mgr_mem_calibrate_write_test() part 1 ddr: altera: Clean up rw_mgr_mem_calibrate_write_test() part 2 ddr: altera: Clean up rw_mgr_mem_calibrate_write_test() part 3 ddr: altera: Clean up rw_mgr_mem_calibrate_write_test_issue() ddr: altera: Clean up rw_mgr_mem_calibrate_vfifo_end() ddr: altera: Clean up rw_mgr_mem_calibrate_lfifo() ddr: altera: Minor clean up of rw_mgr_mem_handoff() ddr: altera: Clean up of delay_for_n_mem_clocks() part 1 ddr: altera: Clean up of delay_for_n_mem_clocks() part 2 ddr: altera: Clean up of delay_for_n_mem_clocks() part 3 ddr: altera: Clean up of delay_for_n_mem_clocks() part 4 ddr: altera: Clean up of delay_for_n_mem_clocks() part 5 arm: socfpga: Add temporary workaround for missing SD/MMC patches ddr: altera: sdram: Switch to generic_hweight32() ddr: altera: sdram: Clean up compute_errata_rows() part 1 ddr: altera: sdram: Clean up compute_errata_rows() part 2 ddr: altera: sdram: Clean up set_sdr_ctrlcfg() ddr: altera: sdram: Clean up set_sdr_dram_timing*() ddr: altera: sdram: Clean up set_sdr_addr_rw() ddr: altera: sdram: Clean up set_sdr_static_cfg() ddr: altera: sdram: Clean up set_sdr_fifo_cfg() ddr: altera: sdram: Clean up set_sdr_mp_weight() ddr: altera: sdram: Clean up set_sdr_mp_pacing() ddr: altera: sdram: Clean up set_sdr_mp_threshold() ddr: altera: sdram: Introduce socfpga_sdram_config() structure ddr: altera: sdram: Clean up sdram_mmr_init_full() part 1 ddr: altera: sdram: Clean up sdram_mmr_init_full() part 2 ddr: altera: sdram: Clean up sdram_mmr_init_full() part 3 ddr: altera: sdram: Clean up sdram_mmr_init_full() part 4 ddr: altera: sdram: Clean up sdram_mmr_init_full() part 5 ddr: altera: sdram: Clean up sdram_mmr_init_full() part 6 ddr: altera: sdram: Clean up sdram_mmr_init_full() part 7 ddr: altera: sdram: Clean up sdram_mmr_init_full() part 8 ddr: altera: sdram: Introduce socfpga_sdram_get_config() ddr: altera: sdram: Clean up sdram_calculate_size() part 1 ddr: altera: sdram: Clean up sdram_calculate_size() part 2 ddr: altera: sdram: Clean up sdram_write_verify() ddr: altera: sdram: Add missing kerneldoc ddr: altera: sdram: Minor cleanup in sdram_set_rule() ddr: altera: sdram: Minor cleanup in sdram_get_rule() ddr: altera: sdram: Make sdram_start and sdram_end into u32 ddr: altera: sequencer: Move qts-generated files to board dir ddr: altera: sequencer: Clean up mach/sdram.h ddr: altera: sequencer: Zap unused params and macros ddr: altera: sequencer: Zap bogus redefinition of RW_MGR_MEM_NUMBER_OF_RANKS ddr: altera: sequencer: Wrap ac_rom_init and inst_rom_init ddr: altera: sequencer: Wrap RW_MGR_* macros ddr: altera: sequencer: Pluck out RW_MGR_* macros from code ddr: altera: sequencer: Wrap IO_* macros ddr: altera: sequencer: Pluck out IO_* macros from code ddr: altera: sequencer: Wrap misc remaining macros ddr: altera: sequencer: Zap VFIFO_SIZE ddr: altera: sequencer: Zap SEQ_T(INIT|RESET)_CNTR._VAL ddr: altera: sequencer: Pluck out misc macros from code ddr: altera: sequencer: Clean data types ddr: altera: sequencer: Clean checkpatch issues arm: socfpga: scan: Clean up scan_chain_engine_is_idle() arm: socfpga: scan: Introduce generic JTAG accessor arm: socfpga: scan: Clean up horrible macros arm: socfpga: scan: Factor out IO chain programming Makefile | 13 + arch/arm/dts/socfpga.dtsi | 4 + arch/arm/dts/socfpga_arria5_socdk.dts | 8 +- arch/arm/dts/socfpga_cyclone5_socdk.dts | 4 - arch/arm/dts/socfpga_cyclone5_socrates.dts | 6 - arch/arm/mach-socfpga/Makefile | 4 +- arch/arm/mach-socfpga/clock_manager.c | 28 +- arch/arm/mach-socfpga/include/mach/clock_manager.h | 12 +- arch/arm/mach-socfpga/include/mach/reset_manager.h | 60 +- arch/arm/mach-socfpga/include/mach/scan_manager.h | 75 +- arch/arm/mach-socfpga/include/mach/sdram.h | 441 +++++++++- arch/arm/mach-socfpga/include/mach/system_manager.h | 7 +- arch/arm/mach-socfpga/misc.c | 184 ++++- arch/arm/mach-socfpga/reset_manager.c | 99 +-- arch/arm/mach-socfpga/scan_manager.c | 335 ++++---- arch/arm/mach-socfpga/spl.c | 220 ++--- arch/arm/mach-socfpga/system_manager.c | 16 +- arch/arm/mach-socfpga/u-boot-spl.lds | 45 - board/altera/socfpga/Makefile | 5 +- board/altera/socfpga/{ => qts}/iocsr_config.c | 0 board/altera/socfpga/{ => qts}/iocsr_config.h | 0 board/altera/socfpga/{ => qts}/pinmux_config.c | 0 board/altera/socfpga/{ => qts}/pinmux_config.h | 0 board/altera/socfpga/{ => qts}/pll_config.h | 0 board/altera/socfpga/qts/sdram_config.h | 100 +++ board/altera/socfpga/qts/sequencer_auto.h | 128 +++ board/altera/socfpga/qts/sequencer_auto_ac_init.h | 84 ++ board/altera/socfpga/qts/sequencer_auto_inst_init.h | 268 ++++++ board/altera/socfpga/qts/sequencer_defines.h | 122 +++ board/altera/socfpga/wrap_iocsr_config.c | 41 + board/altera/socfpga/wrap_pinmux_config.c | 35 + board/altera/socfpga/wrap_pll_config.c | 144 ++++ board/altera/socfpga/wrap_sdram_config.c | 316 ++++++++ configs/socfpga_arria5_defconfig | 10 + configs/socfpga_cyclone5_defconfig | 11 + configs/socfpga_socrates_defconfig | 12 +- drivers/ddr/altera/Makefile | 11 + drivers/ddr/altera/sdram.c | 535 ++++++++++++ drivers/ddr/altera/sequencer.c | 3783 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/ddr/altera/sequencer.h | 227 ++++++ drivers/fpga/socfpga.c | 3 + drivers/net/designware.c | 3 +- include/configs/socfpga_arria5.h | 7 +- include/configs/socfpga_common.h | 63 +- include/configs/socfpga_cyclone5.h | 7 +- include/fdtdec.h | 1 + lib/fdtdec.c | 1 + scripts/Makefile.spl | 11 + 48 files changed, 6913 insertions(+), 576 deletions(-) delete mode 100644 arch/arm/mach-socfpga/u-boot-spl.lds rename board/altera/socfpga/{ => qts}/iocsr_config.c (100%) rename board/altera/socfpga/{ => qts}/iocsr_config.h (100%) rename board/altera/socfpga/{ => qts}/pinmux_config.c (100%) rename board/altera/socfpga/{ => qts}/pinmux_config.h (100%) rename board/altera/socfpga/{ => qts}/pll_config.h (100%) create mode 100644 board/altera/socfpga/qts/sdram_config.h create mode 100644 board/altera/socfpga/qts/sequencer_auto.h create mode 100644 board/altera/socfpga/qts/sequencer_auto_ac_init.h create mode 100644 board/altera/socfpga/qts/sequencer_auto_inst_init.h create mode 100644 board/altera/socfpga/qts/sequencer_defines.h create mode 100644 board/altera/socfpga/wrap_iocsr_config.c create mode 100644 board/altera/socfpga/wrap_pinmux_config.c create mode 100644 board/altera/socfpga/wrap_pll_config.c create mode 100644 board/altera/socfpga/wrap_sdram_config.c create mode 100644 drivers/ddr/altera/Makefile create mode 100644 drivers/ddr/altera/sdram.c create mode 100644 drivers/ddr/altera/sequencer.c create mode 100644 drivers/ddr/altera/sequencer.h

2 2

[U-Boot] [PATCH] x86: baytrail: Add all IDE/SATA PCI device IDs
by Bin Meng 08 Aug '15

08 Aug '15

The BayTrail SoC has 4 different PCI devices IDs regarding to IDE and AHCI. Add these IDs in pci_ids.h and also add the other SATA ID in the Bayley Bay and MinnowMax board configuration header. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- include/configs/bayleybay.h | 3 ++- include/configs/minnowmax.h | 6 ++++-- include/pci_ids.h | 5 ++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/include/configs/bayleybay.h b/include/configs/bayleybay.h index ecda4ba..c590f56 100644 --- a/include/configs/bayleybay.h +++ b/include/configs/bayleybay.h @@ -26,7 +26,8 @@ "stderr=serial,vga\0" #define CONFIG_SCSI_DEV_LIST \ - {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA} + {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \ + {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT} #define CONFIG_MMC #define CONFIG_SDHCI diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h index 2a40d1f..64fa676 100644 --- a/include/configs/minnowmax.h +++ b/include/configs/minnowmax.h @@ -26,8 +26,10 @@ "stdout=vga,serial\0" \ "stderr=vga,serial\0" -#define CONFIG_SCSI_DEV_LIST \ - {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA} +#define CONFIG_SCSI_DEV_LIST \ + {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \ + {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT} + #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_MMC diff --git a/include/pci_ids.h b/include/pci_ids.h index 5771e12..49f7d7d 100644 --- a/include/pci_ids.h +++ b/include/pci_ids.h @@ -2602,7 +2602,10 @@ #define PCI_DEVICE_ID_INTEL_VALLEYVIEW_SDIO 0x0f15 #define PCI_DEVICE_ID_INTEL_VALLEYVIEW_SDCARD 0x0f16 #define PCI_DEVICE_ID_INTEL_VALLEYVIEW_LPC 0x0f1c -#define PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA 0x0f23 +#define PCI_DEVICE_ID_INTEL_VALLEYVIEW_IDE 0x0f20 +#define PCI_DEVICE_ID_INTEL_VALLEYVIEW_IDE_ALT 0x0f21 +#define PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA 0x0f22 +#define PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT 0x0f23 #define PCI_DEVICE_ID_INTEL_82541ER 0x1078 #define PCI_DEVICE_ID_INTEL_82541GI_LF 0x107c #define PCI_DEVICE_ID_INTEL_82542 0x1000 -- 1.8.2.1

2 2

[U-Boot] [PATCH v3] common: Display >=4GiB memory bank size
by Bin Meng 08 Aug '15

08 Aug '15

bd->bi_dram[] has both start address and size defined as 32-bit, which is not the case on some platforms where >=4GiB memory bank is used. Change them to support such memory banks. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- Changes in v3: - Use %llx to print the dram start address Changes in v2: - Drop patches which are already applied - Change start to phys_addr_t - Change debug output to either %016llx or %08lx common/board_f.c | 3 ++- include/asm-generic/u-boot.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index c7cc67c..8cca4de 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -206,7 +206,8 @@ static int show_dram_config(void) debug("\nRAM Configuration:\n"); for (i = size = 0; i < CONFIG_NR_DRAM_BANKS; i++) { size += gd->bd->bi_dram[i].size; - debug("Bank #%d: %08lx ", i, gd->bd->bi_dram[i].start); + debug("Bank #%d: %llx ", i, + (unsigned long long)(gd->bd->bi_dram[i].start)); #ifdef DEBUG print_size(gd->bd->bi_dram[i].size, "\n"); #endif diff --git a/include/asm-generic/u-boot.h b/include/asm-generic/u-boot.h index c918049..9f3351d 100644 --- a/include/asm-generic/u-boot.h +++ b/include/asm-generic/u-boot.h @@ -130,8 +130,8 @@ typedef struct bd_info { ulong bi_boot_params; /* where this board expects params */ #ifdef CONFIG_NR_DRAM_BANKS struct { /* RAM configuration */ - ulong start; - ulong size; + phys_addr_t start; + phys_size_t size; } bi_dram[CONFIG_NR_DRAM_BANKS]; #endif /* CONFIG_NR_DRAM_BANKS */ } bd_t; -- 1.8.2.1

2 2

[U-Boot] [PATCH 1/6] arm: socfpga: scan: Clean up scan_chain_engine_is_idle()
by Marek Vasut 08 Aug '15

08 Aug '15

Rework this function so it's clear that it is only polling for certain bits to be cleared. Add kerneldoc. Fix it's return value to be either 0 on success and -ETIMEDOUT on error and propagate this through the scan manager code. Signed-off-by: Marek Vasut <marex(a)denx.de> --- arch/arm/mach-socfpga/include/mach/scan_manager.h | 9 ---- arch/arm/mach-socfpga/scan_manager.c | 53 +++++++++++++++-------- 2 files changed, 34 insertions(+), 28 deletions(-) diff --git a/arch/arm/mach-socfpga/include/mach/scan_manager.h b/arch/arm/mach-socfpga/include/mach/scan_manager.h index 94ad50b..ddf8790 100644 --- a/arch/arm/mach-socfpga/include/mach/scan_manager.h +++ b/arch/arm/mach-socfpga/include/mach/scan_manager.h @@ -59,15 +59,6 @@ struct socfpga_scan_manager { /* Position of second command byte for TDI_TDO packet */ #define TDI_TDO_HEADER_SECOND_BYTE_SHIFT 8 -/* - * Maximum polling loop to wait for IO scan chain engine - * becomes idle to prevent infinite loop - */ -#define SCAN_MAX_DELAY 100 - -#define SCANMGR_STAT_ACTIVE_GET(x) (((x) & 0x80000000) >> 31) -#define SCANMGR_STAT_WFIFOCNT_GET(x) (((x) & 0x70000000) >> 28) - int scan_mgr_configure_iocsr(void); int iocsr_get_config_table(const unsigned int chain_id, const unsigned long **table, diff --git a/arch/arm/mach-socfpga/scan_manager.c b/arch/arm/mach-socfpga/scan_manager.c index ec0c630..db47f4f 100644 --- a/arch/arm/mach-socfpga/scan_manager.c +++ b/arch/arm/mach-socfpga/scan_manager.c @@ -5,10 +5,22 @@ */ #include <common.h> +#include <errno.h> #include <asm/io.h> #include <asm/arch/freeze_controller.h> #include <asm/arch/scan_manager.h> +/* + * Maximum polling loop to wait for IO scan chain engine becomes idle + * to prevent infinite loop. It is important that this is NOT changed + * to delay using timer functions, since at the time this function is + * called, timer might not yet be inited. + */ +#define SCANMGR_MAX_DELAY 100 + +#define SCANMGR_STAT_ACTIVE (1 << 31) +#define SCANMGR_STAT_WFIFOCNT_MASK 0x70000000 + DECLARE_GLOBAL_DATA_PTR; static const struct socfpga_scan_manager *scan_manager_base = @@ -16,26 +28,26 @@ static const struct socfpga_scan_manager *scan_manager_base = static const struct socfpga_freeze_controller *freeze_controller_base = (void *)(SOCFPGA_SYSMGR_ADDRESS + SYSMGR_FRZCTRL_ADDRESS); -/* +/** + * scan_chain_engine_is_idle() - Check if the JTAG scan chain is idle + * @max_iter: Maximum number of iterations to wait for idle + * * Function to check IO scan chain engine status and wait if the engine is * is active. Poll the IO scan chain engine till maximum iteration reached. */ -static inline uint32_t scan_chain_engine_is_idle(uint32_t max_iter) +static u32 scan_chain_engine_is_idle(uint32_t max_iter) { - uint32_t scanmgr_status; - - scanmgr_status = readl(&scan_manager_base->stat); + const u32 mask = SCANMGR_STAT_ACTIVE | SCANMGR_STAT_WFIFOCNT_MASK; + u32 status; - /* Poll the engine until the scan engine is inactive */ - while (SCANMGR_STAT_ACTIVE_GET(scanmgr_status) || - (SCANMGR_STAT_WFIFOCNT_GET(scanmgr_status) > 0)) { - max_iter--; - if (max_iter > 0) - scanmgr_status = readl(&scan_manager_base->stat); - else + /* Poll the engine until the scan engine is inactive. */ + do { + status = readl(&scan_manager_base->stat); + if (!(status & mask)) return 0; - } - return 1; + } while (max_iter--); + + return -ETIMEDOUT; } /** @@ -70,8 +82,9 @@ static int scan_mgr_io_scan_chain_prg(const unsigned int io_scan_chain_id) * Check if the scan chain engine is inactive and the * WFIFO is empty before enabling the IO scan chain */ - if (!scan_chain_engine_is_idle(SCAN_MAX_DELAY)) - return 1; + ret = scan_chain_engine_is_idle(SCANMGR_MAX_DELAY); + if (ret) + return ret; /* * Enable IO Scan chain based on scan chain id @@ -114,7 +127,8 @@ static int scan_mgr_io_scan_chain_prg(const unsigned int io_scan_chain_id) * Check if the scan chain engine has completed the * IO scan chain data shifting */ - if (!scan_chain_engine_is_idle(SCAN_MAX_DELAY)) + ret = scan_chain_engine_is_idle(SCANMGR_MAX_DELAY); + if (ret) goto error; } @@ -185,7 +199,8 @@ static int scan_mgr_io_scan_chain_prg(const unsigned int io_scan_chain_id) * Check if the scan chain engine has completed the * IO scan chain data shifting */ - if (!scan_chain_engine_is_idle(SCAN_MAX_DELAY)) + ret = scan_chain_engine_is_idle(SCANMGR_MAX_DELAY); + if (ret) goto error; } @@ -196,7 +211,7 @@ static int scan_mgr_io_scan_chain_prg(const unsigned int io_scan_chain_id) error: /* Disable IO Scan chain when error detected */ clrbits_le32(&scan_manager_base->en, 1 << io_scan_chain_id); - return 1; + return ret; } int scan_mgr_configure_iocsr(void) -- 2.1.4

2 12

[U-Boot] driver model is not smp safe
by Bin Meng 08 Aug '15

08 Aug '15

Hi Simon, When adding x86 multi-cpu initialization on a board with 4 cores, I found: => cpu list 0: cpu@0 Genuine Intel(R) CPU @ 1.58GHz 1: cpu@1 Genuine Intel(R) CPU @ 1.58GHz 2: cpu@2 Genuine Intel(R) CPU @ 1.58GHz 2: cpu@3 Genuine Intel(R) CPU @ 1.58GHz cpu@2 and cpu@3 have the same sequence number, which indicates they are running parallelly to get the same sequence number. The call chain on an ap is: mp_init_cpu() -> device_probe() -> uclass_resolve_seq(). Apparently ap2 and ap3 are running at the same time to get the same number. Note so far all x86 boards that we have enabled x86 multi-cpu initialization on only have 2 cores, which will not expose such issue as there is no parallel execution among aps. What does this mean? - Driver model is not smp safe. But given U-Boot is a single-threaded environment, I don't think we want to add such support to driver model. OR: - We are using driver model incorrectly on x86 mp initialization codes. What do you think? Regards, Bin

4 10

[U-Boot] Please pull u-boot-dm
by Simon Glass 07 Aug '15

07 Aug '15

Hi Tom, This includes some driver model support for devres (managed device resource framework), I2C multiplexers, some PMIC framework improvements and USB Ethernet additions. It also includes support for spring (Exynos5-based Chromebook) as requested by Minkyu (Samsung maintainer). The following changes since commit a5325cd5e91f77a2214e80198ae31c1d8b7e7c3c: configs: Remove CONFIG_SERIAL_MULTI (2015-08-05 14:12:42 -0400) are available in the git repository at: git://git.denx.de/u-boot-dm.git for you to fetch changes up to fac971b2b5efbdb6ed2d12ebdbf7e029c5ed30e8: exynos: dts: Correct LDO and BUCK naming (2015-08-06 07:44:30 -0600) ---------------------------------------------------------------- Marcel Ziswiler (1): dm: usb: fix USB Ethernet without CONFIG_DM_ETH regression Masahiro Yamada (5): dm: add DM_FLAG_BOUND flag devres: introduce Devres (Managed Device Resource) framework devres: add devm_kmalloc() and friends (managed memory allocators) devres: make Devres optional with CONFIG_DEVRES devres: add debug command to dump device resources Simon Glass (68): dm: core: Support finding a device by phandle dm: i2c: Add a message debug function dm: i2c: Correct comment nits in dm_i2c_reg_read/write() dm: i2c: Move definitions to the top of the header file dm: i2c: Add a function to transfer messages dm: i2c: Add support for multiplexed I2C buses i2c: Add a mux for GPIO-based I2C bus arbitration exynos: i2c: Fix code style with ReadWriteByte() exynos: i2c: Tidy up the driver model code exynos: dts: Sync up I2C ports with the kernel exynos: dts: Add PMIC and regulator definitions exynos: dts: Support EC tunnel and main TPS65090 regulator dm: cros_ec: Convert the I2C tunnel code to use driver model cros_ec: Support the LDO access method used by spring exynos: serial: Refactor init code for debug UART exynos: Add debug UART support for Samsung S5P serial exynos: Enable the debug UART in SPL dm: power: Add a new driver for the TPS65090 PMIC dm: power: Add support for TPS65090 FETs dm: power: Add support for the S5M8767 PMIC dm: power: Add support for S5M8767 regulators dm: pmic: max77686: Correct a few nits dm: pmic: Correct the pmic_reg_write() implementation dm: power: max77686: Correct BUCK register access dm: pmic: max77686: Support all BUCK regulators dm: power: Don't return an error when regulators are not autoset dm: pmic: Display the regulator limits on error dm: video: Add support for video bridges video: Work around lack of pinctrl dm: video: Add support for the Parade PS8622/625 bridge dm: video: Add support for the NXP PTN3460 bridge exynos: spi: Convert the timeout to debug() exynos: Correct return value in exynos_mmc_init() exynos: Add support for the DisplayPort hotplug detect exynos: video: Correct debug output exynos: Tidy up CPU frequency display dm: gpio: Check a GPIO is valid before using it dts: exynos: snow: Add memory layout description dts: exynos: pit: Add a new node for the parade video bridge driver dts: exynos: snow: Add a new node for the NXP video bridge driver exynos: dts: Drop the old TPS65090 I2C node exynos: Add common board code for exynos5 boards that use device tree exynos: Enable new features for exynos5 boards exynos: Remove unneeded device tree control #ifdefs exynos: config: Move common options to the common headers and tidy up exynos: Drop old exynos5420-specific board code exynos: Drop old exynos5250-specific board code power: Remove old TPS65090 drivers cros_ec: Remove the old tunnel code video: Remove the old parade driver dts: Drop unused compatible ID for the NXP video bridge exynos: video: Remove non-device-tree code exynos: Add support for spring dm: Make regmap and syscon optional dm: usb: Add an errno.h header to usb_ether.c dm: usb: Prepare dwc2 driver for driver-model conversion dm: usb: Add driver-model support to dwc2 net: smsc95xx: Sort the include files net: smsc95xx: Rename AX_RX_URB_SIZE to RX_URB_SIZE net: smsc95xx: Correct the error numbers net: smsc95xx: Prepare for conversion to driver model net: smsc95xx: Add driver-model support dm: Support address translation for simple-bus sandbox: Enable devres subsystem dm: core: Add a way to set a device name dm: core: Fix a typo in the uclass_get_device_by_name() comment x86: Enable debug UART for Minnowmax exynos: dts: Correct LDO and BUCK naming York Sun (2): lib/fdtdec: Fix compiling warning caused by changing fdt_addr_t type lib/fdtdec: Fix fdt_addr_t and fdt_size_t typedef arch/arm/cpu/armv7/exynos/Kconfig | 6 + arch/arm/cpu/armv7/exynos/lowlevel_init.c | 5 + arch/arm/cpu/armv7/exynos/pinmux.c | 10 + arch/arm/cpu/armv7/s5p-common/cpu_info.c | 7 +- arch/arm/dts/Makefile | 1 + arch/arm/dts/exynos4412-odroid.dts | 56 ++-- arch/arm/dts/exynos4412-trats2.dts | 70 ++-- arch/arm/dts/exynos5.dtsi | 34 +- arch/arm/dts/exynos5250-arndale.dts | 16 +- arch/arm/dts/exynos5250-smdk5250.dts | 171 +++++++++- arch/arm/dts/exynos5250-snow.dts | 371 ++++++++++++++++++--- arch/arm/dts/exynos5250-spring.dts | 588 +++++++++++++++++++++++++++++++++ arch/arm/dts/exynos5250.dtsi | 24 +- arch/arm/dts/exynos5420-peach-pit.dts | 260 +++++++++++++-- arch/arm/dts/exynos5420-smdk5420.dts | 4 +- arch/arm/dts/exynos54xx.dtsi | 36 +- arch/arm/dts/exynos5800-peach-pi.dts | 131 ++++++-- arch/arm/include/asm/arch-exynos/dp_info.h | 2 - arch/arm/include/asm/arch-exynos/periph.h | 1 + arch/x86/cpu/start.S | 9 + board/samsung/common/Makefile | 1 + board/samsung/common/board.c | 17 +- board/samsung/common/exynos5-dt.c | 362 ++++++++++++++++++++ board/samsung/smdk5250/Kconfig | 13 + board/samsung/smdk5250/MAINTAINERS | 6 + board/samsung/smdk5250/Makefile | 4 - board/samsung/smdk5250/exynos5-dt.c | 306 ----------------- board/samsung/smdk5420/Makefile | 4 - board/samsung/smdk5420/smdk5420.c | 143 -------- common/cmd_regulator.c | 3 +- common/cmd_usb.c | 9 +- configs/arndale_defconfig | 2 + configs/minnowmax_defconfig | 4 + configs/odroid-xu3_defconfig | 6 + configs/peach-pi_defconfig | 19 ++ configs/peach-pit_defconfig | 19 ++ configs/sandbox_defconfig | 2 + configs/smdk5250_defconfig | 10 + configs/smdk5420_defconfig | 6 + configs/snow_defconfig | 23 ++ configs/spring_defconfig | 42 +++ doc/README.i2c | 60 ++++ doc/device-tree-bindings/i2c/i2c-mux.txt | 60 ++++ doc/device-tree-bindings/video/bridge/ps8622.txt | 33 ++ drivers/core/Kconfig | 43 +++ drivers/core/Makefile | 5 +- drivers/core/device-remove.c | 8 + drivers/core/device.c | 34 +- drivers/core/devres.c | 259 +++++++++++++++ drivers/core/simple-bus.c | 30 ++ drivers/core/uclass.c | 42 +++ drivers/gpio/gpio-uclass.c | 6 +- drivers/i2c/Kconfig | 26 ++ drivers/i2c/Makefile | 4 + drivers/i2c/cros_ec_ldo.c | 77 +++++ drivers/i2c/cros_ec_tunnel.c | 41 +++ drivers/i2c/i2c-uclass.c | 27 ++ drivers/i2c/muxes/Kconfig | 17 + drivers/i2c/muxes/Makefile | 7 + drivers/i2c/muxes/i2c-arb-gpio-challenge.c | 147 +++++++++ drivers/i2c/muxes/i2c-mux-uclass.c | 198 +++++++++++ drivers/i2c/s3c24x0_i2c.c | 153 ++++++--- drivers/misc/cros_ec.c | 288 +++------------- drivers/mmc/s5p_sdhci.c | 2 +- drivers/pci/pci_tegra.c | 10 +- drivers/power/pmic/Kconfig | 18 + drivers/power/pmic/Makefile | 5 +- drivers/power/pmic/max77686.c | 6 +- drivers/power/pmic/pmic-uclass.c | 2 +- drivers/power/pmic/pmic_tps65090.c | 310 ----------------- drivers/power/pmic/pmic_tps65090_ec.c | 218 ------------ drivers/power/pmic/s5m8767.c | 95 ++++++ drivers/power/pmic/tps65090.c | 94 ++++++ drivers/power/regulator/Kconfig | 19 ++ drivers/power/regulator/Makefile | 2 + drivers/power/regulator/max77686.c | 28 +- drivers/power/regulator/regulator-uclass.c | 4 +- drivers/power/regulator/s5m8767.c | 269 +++++++++++++++ drivers/power/regulator/tps65090_regulator.c | 138 ++++++++ drivers/serial/Kconfig | 7 + drivers/serial/serial_s5p.c | 63 +++- drivers/spi/exynos_spi.c | 6 +- drivers/spi/fsl_dspi.c | 4 +- drivers/usb/eth/smsc95xx.c | 469 +++++++++++++++++--------- drivers/usb/eth/usb_ether.c | 1 + drivers/usb/host/dwc2.c | 255 +++++++++++--- drivers/video/Kconfig | 2 + drivers/video/Makefile | 3 +- drivers/video/bridge/Kconfig | 27 ++ drivers/video/bridge/Makefile | 9 + drivers/video/bridge/ps862x.c | 134 ++++++++ drivers/video/bridge/ptn3460.c | 38 +++ drivers/video/bridge/video-bridge-uclass.c | 119 +++++++ drivers/video/exynos_dp.c | 24 +- drivers/video/exynos_dp_lowlevel.c | 2 +- drivers/video/parade.c | 231 ------------- drivers/video/tegra.c | 2 +- include/configs/arndale.h | 18 +- include/configs/exynos5-common.h | 13 +- include/configs/exynos5-dt-common.h | 21 +- include/configs/exynos5250-common.h | 16 +- include/configs/exynos5420-common.h | 9 +- include/configs/odroid_xu3.h | 2 + include/configs/peach-pi.h | 14 +- include/configs/peach-pit.h | 24 +- include/configs/smdk5250.h | 16 +- include/configs/smdk5420.h | 10 +- include/configs/snow.h | 15 +- include/configs/spring.h | 20 ++ include/cros_ec.h | 16 +- include/dm/device-internal.h | 44 +++ include/dm/device.h | 284 ++++++++++++++++ include/dm/uclass-id.h | 2 + include/dm/uclass.h | 19 +- include/dm/util.h | 9 + include/fdtdec.h | 9 +- include/i2c.h | 150 ++++++--- include/parade.h | 18 - include/power/s5m8767.h | 85 +++++ include/power/tps65090.h | 56 ++++ include/power/tps65090_pmic.h | 73 ---- include/video_bridge.h | 92 ++++++ lib/fdtdec.c | 3 - test/dm/cmd_dm.c | 12 +- 124 files changed, 5743 insertions(+), 2291 deletions(-) create mode 100644 arch/arm/dts/exynos5250-spring.dts create mode 100644 board/samsung/common/exynos5-dt.c delete mode 100644 board/samsung/smdk5250/exynos5-dt.c delete mode 100644 board/samsung/smdk5420/smdk5420.c create mode 100644 configs/spring_defconfig create mode 100644 doc/README.i2c create mode 100644 doc/device-tree-bindings/i2c/i2c-mux.txt create mode 100644 doc/device-tree-bindings/video/bridge/ps8622.txt create mode 100644 drivers/core/devres.c create mode 100644 drivers/i2c/cros_ec_ldo.c create mode 100644 drivers/i2c/cros_ec_tunnel.c create mode 100644 drivers/i2c/muxes/Kconfig create mode 100644 drivers/i2c/muxes/Makefile create mode 100644 drivers/i2c/muxes/i2c-arb-gpio-challenge.c create mode 100644 drivers/i2c/muxes/i2c-mux-uclass.c delete mode 100644 drivers/power/pmic/pmic_tps65090.c delete mode 100644 drivers/power/pmic/pmic_tps65090_ec.c create mode 100644 drivers/power/pmic/s5m8767.c create mode 100644 drivers/power/pmic/tps65090.c create mode 100644 drivers/power/regulator/s5m8767.c create mode 100644 drivers/power/regulator/tps65090_regulator.c create mode 100644 drivers/video/bridge/Kconfig create mode 100644 drivers/video/bridge/Makefile create mode 100644 drivers/video/bridge/ps862x.c create mode 100644 drivers/video/bridge/ptn3460.c create mode 100644 drivers/video/bridge/video-bridge-uclass.c delete mode 100644 drivers/video/parade.c create mode 100644 include/configs/spring.h delete mode 100644 include/parade.h create mode 100644 include/power/s5m8767.h create mode 100644 include/power/tps65090.h delete mode 100644 include/power/tps65090_pmic.h create mode 100644 include/video_bridge.h Regards, Simon

2 1

[U-Boot] [PATCH 00/18] x86: minnowmax: Move USB and Ethernet to driver model
by Simon Glass 07 Aug '15

07 Aug '15

This series aims to move minnowmax (an x86 board) to use driver model for USB and Ethernet. Since there is some support lacking, it includes: - driver-model conversion of asix USB Ethernet driver - driver-model conversion of Realtek 8169 Ethernet driver - PCI device matching without using device tree - driver-model conversion of USB Ethernet layer - driver-model conversion of ehci_pci driver Also it includes a proposed change to the Ethernet uclass recv method to support slow devices better. Simon Glass (18): dm: core: Add \n to two dm_warn() messages usb: ehci: Correct a missing hypen in an error message usb: Update some EHCI driver licenses to use SPDX x86: Show the un-relocated IP address in exceptions dm: pci: Add support for PCI driver matching dm: eth: Add driver-model support to the rtl8169 driver dm: pci: Add a function to get the BDF for a device dm: usb: Correct the struct usb_driver_entry comment dm: usb: Avoid using USB ethernet with CONFIG_DM_USB and no DM_ETH dm: eth: Avoid blocking on packet reception dm: usb: eth: Support driver model with USB Ethernet dm: usb: Adjust the USB_DEVICE() macro naming x86: minnowmax: Drop the cache line size hack dm: usb: Add driver-model support to ehci-pci dm: usb: eth: Add driver-model support to the asix driver net: Allow drivers to return -ENOSYS with the write_hwaddr() method x86: Convert minnowmax to use CONFIG_DM_NET x86: Convert minnowmax to use CONFIG_DM_USB arch/x86/cpu/interrupts.c | 2 + board/intel/minnowmax/minnowmax.c | 6 - common/cmd_usb.c | 14 ++- common/usb_hub.c | 2 +- common/usb_kbd.c | 4 +- common/usb_storage.c | 2 +- configs/minnowmax_defconfig | 3 + drivers/core/device.c | 4 +- drivers/net/designware.c | 2 +- drivers/net/rtl8169.c | 236 +++++++++++++++++++++++++++++-------- drivers/net/sandbox-raw.c | 2 +- drivers/net/sandbox.c | 2 +- drivers/net/sunxi_emac.c | 2 +- drivers/pci/pci-uclass.c | 144 ++++++++++++++++++++--- drivers/pci/pci_compat.c | 8 +- drivers/usb/Kconfig | 4 +- drivers/usb/eth/asix.c | 237 ++++++++++++++++++++++++++++++++++---- drivers/usb/eth/usb_ether.c | 131 ++++++++++++++++++++- drivers/usb/host/ehci-hcd.c | 17 +-- drivers/usb/host/ehci-pci.c | 112 ++++++++++++------ drivers/usb/host/ehci.h | 15 +-- drivers/usb/host/r8a66597-hcd.c | 14 +-- drivers/usb/host/r8a66597.h | 14 +-- include/configs/minnowmax.h | 3 - include/net.h | 14 ++- include/pci.h | 87 +++++++++++++- include/usb.h | 22 +++- include/usb_ether.h | 89 ++++++++++++-- net/eth.c | 11 +- 29 files changed, 971 insertions(+), 232 deletions(-) -- 2.4.3.573.g4eafbef

4 49

[U-Boot] CONFIG_DM_ETH USB_ETHER_ASIX Reception Issue on Tegra
by Marcel Ziswiler 07 Aug '15

07 Aug '15

Hi there Trying to update one of my patch sets of late made me notice that the ASIX USB to Ethernet stuff if CONFIG_DM_ETH is enabled seems to be rather broken. I already sent two patches to even get that far but even with that reception still does not seem to work (see below). I tested by enabling CONFIG_DM_ETH on Colibri T20/T30 as well as Apalis T30 with CONFIG_USB_HOST_ETHER and CONFIG_USB_ETHER_ASIX enabled and a LevelOne USB-0301 ASIX AX88772 dongle. Has anybody actually tried that lately? Colibri T20 # usb start starting USB... USB0: USB EHCI 1.00 USB1: USB EHCI 1.00 USB2: USB EHCI 1.00 scanning bus 1 for devices... 1 USB Device(s) found scanning bus 2 for devices... Warning: asix_eth using MAC address from ROM 2 USB Device(s) found scanning bus 0 for devices... 1 USB Device(s) found Colibri T20 # tftpboot $loadaddr uImage-colibri_t20 Using asix_eth device TFTP from server 192.168.10.1; our IP address is 192.168.10.4 Filename 'uImage-colibri_t20'. Load address: 0x1000000 Loading: EHCI timed out on TD - token=0x8008d80 Rx: failed to receive: -5 T EHCI timed out on TD - token=0x8008d80 Rx: failed to receive: -5 T EHCI timed out on TD - token=0x8008d80 Rx: failed to receive: -5 T EHCI timed out on TD - token=0x8008d80 Rx: failed to receive: -5 T EHCI timed out on TD - token=0x8008d80 Rx: failed to receive: -5 T EHCI timed out on TD - token=0x8008d80 Rx: failed to receive: -5 T EHCI timed out on TD - token=0x8008d80 Rx: failed to receive: -5 T EHCI timed out on TD - token=0x8008d80 Rx: failed to receive: -5 T EHCI timed out on TD - token=0x8008d80 Rx: failed to receive: -5 T EHCI timed out on TD - token=0x8008d80 Rx: failed to receive: -5 T EHCI timed out on TD - token=0x8008d80 Rx: failed to receive: -5 Retry count exceeded; starting again Colibri T20 #

3 9

[U-Boot] [ANN] U-Boot v2015.07 released
by Tom Rini 07 Aug '15

07 Aug '15

Hey all, I've pushed v2015.07 out to the repository and tarballs should exist soon. This sounds a bit like a broken record, but it's true. The Kconfig migration and DM work continue moving along. Looking over the announcement for v2015.04, I see I said we'd deprecate MAKEALL. So I've applied http://patchwork.ozlabs.org/patch/383960/ right after the tag. If buildman isn't working for you and your use case, we really need to talk. Finally, I would encourage custodians to follow-up with anything big I've overlooked. Thanks for the hard work everyone! The merge window is now open and will close on Saturday Aug 1st. -- Tom

8 26

[U-Boot] [PATCH] imx: mx6 move TARGET_xx Kconfig option to mx6 specific Kconfig file
by Peng Fan 07 Aug '15

07 Aug '15

Move TARGET_xx Kconfig option based on mx6 to arch/arm/cpu/armv7/mx6/Kconfig. Add enable "CONFIG_ARCH_MX6" for boards based on mx6. Then we can choose target boards using "make ARCH=arm menuconfig" with ARCH_MX6 defined. If using original way, we have no chance to enable ARCH_MX6 when "make menuconfig". Even define CONFIG_ARCH_MX6=y in xx_defconfig, kconfig will complains "arch/../configs/platinum_titanium_defconfig:3: warning: override: TARGET_PLATINUM_TITANIUM changes choice state" Signed-off-by: Peng Fan <Peng.Fan(a)freescale.com> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Heiko Schocher <hs(a)denx.de> Cc: Tim Harvey <tharvey(a)gateworks.com> Cc: Eric Bénard <eric(a)eukrea.com> Cc: Fabio Estevam <fabio.estevam(a)freescale.com> Cc: Eric Nelson <eric.nelson(a)boundarydevices.com> Cc: Marek Vasut <marex(a)denx.de> Cc: Christian Gmeiner <christian.gmeiner(a)gmail.com> Cc: Stefan Roese <sr(a)denx.de> Cc: Soeren Moch <smoch(a)web.de> Cc: Otavio Salvador <otavio(a)ossystems.com.br> Signed-off-by: Peng Fan <Peng.Fan(a)freescale.com> --- arch/arm/Kconfig | 128 ------------------------------------ arch/arm/cpu/armv7/mx6/Kconfig | 128 ++++++++++++++++++++++++++++++++++++ configs/aristainetos2_defconfig | 1 + configs/aristainetos_defconfig | 1 + configs/cgtqmx6qeval_defconfig | 1 + configs/gwventana_defconfig | 1 + configs/marsboard_defconfig | 1 + configs/mx6cuboxi_defconfig | 1 + configs/mx6dlarm2_defconfig | 1 + configs/mx6dlarm2_lpddr2_defconfig | 1 + configs/mx6dlsabreauto_defconfig | 1 + configs/mx6dlsabresd_defconfig | 1 + configs/mx6qarm2_defconfig | 1 + configs/mx6qarm2_lpddr2_defconfig | 1 + configs/mx6qpsabreauto_defconfig | 1 + configs/mx6qsabreauto_defconfig | 1 + configs/mx6qsabrelite_defconfig | 1 + configs/mx6qsabresd_defconfig | 1 + configs/mx6sabresd_spl_defconfig | 1 + configs/mx6slevk_defconfig | 1 + configs/mx6slevk_spinor_defconfig | 1 + configs/mx6sxsabresd_defconfig | 1 + configs/mx6sxsabresd_spl_defconfig | 1 + configs/mx6ul_14x14_evk_defconfig | 1 + configs/nitrogen6dl2g_defconfig | 1 + configs/nitrogen6dl_defconfig | 1 + configs/nitrogen6q2g_defconfig | 1 + configs/nitrogen6q_defconfig | 1 + configs/nitrogen6s1g_defconfig | 1 + configs/nitrogen6s_defconfig | 1 + configs/novena_defconfig | 1 + configs/ot1200_defconfig | 1 + configs/ot1200_spl_defconfig | 1 + configs/platinum_picon_defconfig | 1 + configs/platinum_titanium_defconfig | 1 + configs/riotboard_defconfig | 1 + configs/tbs2910_defconfig | 1 + configs/udoo_defconfig | 1 + configs/wandboard_defconfig | 1 + configs/warp_defconfig | 1 + 40 files changed, 166 insertions(+), 128 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5d54604..d28b50b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -508,113 +508,6 @@ config TARGET_VISION2 bool "Support vision2" select CPU_V7 -config TARGET_UDOO - bool "Support udoo" - select CPU_V7 - select SUPPORT_SPL - -config TARGET_WANDBOARD - bool "Support wandboard" - select CPU_V7 - select SUPPORT_SPL - -config TARGET_WARP - bool "Support WaRP" - select CPU_V7 - -config TARGET_TITANIUM - bool "Support titanium" - select CPU_V7 - -config TARGET_NITROGEN6X - bool "Support nitrogen6x" - select CPU_V7 - -config TARGET_CGTQMX6EVAL - bool "Support cgtqmx6eval" - select CPU_V7 - -config TARGET_EMBESTMX6BOARDS - bool "Support embestmx6boards" - select CPU_V7 - -config TARGET_ARISTAINETOS - bool "Support aristainetos" - select CPU_V7 - -config TARGET_ARISTAINETOS2 - bool "Support aristainetos2" - select CPU_V7 - -config TARGET_MX6QARM2 - bool "Support mx6qarm2" - select CPU_V7 - -config TARGET_MX6QSABREAUTO - bool "Support mx6qsabreauto" - select CPU_V7 - select DM - select DM_THERMAL - -config TARGET_MX6SABRESD - bool "Support mx6sabresd" - select CPU_V7 - select SUPPORT_SPL - select DM - select DM_THERMAL - -config TARGET_MX6CUBOXI - bool "Support Solid-run mx6 boards" - select CPU_V7 - select SUPPORT_SPL - -config TARGET_MX6SLEVK - bool "Support mx6slevk" - select CPU_V7 - -config TARGET_MX6SXSABRESD - bool "Support mx6sxsabresd" - select CPU_V7 - select SUPPORT_SPL - select DM - select DM_THERMAL - -config TARGET_MX6UL_14X14_EVK - bool "Support mx6ul_14x14_evk" - select CPU_V7 - select DM - select DM_THERMAL - select SUPPORT_SPL - -config TARGET_GW_VENTANA - bool "Support gw_ventana" - select CPU_V7 - select SUPPORT_SPL - -config TARGET_KOSAGI_NOVENA - bool "Support Kosagi Novena" - select CPU_V7 - select SUPPORT_SPL - -config TARGET_TBS2910 - bool "Support tbs2910" - select CPU_V7 - -config TARGET_OT1200 - bool "Bachmann OT1200" - select CPU_V7 - select SUPPORT_SPL - -config TARGET_PLATINUM_PICON - bool "Support platinum-picon" - select CPU_V7 - select SUPPORT_SPL - -config TARGET_PLATINUM_TITANIUM - bool "Support platinum-titanium" - select CPU_V7 - select SUPPORT_SPL - config OMAP34XX bool "OMAP34XX SoC" select CPU_V7 @@ -869,7 +762,6 @@ source "arch/arm/cpu/armv8/Kconfig" source "arch/arm/imx-common/Kconfig" -source "board/aristainetos/Kconfig" source "board/BuR/kwb/Kconfig" source "board/BuR/tseries/Kconfig" source "board/CarMediaLab/flea3/Kconfig" @@ -880,24 +772,17 @@ source "board/Marvell/gplugd/Kconfig" source "board/armadeus/apf27/Kconfig" source "board/armltd/vexpress/Kconfig" source "board/armltd/vexpress64/Kconfig" -source "board/bachmann/ot1200/Kconfig" source "board/balloon3/Kconfig" -source "board/barco/platinum/Kconfig" -source "board/barco/titanium/Kconfig" source "board/bluegiga/apx4devkit/Kconfig" -source "board/boundary/nitrogen6x/Kconfig" source "board/broadcom/bcm28155_ap/Kconfig" source "board/broadcom/bcmcygnus/Kconfig" source "board/broadcom/bcmnsp/Kconfig" source "board/cirrus/edb93xx/Kconfig" source "board/compulab/cm_t335/Kconfig" -source "board/compulab/cm_fx6/Kconfig" -source "board/congatec/cgtqmx6eval/Kconfig" source "board/creative/xfi3/Kconfig" source "board/davedenx/qong/Kconfig" source "board/denx/m28evk/Kconfig" source "board/denx/m53evk/Kconfig" -source "board/embest/mx6boards/Kconfig" source "board/esg/ima3-mx53/Kconfig" source "board/freescale/ls2085a/Kconfig" source "board/freescale/ls2085aqds/Kconfig" @@ -915,14 +800,7 @@ source "board/freescale/mx53ard/Kconfig" source "board/freescale/mx53evk/Kconfig" source "board/freescale/mx53loco/Kconfig" source "board/freescale/mx53smd/Kconfig" -source "board/freescale/mx6qarm2/Kconfig" -source "board/freescale/mx6qsabreauto/Kconfig" -source "board/freescale/mx6sabresd/Kconfig" -source "board/freescale/mx6slevk/Kconfig" -source "board/freescale/mx6sxsabresd/Kconfig" -source "board/freescale/mx6ul_14x14_evk/Kconfig" source "board/freescale/vf610twr/Kconfig" -source "board/gateworks/gw_ventana/Kconfig" source "board/genesi/mx51_efikamx/Kconfig" source "board/gumstix/pepper/Kconfig" source "board/h2200/Kconfig" @@ -932,7 +810,6 @@ source "board/imx31_phycore/Kconfig" source "board/isee/igep0033/Kconfig" source "board/jornada/Kconfig" source "board/karo/tx25/Kconfig" -source "board/kosagi/novena/Kconfig" source "board/logicpd/imx27lite/Kconfig" source "board/logicpd/imx31_litekit/Kconfig" source "board/maxbcm/Kconfig" @@ -952,7 +829,6 @@ source "board/siemens/draco/Kconfig" source "board/siemens/pxm2/Kconfig" source "board/siemens/rut/Kconfig" source "board/silica/pengwyn/Kconfig" -source "board/solidrun/mx6cuboxi/Kconfig" source "board/spear/spear300/Kconfig" source "board/spear/spear310/Kconfig" source "board/spear/spear320/Kconfig" @@ -964,7 +840,6 @@ source "board/st/stm32f429-discovery/Kconfig" source "board/st/stv0991/Kconfig" source "board/sunxi/Kconfig" source "board/syteco/zmx25/Kconfig" -source "board/tbs/tbs2910/Kconfig" source "board/ti/am335x/Kconfig" source "board/ti/am43xx/Kconfig" source "board/birdland/bav335x/Kconfig" @@ -975,11 +850,8 @@ source "board/toradex/colibri_pxa270/Kconfig" source "board/toradex/colibri_vf/Kconfig" source "board/trizepsiv/Kconfig" source "board/ttcontrol/vision2/Kconfig" -source "board/udoo/Kconfig" source "board/vpac270/Kconfig" source "board/vscom/baltos/Kconfig" -source "board/wandboard/Kconfig" -source "board/warp/Kconfig" source "board/woodburn/Kconfig" source "board/work-microwave/work_92105/Kconfig" source "board/xaeniax/Kconfig" diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig index dce7ffc..b7481e7 100644 --- a/arch/arm/cpu/armv7/mx6/Kconfig +++ b/arch/arm/cpu/armv7/mx6/Kconfig @@ -46,6 +46,113 @@ config TARGET_SECOMX6 config TARGET_TQMA6 bool "TQ Systems TQMa6 board" +config TARGET_UDOO + bool "Support udoo" + select CPU_V7 + select SUPPORT_SPL + +config TARGET_OT1200 + bool "Bachmann OT1200" + select CPU_V7 + select SUPPORT_SPL + +config TARGET_WANDBOARD + bool "Support wandboard" + select CPU_V7 + select SUPPORT_SPL + +config TARGET_WARP + bool "Support WaRP" + select CPU_V7 + +config TARGET_MX6CUBOXI + bool "Support Solid-run mx6 boards" + select CPU_V7 + select SUPPORT_SPL + +config TARGET_MX6SLEVK + bool "Support mx6slevk" + select CPU_V7 + +config TARGET_MX6SXSABRESD + bool "Support mx6sxsabresd" + select CPU_V7 + select SUPPORT_SPL + select DM + select DM_THERMAL + +config TARGET_MX6UL_14X14_EVK + bool "Support mx6ul_14x14_evk" + select CPU_V7 + select DM + select DM_THERMAL + select SUPPORT_SPL + +config TARGET_MX6QARM2 + bool "Support mx6qarm2" + select CPU_V7 + +config TARGET_MX6QSABREAUTO + bool "Support mx6qsabreauto" + select CPU_V7 + select DM + select DM_THERMAL + +config TARGET_MX6SABRESD + bool "Support mx6sabresd" + select CPU_V7 + select SUPPORT_SPL + select DM + select DM_THERMAL + +config TARGET_GW_VENTANA + bool "Support gw_ventana" + select CPU_V7 + select SUPPORT_SPL + +config TARGET_TITANIUM + bool "Support titanium" + select CPU_V7 + +config TARGET_NITROGEN6X + bool "Support nitrogen6x" + select CPU_V7 + +config TARGET_CGTQMX6EVAL + bool "Support cgtqmx6eval" + select CPU_V7 + +config TARGET_EMBESTMX6BOARDS + bool "Support embestmx6boards" + select CPU_V7 + +config TARGET_ARISTAINETOS + bool "Support aristainetos" + select CPU_V7 + +config TARGET_ARISTAINETOS2 + bool "Support aristainetos2" + select CPU_V7 + +config TARGET_KOSAGI_NOVENA + bool "Support Kosagi Novena" + select CPU_V7 + select SUPPORT_SPL + +config TARGET_TBS2910 + bool "Support tbs2910" + select CPU_V7 + +config TARGET_PLATINUM_PICON + bool "Support platinum-picon" + select CPU_V7 + select SUPPORT_SPL + +config TARGET_PLATINUM_TITANIUM + bool "Support platinum-titanium" + select CPU_V7 + select SUPPORT_SPL + endchoice config SYS_SOC @@ -53,5 +160,26 @@ config SYS_SOC source "board/seco/Kconfig" source "board/tqc/tqma6/Kconfig" +source "board/udoo/Kconfig" +source "board/bachmann/ot1200/Kconfig" +source "board/wandboard/Kconfig" +source "board/warp/Kconfig" +source "board/compulab/cm_fx6/Kconfig" +source "board/solidrun/mx6cuboxi/Kconfig" +source "board/freescale/mx6qarm2/Kconfig" +source "board/freescale/mx6qsabreauto/Kconfig" +source "board/freescale/mx6sabresd/Kconfig" +source "board/freescale/mx6slevk/Kconfig" +source "board/freescale/mx6sxsabresd/Kconfig" +source "board/freescale/mx6ul_14x14_evk/Kconfig" +source "board/gateworks/gw_ventana/Kconfig" +source "board/barco/platinum/Kconfig" +source "board/barco/titanium/Kconfig" +source "board/boundary/nitrogen6x/Kconfig" +source "board/congatec/cgtqmx6eval/Kconfig" +source "board/embest/mx6boards/Kconfig" +source "board/aristainetos/Kconfig" +source "board/kosagi/novena/Kconfig" +source "board/tbs/tbs2910/Kconfig" endif diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig index e676f0e..e43f6eb 100644 --- a/configs/aristainetos2_defconfig +++ b/configs/aristainetos2_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_ARISTAINETOS2=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg,MX6DL" # CONFIG_CMD_IMLS is not set diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig index f5b0b6b..e6affed 100644 --- a/configs/aristainetos_defconfig +++ b/configs/aristainetos_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_ARISTAINETOS=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos.cfg,MX6DL" # CONFIG_CMD_IMLS is not set diff --git a/configs/cgtqmx6qeval_defconfig b/configs/cgtqmx6qeval_defconfig index 6fd29a0..a6ccd7a 100644 --- a/configs/cgtqmx6qeval_defconfig +++ b/configs/cgtqmx6qeval_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_CGTQMX6EVAL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/congatec/cgtqmx6eval/imximage.cfg,MX6Q" CONFIG_CMD_NET=y diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig index 401f77e..82d7206 100644 --- a/configs/gwventana_defconfig +++ b/configs/gwventana_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_GW_VENTANA=y CONFIG_SPL=y CONFIG_SPL_STACK_R=y diff --git a/configs/marsboard_defconfig b/configs/marsboard_defconfig index 5ea278f..0707f0d 100644 --- a/configs/marsboard_defconfig +++ b/configs/marsboard_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_EMBESTMX6BOARDS=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,ENV_IS_IN_SPI_FLASH" # CONFIG_CMD_IMLS is not set diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig index 27fe22e..59362c6 100644 --- a/configs/mx6cuboxi_defconfig +++ b/configs/mx6cuboxi_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_MX6CUBOXI=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL" diff --git a/configs/mx6dlarm2_defconfig b/configs/mx6dlarm2_defconfig index 6c1ba33..e1bdaaf 100644 --- a/configs/mx6dlarm2_defconfig +++ b/configs/mx6dlarm2_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_MX6QARM2=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage_mx6dl.cfg,MX6DL,DDR_MB=2048" # CONFIG_CMD_IMLS is not set diff --git a/configs/mx6dlarm2_lpddr2_defconfig b/configs/mx6dlarm2_lpddr2_defconfig index 4624a09..a37c254 100644 --- a/configs/mx6dlarm2_lpddr2_defconfig +++ b/configs/mx6dlarm2_lpddr2_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_MX6QARM2=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage_mx6dl.cfg,MX6DL,MX6DL_LPDDR2,DDR_MB=512" # CONFIG_CMD_IMLS is not set diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig index 756e5db..17d1b96 100644 --- a/configs/mx6dlsabreauto_defconfig +++ b/configs/mx6dlsabreauto_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_MX6QSABREAUTO=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL" # CONFIG_CMD_IMLS is not set diff --git a/configs/mx6dlsabresd_defconfig b/configs/mx6dlsabresd_defconfig index de99998..6610a0c 100644 --- a/configs/mx6dlsabresd_defconfig +++ b/configs/mx6dlsabresd_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_MX6SABRESD=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6dlsabresd.cfg,MX6DL" # CONFIG_CMD_IMLS is not set diff --git a/configs/mx6qarm2_defconfig b/configs/mx6qarm2_defconfig index 42dbded..5cd78cd 100644 --- a/configs/mx6qarm2_defconfig +++ b/configs/mx6qarm2_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_MX6QARM2=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg,MX6Q,DDR_MB=2048" # CONFIG_CMD_IMLS is not set diff --git a/configs/mx6qarm2_lpddr2_defconfig b/configs/mx6qarm2_lpddr2_defconfig index 5f9105f..89c42b8 100644 --- a/configs/mx6qarm2_lpddr2_defconfig +++ b/configs/mx6qarm2_lpddr2_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_MX6QARM2=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg,MX6Q,MX6DQ_LPDDR2,DDR_MB=512" # CONFIG_CMD_IMLS is not set diff --git a/configs/mx6qpsabreauto_defconfig b/configs/mx6qpsabreauto_defconfig index 293e3f2..2cbbc32 100644 --- a/configs/mx6qpsabreauto_defconfig +++ b/configs/mx6qpsabreauto_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_MX6QSABREAUTO=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6qp.cfg,MX6Q" CONFIG_SPI_FLASH=y diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig index 9343bcc..11ded40 100644 --- a/configs/mx6qsabreauto_defconfig +++ b/configs/mx6qsabreauto_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_MX6QSABREAUTO=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q" # CONFIG_CMD_IMLS is not set diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig index 427fbee..1a2bb22 100644 --- a/configs/mx6qsabrelite_defconfig +++ b/configs/mx6qsabrelite_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_NITROGEN6X=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,SABRELITE" # CONFIG_CMD_IMLS is not set diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig index 732c1dc..6cbe1cf 100644 --- a/configs/mx6qsabresd_defconfig +++ b/configs/mx6qsabresd_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_MX6SABRESD=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg,MX6Q" # CONFIG_CMD_IMLS is not set diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig index d93a40d..bfd371a 100644 --- a/configs/mx6sabresd_spl_defconfig +++ b/configs/mx6sabresd_spl_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_MX6SABRESD=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6Q" diff --git a/configs/mx6slevk_defconfig b/configs/mx6slevk_defconfig index dcc3296..ae9912b 100644 --- a/configs/mx6slevk_defconfig +++ b/configs/mx6slevk_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_MX6SLEVK=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL" # CONFIG_CMD_IMLS is not set diff --git a/configs/mx6slevk_spinor_defconfig b/configs/mx6slevk_spinor_defconfig index 964a147..3904616 100644 --- a/configs/mx6slevk_spinor_defconfig +++ b/configs/mx6slevk_spinor_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_MX6SLEVK=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL,SYS_BOOT_SPINOR" # CONFIG_CMD_IMLS is not set diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig index e6e4db5..a582905 100644 --- a/configs/mx6sxsabresd_defconfig +++ b/configs/mx6sxsabresd_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_MX6SXSABRESD=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabresd/imximage.cfg,MX6SX" # CONFIG_CMD_IMLS is not set diff --git a/configs/mx6sxsabresd_spl_defconfig b/configs/mx6sxsabresd_spl_defconfig index df34894..3f19659 100644 --- a/configs/mx6sxsabresd_spl_defconfig +++ b/configs/mx6sxsabresd_spl_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_MX6SXSABRESD=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6SX" diff --git a/configs/mx6ul_14x14_evk_defconfig b/configs/mx6ul_14x14_evk_defconfig index 87ba686..250f3f2 100644 --- a/configs/mx6ul_14x14_evk_defconfig +++ b/configs/mx6ul_14x14_evk_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6UL" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_MX6UL_14X14_EVK=y CONFIG_SPL=y CONFIG_CMD_NET=y diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig index 6cbc0e3..2044fc9 100644 --- a/configs/nitrogen6dl2g_defconfig +++ b/configs/nitrogen6dl2g_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_NITROGEN6X=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048" # CONFIG_CMD_IMLS is not set diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig index 055266c..c90c8c9 100644 --- a/configs/nitrogen6dl_defconfig +++ b/configs/nitrogen6dl_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_NITROGEN6X=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024" # CONFIG_CMD_IMLS is not set diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig index 7b5ccc7..90ef17e 100644 --- a/configs/nitrogen6q2g_defconfig +++ b/configs/nitrogen6q2g_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_NITROGEN6X=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048" # CONFIG_CMD_IMLS is not set diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig index 5cc245e..798467e 100644 --- a/configs/nitrogen6q_defconfig +++ b/configs/nitrogen6q_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_NITROGEN6X=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024" # CONFIG_CMD_IMLS is not set diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig index b613a49..e8eca1b 100644 --- a/configs/nitrogen6s1g_defconfig +++ b/configs/nitrogen6s1g_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_NITROGEN6X=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024" # CONFIG_CMD_IMLS is not set diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig index b7cd09a..d142ebc 100644 --- a/configs/nitrogen6s_defconfig +++ b/configs/nitrogen6s_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_NITROGEN6X=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512" # CONFIG_CMD_IMLS is not set diff --git a/configs/novena_defconfig b/configs/novena_defconfig index aca98b7..60d6658 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_KOSAGI_NOVENA=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" diff --git a/configs/ot1200_defconfig b/configs/ot1200_defconfig index ea78934..17022a4 100644 --- a/configs/ot1200_defconfig +++ b/configs/ot1200_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_OT1200=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/bachmann/ot1200/mx6q_4x_mt41j128.cfg,MX6Q" # CONFIG_CMD_IMLS is not set diff --git a/configs/ot1200_spl_defconfig b/configs/ot1200_spl_defconfig index 3c7346b..dbbea35 100644 --- a/configs/ot1200_spl_defconfig +++ b/configs/ot1200_spl_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_OT1200=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" diff --git a/configs/platinum_picon_defconfig b/configs/platinum_picon_defconfig index 3484c46..446a726 100644 --- a/configs/platinum_picon_defconfig +++ b/configs/platinum_picon_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_PLATINUM_PICON=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6DL" diff --git a/configs/platinum_titanium_defconfig b/configs/platinum_titanium_defconfig index 6a2cacf..01cbb08 100644 --- a/configs/platinum_titanium_defconfig +++ b/configs/platinum_titanium_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_PLATINUM_TITANIUM=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig index fd18e2d..859b143 100644 --- a/configs/riotboard_defconfig +++ b/configs/riotboard_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_EMBESTMX6BOARDS=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024,ENV_IS_IN_MMC" # CONFIG_CMD_IMLS is not set diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index f0e5106..1e20d29 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TBS2910=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q" # CONFIG_CMD_IMLS is not set diff --git a/configs/udoo_defconfig b/configs/udoo_defconfig index 9fe30d3..e4f1d8d 100644 --- a/configs/udoo_defconfig +++ b/configs/udoo_defconfig @@ -1,5 +1,6 @@ CONFIG_SPL=y CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_DM=y CONFIG_DM_THERMAL=y CONFIG_TARGET_UDOO=y diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index 62666ff..595e4be 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_WANDBOARD=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL" diff --git a/configs/warp_defconfig b/configs/warp_defconfig index dacb432..423f820 100644 --- a/configs/warp_defconfig +++ b/configs/warp_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_WARP=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL" # CONFIG_CMD_IMLS is not set -- 1.8.4

6 7