From: Lukasz Majewski <lukma@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v1 07/22] configs: move CONFIG_MXC_OCOTP to Kconfig
Date: Sun, 17 Feb 2019 23:38:07 +0100 [thread overview]
Message-ID: <20190217233807.758afe58@jawa> (raw)
In-Reply-To: <20190215222039.10005-8-marcel@ziswiler.com>
On Fri, 15 Feb 2019 23:20:23 +0100
Marcel Ziswiler <marcel@ziswiler.com> wrote:
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
>
> While commit 3e020f03e94f ("driver: misc: add MXC_OCOTP Kconfig
> entry") introduced a Kconfig entry it did not actually migrate all
> configurations to using it.
>
> As CONFIG_MXC_OCOTP was in mx{6/7}_common.h enable it by default on
> those architectures. Additionally, also enable it on ARCH_IMX8M and
> ARCH_VF610 where all current members enabled it through their legacy
> configuration header files.
>
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
>
> ---
>
> configs/bk4r1_defconfig | 1 -
> configs/pcm052_defconfig | 1 -
> drivers/misc/Kconfig | 2 ++
> include/configs/advantech_dms-ba16.h | 2 --
> include/configs/apalis_imx6.h | 5 -----
> include/configs/colibri_imx6.h | 5 -----
> include/configs/colibri_vf.h | 4 ----
> include/configs/dh_imx6.h | 5 -----
> include/configs/ge_bx50v3.h | 2 --
> include/configs/imx8mq_evk.h | 1 -
> include/configs/kp_imx6q_tpc.h | 5 -----
> include/configs/mx6_common.h | 3 ---
> include/configs/mx7_common.h | 3 ---
> include/configs/vf610twr.h | 4 ----
> 14 files changed, 2 insertions(+), 41 deletions(-)
>
> diff --git a/configs/bk4r1_defconfig b/configs/bk4r1_defconfig
> index e3852f4856..439207fd39 100644
> --- a/configs/bk4r1_defconfig
> +++ b/configs/bk4r1_defconfig
> @@ -49,7 +49,6 @@ CONFIG_SYS_I2C_MXC_I2C4=y
> CONFIG_LED=y
> CONFIG_LED_GPIO=y
> CONFIG_MISC=y
> -CONFIG_MXC_OCOTP=y
> CONFIG_I2C_EEPROM=y
> CONFIG_SYS_I2C_EEPROM_ADDR=0x50
> CONFIG_SYS_I2C_EEPROM_BUS=2
> diff --git a/configs/pcm052_defconfig b/configs/pcm052_defconfig
> index 906abbfd69..fd093b35c2 100644
> --- a/configs/pcm052_defconfig
> +++ b/configs/pcm052_defconfig
> @@ -36,7 +36,6 @@ CONFIG_SYS_I2C_MXC_I2C2=y
> CONFIG_SYS_I2C_MXC_I2C3=y
> CONFIG_SYS_I2C_MXC_I2C4=y
> CONFIG_MISC=y
> -CONFIG_MXC_OCOTP=y
> CONFIG_I2C_EEPROM=y
> CONFIG_SYS_I2C_EEPROM_ADDR=0x50
> CONFIG_SYS_I2C_EEPROM_BUS=2
> diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
> index 704c8dd195..137baa71f0 100644
> --- a/drivers/misc/Kconfig
> +++ b/drivers/misc/Kconfig
> @@ -128,6 +128,8 @@ config JZ4780_EFUSE
>
> config MXC_OCOTP
> bool "Enable MXC OCOTP Driver"
> + depends on ARCH_IMX8M || ARCH_MX6 || ARCH_MX7 || ARCH_VF610
> + default y
> help
> If you say Y here, you will get support for the One Time
> Programmable memory pages that are stored on the some
> diff --git a/include/configs/advantech_dms-ba16.h
> b/include/configs/advantech_dms-ba16.h index 0c9de6125d..a22c6a7d45
> 100644 --- a/include/configs/advantech_dms-ba16.h
> +++ b/include/configs/advantech_dms-ba16.h
> @@ -34,8 +34,6 @@
>
> #define CONFIG_MXC_UART
>
> -#define CONFIG_MXC_OCOTP
> -
> /* SATA Configs */
> #define CONFIG_SYS_SATA_MAX_DEVICE 1
> #define CONFIG_DWC_AHSATA_PORT_ID 0
> diff --git a/include/configs/apalis_imx6.h
> b/include/configs/apalis_imx6.h index c8aa1bdddf..95dd6f9362 100644
> --- a/include/configs/apalis_imx6.h
> +++ b/include/configs/apalis_imx6.h
> @@ -41,11 +41,6 @@
> #define CONFIG_SYS_I2C_SPEED 100000
> #define CONFIG_SYS_MXC_I2C3_SPEED 400000
>
> -/* OCOTP Configs */
> -#ifdef CONFIG_CMD_FUSE
> -#define CONFIG_MXC_OCOTP
> -#endif
> -
> /* MMC Configs */
> #define CONFIG_FSL_USDHC
> #define CONFIG_SYS_FSL_ESDHC_ADDR 0
> diff --git a/include/configs/colibri_imx6.h
> b/include/configs/colibri_imx6.h index a6a823ee1f..d2f8a58e80 100644
> --- a/include/configs/colibri_imx6.h
> +++ b/include/configs/colibri_imx6.h
> @@ -39,11 +39,6 @@
> #define CONFIG_SYS_I2C_SPEED 100000
> #define CONFIG_SYS_MXC_I2C3_SPEED 400000
>
> -/* OCOTP Configs */
> -#ifdef CONFIG_CMD_FUSE
> -#define CONFIG_MXC_OCOTP
> -#endif
> -
> /* MMC Configs */
> #define CONFIG_FSL_USDHC
> #define CONFIG_SYS_FSL_ESDHC_ADDR 0
> diff --git a/include/configs/colibri_vf.h
> b/include/configs/colibri_vf.h index 7b974d9e97..e7b786e48b 100644
> --- a/include/configs/colibri_vf.h
> +++ b/include/configs/colibri_vf.h
> @@ -17,10 +17,6 @@
>
> #define CONFIG_SKIP_LOWLEVEL_INIT
>
> -#ifdef CONFIG_CMD_FUSE
> -#define CONFIG_MXC_OCOTP
> -#endif
> -
> #ifdef CONFIG_VIDEO_FSL_DCU_FB
> #define CONFIG_SPLASH_SCREEN_ALIGN
> #define CONFIG_VIDEO_LOGO
> diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
> index 9231bd853f..4dc795c3f4 100644
> --- a/include/configs/dh_imx6.h
> +++ b/include/configs/dh_imx6.h
> @@ -48,11 +48,6 @@
> #define CONFIG_FEC_MXC_PHYADDR 0
> #define CONFIG_ARP_TIMEOUT 200UL
>
> -/* Fuses */
> -#ifdef CONFIG_CMD_FUSE
> -#define CONFIG_MXC_OCOTP
> -#endif
> -
> /* I2C Configs */
> #define CONFIG_SYS_I2C
> #define CONFIG_SYS_I2C_MXC
> diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
> index e0e1f713ef..8bbda2788d 100644
> --- a/include/configs/ge_bx50v3.h
> +++ b/include/configs/ge_bx50v3.h
> @@ -35,8 +35,6 @@
>
> #define CONFIG_MXC_UART
>
> -#define CONFIG_MXC_OCOTP
> -
> /* SATA Configs */
> #ifdef CONFIG_CMD_SATA
> #define CONFIG_SYS_SATA_MAX_DEVICE 1
> diff --git a/include/configs/imx8mq_evk.h
> b/include/configs/imx8mq_evk.h index f0430224cb..044a254320 100644
> --- a/include/configs/imx8mq_evk.h
> +++ b/include/configs/imx8mq_evk.h
> @@ -231,7 +231,6 @@
>
> #define CONFIG_MXC_GPIO
>
> -#define CONFIG_MXC_OCOTP
> #define CONFIG_CMD_FUSE
>
> /* I2C Configs */
> diff --git a/include/configs/kp_imx6q_tpc.h
> b/include/configs/kp_imx6q_tpc.h index b6b27ee1d5..d2ebf92953 100644
> --- a/include/configs/kp_imx6q_tpc.h
> +++ b/include/configs/kp_imx6q_tpc.h
> @@ -31,11 +31,6 @@
> #define CONFIG_FEC_MXC_PHYADDR 0
> #define CONFIG_ARP_TIMEOUT 200UL
>
> -/* Fuses */
> -#ifdef CONFIG_CMD_FUSE
> -#define CONFIG_MXC_OCOTP
> -#endif
> -
> /* I2C Configs */
> #define CONFIG_SYS_I2C
> #define CONFIG_SYS_I2C_MXC
> diff --git a/include/configs/mx6_common.h
> b/include/configs/mx6_common.h index cdc8833778..6b20c6db58 100644
> --- a/include/configs/mx6_common.h
> +++ b/include/configs/mx6_common.h
> @@ -57,9 +57,6 @@
> /* MMC */
> #define CONFIG_FSL_USDHC
>
> -/* Fuses */
> -#define CONFIG_MXC_OCOTP
> -
> /* Secure boot (HAB) support */
> #ifdef CONFIG_SECURE_BOOT
> #define CONFIG_CSF_SIZE 0x2000
> diff --git a/include/configs/mx7_common.h
> b/include/configs/mx7_common.h index a895c936aa..cc7e87269e 100644
> --- a/include/configs/mx7_common.h
> +++ b/include/configs/mx7_common.h
> @@ -42,9 +42,6 @@
> /* MMC */
> #define CONFIG_FSL_USDHC
>
> -/* Fuses */
> -#define CONFIG_MXC_OCOTP
> -
> #define CONFIG_ARMV7_SECURE_BASE 0x00900000
>
> #define CONFIG_ARMV7_PSCI_1_0
> diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
> index 686a383739..ba85bc91e7 100644
> --- a/include/configs/vf610twr.h
> +++ b/include/configs/vf610twr.h
> @@ -19,10 +19,6 @@
> /* Enable passing of ATAGs */
> #define CONFIG_CMDLINE_TAG
>
> -#ifdef CONFIG_CMD_FUSE
> -#define CONFIG_MXC_OCOTP
> -#endif
> -
> /* Size of malloc() pool */
> #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 *
> 1024 * 1024)
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190217/0fc66a60/attachment.sig>
next prev parent reply other threads:[~2019-02-17 22:38 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-15 22:20 [U-Boot] [PATCH v1 00/22] colibri vybrid fixes, device tree enablement and driver model conversion Marcel Ziswiler
2019-02-15 22:20 ` [U-Boot] [PATCH v1 01/22] add missing space in comment Marcel Ziswiler
2019-03-07 5:29 ` Igor Opaniuk
2019-02-15 22:20 ` [U-Boot] [PATCH v1 02/22] vf610: ddrmc: add missing include Marcel Ziswiler
2019-03-11 13:27 ` Igor Opaniuk
2019-02-15 22:20 ` [U-Boot] [PATCH v1 03/22] imx: bootaux: add dependency on vf610 Marcel Ziswiler
2019-03-07 5:31 ` Igor Opaniuk
2019-02-15 22:20 ` [U-Boot] [PATCH v1 04/22] configs: move CONFIG_USB_EHCI_VF to Kconfig Marcel Ziswiler
2019-03-07 5:39 ` Igor Opaniuk
2019-02-15 22:20 ` [U-Boot] [PATCH v1 05/22] configs: colibri_vf: remove obsolete mmc/sd card environment Marcel Ziswiler
2019-03-11 13:43 ` Igor Opaniuk
2019-02-15 22:20 ` [U-Boot] [PATCH v1 06/22] configs: colibri_vf: limit size of malloc() pool before relocation Marcel Ziswiler
2019-03-07 5:37 ` Igor Opaniuk
2019-02-15 22:20 ` [U-Boot] [PATCH v1 07/22] configs: move CONFIG_MXC_OCOTP to Kconfig Marcel Ziswiler
2019-02-17 22:38 ` Lukasz Majewski [this message]
2019-02-15 22:20 ` [U-Boot] [PATCH v1 08/22] ARM: dts: colibri_vf: update device trees Marcel Ziswiler
2019-02-15 22:20 ` [U-Boot] [PATCH v1 09/22] configs: colibri_vf: disable obscure options Marcel Ziswiler
2019-02-15 22:20 ` [U-Boot] [PATCH v1 10/22] colibri_vf: migrate pinctrl and regulators to dtb/dm Marcel Ziswiler
2019-02-15 22:20 ` [U-Boot] [PATCH v1 11/22] colibri_vf: migrate fec, esdhc, nfc and usb to driver model Marcel Ziswiler
2019-02-15 22:20 ` [U-Boot] [PATCH v1 12/22] config: colibri_vf: use macros from linux/sizes.h Marcel Ziswiler
2019-03-06 16:48 ` Igor Opaniuk
2019-02-15 22:20 ` [U-Boot] [PATCH v1 13/22] colibri_vf: add distroboot support Marcel Ziswiler
2019-02-15 22:20 ` [U-Boot] [PATCH v1 14/22] colibri_vf: set fdtfile for distroboot Marcel Ziswiler
2019-02-15 22:20 ` [U-Boot] [PATCH v1 15/22] colibri_vf: sync the board info message Marcel Ziswiler
2019-03-06 16:53 ` Igor Opaniuk
2019-02-15 22:20 ` [U-Boot] [PATCH v1 16/22] colibri_vf: enable user debug by default Marcel Ziswiler
2019-03-11 13:46 ` Igor Opaniuk
2019-02-15 22:20 ` [U-Boot] [PATCH v1 17/22] colibri_vf: disable undefined instruction events in user debug Marcel Ziswiler
2019-03-11 13:51 ` Igor Opaniuk
2019-02-15 22:20 ` [U-Boot] [PATCH v1 18/22] config: colibri_vf: enable mtd partitions via dt Marcel Ziswiler
2019-03-11 14:01 ` Igor Opaniuk
2019-03-24 21:33 ` Marcel Ziswiler
2019-02-15 22:20 ` [U-Boot] [PATCH v1 19/22] arm: vf610: add uart2 clock/pinmux support Marcel Ziswiler
2019-02-15 22:20 ` [U-Boot] [PATCH v1 20/22] colibri_vf: adjust timing according to data sheet Marcel Ziswiler
2019-02-15 22:20 ` [U-Boot] [PATCH v1 21/22] colibri_vf: use leveling evaluated by DDR validation tools Marcel Ziswiler
2019-02-15 22:20 ` [U-Boot] [PATCH v1 22/22] colibri_vf: fix sdboot for vybrid modules Marcel Ziswiler
2019-03-06 15:30 ` Igor Opaniuk
2019-02-17 22:40 ` [U-Boot] [PATCH v1 00/22] colibri vybrid fixes, device tree enablement and driver model conversion Lukasz Majewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190217233807.758afe58@jawa \
--to=lukma@denx.de \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox