From 1b25f2d9d72823cc6ba35e8cb9086c9b3f6b849b Mon Sep 17 00:00:00 2001 From: Adam Ford Date: Sat, 25 Nov 2017 13:39:09 -0600 Subject: mx6_common: remove dead code There is an #ifdef and #endif with nothing in between. This patch simply removes this dead/useless code. Signed-off-by: Adam Ford Reviewed-by: Fabio Estevam --- include/configs/mx6_common.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'include') diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 4de9db65c10..5fb85a11277 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -65,9 +65,6 @@ #define CONFIG_SYS_CBSIZE 512 #define CONFIG_SYS_MAXARGS 32 -#ifndef CONFIG_SYS_DCACHE_OFF -#endif - /* GPIO */ #define CONFIG_MXC_GPIO -- cgit v1.3.1 From d56f6ca288c588b6a17edf7a4952e1bc3b56220c Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Mon, 4 Dec 2017 12:31:20 +0800 Subject: power: pmic.h: include dm/ofnode.h Include dm/ofnode.h. Signed-off-by: Peng Fan Reviewed-by: Simon Glass Cc: Stefano Babic Reviewed-by: Fabio Estevam --- include/power/pmic.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/power/pmic.h b/include/power/pmic.h index 4b343164270..f2fe537fb7c 100644 --- a/include/power/pmic.h +++ b/include/power/pmic.h @@ -11,6 +11,7 @@ #ifndef __CORE_PMIC_H_ #define __CORE_PMIC_H_ +#include #include #include #include -- cgit v1.3.1 From 6ca03f0dfb2f65c7834737f9e0befff24064e34a Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 27 Nov 2017 10:25:10 -0200 Subject: mx6sxsabresd: Load the correct dtb for revA board Currently only imx6sx-sdb.dtb is loaded, but if revA board is used the correct dtb is imx6sx-sdb-reva.dtb, so make this possible. While at it, remove an extra 'mmc dev'. Signed-off-by: Fabio Estevam --- arch/arm/mach-imx/mx6/Kconfig | 1 + board/freescale/mx6sxsabresd/mx6sxsabresd.c | 16 +++++++++++++++- configs/mx6sxsabresd_defconfig | 1 + configs/mx6sxsabresd_spl_defconfig | 1 + include/configs/mx6sxsabresd.h | 8 ++++++-- 5 files changed, 24 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index bee7eabe026..44d2db4f282 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -255,6 +255,7 @@ config TARGET_MX6SLLEVK config TARGET_MX6SXSABRESD bool "mx6sxsabresd" + select BOARD_LATE_INIT select MX6SX select SUPPORT_SPL select DM diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c index 2aeef61ffde..3ad2140314f 100644 --- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c +++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c @@ -540,9 +540,23 @@ int board_init(void) return 0; } +static bool is_reva(void) +{ + return (nxp_board_rev() == 1); +} + +int board_late_init(void) +{ +#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG + if (is_reva()) + env_set("board_rev", "REVA"); +#endif + return 0; +} + int checkboard(void) { - puts("Board: MX6SX SABRE SDB\n"); + printf("Board: MX6SX SABRE SDB rev%c\n", nxp_board_rev_string()); return 0; } diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig index a411032b86b..b7073227147 100644 --- a/configs/mx6sxsabresd_defconfig +++ b/configs/mx6sxsabresd_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_MX6SXSABRESD=y # CONFIG_CMD_BMODE is not set +CONFIG_NXP_BOARD_REVISION=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabresd/imximage.cfg" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/mx6sxsabresd_spl_defconfig b/configs/mx6sxsabresd_spl_defconfig index a0483c3472f..9ab4b2f0060 100644 --- a/configs/mx6sxsabresd_spl_defconfig +++ b/configs/mx6sxsabresd_spl_defconfig @@ -9,6 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y # CONFIG_CMD_BMODE is not set +CONFIG_NXP_BOARD_REVISION=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index f4c9c283979..906e677cd14 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -43,6 +43,7 @@ #define UPDATE_M4_ENV "" #endif +#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ UPDATE_M4_ENV \ "script=boot.scr\0" \ @@ -105,10 +106,13 @@ "fi; " \ "else " \ "bootz; " \ - "fi;\0" + "fi;\0" \ + "findfdt="\ + "if test test $board_rev = REVA ; then " \ + "setenv fdt_file imx6sx-sdb-reva.dtb; fi; " \ #define CONFIG_BOOTCOMMAND \ - "mmc dev ${mmcdev};" \ + "run findfdt; " \ "mmc dev ${mmcdev}; if mmc rescan; then " \ "if run loadbootscript; then " \ "run bootscript; " \ -- cgit v1.3.1