From patchwork Mon Mar 26 12:16:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 890931 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="EDTFoZ71"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 408tSK0PZ7z9s1l for ; Mon, 26 Mar 2018 23:17:18 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 05575C21F47; Mon, 26 Mar 2018 12:17:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 2EC2DC21E76; Mon, 26 Mar 2018 12:17:10 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id CC035C21E76; Mon, 26 Mar 2018 12:17:08 +0000 (UTC) Received: from mail-pl0-f68.google.com (mail-pl0-f68.google.com [209.85.160.68]) by lists.denx.de (Postfix) with ESMTPS id EE5DDC21C29 for ; Mon, 26 Mar 2018 12:17:07 +0000 (UTC) Received: by mail-pl0-f68.google.com with SMTP id s24-v6so1427333plq.6 for ; Mon, 26 Mar 2018 05:17:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id; bh=qSJFsxYKmFAYl5SlmJ8jGmWWrAGc2/BNIYYydT4H1QI=; b=EDTFoZ717pz4PgnfMnACt2WkX3D+Z7/sy2jyH7JRCahumDIjvLVtOFPXfJjOxX617S AcjHUkvLCumpdPb9pLWDWQsxB114e26tYzehrRYtxE4fGn5adqBK8ybW7mTJe4AcAzQI faqcwKn+nFRamQjsmIerN0nVzV6MPvuIzkDKY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=qSJFsxYKmFAYl5SlmJ8jGmWWrAGc2/BNIYYydT4H1QI=; b=bEAfkVzzp5Fcdk66wnnJdGFqWL5x708JxB69j/pChw7C3OSBMRKJDDFXNnR13EzWYo 3QVJ8NZk8GnbCPvByURlGEXlqnyz2mtf5wRVw2t+BdVRJ4lPgLU1Sttfl8YEwOY37tH+ AUHvZZ8Q+1kM3wQxQedJoWXvxEfQLCSIhEE96+vRQg3ggJJZOyH3ibMIWGOZF9JFJrDZ MytwJLLq4i5wTBUEE6ezIFqpjtQ2kW5/3vh8UZ17Z0AiqBGk6eU9c6+HQDnYTGvfF085 EYUKPvjBHXsoQW4YOe+fCUj7xMwLs95HsJNYSyCuQAvz/Ie+kEY5o9bwKR5i1oTwkbYt dzUg== X-Gm-Message-State: AElRT7EeZN4dbrsiIrx6GckA+BuftAW1FzHZphBn25grCL04xP+8a+wE erPIMc99kS7nVAAxtn958Z1j8A== X-Google-Smtp-Source: AIpwx4/io9vdFQYPzDl0WWBRMAatlwOe1I+iY68sN93v4oUIXFcBLqrnF7T/m32Pqb5mWzJHfxGCIw== X-Received: by 2002:a17:902:670f:: with SMTP id f15-v6mr7947144plk.188.1522066626073; Mon, 26 Mar 2018 05:17:06 -0700 (PDT) Received: from localhost.localdomain ([115.97.190.51]) by smtp.gmail.com with ESMTPSA id n22sm5948674pff.19.2018.03.26.05.17.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Mar 2018 05:17:05 -0700 (PDT) From: Jagan Teki To: Stefano Babic Date: Mon, 26 Mar 2018 17:46:50 +0530 Message-Id: <20180326121655.13403-1-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.14.3 Cc: Fabio Estevam , u-boot@lists.denx.de Subject: [U-Boot] [PATCH v3 0/5] ARM: i.MX6: Add proper CONFIG names X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This series add proper CONFIG names for i.MX6 architecture code, where CONFIG_MX6 become CONFIG_ARCH_IMX6 and rest of SOC types like CONFIG_MX6Q become CONFIG_SOC_IMX6Q which is similar to Linux. patch 1: Update new CONFIG names globally to all files for i.MX6 code patch 2: Add separate u-boot dtsi files for i.MX6QDL dt files patch 3: Move imx6ul-isiot usdhc2 into dtsi patch 4: Add separate u-boot dtsi files for i.MX6UL dt files patch 5: Build dtbs based on the SOC types Changes for v3: - Drop patch "Change SYS_SOC from mx6 to imx6" Changes for v2: - Add new patch "ARM: dts: imx6ul-isiot: Move usdhc2 into dtsi" - Fixed *u-boot.dtsi files - Fixed board/logicpd/imx6/mx6q_2x_MT41K512M16HA.cfg to use imx6 Jagan Teki (5): i.MX6: Add proper CONFIG_SOC_ names for MX6 architectures ARM: dts: i.MX6QDL: U-Boot specific dts for u-boot,dm-spl ARM: dts: imx6ul-isiot: Move usdhc2 into dtsi ARM: dts: i.MX6UL: U-Boot specific dts for u-boot,dm-spl ARM: i.MX6: dts: Build dtb based on SOC type Makefile | 2 +- arch/arm/Kconfig | 6 +- arch/arm/dts/Makefile | 44 ++++++---- arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi | 11 +++ arch/arm/dts/imx6dl-icore-mipi.dts | 1 - arch/arm/dts/imx6dl-icore-rqs-u-boot.dtsi | 7 ++ arch/arm/dts/imx6dl-icore-u-boot.dtsi | 7 ++ arch/arm/dts/imx6q-icore-mipi-u-boot.dtsi | 11 +++ arch/arm/dts/imx6q-icore-mipi.dts | 1 - arch/arm/dts/imx6q-icore-rqs-u-boot.dtsi | 7 ++ arch/arm/dts/imx6q-icore-u-boot.dtsi | 7 ++ arch/arm/dts/imx6qdl-icore-rqs-u-boot.dtsi | 23 +++++ arch/arm/dts/imx6qdl-icore-rqs.dtsi | 4 - arch/arm/dts/imx6qdl-icore-u-boot.dtsi | 19 ++++ arch/arm/dts/imx6qdl-icore.dtsi | 3 - arch/arm/dts/imx6qdl-u-boot.dtsi | 27 ++++++ arch/arm/dts/imx6qdl.dtsi | 5 -- arch/arm/dts/imx6ul-geam-kit-u-boot.dtsi | 25 ++++++ arch/arm/dts/imx6ul-geam-kit.dts | 4 - arch/arm/dts/imx6ul-isiot-emmc-u-boot.dtsi | 11 +++ arch/arm/dts/imx6ul-isiot-emmc.dts | 25 +----- arch/arm/dts/imx6ul-isiot-nand.dts | 1 + arch/arm/dts/imx6ul-isiot-u-boot.dtsi | 19 ++++ arch/arm/dts/imx6ul-isiot.dtsi | 29 ++++++- arch/arm/dts/imx6ul-u-boot.dtsi | 31 +++++++ arch/arm/dts/imx6ul.dtsi | 6 -- arch/arm/include/asm/arch-mx6/crm_regs.h | 46 +++++----- arch/arm/include/asm/arch-mx6/imx-rdc.h | 4 +- arch/arm/include/asm/arch-mx6/imx-regs.h | 69 ++++++++------- arch/arm/include/asm/arch-mx6/mx6-ddr.h | 20 ++--- arch/arm/include/asm/arch-mx6/mx6-pins.h | 18 ++-- arch/arm/include/asm/arch-mx6/mx6_plugin.S | 6 +- arch/arm/include/asm/arch-mx6/mx6dl-ddr.h | 4 +- arch/arm/include/asm/arch-mx6/mx6q-ddr.h | 2 +- arch/arm/include/asm/arch-mx6/mx6sl-ddr.h | 2 +- arch/arm/include/asm/arch-mx6/mx6sx-ddr.h | 2 +- arch/arm/include/asm/arch-mx6/mx6ul-ddr.h | 2 +- arch/arm/include/asm/mach-imx/dma.h | 2 +- arch/arm/include/asm/mach-imx/iomux-v3.h | 11 +-- arch/arm/include/asm/mach-imx/mxc_i2c.h | 2 +- arch/arm/include/asm/mach-imx/regs-apbh.h | 6 +- arch/arm/include/asm/mach-imx/regs-bch.h | 4 +- arch/arm/include/asm/mach-imx/regs-lcdif.h | 21 +++-- arch/arm/include/asm/mach-imx/sys_proto.h | 6 +- arch/arm/mach-imx/Kconfig | 12 +-- arch/arm/mach-imx/Makefile | 2 +- arch/arm/mach-imx/cache.c | 2 +- arch/arm/mach-imx/cpu.c | 6 +- arch/arm/mach-imx/init.c | 2 +- arch/arm/mach-imx/iomux-v3.c | 6 +- arch/arm/mach-imx/mx6/Kconfig | 100 +++++++++++----------- arch/arm/mach-imx/mx6/Makefile | 4 +- arch/arm/mach-imx/mx6/clock.c | 14 +-- arch/arm/mach-imx/mx6/ddr.c | 20 +++-- arch/arm/mach-imx/mx6/soc.c | 6 +- arch/arm/mach-imx/spl.c | 8 +- arch/arm/mach-imx/timer.c | 2 +- board/bachmann/ot1200/ot1200_spl.c | 4 +- board/barco/platinum/spl_picon.c | 4 +- board/barco/platinum/spl_titanium.c | 4 +- board/boundary/nitrogen6x/ddr-setup.cfg | 8 +- board/compulab/cm_fx6/cm_fx6.c | 6 +- board/congatec/cgtqmx6eval/cgtqmx6eval.c | 4 +- board/dhelectronics/dh_imx6/dh_imx6.c | 4 +- board/engicam/common/spl.c | 24 +++--- board/engicam/imx6q/MAINTAINERS | 11 ++- board/engicam/imx6ul/MAINTAINERS | 5 ++ board/freescale/mx6memcal/spl.c | 6 +- board/freescale/mx6qarm2/mx6qarm2.c | 8 +- board/freescale/mx6sabreauto/mx6sabreauto.c | 8 +- board/freescale/mx6sabresd/mx6sabresd.c | 8 +- board/freescale/mx6sllevk/mx6sllevk.c | 2 +- board/freescale/mx6sxsabreauto/mx6sxsabreauto.c | 2 +- board/freescale/mx6sxsabresd/mx6sxsabresd.c | 2 +- board/freescale/mx6ul_14x14_evk/README | 6 +- board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 4 +- board/freescale/mx6ullevk/README | 6 +- board/freescale/mx6ullevk/mx6ullevk.c | 2 +- board/gateworks/gw_ventana/gw_ventana_spl.c | 4 +- board/kosagi/novena/novena_spl.c | 4 +- board/liebherr/mccmon6/spl.c | 4 +- board/logicpd/imx6/imx6logic.c | 2 +- board/seco/Kconfig | 6 +- board/solidrun/mx6cuboxi/mx6cuboxi.c | 10 +-- board/tbs/tbs2910/Kconfig | 2 +- board/toradex/apalis_imx6/ddr-setup.cfg | 8 +- board/toradex/colibri_imx6/ddr-setup.cfg | 8 +- board/tqc/tqma6/Kconfig | 6 +- board/udoo/README | 4 +- board/udoo/udoo.c | 4 +- board/udoo/udoo_spl.c | 4 +- board/wandboard/spl.c | 8 +- board/wandboard/wandboard.c | 6 +- cmd/fastboot/Kconfig | 3 +- common/spl/Kconfig | 6 +- common/spl/spl.c | 2 +- configs/apalis_imx6_defconfig | 4 +- configs/apalis_imx6_nospl_com_defconfig | 4 +- configs/apalis_imx6_nospl_it_defconfig | 4 +- configs/aristainetos2_defconfig | 4 +- configs/aristainetos2b_defconfig | 4 +- configs/aristainetos_defconfig | 4 +- configs/cgtqmx6eval_defconfig | 2 +- configs/cm_fx6_defconfig | 2 +- configs/colibri_imx6_defconfig | 4 +- configs/colibri_imx6_nospl_defconfig | 4 +- configs/dh_imx6_defconfig | 2 +- configs/display5_defconfig | 4 +- configs/display5_factory_defconfig | 4 +- configs/dms-ba16-1g_defconfig | 2 +- configs/dms-ba16_defconfig | 2 +- configs/ge_b450v3_defconfig | 2 +- configs/ge_b650v3_defconfig | 2 +- configs/ge_b850v3_defconfig | 2 +- configs/gwventana_emmc_defconfig | 2 +- configs/gwventana_gw5904_defconfig | 2 +- configs/gwventana_nand_defconfig | 2 +- configs/imx6dl_icore_nand_defconfig | 2 +- configs/imx6q_icore_nand_defconfig | 2 +- configs/imx6q_logic_defconfig | 4 +- configs/imx6qdl_icore_mipi_defconfig | 2 +- configs/imx6qdl_icore_mmc_defconfig | 2 +- configs/imx6qdl_icore_nand_defconfig | 2 +- configs/imx6qdl_icore_rqs_defconfig | 2 +- configs/imx6ul_geam_mmc_defconfig | 2 +- configs/imx6ul_geam_nand_defconfig | 2 +- configs/imx6ul_isiot_emmc_defconfig | 2 +- configs/imx6ul_isiot_nand_defconfig | 2 +- configs/liteboard_defconfig | 2 +- configs/marsboard_defconfig | 4 +- configs/mccmon6_nor_defconfig | 2 +- configs/mccmon6_sd_defconfig | 2 +- configs/mx6cuboxi_defconfig | 2 +- configs/mx6dlarm2_defconfig | 4 +- configs/mx6dlarm2_lpddr2_defconfig | 4 +- configs/mx6memcal_defconfig | 4 +- configs/mx6qarm2_defconfig | 4 +- configs/mx6qarm2_lpddr2_defconfig | 4 +- configs/mx6qsabrelite_defconfig | 4 +- configs/mx6sabreauto_defconfig | 2 +- configs/mx6sabresd_defconfig | 2 +- configs/mx6slevk_defconfig | 2 +- configs/mx6slevk_spinor_defconfig | 2 +- configs/mx6slevk_spl_defconfig | 2 +- configs/mx6sllevk_defconfig | 2 +- configs/mx6sllevk_plugin_defconfig | 2 +- configs/mx6sxsabreauto_defconfig | 2 +- configs/mx6sxsabresd_defconfig | 2 +- configs/mx6sxsabresd_spl_defconfig | 2 +- configs/mx6ul_14x14_evk_defconfig | 2 +- configs/mx6ul_9x9_evk_defconfig | 2 +- configs/mx6ull_14x14_evk_defconfig | 2 +- configs/mx6ull_14x14_evk_plugin_defconfig | 2 +- configs/nitrogen6dl2g_defconfig | 4 +- configs/nitrogen6dl_defconfig | 4 +- configs/nitrogen6q2g_defconfig | 4 +- configs/nitrogen6q_defconfig | 4 +- configs/nitrogen6s1g_defconfig | 4 +- configs/nitrogen6s_defconfig | 4 +- configs/novena_defconfig | 4 +- configs/opos6uldev_defconfig | 2 +- configs/ot1200_defconfig | 4 +- configs/ot1200_spl_defconfig | 4 +- configs/pcm058_defconfig | 4 +- configs/pfla02_defconfig | 2 +- configs/pico-imx6ul_defconfig | 2 +- configs/platinum_picon_defconfig | 4 +- configs/platinum_titanium_defconfig | 4 +- configs/riotboard_defconfig | 4 +- configs/secomx6quq7_defconfig | 4 +- configs/sksimx6_defconfig | 4 +- configs/tbs2910_defconfig | 2 +- configs/titanium_defconfig | 2 +- configs/tqma6dl_mba6_mmc_defconfig | 2 +- configs/tqma6dl_mba6_spi_defconfig | 2 +- configs/tqma6q_mba6_mmc_defconfig | 2 +- configs/tqma6q_mba6_spi_defconfig | 2 +- configs/tqma6s_mba6_mmc_defconfig | 2 +- configs/tqma6s_mba6_spi_defconfig | 2 +- configs/tqma6s_wru4_mmc_defconfig | 2 +- configs/udoo_defconfig | 2 +- configs/udoo_neo_defconfig | 2 +- configs/vining_2000_defconfig | 2 +- configs/wandboard_defconfig | 2 +- configs/warp_defconfig | 2 +- configs/xpress_defconfig | 2 +- configs/xpress_spl_defconfig | 2 +- configs/zc5202_defconfig | 4 +- configs/zc5601_defconfig | 4 +- doc/README.imx6 | 2 +- doc/README.imximage | 4 +- drivers/ata/dwc_ahsata.c | 2 +- drivers/crypto/fsl/jobdesc.c | 2 +- drivers/dma/Kconfig | 2 +- drivers/dma/apbh_dma.c | 2 +- drivers/gpio/mxc_gpio.c | 23 ++--- drivers/i2c/Kconfig | 2 +- drivers/misc/mxc_ocotp.c | 8 +- drivers/mmc/Kconfig | 6 +- drivers/mtd/nand/Kconfig | 6 +- drivers/mtd/nand/mxs_nand.c | 2 +- drivers/net/Kconfig | 2 +- drivers/net/fec_mxc.c | 2 +- drivers/net/fec_mxc.h | 4 +- drivers/pci/pcie_imx.c | 14 +-- drivers/pinctrl/nxp/Kconfig | 2 +- drivers/pwm/pwm-imx-util.c | 4 +- drivers/serial/Kconfig | 2 +- drivers/spi/fsl_qspi.c | 18 ++-- drivers/thermal/Kconfig | 2 +- drivers/thermal/imx_thermal.c | 2 +- drivers/usb/host/Kconfig | 4 +- drivers/usb/host/ehci-mx6.c | 8 +- drivers/video/Kconfig | 2 +- drivers/video/ipu_regs.h | 2 +- env/Kconfig | 2 +- include/configs/cgtqmx6eval.h | 4 +- include/configs/cm_fx6.h | 2 +- include/configs/ge_bx50v3.h | 2 +- include/configs/imx6-engicam.h | 4 +- include/configs/imx6_spl.h | 4 +- include/configs/mx6_common.h | 12 +-- include/configs/mx6cuboxi.h | 12 +-- include/configs/mx6memcal.h | 2 +- include/configs/mx6sabre_common.h | 12 +-- include/configs/titanium.h | 2 +- include/configs/udoo.h | 4 +- include/configs/wandboard.h | 14 +-- include/fsl_sec.h | 8 +- lib/rsa/Kconfig | 4 +- 230 files changed, 825 insertions(+), 614 deletions(-) create mode 100644 arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi create mode 100644 arch/arm/dts/imx6dl-icore-rqs-u-boot.dtsi create mode 100644 arch/arm/dts/imx6dl-icore-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-icore-mipi-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-icore-rqs-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-icore-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qdl-icore-rqs-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qdl-icore-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qdl-u-boot.dtsi create mode 100644 arch/arm/dts/imx6ul-geam-kit-u-boot.dtsi create mode 100644 arch/arm/dts/imx6ul-isiot-emmc-u-boot.dtsi create mode 100644 arch/arm/dts/imx6ul-isiot-u-boot.dtsi create mode 100644 arch/arm/dts/imx6ul-u-boot.dtsi