dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-10-27 00:24:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

global: Migrate CONFIG_SCIF_A to CFG

Browse Source 
Perform a simple rename of CONFIG_SCIF_A to CFG_SCIF_A

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini
2022-12-04 10:13:43 -05:00
parent 9dbe356ef4
commit dbfaeecf59
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/serial/serial_sh.c
View File

@@ -274,7 +274,7 @@ U_BOOT_DRIVER(serial_sh) = {
# error "Default SCIF doesn't set....." # error "Default SCIF doesn't set....."
#endif #endif
#if defined(CONFIG_SCIF_A) #if defined(CFG_SCIF_A)
#define SCIF_BASE_PORT PORT_SCIFA #define SCIF_BASE_PORT PORT_SCIFA
#elif defined(CONFIG_SCI) #elif defined(CONFIG_SCI)
#define SCIF_BASE_PORT PORT_SCI #define SCIF_BASE_PORT PORT_SCI

8
drivers/serial/serial_sh.h
View File

@@ -92,7 +92,7 @@ struct uart_port {
# define SCIF_ORER 0x0001 /* overrun error bit */ # define SCIF_ORER 0x0001 /* overrun error bit */
#elif defined(CONFIG_RCAR_GEN2) || defined(CONFIG_RCAR_GEN3) || \ #elif defined(CONFIG_RCAR_GEN2) || defined(CONFIG_RCAR_GEN3) || \
defined(CONFIG_R7S72100) defined(CONFIG_R7S72100)
# if defined(CONFIG_SCIF_A) # if defined(CFG_SCIF_A)
# define SCIF_ORER 0x0200 # define SCIF_ORER 0x0200
# else # else
# define SCIF_ORER 0x0001 # define SCIF_ORER 0x0001
@@ -164,7 +164,7 @@ struct uart_port {
# define SCIF2_TXROOM_MAX 16 # define SCIF2_TXROOM_MAX 16
#elif defined(CONFIG_RCAR_GEN2) #elif defined(CONFIG_RCAR_GEN2)
# define SCIF_ERRORS (SCIF_PER | SCIF_FER | SCIF_ER | SCIF_BRK) # define SCIF_ERRORS (SCIF_PER | SCIF_FER | SCIF_ER | SCIF_BRK)
# if defined(CONFIG_SCIF_A) # if defined(CFG_SCIF_A)
# define SCIF_RFDC_MASK 0x007f # define SCIF_RFDC_MASK 0x007f
# else # else
# define SCIF_RFDC_MASK 0x001f # define SCIF_RFDC_MASK 0x001f
@@ -380,7 +380,7 @@ SCIF_FNS(SCFDR, 0, 0, 0x1C, 16)
SCIF_FNS(SCSPTR, 0, 0, 0x20, 16) SCIF_FNS(SCSPTR, 0, 0, 0x20, 16)
SCIF_FNS(DL, 0, 0, 0x30, 16) SCIF_FNS(DL, 0, 0, 0x30, 16)
SCIF_FNS(CKS, 0, 0, 0x34, 16) SCIF_FNS(CKS, 0, 0, 0x34, 16)
#if defined(CONFIG_SCIF_A) #if defined(CFG_SCIF_A)
SCIF_FNS(SCLSR, 0, 0, 0x14, 16) SCIF_FNS(SCLSR, 0, 0, 0x14, 16)
#else #else
SCIF_FNS(SCLSR, 0, 0, 0x24, 16) SCIF_FNS(SCLSR, 0, 0, 0x24, 16)
@@ -491,7 +491,7 @@ static inline int scbrr_calc(struct uart_port *port, int bps, int clk)
#define SCBRR_VALUE(bps, clk) scbrr_calc(port, bps, clk) #define SCBRR_VALUE(bps, clk) scbrr_calc(port, bps, clk)
#elif defined(CONFIG_RCAR_GEN2) #elif defined(CONFIG_RCAR_GEN2)
#define DL_VALUE(bps, clk) (clk / bps / 16) /* External Clock */ #define DL_VALUE(bps, clk) (clk / bps / 16) /* External Clock */
#if defined(CONFIG_SCIF_A) #if defined(CFG_SCIF_A)
#define SCBRR_VALUE(bps, clk) (clk / bps / 16 - 1) /* Internal Clock */ #define SCBRR_VALUE(bps, clk) (clk / bps / 16 - 1) /* Internal Clock */
#else #else
#define SCBRR_VALUE(bps, clk) (clk / bps / 32 - 1) /* Internal Clock */ #define SCBRR_VALUE(bps, clk) (clk / bps / 32 - 1) /* Internal Clock */

2
include/configs/stout.h
View File

@@ -23,7 +23,7 @@
#define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024) #define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024)
/* SCIF */ /* SCIF */
#define CONFIG_SCIF_A #define CFG_SCIF_A
/* SH Ether */ /* SH Ether */
#define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_USE_PORT 0