[PATCH] ARM: imx: imx8q: Use LPUART_BASE macro in config files
Replace ad-hoc value with LPUART_BASE macro, no functional change.
Signed-off-by: Marek Vasut marex@denx.de Cc: Fabio Estevam festevam@denx.de Cc: Peng Fan peng.fan@nxp.com Cc: Stefano Babic sbabic@denx.de Cc: Tom Rini trini@konsulko.com --- include/configs/cgtqmx8.h | 2 +- include/configs/imx8qm_mek.h | 4 ++-- include/configs/imx8qxp_mek.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h index 6da0483ef09..db2555c23cc 100644 --- a/include/configs/cgtqmx8.h +++ b/include/configs/cgtqmx8.h @@ -20,7 +20,7 @@ #define CONFIG_SPL_BSS_MAX_SIZE 0x1000 /* 4 KB */ #define CONFIG_SYS_SPL_MALLOC_START 0x00120000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x3000 /* 12 KB */ -#define CONFIG_SERIAL_LPUART_BASE 0x5a060000 +#define CONFIG_SERIAL_LPUART_BASE LPUART_BASE #define CONFIG_MALLOC_F_ADDR 0x00120000
#define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index 61d56e269ac..b9ad61ce501 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -21,7 +21,7 @@ #define CONFIG_SPL_BSS_MAX_SIZE 0x1000 /* 4 KB */ #define CONFIG_SYS_SPL_MALLOC_START 0x00120000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x3000 /* 12 KB */ -#define CONFIG_SERIAL_LPUART_BASE 0x5a060000 +#define CONFIG_SERIAL_LPUART_BASE LPUART_BASE #define CONFIG_MALLOC_F_ADDR 0x00120000
#define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE @@ -41,7 +41,7 @@ "script=boot.scr\0" \ "image=Image\0" \ "panel=NULL\0" \ - "console=ttyLP0,${baudrate} earlycon=lpuart32,0x5a060000,${baudrate}\0" \ + "console=ttyLP0,${baudrate} earlycon=lpuart32," __stringify(LPUART_BASE) ",${baudrate}\0" \ "fdt_addr=0x83000000\0" \ "fdt_high=0xffffffffffffffff\0" \ "boot_fdt=try\0" \ diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index 26dc4ded030..11a8ac50691 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -19,7 +19,7 @@ #define CONFIG_SPL_BSS_MAX_SIZE 0x1000 /* 4 KB */ #define CONFIG_SYS_SPL_MALLOC_START 0x00120000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x3000 /* 12 KB */ -#define CONFIG_SERIAL_LPUART_BASE 0x5a060000 +#define CONFIG_SERIAL_LPUART_BASE LPUART_BASE #define CONFIG_MALLOC_F_ADDR 0x00120000
#define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE
On Sun, Apr 24, 2022 at 11:43:10PM +0200, Marek Vasut wrote:
Replace ad-hoc value with LPUART_BASE macro, no functional change.
Signed-off-by: Marek Vasut marex@denx.de Cc: Fabio Estevam festevam@denx.de Cc: Peng Fan peng.fan@nxp.com Cc: Stefano Babic sbabic@denx.de Cc: Tom Rini trini@konsulko.com
include/configs/cgtqmx8.h | 2 +- include/configs/imx8qm_mek.h | 4 ++-- include/configs/imx8qxp_mek.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h index 6da0483ef09..db2555c23cc 100644 --- a/include/configs/cgtqmx8.h +++ b/include/configs/cgtqmx8.h @@ -20,7 +20,7 @@ #define CONFIG_SPL_BSS_MAX_SIZE 0x1000 /* 4 KB */ #define CONFIG_SYS_SPL_MALLOC_START 0x00120000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x3000 /* 12 KB */ -#define CONFIG_SERIAL_LPUART_BASE 0x5a060000 +#define CONFIG_SERIAL_LPUART_BASE LPUART_BASE #define CONFIG_MALLOC_F_ADDR 0x00120000
#define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index 61d56e269ac..b9ad61ce501 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -21,7 +21,7 @@ #define CONFIG_SPL_BSS_MAX_SIZE 0x1000 /* 4 KB */ #define CONFIG_SYS_SPL_MALLOC_START 0x00120000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x3000 /* 12 KB */ -#define CONFIG_SERIAL_LPUART_BASE 0x5a060000 +#define CONFIG_SERIAL_LPUART_BASE LPUART_BASE #define CONFIG_MALLOC_F_ADDR 0x00120000
#define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE @@ -41,7 +41,7 @@ "script=boot.scr\0" \ "image=Image\0" \ "panel=NULL\0" \
- "console=ttyLP0,${baudrate} earlycon=lpuart32,0x5a060000,${baudrate}\0" \
- "console=ttyLP0,${baudrate} earlycon=lpuart32," __stringify(LPUART_BASE) ",${baudrate}\0" \ "fdt_addr=0x83000000\0" \ "fdt_high=0xffffffffffffffff\0" \ "boot_fdt=try\0" \
diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index 26dc4ded030..11a8ac50691 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -19,7 +19,7 @@ #define CONFIG_SPL_BSS_MAX_SIZE 0x1000 /* 4 KB */ #define CONFIG_SYS_SPL_MALLOC_START 0x00120000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x3000 /* 12 KB */ -#define CONFIG_SERIAL_LPUART_BASE 0x5a060000 +#define CONFIG_SERIAL_LPUART_BASE LPUART_BASE #define CONFIG_MALLOC_F_ADDR 0x00120000
#define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE
This kind of change makes Kconfig migration harder for moveconfig.py to handle. I don't see CONFIG_SERIAL_LPUART_BASE used in code, so we should just drop it. And so far as we're consistent about how to pass earlycon info, we just put the raw address, but I don't strongly object to __stringify(LPUART_BASE) as it is clearer, and handling the default env part of board config.h has its own challenges more broadly.
participants (2)
-
Marek Vasut -
Tom Rini