Skip to contentSkip to conversation

Please pull u-boot-imx

GIT PULL New Stefano Babic 2 participants 9 messages Sep 2, 2015 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

Hi Tom,

please pull from u-boot-imx, thanks !

The following changes since commit e3d50d4292ebabdf61f56f3a633cdb3a1e58bf88:

fsl_esdhc.c: Always make check_and_invalidate_dcache_range available
(2015-08-02 10:27:52 -0400)

are available in the git repository at:

git://www.denx.de/git/u-boot-imx.git master

for you to fetch changes up to 3761c42da1763118e4fbf3d09f5120cec6bd3ad0:

imx: vf610 add get_cpu_rev (2015-09-02 10:24:10 +0200)

----------------------------------------------------------------
Adrian Alonso (4):
power: pmic: add pfuze3000 support
imx: iomux-v3: add imx7d support for iomuxc
imx: mxc_gpio: add support for imx7d SoC
imx: ocotp: mxc add i.MX7D support

Baruch Siach (1):
tools/imximage: set DCD pointer to NULL when its length is 0

Chris Smith (1):
mxs_ocotp: Shift the HBUS divider correctly

Damien Riegel (1):
ARM: ts4800: add ethernet support

Eric Nelson (1):
nitrogen6x: change maintainer

Heiko Schocher (3):
arm, imx6: aristainetos board updates video, lg4573: make spi bus and cs configurable arm, imx6: add aristainetos 2b board version

J?rg Krause (1):
tools: mxsboot: calculate ECC block level dynamically

Lucile Quirion (1):
ARM: ts4800: add basic board support

Marek Vasut (1):
arm: mxs: Fix mkimage invocation

Nikita Kiryanov (3):
arm: mx6: cm-fx6: force host mode on usb controller
arm: mx6: cm-fx6: print PCB revision
arm: mx6: cm-fx6: switch to usb kbd polling via int queue

Olaf Mandel (1):
imx: fec: add MAC reading from eFuses to README

Otavio Salvador (1):
cgtqmx6eval: Add Ethernet support

Peng Fan (25):
imx: mx6ul_14x14_evk discard redefined CONFIG_MX6
imx: mx6 move TARGET_xx Kconfig option to mx6 specific Kconfig file
imx: add cpu type for i.MX2 and i.MX3
imx: mx27 implement get_cpu_rev
imx: mx31 use new formula for get_cpu_rev
imx: mxs: reimplement get_cpu_rev
imx-common: consolidate macros and prototypes into sys_proto.h
imx: clock support enet2 anatop clock support
net: fec: do not access reserved register for i.MX6UL
imx: mx6ul_14x14_evk add ENET support
imx: mx6sxsabresd: enable CONFIG_SPL_FAT_SUPPORT
imx: mx6: ddr add more register entry for mmdc_p_regs
imx: mx6: ddr no support MMDC1 for i.MX6SL
imx: mx6: ddr correct tRFC and tXS
imx: mx6: ddr add dram io configuration and header file for i.MX6SL
imx: mx6: ddr add mpzqlp2ctl entry
imx: mx6: ddr add an entry ddr_type for mx6_ddr_sysinfo
imx: mx6: ddr init MMDC according to ddr_type
imx: mx6: ddr: add LPDDR2 support
imx: mx6slevk: add SPL support
arm: Add SYS_L2CACHE_OFF Kconfig entry
imx: mx6ul_14x14_evk select MX6UL
imx: mx6ul_14x14_evk discard MX6UL from CONFIG_SYS_EXTRA_OPTIONS
mxc: ocotp fix hole in shadow registers
imx: vf610 add get_cpu_rev

Soeren Moch (3):
tbs2910: use full name in Kconfig board selection
tbs2910: remove deprecated CONFIG_SYS_EXTRA_OPTIONS
tbs2910: remove SYS_SOC from board specific Kconfig

Stefan Roese (1):
arm: mx6: Remove SPI support from WRU-IV baseboard

Stefano Babic (1):
Merge branch 'master' of git://git.denx.de/u-boot

vpeter4 (2):
udoo: Switch to SPL support
udoo: Remove SPL fat support

 arch/arm/Kconfig                                  |  138 +--
 arch/arm/cpu/arm1136/mx31/generic.c               |    2 +-
 arch/arm/cpu/arm926ejs/mx27/generic.c             |    6 +
 arch/arm/cpu/arm926ejs/mxs/Makefile               |   10 +-
 arch/arm/cpu/arm926ejs/mxs/mxs.c                  |   52 +-
 arch/arm/cpu/armv7/mx6/Kconfig                    |  138 ++-
 arch/arm/cpu/armv7/mx6/clock.c                    |   23 +-
 arch/arm/cpu/armv7/mx6/ddr.c                      |  379 +++++-
 arch/arm/cpu/armv7/vf610/generic.c                |    6 +
 arch/arm/imx-common/iomux-v3.c                    |   18 +
 arch/arm/include/asm/arch-imx/cpu.h               |    7 +
 arch/arm/include/asm/arch-mx31/sys_proto.h        |    7 +-
 arch/arm/include/asm/arch-mx35/sys_proto.h        |   12 +-
 arch/arm/include/asm/arch-mx5/iomux-mx51.h        |   11 +
 arch/arm/include/asm/arch-mx5/sys_proto.h         |   22 +-
 arch/arm/include/asm/arch-mx6/clock.h             |    2 +-
 arch/arm/include/asm/arch-mx6/crm_regs.h          |    6 +
 arch/arm/include/asm/arch-mx6/imx-regs.h          |    3 +-
 arch/arm/include/asm/arch-mx6/mx6-ddr.h           |  140 ++-
 arch/arm/include/asm/arch-mx6/mx6sl-ddr.h         |   45 +
 arch/arm/include/asm/arch-mx6/sys_proto.h         |   45 +-
 arch/arm/include/asm/arch-mx7/gpio.h              |   12 +
 arch/arm/include/asm/arch-mx7/mx7-pins.h          |   19 +
 arch/arm/include/asm/arch-mx7/mx7d_pins.h         | 1308
+++++++++++++++++++++
 arch/arm/include/asm/arch-mxs/sys_proto.h         |   14 +-
 arch/arm/include/asm/imx-common/iomux-v3.h        |   32 +
 arch/arm/include/asm/imx-common/sys_proto.h       |   46 +
 board/aristainetos/Kconfig                        |   13 +
 board/aristainetos/aristainetos-v1.c              |    2 +-
 board/aristainetos/aristainetos-v2.c              |   57 +-
 board/aristainetos/aristainetos.c                 |   19 +-
 board/barco/platinum/platinum_picon.c             |    2 +-
 board/barco/platinum/spl_picon.c                  |    1 +
 board/barco/platinum/spl_titanium.c               |    1 +
 board/boundary/nitrogen6x/MAINTAINERS             |    2 +-
 board/compulab/cm_fx6/cm_fx6.c                    |   13 +
 board/congatec/cgtqmx6eval/cgtqmx6eval.c          |  207 ++++
 board/freescale/mx6qsabreauto/mx6qsabreauto.c     |    2 +-
 board/freescale/mx6sabresd/mx6sabresd.c           |    1 +
 board/freescale/mx6slevk/mx6slevk.c               |  166 ++-
 board/freescale/mx6sxsabresd/mx6sxsabresd.c       |    3 +-
 board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c |  111 ++
 board/gateworks/gw_ventana/gw_ventana_spl.c       |    1 +
 board/solidrun/mx6cuboxi/mx6cuboxi.c              |    3 +-
 board/tbs/tbs2910/Kconfig                         |    9 +-
 board/technologic/ts4800/Kconfig                  |   15 +
 board/technologic/ts4800/MAINTAINERS              |    6 +
 board/technologic/ts4800/Makefile                 |    7 +
 board/technologic/ts4800/ts4800.c                 |  257 ++++
 board/technologic/ts4800/ts4800.h                 |   16 +
 board/tqc/tqma6/tqma6.c                           |    1 +
 board/udoo/1066mhz_4x256mx16.cfg                  |   55 -
 board/udoo/MAINTAINERS                            |    2 +-
 board/udoo/Makefile                               |    2 +-
 board/udoo/clocks.cfg                             |   32 -
 board/udoo/ddr-setup.cfg                          |   87 --
 board/udoo/udoo.c                                 |   95 +-
 board/udoo/udoo.cfg                               |   29 -
 board/udoo/udoo_spl.c                             |  271 +++++
 configs/aristainetos2_defconfig                   |    1 +
 configs/aristainetos2b_defconfig                  |    7 +
 configs/aristainetos_defconfig                    |    1 +
 configs/cgtqmx6qeval_defconfig                    |    1 +
 configs/cm_fx6_defconfig                          |    2 +-
 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/mx6slevk_spl_defconfig                    |    8 +
 configs/mx6sxsabresd_defconfig                    |    1 +
 configs/mx6sxsabresd_spl_defconfig                |    1 +
 configs/mx6ul_14x14_evk_defconfig                 |    6 +-
 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                         |    2 +-
 configs/tqma6s_wru4_mmc_defconfig                 |    3 -
 configs/ts4800_defconfig                          |    4 +
 configs/udoo_defconfig                            |    7 +
 configs/udoo_quad_defconfig                       |    5 -
 configs/wandboard_defconfig                       |    1 +
 configs/warp_defconfig                            |    1 +
 doc/README.fec_mxc                                |    9 +-
 doc/README.imx5                                   |   12 +
 drivers/gpio/mxc_gpio.c                           |    8 +-
 drivers/misc/mxc_ocotp.c                          |  152 ++-
 drivers/misc/mxs_ocotp.c                          |    1 +
 drivers/net/fec_mxc.c                             |   14 +-
 drivers/power/pmic/Makefile                       |    1 +
 drivers/power/pmic/pmic_pfuze3000.c               |   32 +
 drivers/video/lg4573.c                            |    3 +-
 include/configs/aristainetos-common.h             |    4 -
 include/configs/aristainetos.h                    |    6 +-
 include/configs/aristainetos2.h                   |    8 +-
 include/configs/aristainetos2b.h                  |   62 +
 include/configs/cgtqmx6eval.h                     |   13 +
 include/configs/cm_fx6.h                          |    1 +
 include/configs/imx6_spl.h                        |    2 +-
 include/configs/mx6slevk.h                        |    7 +
 include/configs/mx6sxsabresd.h                    |    1 +
 include/configs/mx6ul_14x14_evk.h                 |   22 +-
 include/configs/tqma6_wru4.h                      |    8 +
 include/configs/ts4800.h                          |  185 +++
 include/configs/udoo.h                            |   19 +-
 include/micrel.h                                  |    4 +
 include/power/pfuze3000_pmic.h                    |   78 ++
 tools/imximage.c                                  |    6 +-
 tools/mxsboot.c                                   |   21 +-
 129 files changed, 4145 insertions(+), 604 deletions(-)
 create mode 100644 arch/arm/include/asm/arch-mx6/mx6sl-ddr.h
 create mode 100644 arch/arm/include/asm/arch-mx7/gpio.h
 create mode 100644 arch/arm/include/asm/arch-mx7/mx7-pins.h
 create mode 100644 arch/arm/include/asm/arch-mx7/mx7d_pins.h
 create mode 100644 arch/arm/include/asm/imx-common/sys_proto.h
 create mode 100644 board/technologic/ts4800/Kconfig
 create mode 100644 board/technologic/ts4800/MAINTAINERS
 create mode 100644 board/technologic/ts4800/Makefile
 create mode 100644 board/technologic/ts4800/ts4800.c
 create mode 100644 board/technologic/ts4800/ts4800.h
 delete mode 100644 board/udoo/1066mhz_4x256mx16.cfg
 delete mode 100644 board/udoo/clocks.cfg
 delete mode 100644 board/udoo/ddr-setup.cfg
 delete mode 100644 board/udoo/udoo.cfg
 create mode 100644 board/udoo/udoo_spl.c
 create mode 100644 configs/aristainetos2b_defconfig
 create mode 100644 configs/mx6slevk_spl_defconfig
 create mode 100644 configs/ts4800_defconfig
 create mode 100644 configs/udoo_defconfig
 delete mode 100644 configs/udoo_quad_defconfig
 create mode 100644 drivers/power/pmic/pmic_pfuze3000.c
 create mode 100644 include/configs/aristainetos2b.h
 create mode 100644 include/configs/ts4800.h
 create mode 100644 include/power/pfuze3000_pmic.h
Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#1 lore raw
Quoted 8 lines · Stefano Babic

Hi Tom,

please pull from u-boot-imx, thanks !

The following changes since commit e3d50d4292ebabdf61f56f3a633cdb3a1e58bf88:

fsl_esdhc.c: Always make check_and_invalidate_dcache_range available
(2015-08-02 10:27:52 -0400)

That's actually really old and I get a few non-trivial conflicts. Can you please rebase on master? Thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150902/4ace3fb8/attachment.sig>
#2 lore raw

Hi Tom,

Quoted 6 lines · Tom Rini
Quoted 4 lines · Stefano Babic

Hi Tom,

please pull from u-boot-imx, thanks !

Quoted 7 lines
Quoted 4 lines

The following changes since commit e3d50d4292ebabdf61f56f3a633cdb3a1e58bf88:

fsl_esdhc.c: Always make check_and_invalidate_dcache_range available
(2015-08-02 10:27:52 -0400)

That's actually really old and I get a few non-trivial conflicts. Can you please rebase on master? Thanks!

You're right - I am solving conflicts and I will send a new PR afterward.

Stefano

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#3 lore raw

Hi Tom,

Quoted 11 lines · Stefano Babic

Hi Tom,

Quoted 8 lines · Tom Rini
Quoted 6 lines · Stefano Babic

Hi Tom,

please pull from u-boot-imx, thanks !

The following changes since commit e3d50d4292ebabdf61f56f3a633cdb3a1e58bf88:

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

fsl_esdhc.c: Always make check_and_invalidate_dcache_range available
(2015-08-02 10:27:52 -0400)

That's actually really old and I get a few non-trivial conflicts. Can you please rebase on master? Thanks!

You're right - I am solving conflicts and I will send a new PR afterward.

Conflicts are solved - I had to rebase, sorry for that!

Can you try again to take my PR ?

Regards,
Stefano

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#4 lore raw
Quoted 20 lines · Stefano Babic

Hi Tom,

Quoted 17 lines · Stefano Babic

Hi Tom,

Quoted 13 lines · Tom Rini
Quoted 8 lines · Stefano Babic

Hi Tom,

please pull from u-boot-imx, thanks !

The following changes since commit e3d50d4292ebabdf61f56f3a633cdb3a1e58bf88:

fsl_esdhc.c: Always make check_and_invalidate_dcache_range available
(2015-08-02 10:27:52 -0400)

That's actually really old and I get a few non-trivial conflicts. Can you please rebase on master? Thanks!

Quoted 6 lines
Quoted 2 lines

You're right - I am solving conflicts and I will send a new PR afterward.

Conflicts are solved - I had to rebase, sorry for that!

Can you try again to take my PR ?

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150902/762dd457/attachment.sig>
#5 lore raw

PATCH 1/2 arch/arm/Kconfig: Add back in missing entries.

In reply to Stefano Babic

In 2178282 we accidentally dropped out hilsilicon and cm_t43. Bring these back in.

---
 arch/arm/Kconfig |    2 ++
 1 file changed, 2 insertions(+)
arch/arm/Kconfig +2 -0
index de0d6fb..5feef97 100644
@@ -804,6 +804,7 @@ 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_t43/Kconfig"
 source "board/creative/xfi3/Kconfig"
 source "board/davedenx/qong/Kconfig"
 source "board/denx/m28evk/Kconfig"
@@ -830,6 +831,7 @@ source "board/genesi/mx51_efikamx/Kconfig"
 source "board/gumstix/pepper/Kconfig"
 source "board/h2200/Kconfig"
 source "board/hale/tt01/Kconfig"
+source "board/hisilicon/hikey/Kconfig"
 source "board/icpdas/lp8x4x/Kconfig"
 source "board/imx31_phycore/Kconfig"
 source "board/isee/igep0033/Kconfig"
Signature · 1 line
1.7.9.5
#6 lore raw

PATCH 1/2 arch/arm/Kconfig: Add back in missing entries.

Quoted 4 lines · Tom Rini

In 2178282 we accidentally dropped out hilsilicon and cm_t43. Bring these back in.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150902/edec515e/attachment.sig>
#7 lore raw

PATCH 2/2 configs/titanium_defconfig: Select MX6

In reply to Tom Rini

In 2178282 this config wasn't updated by accident, so update it.

---
 configs/titanium_defconfig |    1 +
 1 file changed, 1 insertion(+)
configs/titanium_defconfig +1 -0
index d286fd6..de3c78d 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TITANIUM=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/barco/titanium/imximage.cfg"
 # CONFIG_CMD_IMLS is not set
Signature · 1 line
1.7.9.5
#8 lore raw

PATCH 2/2 configs/titanium_defconfig: Select MX6

Quoted 3 lines · Tom Rini

In 2178282 this config wasn't updated by accident, so update it.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150902/a4f15e6f/attachment.sig>