global: Migrate CONFIG_MXC_UART_BASE to CFG

Perform a simple rename of CONFIG_MXC_UART_BASE to CFG_MXC_UART_BASE

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2022-12-04 10:04:55 -05:00
parent d1c723895b
commit 4db386655a
62 changed files with 73 additions and 73 deletions

View file

@ -565,9 +565,9 @@ void board_init_f(ulong dummy)
timer_init();
/* iomux */
if (CONFIG_MXC_UART_BASE == UART2_BASE)
if (CFG_MXC_UART_BASE == UART2_BASE)
SETUP_IOMUX_PADS(uart2_pads);
else if (CONFIG_MXC_UART_BASE == UART3_BASE)
else if (CFG_MXC_UART_BASE == UART3_BASE)
SETUP_IOMUX_PADS(uart3_pads);
/* UART clocks enabled and gd valid - init serial console */

View file

@ -194,11 +194,11 @@ static void _mxc_serial_setbrg(struct mxc_uart *base, unsigned long clk,
#if !CONFIG_IS_ENABLED(DM_SERIAL)
#ifndef CONFIG_MXC_UART_BASE
#error "define CONFIG_MXC_UART_BASE to use the MXC UART driver"
#ifndef CFG_MXC_UART_BASE
#error "define CFG_MXC_UART_BASE to use the MXC UART driver"
#endif
#define mxc_base ((struct mxc_uart *)CONFIG_MXC_UART_BASE)
#define mxc_base ((struct mxc_uart *)CFG_MXC_UART_BASE)
static void mxc_serial_setbrg(void)
{

View file

@ -15,7 +15,7 @@
#include <asm/arch/imx-regs.h>
#include <asm/mach-imx/gpio.h>
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CFG_MXC_UART_BASE UART1_BASE
/* MMC Configs */
#define CFG_SYS_FSL_ESDHC_ADDR 0

View file

@ -10,7 +10,7 @@
#include "mx7_common.h"
#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR
#define CFG_MXC_UART_BASE UART1_IPS_BASE_ADDR
/* Network */
#define CFG_FEC_MXC_PHYADDR 0

View file

@ -26,7 +26,7 @@
#define CFG_SYS_INIT_RAM_SIZE IRAM_SIZE
/* Serial console */
#define CONFIG_MXC_UART_BASE UART4_BASE
#define CFG_MXC_UART_BASE UART4_BASE
/* Environment */

View file

@ -15,7 +15,7 @@
#include <asm/arch/imx-regs.h>
#include <asm/mach-imx/gpio.h>
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CFG_MXC_UART_BASE UART1_BASE
/* MMC Configs */
#define CFG_SYS_FSL_ESDHC_ADDR 0

View file

@ -28,7 +28,7 @@
#define MMC_ROOTFS_PART 2
/* Console configs */
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CFG_MXC_UART_BASE UART1_BASE
/* MMC Configs */

View file

@ -28,7 +28,7 @@
#define CFG_SYS_FSL_USDHC_NUM 3
/* UART */
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CFG_MXC_UART_BASE UART1_BASE
/* USB Configs */
#ifdef CONFIG_CMD_USB

View file

@ -34,7 +34,7 @@
#define CFG_SYS_SPI_ARGS_OFFS 0x140000
#define CFG_SYS_SPI_ARGS_SIZE 0x10000
#define CONFIG_MXC_UART_BASE UART5_BASE
#define CFG_MXC_UART_BASE UART5_BASE
/* MMC Configs */
#define CFG_SYS_FSL_ESDHC_ADDR 0

View file

@ -21,7 +21,7 @@
/* Commands */
#define CONFIG_MXC_UART_BASE UART2_BASE
#define CFG_MXC_UART_BASE UART2_BASE
#define CFG_EXTRA_ENV_SETTINGS \
"board=EL6Q\0" \

View file

@ -12,7 +12,7 @@
#ifndef __RIOTBOARD_CONFIG_H
#define __RIOTBOARD_CONFIG_H
#define CONFIG_MXC_UART_BASE UART2_BASE
#define CFG_MXC_UART_BASE UART2_BASE
#define CONSOLE_DEV "ttymxc1"
#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)

View file

@ -13,9 +13,9 @@
#include "mx6_common.h"
/* UART */
#define CONFIG_MXC_UART_BASE UART3_BASE
#define CFG_MXC_UART_BASE UART3_BASE
#if CONFIG_MXC_UART_BASE == UART2_BASE
#if CFG_MXC_UART_BASE == UART2_BASE
/* UART2 requires CONFIG_DEBUG_UART_BASE=0x21e8000 */
#define CONSOLE_DEVICE "ttymxc1" /* System on Module debug connector */
#else

View file

@ -16,7 +16,7 @@
#include "mx6_common.h"
/* Serial */
#define CONFIG_MXC_UART_BASE UART2_BASE
#define CFG_MXC_UART_BASE UART2_BASE
/* NAND */

View file

@ -116,9 +116,9 @@
/* UART */
#ifdef CONFIG_MXC_UART
# ifdef CONFIG_MX6UL
# define CONFIG_MXC_UART_BASE UART1_BASE
# define CFG_MXC_UART_BASE UART1_BASE
# else
# define CONFIG_MXC_UART_BASE UART4_BASE
# define CFG_MXC_UART_BASE UART4_BASE
# endif
#endif

View file

@ -8,7 +8,7 @@
#ifndef __IMX6LOGIC_CONFIG_H
#define __IMX6LOGIC_CONFIG_H
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CFG_MXC_UART_BASE UART1_BASE
#define CONSOLE_DEV "ttymxc0"
#include "mx6_common.h"

View file

@ -35,7 +35,7 @@
#include <config_distro_bootcmd.h>
/* UART */
#define CONFIG_MXC_UART_BASE UART3_BASE
#define CFG_MXC_UART_BASE UART3_BASE
/* MMC */

View file

@ -12,7 +12,7 @@
#include <linux/sizes.h>
#include <linux/stringify.h>
#define CONFIG_MXC_UART_BASE UART4_BASE
#define CFG_MXC_UART_BASE UART4_BASE
#ifndef CONFIG_SPL_BUILD

View file

@ -10,7 +10,7 @@
#include "mx7_common.h"
#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR
#define CFG_MXC_UART_BASE UART1_IPS_BASE_ADDR
#undef CFG_EXTRA_ENV_SETTINGS

View file

@ -25,7 +25,7 @@
#define PHYS_SDRAM 0x40000000
#define PHYS_SDRAM_SIZE 0x40000000 /* Minimum 1 GiB DDR */
#define CONFIG_MXC_UART_BASE UART3_BASE_ADDR
#define CFG_MXC_UART_BASE UART3_BASE_ADDR
/* PHY needs a longer autonegotiation timeout after reset */
#define PHY_ANEG_TIMEOUT 20000

View file

@ -18,7 +18,7 @@
#define PHYS_SDRAM 0x40000000
#define PHYS_SDRAM_SIZE 0x20000000 /* Minimum 512 MiB DDR */
#define CONFIG_MXC_UART_BASE UART1_BASE_ADDR
#define CFG_MXC_UART_BASE UART1_BASE_ADDR
/* PHY needs a longer autonegotiation timeout after reset */
#define PHY_ANEG_TIMEOUT 20000

View file

@ -148,7 +148,7 @@
#define PHYS_SDRAM_2_SIZE 0x80000000 /* 2 GB */
#endif
#define CONFIG_MXC_UART_BASE UART3_BASE_ADDR
#define CFG_MXC_UART_BASE UART3_BASE_ADDR
#define CFG_SYS_FSL_USDHC_NUM 2
#define CFG_SYS_FSL_ESDHC_ADDR 0

View file

@ -54,7 +54,7 @@
#define PHYS_SDRAM 0x40000000
#define PHYS_SDRAM_SIZE 0x40000000 /* 1 GB DDR */
#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(1)
#define CFG_MXC_UART_BASE UART_BASE_ADDR(1)
#define CFG_SYS_FSL_USDHC_NUM 2
#define CFG_SYS_FSL_ESDHC_ADDR 0

View file

@ -59,7 +59,7 @@
#define PHYS_SDRAM 0x40000000
#define PHYS_SDRAM_SIZE 0xC0000000 /* 3GB DDR */
#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(1)
#define CFG_MXC_UART_BASE UART_BASE_ADDR(1)
#define CFG_SYS_FSL_USDHC_NUM 2
#define CFG_SYS_FSL_ESDHC_ADDR 0

View file

@ -92,7 +92,7 @@
#define PHYS_SDRAM 0x40000000
#define PHYS_SDRAM_SIZE 0x40000000 /* 1GB DDR */
#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(1)
#define CFG_MXC_UART_BASE UART_BASE_ADDR(1)
#define CFG_SYS_FSL_USDHC_NUM 2
#define CFG_SYS_FSL_ESDHC_ADDR 0

View file

@ -22,7 +22,7 @@
#define CFG_SYS_UBOOT_BASE CONFIG_TEXT_BASE
/* Board and environment settings */
#define CONFIG_MXC_UART_BASE UART4_BASE
#define CFG_MXC_UART_BASE UART4_BASE
#ifdef CONFIG_USB_EHCI_HCD
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)

View file

@ -67,7 +67,7 @@
#define PHYS_SDRAM 0x40000000
#define PHYS_SDRAM_SIZE 0xC0000000 /* 3GB DDR */
#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(3)
#define CFG_MXC_UART_BASE UART_BASE_ADDR(3)
#define CFG_SYS_FSL_USDHC_NUM 2
#define CFG_SYS_FSL_ESDHC_ADDR 0

View file

@ -30,23 +30,23 @@
#define CONSOLE_ON_UART1
#ifdef CONSOLE_ON_UART1
#define CONFIG_MXC_UART_BASE UART1_BASE_ADDR
#define CFG_MXC_UART_BASE UART1_BASE_ADDR
#define CONSOLE_UART_CLK 0
#define CONSOLE "ttymxc0"
#elif defined(CONSOLE_ON_UART2)
#define CONFIG_MXC_UART_BASE UART2_BASE_ADDR
#define CFG_MXC_UART_BASE UART2_BASE_ADDR
#define CONSOLE_UART_CLK 1
#define CONSOLE "ttymxc1"
#elif defined(CONSOLE_ON_UART3)
#define CONFIG_MXC_UART_BASE UART3_BASE_ADDR
#define CFG_MXC_UART_BASE UART3_BASE_ADDR
#define CONSOLE_UART_CLK 2
#define CONSOLE "ttymxc2"
#elif defined(CONSOLE_ON_UART4)
#define CONFIG_MXC_UART_BASE UART4_BASE_ADDR
#define CFG_MXC_UART_BASE UART4_BASE_ADDR
#define CONSOLE_UART_CLK 3
#define CONSOLE "ttymxc3"
#else
#define CONFIG_MXC_UART_BASE UART1_BASE_ADDR
#define CFG_MXC_UART_BASE UART1_BASE_ADDR
#define CONSOLE_UART_CLK 0
#define CONSOLE "ttymxc0"
#endif

View file

@ -13,7 +13,7 @@
#include <linux/stringify.h>
#include "mx6_common.h"
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CFG_MXC_UART_BASE UART1_BASE
/* MMC Configs */
#ifdef CONFIG_FSL_USDHC

View file

@ -31,7 +31,7 @@
/*
* Serial Driver
*/
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CFG_MXC_UART_BASE UART1_BASE
/*
* MMC Driver

View file

@ -17,7 +17,7 @@
* mode from SD card (SD2)
*/
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CFG_MXC_UART_BASE UART1_BASE
/* MMC Configuration */
#define CFG_SYS_FSL_USDHC_NUM 2

View file

@ -55,7 +55,7 @@
#define PHYS_SDRAM_2 0xc0000000
#define PHYS_SDRAM_2_SIZE 0x0
#define CONFIG_MXC_UART_BASE UART2_BASE_ADDR
#define CFG_MXC_UART_BASE UART2_BASE_ADDR
#define CFG_SYS_FSL_USDHC_NUM 2
#define CFG_SYS_FSL_ESDHC_ADDR 0

View file

@ -18,7 +18,7 @@
* Hardware drivers
*/
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CFG_MXC_UART_BASE UART1_BASE
/* PMIC Controller */
#define CFG_FSL_PMIC_BUS 0

View file

@ -14,7 +14,7 @@
#include <asm/arch/imx-regs.h>
#define CONFIG_MXC_UART_BASE UART2_BASE
#define CFG_MXC_UART_BASE UART2_BASE
/* MMC Configs */
#define CFG_SYS_FSL_ESDHC_ADDR 0

View file

@ -11,7 +11,7 @@
#include <asm/arch/imx-regs.h>
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CFG_MXC_UART_BASE UART1_BASE
/* MMC Configs */
#define CFG_SYS_FSL_ESDHC_ADDR 0

View file

@ -19,7 +19,7 @@
/* Command definition */
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CFG_MXC_UART_BASE UART1_BASE
#define CFG_EXTRA_ENV_SETTINGS \
"som_rev=undefined\0" \

View file

@ -14,12 +14,12 @@
#ifdef CONFIG_SERIAL_CONSOLE_UART1
#if defined(CONFIG_MX6SL)
#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR
#define CFG_MXC_UART_BASE UART1_IPS_BASE_ADDR
#else
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CFG_MXC_UART_BASE UART1_BASE
#endif
#elif defined(CONFIG_SERIAL_CONSOLE_UART2)
#define CONFIG_MXC_UART_BASE UART2_BASE
#define CFG_MXC_UART_BASE UART2_BASE
#else
#error please define serial console (CONFIG_SERIAL_CONSOLE_UARTx)
#endif

View file

@ -8,7 +8,7 @@
#ifndef __MX6SABREAUTO_CONFIG_H
#define __MX6SABREAUTO_CONFIG_H
#define CONFIG_MXC_UART_BASE UART4_BASE
#define CFG_MXC_UART_BASE UART4_BASE
#define CONSOLE_DEV "ttymxc3"
/* USB Configs */

View file

@ -8,7 +8,7 @@
#ifndef __MX6SABRESD_CONFIG_H
#define __MX6SABRESD_CONFIG_H
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CFG_MXC_UART_BASE UART1_BASE
#define CONSOLE_DEV "ttymxc0"
#include "mx6sabre_common.h"

View file

@ -10,7 +10,7 @@
#include "mx6_common.h"
#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR
#define CFG_MXC_UART_BASE UART1_IPS_BASE_ADDR
/* MMC Configs */
#define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR

View file

@ -10,7 +10,7 @@
#include "mx6_common.h"
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CFG_MXC_UART_BASE UART1_BASE
#define CFG_EXTRA_ENV_SETTINGS \
"epdc_waveform=epdc_splash.bin\0" \

View file

@ -10,7 +10,7 @@
#include "mx6_common.h"
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CFG_MXC_UART_BASE UART1_BASE
#define CFG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \

View file

@ -12,7 +12,7 @@
#include "mx6_common.h"
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CFG_MXC_UART_BASE UART1_BASE
#ifdef CONFIG_IMX_BOOTAUX

View file

@ -15,7 +15,7 @@
#define is_mx6ul_9x9_evk() CONFIG_IS_ENABLED(TARGET_MX6UL_9X9_EVK)
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CFG_MXC_UART_BASE UART1_BASE
/* MMC Configs */
#ifdef CONFIG_FSL_USDHC

View file

@ -16,7 +16,7 @@
#define PHYS_SDRAM_SIZE SZ_512M
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CFG_MXC_UART_BASE UART1_BASE
/* MMC Configs */
#ifdef CONFIG_FSL_USDHC

View file

@ -13,7 +13,7 @@
#define CFG_SYS_FSL_USDHC_NUM 1
/* Console configs */
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CFG_MXC_UART_BASE UART1_BASE
/* MMC Configs */
#define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR

View file

@ -11,7 +11,7 @@
#include "mx6_common.h"
#define CONFIG_MXC_UART_BASE UART2_BASE
#define CFG_MXC_UART_BASE UART2_BASE
/* MMC Configs */
#define CFG_SYS_FSL_ESDHC_ADDR 0

View file

@ -49,7 +49,7 @@
#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
/* UART */
#define CONFIG_MXC_UART_BASE UART2_BASE
#define CFG_MXC_UART_BASE UART2_BASE
/* USB Configs */
#ifdef CONFIG_CMD_USB

View file

@ -13,7 +13,7 @@
#define CFG_SYS_FSL_USDHC_NUM 1
/* Console configs */
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CFG_MXC_UART_BASE UART1_BASE
/* MMC Configs */
#define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR

View file

@ -22,7 +22,7 @@
#define CFG_SYS_FSL_USDHC_NUM 1
/* Console configs */
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CFG_MXC_UART_BASE UART1_BASE
/* MMC Configs */

View file

@ -22,7 +22,7 @@
#define MMC_ROOTFS_PART 2
/* Console configs */
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CFG_MXC_UART_BASE UART1_BASE
/* MMC Configs */

View file

@ -10,7 +10,7 @@
#include "mx6_common.h"
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CFG_MXC_UART_BASE UART1_BASE
/* MMC Configuration */
#define CFG_SYS_FSL_ESDHC_ADDR USDHC3_BASE_ADDR

View file

@ -17,7 +17,7 @@
#define CFG_FEC_MXC_PHYADDR 0x1
#define CONFIG_MXC_UART_BASE UART6_BASE_ADDR
#define CFG_MXC_UART_BASE UART6_BASE_ADDR
/* MMC Configs */
#define CFG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR

View file

@ -10,7 +10,7 @@
#include "mx7_common.h"
#define CONFIG_MXC_UART_BASE UART5_IPS_BASE_ADDR
#define CFG_MXC_UART_BASE UART5_IPS_BASE_ADDR
/* MMC Config */
#define CFG_SYS_FSL_ESDHC_ADDR 0

View file

@ -71,7 +71,7 @@
#define PHYS_SDRAM 0x40000000
#define PHYS_SDRAM_SIZE 0x80000000 /* 2 GiB DDR */
#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(1)
#define CFG_MXC_UART_BASE UART_BASE_ADDR(1)
#define CFG_SYS_FSL_USDHC_NUM 2
#define CFG_SYS_FSL_ESDHC_ADDR 0

View file

@ -11,7 +11,7 @@
#define CFG_FEC_MXC_PHYADDR 0x03
#define CONFIG_MXC_UART_BASE UART2_BASE
#define CFG_MXC_UART_BASE UART2_BASE
#define CONSOLE_DEV "ttymxc1"
#endif /* __CONFIG_TQMA6_MBA6_H */

View file

@ -10,7 +10,7 @@
#define CFG_FEC_MXC_PHYADDR 0x01
/* UART */
#define CONFIG_MXC_UART_BASE UART4_BASE
#define CFG_MXC_UART_BASE UART4_BASE
#define CONSOLE_DEV "ttymxc3"
/* Watchdog */

View file

@ -10,7 +10,7 @@
#include "mx6_common.h"
#define CONFIG_MXC_UART_BASE UART2_BASE
#define CFG_MXC_UART_BASE UART2_BASE
/* MMC Configuration */
#define CFG_SYS_FSL_ESDHC_ADDR 0

View file

@ -16,7 +16,7 @@
#define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
/* Command definition */
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CFG_MXC_UART_BASE UART1_BASE
/* Linux only */
#define CFG_EXTRA_ENV_SETTINGS \

View file

@ -17,7 +17,7 @@
/* U-Boot general configurations */
/* UART */
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CFG_MXC_UART_BASE UART1_BASE
/* SD/MMC */
#define CFG_SYS_FSL_ESDHC_ADDR 0

View file

@ -50,7 +50,7 @@
#endif
#ifdef CONFIG_SPL_BUILD
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CFG_MXC_UART_BASE UART1_BASE
#endif
#endif /* __CONFIG_H */

View file

@ -10,7 +10,7 @@
#include "mx6_common.h"
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CFG_MXC_UART_BASE UART1_BASE
/* MMC Configuration */
#define CFG_SYS_FSL_USDHC_NUM 2

View file

@ -10,7 +10,7 @@
#include "mx6_common.h"
#include <asm/mach-imx/gpio.h>
#define CONFIG_MXC_UART_BASE MX6UL_UART7_BASE_ADDR
#define CFG_MXC_UART_BASE MX6UL_UART7_BASE_ADDR
/* MMC Configs */
#define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR