From: Paul Kocialkowski <contact@paulk.fr>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 06/17] omap4: Drop redundant CONFIG_OMAP4430 symbol
Date: Sun, 30 Jul 2017 20:14:30 +0300 [thread overview]
Message-ID: <1501434870.1285.4.camel@paulk.fr> (raw)
In-Reply-To: <1494642810-22796-6-git-send-email-trini@konsulko.com>
Le vendredi 12 mai 2017 à 22:33 -0400, Tom Rini a écrit :
> While there are a few different OMAP4 SoCs, today we always set
> CONFIG_OMAP4430 and CONFIG_OMAP44XX. Convert the few test of
> CONFIG_OMAP4430 to CONFIG_OMAP44XX.
I don't have any omap4 device in hands these days, but I definitely
agree with the intent. If this is not merged when I get access back to
my device (in approx. 1 month), I will test and report back.
> Cc: Marek Vasut <marex@denx.de>
> Cc: Paul Kocialkowski <contact@paulk.fr>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
> drivers/usb/musb-new/linux-compat.h | 2 +-
> drivers/usb/musb-new/omap2430.c | 2 +-
> drivers/usb/musb/omap3.c | 4 ++--
> include/configs/kc1.h | 5 -----
> include/configs/ti_omap4_common.h | 4 ----
> scripts/config_whitelist.txt | 1 -
> 6 files changed, 4 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/usb/musb-new/linux-compat.h b/drivers/usb/musb-
> new/linux-compat.h
> index 92449775799f..4dae83ed6850 100644
> --- a/drivers/usb/musb-new/linux-compat.h
> +++ b/drivers/usb/musb-new/linux-compat.h
> @@ -30,7 +30,7 @@
> #define CONFIG_SOC_OMAP3430
> #endif
>
> -#ifdef CONFIG_OMAP4430
> +#ifdef CONFIG_OMAP44XX
> #define CONFIG_ARCH_OMAP4
> #endif
>
> diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-
> new/omap2430.c
> index 684ad9539af5..ba22dfe6cb09 100644
> --- a/drivers/usb/musb-new/omap2430.c
> +++ b/drivers/usb/musb-new/omap2430.c
> @@ -441,7 +441,7 @@ static int omap2430_musb_enable(struct musb *musb)
> twl6030_usb_device_settings();
> #endif
>
> -#ifdef CONFIG_OMAP4430
> +#ifdef CONFIG_OMAP44XX
> u32 *usbotghs_control = (u32 *)((*ctrl)-
> >control_usbotghs_ctrl);
> *usbotghs_control = USBOTGHS_CONTROL_AVALID |
> USBOTGHS_CONTROL_VBUSVALID | USBOTGHS_CONTROL_IDDIG;
> diff --git a/drivers/usb/musb/omap3.c b/drivers/usb/musb/omap3.c
> index 99b4291a27d8..57889ef0e7d2 100644
> --- a/drivers/usb/musb/omap3.c
> +++ b/drivers/usb/musb/omap3.c
> @@ -55,7 +55,7 @@ static struct omap3_otg_regs *otg;
> #define OMAP3_OTG_SYSSTATUS_RESETDONE 0x0001
>
> /* OMAP4430 has an internal PHY, use it */
> -#ifdef CONFIG_OMAP4430
> +#ifdef CONFIG_OMAP44XX
> #define OMAP3_OTG_INTERFSEL_OMAP 0x0000
> #else
> #define OMAP3_OTG_INTERFSEL_OMAP 0x0001
> @@ -122,7 +122,7 @@ int musb_platform_init(void)
> musb_cfg.extvbus = omap3_evm_need_extvbus();
> #endif
>
> -#ifdef CONFIG_OMAP4430
> +#ifdef CONFIG_OMAP44XX
> u32 *usbotghs_control =
> (u32 *)((*ctrl)->control_usbotghs_ctrl);
> *usbotghs_control = 0x15;
> diff --git a/include/configs/kc1.h b/include/configs/kc1.h
> index 939bd6c8129e..39c750c15e01 100644
> --- a/include/configs/kc1.h
> +++ b/include/configs/kc1.h
> @@ -24,11 +24,6 @@
> #define CONFIG_SYS_PL310_BASE 0x48242000
>
> /*
> - * Platform
> - */
> -#define CONFIG_OMAP4430
> -
> -/*
> * Board
> */
>
> diff --git a/include/configs/ti_omap4_common.h
> b/include/configs/ti_omap4_common.h
> index b85db500b574..1a6551e24d20 100644
> --- a/include/configs/ti_omap4_common.h
> +++ b/include/configs/ti_omap4_common.h
> @@ -12,10 +12,6 @@
> #ifndef __CONFIG_TI_OMAP4_COMMON_H
> #define __CONFIG_TI_OMAP4_COMMON_H
>
> -/*
> - * High Level Configuration Options
> - */
> -#define CONFIG_OMAP4430 1 /* which is in a 4430
> */
> #define CONFIG_MISC_INIT_R
>
> #ifndef CONFIG_SYS_L2CACHE_OFF
> diff --git a/scripts/config_whitelist.txt
> b/scripts/config_whitelist.txt
> index 4382b6aa1a1f..93ee3035d183 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -1992,7 +1992,6 @@ CONFIG_OMAP3_MICRON_DDR
> CONFIG_OMAP3_RX51
> CONFIG_OMAP3_SPI_D0_D1_SWAPPED
> CONFIG_OMAP3_ZOOM1
> -CONFIG_OMAP4430
> CONFIG_OMAP_EHCI_PHY1_RESET_GPIO
> CONFIG_OMAP_EHCI_PHY2_RESET_GPIO
> CONFIG_OMAP_EHCI_PHY3_RESET_GPIO
--
Paul Kocialkowski,
developer of free digital technology and hardware support.
Website: https://www.paulk.fr/
Coding blog: https://code.paulk.fr/
Git repositories: https://git.paulk.fr/ https://git.code.paulk.fr/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170730/3f3fd398/attachment.sig>
next prev parent reply other threads:[~2017-07-30 17:14 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-13 2:33 [U-Boot] [PATCH 01/17] arch/arm/cpu/arm926ejs/omap: Remove Tom Rini
2017-05-13 2:33 ` [U-Boot] [PATCH 02/17] omap24xx_i2c.c: Drop references to CONFIG_OMAP243X Tom Rini
2017-05-15 4:13 ` Heiko Schocher
2017-05-15 23:18 ` [U-Boot] [U-Boot, " Tom Rini
2017-05-13 2:33 ` [U-Boot] [PATCH 03/17] TI: Drop 'CONFIG_OMAP' Tom Rini
2017-05-15 23:18 ` [U-Boot] [U-Boot,03/17] " Tom Rini
2017-05-13 2:33 ` [U-Boot] [PATCH 04/17] omap5: Migrate CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC to Kconfig Tom Rini
2017-05-15 23:18 ` [U-Boot] [U-Boot, " Tom Rini
2017-05-13 2:33 ` [U-Boot] [PATCH 05/17] omap3: Drop CONFIG_OMAP3_EVM, switch to CONFIG_TARGET_OMAP3_EVM when needed Tom Rini
2017-05-15 23:18 ` [U-Boot] [U-Boot, " Tom Rini
2017-05-13 2:33 ` [U-Boot] [PATCH 06/17] omap4: Drop redundant CONFIG_OMAP4430 symbol Tom Rini
2017-05-15 23:18 ` [U-Boot] [U-Boot, " Tom Rini
2017-07-30 17:14 ` Paul Kocialkowski [this message]
2017-05-13 2:33 ` [U-Boot] [PATCH 07/17] omap3: Drop unused CONFIG_OMAP3_xxx board defines Tom Rini
2017-05-15 23:18 ` [U-Boot] [U-Boot, " Tom Rini
2017-05-13 2:33 ` [U-Boot] [PATCH 08/17] gpio: Move OMAP_GPIO to Kconfig Tom Rini
2017-05-15 23:19 ` [U-Boot] [U-Boot,08/17] " Tom Rini
2017-05-13 2:33 ` [U-Boot] [PATCH 09/17] omap3: Migrate CONFIG_OMAP3_GPIO_X " Tom Rini
2017-05-15 23:19 ` [U-Boot] [U-Boot, " Tom Rini
2017-05-13 2:33 ` [U-Boot] [PATCH 10/17] omap: spi: Drop CONFIG_OMAP3_SPI_D0_D1_SWAPPED support Tom Rini
2017-05-15 23:19 ` [U-Boot] [U-Boot, " Tom Rini
2017-05-13 2:33 ` [U-Boot] [PATCH 11/17] watchdog: Migrate OMAP_WATCHDOG to Kconfig Tom Rini
2017-05-15 23:19 ` [U-Boot] [U-Boot, " Tom Rini
2017-05-13 2:33 ` [U-Boot] [PATCH 12/17] omap: Drop CONFIG_OMAP_VC_I2C_HS_MCODE Tom Rini
2017-05-15 23:19 ` [U-Boot] [U-Boot,12/17] " Tom Rini
2017-05-13 2:33 ` [U-Boot] [PATCH 13/17] whitelist: Drop more unused OMAP symbols Tom Rini
2017-05-15 23:19 ` [U-Boot] [U-Boot, " Tom Rini
2017-05-13 2:33 ` [U-Boot] [PATCH 14/17] Kconfig: USB: Migrate CONFIG_USB_EHCI to CONFIG_USB_EHCI_HCD Tom Rini
2017-05-13 10:47 ` Marek Vasut
2017-05-15 23:19 ` [U-Boot] [U-Boot, " Tom Rini
2017-05-13 2:33 ` [U-Boot] [PATCH 15/17] Kconfig: USB: Migrate CONFIG_USB_EHCI_HCD users to Kconfig Tom Rini
2017-05-13 10:49 ` Marek Vasut
2017-05-15 23:19 ` [U-Boot] [U-Boot, " Tom Rini
2017-05-13 2:33 ` [U-Boot] [PATCH 16/17] Kconfig: USB: Migrate existing USB_EHCI_xxx options Tom Rini
2017-05-13 10:50 ` Marek Vasut
2017-05-15 23:20 ` [U-Boot] [U-Boot, " Tom Rini
2017-05-13 2:33 ` [U-Boot] [PATCH 17/17] Kconfig: OMAP: USB: Migrate CONFIG_USB_EHCI_OMAP to Kconfig Tom Rini
2017-05-13 10:51 ` Marek Vasut
2017-05-13 15:12 ` Tom Rini
2017-05-15 23:20 ` [U-Boot] [U-Boot, " Tom Rini
2017-05-15 23:18 ` [U-Boot] [U-Boot,01/17] arch/arm/cpu/arm926ejs/omap: Remove Tom Rini
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=1501434870.1285.4.camel@paulk.fr \
--to=contact@paulk.fr \
--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