Skip to contentSkip to conversation

prep work for submitting Draeger imx6-ralated patches

DISCUSSION Petko Manolov 2 participants 2 messages Aug 17

lore
Share & tools
lore
#0 lore raw

Hello guys,

I am tasked with submitting the patches Draeger (Dräger) applied to u-boot for their imx6-based product line. I've already spoken to Tom Rini about how to approach the upstreaming them, but would like to get your opinion as imx6 maintainers.

The patch series touch quite a few files and some changes are not suitable for mainlining in their present form and thus i'll have to rework them. I'll start with sending (below) the short diff stat just to give you an idea about what's been changed.

cheers,
Petko

---
 arch/arm/Kconfig                                   |     1 +
 arch/arm/dts/Makefile                              |     5 +-
 arch/arm/dts/imx6dl-draeger-m48.dts                |    23 +
 arch/arm/dts/imx6q-draeger-m48.dts                 |    23 +
 arch/arm/dts/imx6qdl-draeger-m48-u-boot.dtsi       |    20 +
 arch/arm/dts/imx6qdl-draeger-m48.dtsi              |   354 +
 arch/arm/dts/imx6qp-draeger-m48.dts                |    87 +
 .../dts/socfpga_cyclone5_draeger_m48-u-boot.dtsi   |    66 +
 arch/arm/dts/socfpga_cyclone5_draeger_m48.dts      |   134 +
 arch/arm/include/asm/arch-mx6/mx6-ddr.h            |     1 +
 arch/arm/include/asm/arch-mx6/mx6dl-ddr.h          |     2 +
 arch/arm/include/asm/arch-mx6/mx6q-ddr.h           |     2 +
 arch/arm/include/asm/mach-imx/mxc_i2c.h            |     1 +
 arch/arm/mach-imx/i2c-mxv7.c                       |    51 +-
 arch/arm/mach-imx/mx6/Kconfig                      |    14 +
 arch/arm/mach-imx/mx6/clock.c                      |     4 +
 arch/arm/mach-socfpga/Kconfig                      |     7 +
 arch/arm/mach-socfpga/spl_gen5.c                   |     4 +
 board/draeger/common/Makefile                      |    11 +
 board/draeger/common/draeger_common.c              |   549 +
 board/draeger/common/draeger_common.h              |    59 +
 board/draeger/common/draeger_m48_pmstruct.h        |    77 +
 board/draeger/common/draeger_post_memory.c         |    28 +
 board/draeger/imx6m48/Kconfig                      |    21 +
 board/draeger/imx6m48/MAINTAINERS                  |     6 +
 board/draeger/imx6m48/Makefile                     |    15 +
 board/draeger/imx6m48/clocks.cfg                   |    41 +
 board/draeger/imx6m48/imx6_dp.c                    |   495 +
 board/draeger/imx6m48/imx6m48.c                    |  1330 +++
 board/draeger/imx6m48/imx6m48.h                    |    67 +
 board/draeger/imx6m48/imx6m48_spl.c                |   674 ++
 board/draeger/imx6m48/imx6m48_spl_cfg.h            |    45 +
 board/draeger/imx6m48/imx6m48dl_spl_cfg.c          |   969 ++
 board/draeger/imx6m48/imx6m48q_spl_cfg.c           |   975 ++
 board/draeger/imx6m48/imx6m48qp_spl_cfg.c          |   619 ++
 board/draeger/imx6m48/imx6m48spl.cfg               |    27 +
 board/draeger/socfpga_m48/MAINTAINERS              |     6 +
 board/draeger/socfpga_m48/Makefile                 |     8 +
 board/draeger/socfpga_m48/socfpga.c                |  1294 +++
 boot/bootm_os.c                                    |    35 +
 cmd/diag.c                                         |     1 +
 cmd/net.c                                          |    14 +-
 cmd/sf.c                                           |    16 +-
 common/spl/Kconfig                                 |     6 -
 common/spl/spl.c                                   |     7 +
 common/spl/spl_spi.c                               |    16 +-
 configs/draeger_imx6m48_defconfig                  |  2006 ++++
 configs/draeger_imx6m48_revoke_defconfig           |  2006 ++++
 configs/draeger_socfpga_m48_defconfig              |  1932 ++++
 draeger/FPGA/m48_test/bin/m48_cv_se_a2.img         |   Bin 0 -> 4244884 bytes
 draeger/FPGA/m48_test/bin/m48_default_system.img   |   Bin 0 -> 4244884 bytes
 draeger/FPGA/m48_test/bin/m48_default_system.jpg   |   Bin 0 -> 1053337 bytes
 draeger/FPGA/m48_test/bin/m48_default_system.rbf   |   Bin 0 -> 4244820 bytes
 draeger/FPGA/m48_test/bin/preloader-mkpimage.bin   |   Bin 0 -> 262144 bytes
 draeger/FPGA/m48_test/quartus/m48_cv_se_a2.qsys    |  1605 +++
 draeger/FPGA/m48_test/quartus/m48_soc.qsys         |  1605 +++
 draeger/FPGA/m48_test/scripts/buildFPGAImage.cmd   |    79 +
 draeger/FPGA/m48_test/scripts/buildPreloader.cmd   |    59 +
 .../m48_test/scripts/create_quartus_project.tcl    |    13 +
 draeger/FPGA/m48_test/scripts/m48_cv_se_a2.tcl     |   929 ++
 .../FPGA/m48_test/scripts/m48_default_system.tcl   |   929 ++
 .../FPGA/m48_test/scripts/prepareIpSearchPath.cmd  |    29 +
 .../m48_test/src/m48_default_system_timing.sdc     |   507 +
 draeger/FPGA/m48_test/src/m48_top.v                |   659 ++
 .../m48_test/src/my_ClkDivider/my_ClkDivider.qip   |   338 +
 .../m48_test/src/my_ClkDivider/my_ClkDivider.v     |   255 +
 .../my_ClkDivider/my_ClkDivider_0002.qip           |     4 +
 .../my_ClkDivider/my_ClkDivider_0002.v             |    90 +
 draeger/FPGA/m48_test/srcPreloader/build.h         |   167 +
 .../m48_test/srcPreloader/iocsr_config_cyclone5.c  |   675 ++
 .../m48_test/srcPreloader/iocsr_config_cyclone5.h  |    38 +
 draeger/FPGA/m48_test/srcPreloader/pinmux_config.h |    75 +
 .../m48_test/srcPreloader/pinmux_config_cyclone5.c |   241 +
 draeger/FPGA/m48_test/srcPreloader/pll_config.h    |   108 +
 draeger/FPGA/m48_test/srcPreloader/reset_config.h  |    82 +
 .../FPGA/m48_test/srcPreloader/sdram/alt_types.h   |    51 +
 .../m48_test/srcPreloader/sdram/sdram_config.h     |   108 +
 .../FPGA/m48_test/srcPreloader/sdram/sdram_io.h    |    54 +
 .../FPGA/m48_test/srcPreloader/sdram/sequencer.c   | 10739 +++++++++++++++++++
 .../FPGA/m48_test/srcPreloader/sdram/sequencer.h   |   648 ++
 .../m48_test/srcPreloader/sdram/sequencer_auto.h   |   228 +
 .../srcPreloader/sdram/sequencer_auto_ac_init.c    |    72 +
 .../srcPreloader/sdram/sequencer_auto_inst_init.c  |   163 +
 .../srcPreloader/sdram/sequencer_defines.h         |   162 +
 draeger/FPGA/m48_test/srcPreloader/sdram/system.h  |    38 +
 draeger/FPGA/m48_test/srcPreloader/sdram/tclrpt.c  |  1130 ++
 draeger/FPGA/m48_test/srcPreloader/sdram/tclrpt.h  |   581 +
 draeger/Jenkinsfile                                |   251 +
 draeger/M48Test/iocsr_config_cyclone5.c            |   675 ++
 draeger/M48Test/iocsr_config_cyclone5.h            |    38 +
 draeger/M48Test/pinmux_config_cyclone5.c           |   241 +
 draeger/M48Test/pll_config.h                       |   107 +
 draeger/M48Test/reset_config.h                     |    82 +
 draeger/M48Test/sdram/sdram_config.h               |   113 +
 draeger/M48Test/sdram/sequencer_auto.h             |   228 +
 draeger/M48Test/sdram/sequencer_auto_ac_init.c     |    72 +
 draeger/M48Test/sdram/sequencer_auto_inst_init.c   |   163 +
 draeger/M48Test/sdram/sequencer_defines.h          |   162 +
 draeger/build/README.md                            |    52 +
 draeger/build/SyncSourceToArtifactVersion.sh       |    40 +
 draeger/build/build_all.sh                         |    62 +
 draeger/build/conan_v1/conanfile.py.in             |    39 +
 draeger/build/conan_v1/copy_gcc_copyright.sh       |    12 +
 draeger/build/conan_v1/create_conan_package.cmake  |    73 +
 draeger/build/conan_v1/gcc_package_skeleton.yml    |    19 +
 draeger/build/conan_v1/package_uboot.yml           |   355 +
 .../plain/cmake/container_images.properties        |     1 +
 draeger/build/conanfile.py                         |   176 +
 draeger/build/create_conan_package.cmake           |     9 +
 draeger/build/getBuildId.sh                        |    65 +
 .../0_m48_up1_field_return.cmm                     |    41 +
 .../imx6FieldReturnScripts/calculateresponse.cmm   |    10 +
 .../imx6FieldReturnScripts/imx6_attach_secured.cmm |   Bin 0 -> 6712 bytes
 draeger/build/imx6FieldReturnScripts/readme.txt    |     5 +
 .../build/make_up2_preloader_with_synced_source.sh |    77 +
 draeger/build/mkuboot.sh                           |   195 +
 draeger/build/startDockerContainer.sh              |    62 +
 draeger/draco.json                                 |    15 +
 draeger/scripts/UpdateUBootSD.scr                  |     5 +
 drivers/clk/imx/clk-imx6q.c                        |    39 +-
 drivers/clk/imx/clk-pllv3.c                        |     5 +
 drivers/crypto/fsl/jr.c                            |    20 +-
 drivers/crypto/fsl/jr.h                            |     4 -
 drivers/ddr/altera/sdram_gen5.c                    |     2 +-
 drivers/ddr/altera/sequencer.c                     |    15 +-
 drivers/ddr/altera/sequencer.h                     |     3 +
 drivers/gpio/Makefile                              |     2 +
 drivers/i2c/mxc_i2c.c                              |     7 +
 drivers/mmc/fsl_esdhc_imx.c                        |    21 +-
 drivers/mtd/spi/sf-uclass.c                        |    13 +
 drivers/mtd/spi/sf_internal.h                      |     2 +
 drivers/mtd/spi/sf_probe.c                         |     8 +
 drivers/mtd/spi/spi-nor-core.c                     |    18 +-
 drivers/mtd/spi/spi-nor-tiny.c                     |     5 +
 drivers/net/phy/micrel_ksz90x1.c                   |   316 +-
 drivers/net/phy/phy.c                              |    26 +-
 drivers/serial/serial_mxc.c                        |    44 +-
 drivers/video/imx/ipu.h                            |    36 +-
 drivers/video/imx/ipu_common.c                     |    94 +-
 drivers/video/imx/ipu_disp.c                       |    44 +-
 drivers/video/imx/mxc_ipuv3_fb.c                   |    75 +-
 drivers/watchdog/imx_watchdog.c                    |     2 +-
 env/sf.c                                           |     1 +
 include/configs/draeger_imx6m48.h                  |   185 +
 include/configs/draeger_socfpga_m48.h              |   138 +
 include/env_default.h                              |     2 +
 include/fsl_esdhc_imx.h                            |     1 +
 include/spi_flash.h                                |    22 +
 lib/display_options.c                              |     2 +-
 lib/tiny-printf.c                                  |     1 +
 net/net.c                                          |     6 +-
 post/drivers/memory.c                              |     4 +-
 post/tests.c                                       |    12 +-
 scripts/Makefile.lib                               |     1 +
 tools/logos/imx6m48.bmp                            |   Bin 0 -> 38778 bytes
 155 files changed, 40997 insertions(+), 239 deletions(-)

---

#1 lore raw

Hi Petko,

Quoted 7 lines · Petko Manolov

Hello guys,

I am tasked with submitting the patches Draeger (Dräger) applied to u-boot for their imx6-based product line. I've already spoken to Tom Rini about how to approach the upstreaming them, but would like to get your opinion as imx6 maintainers.

....

Quoted 7 lines
 arch/arm/Kconfig                                   |     1 +
 arch/arm/dts/Makefile                              |     5 +-
 arch/arm/dts/imx6dl-draeger-m48.dts                |    23 +
 arch/arm/dts/imx6q-draeger-m48.dts                 |    23 +
 arch/arm/dts/imx6qdl-draeger-m48-u-boot.dtsi       |    20 +
 arch/arm/dts/imx6qdl-draeger-m48.dtsi              |   354 +
 arch/arm/dts/imx6qp-draeger-m48.dts                |    87 +

I suggest you start by upstreaming the DTS files.

Then try to add minimal U-Boot support for the board that allows booting Linux.