From 0e79ff0941c2f306622448b06910af44fa90f828 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Mon, 26 Oct 2015 09:58:17 +0100 Subject: apalis/colibri_imx6: cosmetic configuration file changes Fix various spelling issues in our Apalis/Colibri iMX6 configuration files (e.g. UARTS vs. UARTs, u-boot vs. U-Boot, 8bit vs. 8-bit. While at it also stop claiming sdboot having anything to do with an 8-bit SD slot on Colibri iMX6 which does not have any such at least in its default pin muxing. --- include/configs/apalis_imx6.h | 6 +++--- include/configs/colibri_imx6.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 6553446ec5..b0589bc24d 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -21,7 +21,7 @@ #define CONFIG_SYS_GENERIC_BOARD -/* Define CONFIG_APALIS_IMX6_V1_0 to use the UARTS in DCE mode unconditionally. +/* Define CONFIG_APALIS_IMX6_V1_0 to use the UARTs in DCE mode unconditionally. Otherwise U-Boot uses the Configblock to fall back to DCE on V1.0 HW */ /* #define CONFIG_APALIS_IMX6_V1_0 */ @@ -47,7 +47,7 @@ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE -/* Make the HW version stuff available in u-boot env */ +/* Make the HW version stuff available in U-Boot env */ #define CONFIG_VERSION_VARIABLE /* ver environment variable */ #define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG @@ -255,7 +255,7 @@ "rootwait\0" \ "sdboot=run setup; " \ "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ - "${vidargs}; echo Booting from SD card in 8bit slot...; " \ + "${vidargs}; echo Booting from SD card in 8-bit slot...; " \ "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \ "${boot_file} && bootm ${kernel_addr_r} ${dtbparam}\0" \ "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \ diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index d3eb94e048..aa8d293d66 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -40,7 +40,7 @@ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE -/* Make the HW version stuff available in u-boot env */ +/* Make the HW version stuff available in U-Boot env */ #define CONFIG_VERSION_VARIABLE /* ver environment variable */ #define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG @@ -224,7 +224,7 @@ "rootwait\0" \ "sdboot=run setup; " \ "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ - "${vidargs}; echo Booting from SD card in 8bit slot...; " \ + "${vidargs}; echo Booting from SD card; " \ "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \ "${boot_file} && bootm ${kernel_addr_r} ${dtbparam}\0" \ "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \ -- cgit v1.2.3