From 0a112072bb39cf11b03abee773f1a001bad62d72 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 14 Feb 2019 10:01:50 -0200 Subject: pico-imx6ul: Convert to DM_PMIC Convert to use DM_PMIC for the PFUZE3000. Since this PMIC is under an I2C bus, conver to DM_I2C as well. Also, since I2C is not used in SPL, remove CONFIG_SPL_I2C_SUPPORT to avoid build warnings. Signed-off-by: Fabio Estevam Acked-by: Otavio Salvador --- include/configs/pico-imx6ul.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'include') diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 8082b74c9c5..050f69801b4 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -128,17 +128,9 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) /* I2C configs */ -#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MXC -#define CONFIG_SYS_I2C_MXC_I2C1 #define CONFIG_SYS_I2C_SPEED 100000 -/* PMIC */ -#define CONFIG_POWER -#define CONFIG_POWER_I2C -#define CONFIG_POWER_PFUZE3000 -#define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08 - /* environment organization */ #define CONFIG_ENV_SIZE SZ_8K #define CONFIG_ENV_OFFSET (8 * SZ_64K) -- cgit v1.2.3 From 15b7e91f5cbd9e9518879aba8c7c702df205dab1 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 28 Feb 2019 08:46:14 -0300 Subject: imx8mq_evk: Move CONFIG_ENV_IS_IN_MMC to Kconfig Currently the command "saveenv" is not available. The CONFIG_ENV_IS_IN_MMC symbol has been converted to Kconfig, so fix the problem by moving it to the defconfig. Signed-off-by: Fabio Estevam Reviewed-by: Peng Fan --- include/configs/imx8mq_evk.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include') diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index f0430224cb8..a9e38a70e60 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -187,7 +187,6 @@ #define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_OFFSET (64 * SZ_64K) #define CONFIG_ENV_SIZE 0x1000 -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 /* USDHC2 */ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ -- cgit v1.2.3 From 3f77c933eeb222d44787d625cbc68539708af14f Mon Sep 17 00:00:00 2001 From: Shyam Saini Date: Wed, 6 Feb 2019 13:23:37 +0530 Subject: include: configs: imx6-engicam: Add recovery boot option Combined with watchdog board reset mechanism, this can be used as recovery boot option after bootlimit exceeds the configured value. Signed-off-by: Shyam Saini --- include/configs/imx6-engicam.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'include') diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h index 7baa265934f..571852d803a 100644 --- a/include/configs/imx6-engicam.h +++ b/include/configs/imx6-engicam.h @@ -43,19 +43,30 @@ "fdt_addr=" FDT_ADDR "\0" \ "boot_fdt=try\0" \ "mmcpart=1\0" \ + "recovery_device=0\0" \ + "recovery_part=2\0" \ + "recovery_root=/dev/mmcblk0p2 rootwait rw\0" \ "nandroot=ubi0:rootfs rootfstype=ubifs\0" \ "mmcautodetect=yes\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=${mmcroot}\0" \ + "recovery_mmcargs= setenv bootargs console=${console},${baudrate} "\ + "root=${recovery_root}\0" \ "ubiargs=setenv bootargs console=${console},${baudrate} " \ "ubi.mtd=5 root=${nandroot} ${mtdparts}\0" \ "loadbootscript=" \ "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ "bootscript=echo Running bootscript from mmc ...; " \ "source\0" \ + "recovery_loadimage=ext2load mmc ${recovery_device}:${recovery_part} ${loadaddr} ${image}\0" \ + "recovery_loadfdt=ext2load mmc ${recovery_device}:${recovery_part} ${fdt_addr} ${fdt_file}\0" \ "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ "loadfit=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${fit_image}\0" \ + "altbootcmd=run recovery_boot\0"\ + "recovery_boot=echo Recovery Boot from mmc ...; " \ + "run recovery_loadimage ; run recovery_loadfdt; run recovery_mmcargs; "\ + "bootm ${loadaddr} - ${fdt_addr}\0" \ "fitboot=echo Booting FIT image from mmc ...; " \ "run mmcargs; " \ "bootm ${loadaddr}\0" \ -- cgit v1.2.3 From 12d64098a58dbc36dd4886e58841115f532a7168 Mon Sep 17 00:00:00 2001 From: Adam Ford Date: Sat, 16 Feb 2019 14:09:45 -0600 Subject: ARM: imx6_logic: Fix typo in FDT address A few scripts reference 'fdt_addr' when they should reference 'fdt_addr_r' so this patch fixes those broken references. Signed-off-by: Adam Ford --- include/configs/imx6_logic.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index 70cc63fc1b9..a121064e373 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -68,8 +68,8 @@ "nandboot=echo Booting from nand ...; " \ " run nandargs;" \ " nand read ${loadaddr} kernel ${kernelsize};" \ - " nand read ${fdt_addr} dtb;" \ - " bootz ${loadaddr} - ${fdt_addr}\0" \ + " nand read ${fdt_addr_r} dtb;" \ + " bootz ${loadaddr} - ${fdt_addr_r}\0" \ "nandramboot=echo Booting RAMdisk from nand ...; " \ " nand read ${ramdisk_addr_r} fs ${ramdisksize};" \ " nand read ${loadaddr} kernel ${kernelsize};" \ @@ -88,8 +88,8 @@ "fi; " \ "${get_cmd} ${image}; " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ - "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ - "bootz ${loadaddr} - ${fdt_addr}; " \ + "if ${get_cmd} ${fdt_addr_r} ${fdt_file}; then " \ + "bootz ${loadaddr} - ${fdt_addr_r}; " \ "else " \ "if test ${boot_fdt} = try; then " \ "bootz; " \ -- cgit v1.2.3