Browse code Merge branch 'for-next/imx' Conflicts: arch/arm/boards/Makefile WIP_next-LS master next stable/v2013.10 stable/v2014.05 stable/v2014.06 stable/v2014.07 stable/v2014.08 stable/v2014.09 stable/v2014.10 stable/v2014.11 stable/v2014.12 stable/v2015.01 stable/v2015.02 stable/v2017.05 stable/v2017.06 stable/v2017.07 stable/v2017.11 stable/v2018.07 stable/v2018.09 stable/v2018.12 work/fit-support v2020.07.0 v2020.06.0 v2020.05.0 v2020.04.0 v2020.03.0 v2020.02.0 v2020.01.0 v2019.12.0 v2019.11.0 v2019.10.0 v2019.09.0 v2019.08.1 v2019.08.0 v2019.07.0 v2019.06.1 v2019.06.0 v2019.05.0 v2019.04.0 v2019.03.0 v2019.02.0 v2019.01.0 v2018.12.0 v2018.11.0 v2018.10.0 v2018.09.1 v2018.09.0 v2018.08.1 v2018.08.0 v2018.07.2 v2018.07.1 v2018.07.0 v2018.06.0 v2018.05.0 v2018.04.0 v2018.03.0 v2018.02.0 v2018.01.0 v2017.12.0 v2017.11.0 v2017.10.0 v2017.09.0 v2017.08.0 v2017.07.1 v2017.07.0 v2017.06.2 v2017.06.1 v2017.06.0 v2017.05.4 v2017.05.3 v2017.05.2 v2017.05.1 v2017.05.0 v2017.04.0 v2017.03.0 v2017.02.0 v2017.01.0 v2016.11.0 v2016.10.0 v2016.09.0 v2016.08.0 v2016.07.0 v2016.06.0 v2016.05.0 v2016.04.0 v2016.03.0 v2016.02.0 v2016.01.0 v2015.12.0 v2015.11.0 v2015.10.0 v2015.09.0 v2015.08.0 v2015.07.0 v2015.06.0 v2015.05.0 v2015.04.0 v2015.03.0 v2015.02.0 v2015.01.0 v2014.12.0 v2014.11.0 v2014.10.0 v2014.09.0 v2014.08.0 v2014.07.0 v2014.06.0 v2014.05.0 v2014.04.0 v2014.03.0 v2014.02.0 v2014.01.0 v2013.12.0 v2013.11.0 v2013.10.1 v2013.10.0 v2013.09.0

commit 5034e4eacc136f05747c0d1a2d9e9daef510af6b 2 parents b8c60d5 + 30f29e3 Sascha Hauer authored on 5 Aug 2013

Showing 45 changed files

• Documentation/devicetree/bindings/misc/fsl,imx-ocotp.txt
• arch/arm/boards/Makefile
• arch/arm/boards/freescale-mx6-sabrelite/board.c
• arch/arm/boards/freescale-mx6-sabresd/board.c
• arch/arm/boards/gk802/Makefile
• arch/arm/boards/gk802/board.c
• arch/arm/boards/gk802/env/config-board
• arch/arm/boards/gk802/flash-header.imxcfg
• arch/arm/boards/gk802/lowlevel.c
• arch/arm/boards/phytec-pfla02/Makefile
• arch/arm/boards/phytec-pfla02/board.c
• arch/arm/boards/phytec-pfla02/flash-header-phytec-pfla02-1gib.imxcfg
• arch/arm/boards/phytec-pfla02/flash-header-phytec-pfla02-2gib.imxcfg
• arch/arm/boards/phytec-pfla02/flash-header-phytec-pfla02.h
• arch/arm/boards/phytec-pfla02/lowlevel.c
• arch/arm/boards/tqma6x/Makefile
• arch/arm/boards/tqma6x/board.c
• arch/arm/boards/tqma6x/flash-header-tqma6dl.imxcfg
• arch/arm/boards/tqma6x/flash-header-tqma6q.imxcfg
• arch/arm/boards/tqma6x/lowlevel.c
• arch/arm/configs/imx_v7_defconfig
• arch/arm/dts/Makefile
• arch/arm/dts/imx6dl-mba6x.dts
• arch/arm/dts/imx6dl-pinfunc.h
• arch/arm/dts/imx6dl-tqma6s.dtsi
• arch/arm/dts/imx6dl.dtsi
• arch/arm/dts/imx6q-gk802.dts
• arch/arm/dts/imx6q-mba6x.dts
• arch/arm/dts/imx6q-phytec-pbab01.dts
• arch/arm/dts/imx6q-phytec-pfla02.dtsi
• arch/arm/dts/imx6q-sabrelite.dts
• arch/arm/dts/imx6q-tqma6q.dtsi
• arch/arm/dts/imx6q-tqma6x.dts
• arch/arm/dts/imx6q.dtsi
• arch/arm/dts/imx6qdl-mba6x.dtsi
• arch/arm/dts/imx6qdl-sabresd.dtsi
• arch/arm/dts/imx6qdl-tqma6x.dtsi
• arch/arm/dts/imx6qdl.dtsi
• arch/arm/mach-imx/Kconfig
• arch/arm/mach-imx/Makefile
• arch/arm/mach-imx/external-nand-boot.c
• arch/arm/mach-imx/ocotp.c
• images/Makefile.imx
• scripts/Makefile.lib
• scripts/imx/imx-image.c

Ignore Space Show notes View Documentation/devicetree/bindings/misc/fsl,imx-ocotp.txt 0 → 100644

Ignore Space Show notes View arch/arm/boards/Makefile

Ignore Space Show notes View arch/arm/boards/freescale-mx6-sabrelite/board.c

Ignore Space Show notes View arch/arm/boards/freescale-mx6-sabresd/board.c

Ignore Space Show notes View arch/arm/boards/gk802/Makefile 0 → 100644

Ignore Space Show notes View arch/arm/boards/gk802/board.c 0 → 100644

Ignore Space Show notes View arch/arm/boards/gk802/env/config-board 0 → 100644

Ignore Space Show notes View arch/arm/boards/gk802/flash-header.imxcfg 0 → 100644

Ignore Space Show notes View arch/arm/boards/gk802/lowlevel.c 0 → 100644

Ignore Space Show notes View arch/arm/boards/phytec-pfla02/Makefile 0 → 100644

Ignore Space Show notes View arch/arm/boards/phytec-pfla02/board.c 0 → 100644

Ignore Space Show notes View arch/arm/boards/phytec-pfla02/flash-header-phytec-pfla02-1gib.imxcfg 0 → 100644

Ignore Space Show notes View arch/arm/boards/phytec-pfla02/flash-header-phytec-pfla02-2gib.imxcfg 0 → 100644

Ignore Space Show notes View arch/arm/boards/phytec-pfla02/flash-header-phytec-pfla02.h 0 → 100644

Ignore Space Show notes View arch/arm/boards/phytec-pfla02/lowlevel.c 0 → 100644

Ignore Space Show notes View arch/arm/boards/tqma6x/Makefile 0 → 100644

Ignore Space Show notes View arch/arm/boards/tqma6x/board.c 0 → 100644

Ignore Space Show notes View arch/arm/boards/tqma6x/flash-header-tqma6dl.imxcfg 0 → 100644

Ignore Space Show notes View arch/arm/boards/tqma6x/flash-header-tqma6q.imxcfg 0 → 100644

Ignore Space Show notes View arch/arm/boards/tqma6x/lowlevel.c 0 → 100644

Ignore Space Show notes View arch/arm/configs/imx_v7_defconfig

Ignore Space Show notes View arch/arm/dts/Makefile

Ignore Space Show notes View arch/arm/dts/imx6dl-mba6x.dts 0 → 100644

Ignore Space Show notes View arch/arm/dts/imx6dl-pinfunc.h 0 → 100644
Too large (Show diff)

Ignore Space Show notes View arch/arm/dts/imx6dl-tqma6s.dtsi 0 → 100644

Ignore Space Show notes View arch/arm/dts/imx6dl.dtsi 0 → 100644

Ignore Space Show notes View arch/arm/dts/imx6q-gk802.dts 0 → 100644

Ignore Space Show notes View arch/arm/dts/imx6q-mba6x.dts 0 → 100644

Ignore Space Show notes View arch/arm/dts/imx6q-phytec-pbab01.dts 0 → 100644

Ignore Space Show notes View arch/arm/dts/imx6q-phytec-pfla02.dtsi 0 → 100644

Ignore Space Show notes View arch/arm/dts/imx6q-sabrelite.dts

Ignore Space Show notes View arch/arm/dts/imx6q-tqma6q.dtsi 0 → 100644

Ignore Space Show notes View arch/arm/dts/imx6q-tqma6x.dts 0 → 100644

Ignore Space Show notes View arch/arm/dts/imx6q.dtsi

Ignore Space Show notes View arch/arm/dts/imx6qdl-mba6x.dtsi 0 → 100644

Ignore Space Show notes View arch/arm/dts/imx6qdl-sabresd.dtsi

Ignore Space Show notes View arch/arm/dts/imx6qdl-tqma6x.dtsi 0 → 100644

Ignore Space Show notes View arch/arm/dts/imx6qdl.dtsi

Ignore Space Show notes View arch/arm/mach-imx/Kconfig

Ignore Space Show notes View arch/arm/mach-imx/Makefile

Ignore Space Show notes View arch/arm/mach-imx/external-nand-boot.c

Ignore Space Show notes View arch/arm/mach-imx/ocotp.c 0 → 100644

Ignore Space Show notes View images/Makefile.imx

Ignore Space Show notes View scripts/Makefile.lib

Ignore Space Show notes View scripts/imx/imx-image.c

Show line notes below