From 86d759ea3c017a9c4549066a7b73d5e644f3d538 Mon Sep 17 00:00:00 2001 From: Lukasz Majewski Date: Fri, 11 May 2018 16:51:01 +0200 Subject: display5: config: Add "factory" (1MiB) SPI-NOR partition in u-boot To test if this partition is present - one needs to write: display5 > sf probe; mtdparts display5 > sf erase factory +0x100000 Signed-off-by: Lukasz Majewski --- configs/display5_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configs') diff --git a/configs/display5_defconfig b/configs/display5_defconfig index 4db8a2bfb9..ee0947fbc1 100644 --- a/configs/display5_defconfig +++ b/configs/display5_defconfig @@ -48,7 +48,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nor0=02008000.spi.1" -CONFIG_MTDPARTS_DEFAULT="mtdparts=02008000.spi.1:128k(SPL),1m(u-boot),64k(env1),64k(env2),8m(lin-recovery),4m(swu-kernel),8m(swu-initramfs),-(reserved)" +CONFIG_MTDPARTS_DEFAULT="mtdparts=02008000.spi.1:128k(SPL),1m(u-boot),64k(env1),64k(env2),8m(lin-recovery),4m(swu-kernel),8m(swu-initramfs),1m(factory),-(reserved)" CONFIG_EFI_PARTITION=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y -- cgit v1.2.3 From b78e9c4f1e6442d33c48eec482022d8f13f7112a Mon Sep 17 00:00:00 2001 From: Lukasz Majewski Date: Fri, 11 May 2018 16:51:05 +0200 Subject: display5: config: Remove support for Linux initramfs recovery image boot This is a prerequisite patch to combine SWUpdate and Linux recovery initramfs images. It removes the support for it. Signed-off-by: Lukasz Majewski --- configs/display5_defconfig | 2 +- configs/display5_factory_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'configs') diff --git a/configs/display5_defconfig b/configs/display5_defconfig index ee0947fbc1..196b20240c 100644 --- a/configs/display5_defconfig +++ b/configs/display5_defconfig @@ -48,7 +48,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nor0=02008000.spi.1" -CONFIG_MTDPARTS_DEFAULT="mtdparts=02008000.spi.1:128k(SPL),1m(u-boot),64k(env1),64k(env2),8m(lin-recovery),4m(swu-kernel),8m(swu-initramfs),1m(factory),-(reserved)" +CONFIG_MTDPARTS_DEFAULT="mtdparts=02008000.spi.1:128k(SPL),1m(u-boot),64k(env1),64k(env2),4m(swu-kernel),8m(swu-initramfs),1m(factory),-(reserved)" CONFIG_EFI_PARTITION=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y diff --git a/configs/display5_factory_defconfig b/configs/display5_factory_defconfig index 10b025ce04..e1b5334921 100644 --- a/configs/display5_factory_defconfig +++ b/configs/display5_factory_defconfig @@ -53,7 +53,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nor0=02008000.spi.1" -CONFIG_MTDPARTS_DEFAULT="mtdparts=02008000.spi.1:128k(SPL),1m(u-boot),64k(env1),64k(env2),8m(lin-recovery),4m(swu-kernel),8m(swu-initramfs),-(reserved)" +CONFIG_MTDPARTS_DEFAULT="mtdparts=02008000.spi.1:128k(SPL),1m(u-boot),64k(env1),64k(env2),4m(swu-kernel),8m(swu-initramfs),-(reserved)" # CONFIG_SPL_EFI_PARTITION is not set CONFIG_PARTITION_TYPE_GUID=y CONFIG_ENV_IS_IN_SPI_FLASH=y -- cgit v1.2.3 From 1fa328f73a6b4f69f8d3132884f797b15bb23bbd Mon Sep 17 00:00:00 2001 From: Lukasz Majewski Date: Fri, 11 May 2018 16:51:06 +0200 Subject: display5: config: Update SPI-NOR partition for larger swupdate-initramfs The SPI-NOR partition information has been updated to store swupdate-kernel-FIT just after envs as well as two times larger swupdate-initramfs image. Signed-off-by: Lukasz Majewski --- configs/display5_defconfig | 2 +- configs/display5_factory_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'configs') diff --git a/configs/display5_defconfig b/configs/display5_defconfig index 196b20240c..04671abfeb 100644 --- a/configs/display5_defconfig +++ b/configs/display5_defconfig @@ -48,7 +48,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nor0=02008000.spi.1" -CONFIG_MTDPARTS_DEFAULT="mtdparts=02008000.spi.1:128k(SPL),1m(u-boot),64k(env1),64k(env2),4m(swu-kernel),8m(swu-initramfs),1m(factory),-(reserved)" +CONFIG_MTDPARTS_DEFAULT="mtdparts=02008000.spi.1:128k(SPL),1m(u-boot),64k(env1),64k(env2),4m(swu-kernel),16m(swu-initramfs),1m(factory),-(reserved)" CONFIG_EFI_PARTITION=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y diff --git a/configs/display5_factory_defconfig b/configs/display5_factory_defconfig index e1b5334921..7b3684e6d5 100644 --- a/configs/display5_factory_defconfig +++ b/configs/display5_factory_defconfig @@ -53,7 +53,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nor0=02008000.spi.1" -CONFIG_MTDPARTS_DEFAULT="mtdparts=02008000.spi.1:128k(SPL),1m(u-boot),64k(env1),64k(env2),4m(swu-kernel),8m(swu-initramfs),-(reserved)" +CONFIG_MTDPARTS_DEFAULT="mtdparts=02008000.spi.1:128k(SPL),1m(u-boot),64k(env1),64k(env2),4m(swu-kernel),16m(swu-initramfs),-(reserved)" # CONFIG_SPL_EFI_PARTITION is not set CONFIG_PARTITION_TYPE_GUID=y CONFIG_ENV_IS_IN_SPI_FLASH=y -- cgit v1.2.3 From cf74e0a96b0f99c4c6025f07549cc51e06a772e0 Mon Sep 17 00:00:00 2001 From: Lukasz Majewski Date: Fri, 11 May 2018 16:51:07 +0200 Subject: display5: config: factory: Extend mtdparts to support LEG factory partition This special partition has been added solely for production purpose. Signed-off-by: Lukasz Majewski --- configs/display5_factory_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configs') diff --git a/configs/display5_factory_defconfig b/configs/display5_factory_defconfig index 7b3684e6d5..e23948b932 100644 --- a/configs/display5_factory_defconfig +++ b/configs/display5_factory_defconfig @@ -53,7 +53,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nor0=02008000.spi.1" -CONFIG_MTDPARTS_DEFAULT="mtdparts=02008000.spi.1:128k(SPL),1m(u-boot),64k(env1),64k(env2),4m(swu-kernel),16m(swu-initramfs),-(reserved)" +CONFIG_MTDPARTS_DEFAULT="mtdparts=02008000.spi.1:128k(SPL),1m(u-boot),64k(env1),64k(env2),4m(swu-kernel),16m(swu-initramfs),1m(factory),-(reserved)" # CONFIG_SPL_EFI_PARTITION is not set CONFIG_PARTITION_TYPE_GUID=y CONFIG_ENV_IS_IN_SPI_FLASH=y -- cgit v1.2.3 From 76d1d169f302b533249aa1fb84b765af0722a629 Mon Sep 17 00:00:00 2001 From: Lukasz Majewski Date: Fri, 11 May 2018 16:51:09 +0200 Subject: display5: wdt: Enable WDT support (both SPL and u-boot) Test case: The fitImage gets corrupted: truncate -c -s 3M fitImage run tftp_mmc_fitImg setenv boot_os y reset [board shall hang in SPL with "Trying to boot from MMC1" information] Then after X seconds WDT is causing board to reset. After N boot attempts we enter recovery mode. Signed-off-by: Lukasz Majewski --- configs/display5_defconfig | 1 + configs/display5_factory_defconfig | 1 + 2 files changed, 2 insertions(+) (limited to 'configs') diff --git a/configs/display5_defconfig b/configs/display5_defconfig index 04671abfeb..aaf8529628 100644 --- a/configs/display5_defconfig +++ b/configs/display5_defconfig @@ -10,6 +10,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y +CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-display5" CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y diff --git a/configs/display5_factory_defconfig b/configs/display5_factory_defconfig index e23948b932..14df849fb7 100644 --- a/configs/display5_factory_defconfig +++ b/configs/display5_factory_defconfig @@ -9,6 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y +CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q" -- cgit v1.2.3 From ea4584d73d731c49cc838cae3955a2ef92d5eff7 Mon Sep 17 00:00:00 2001 From: Lukasz Majewski Date: Fri, 11 May 2018 16:51:13 +0200 Subject: display5: ddr: Enable support for DDR3 auto calibration This code performs DDR3 memory calibration for display5 board. Signed-off-by: Lukasz Majewski --- configs/display5_defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'configs') diff --git a/configs/display5_defconfig b/configs/display5_defconfig index aaf8529628..6ae6d05659 100644 --- a/configs/display5_defconfig +++ b/configs/display5_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_MX6_DDRCAL=y CONFIG_TARGET_DISPLAY5=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y -- cgit v1.2.3 From bfb504bc7efb0bae6f0f8e865f79062d5ed6b014 Mon Sep 17 00:00:00 2001 From: Lukasz Majewski Date: Fri, 11 May 2018 16:51:17 +0200 Subject: display5: display5_defconfig: Enable support for gpt command (CMD_GPT) in production u-boot After this change one can run 'gpt' command on production u-boot. Signed-off-by: Lukasz Majewski --- configs/display5_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configs') diff --git a/configs/display5_defconfig b/configs/display5_defconfig index 6ae6d05659..f51fbd4aa5 100644 --- a/configs/display5_defconfig +++ b/configs/display5_defconfig @@ -34,6 +34,7 @@ CONFIG_CMD_ASKENV=y CONFIG_CRC32_VERIFY=y CONFIG_CMD_EEPROM=y CONFIG_CMD_GPIO=y +CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_PART=y @@ -51,7 +52,6 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nor0=02008000.spi.1" CONFIG_MTDPARTS_DEFAULT="mtdparts=02008000.spi.1:128k(SPL),1m(u-boot),64k(env1),64k(env2),4m(swu-kernel),16m(swu-initramfs),1m(factory),-(reserved)" -CONFIG_EFI_PARTITION=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_SPI_FLASH=y -- cgit v1.2.3 From 76881bbf40dd98ed5d4e42524e6562483f965651 Mon Sep 17 00:00:00 2001 From: Lukasz Majewski Date: Sun, 20 May 2018 08:33:19 +0200 Subject: config: Update defconfig for imx53 K+P boards This commit updates the defconfig for the HSC and DDC boards. Signed-off-by: Lukasz Majewski --- configs/kp_imx53_defconfig | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'configs') diff --git a/configs/kp_imx53_defconfig b/configs/kp_imx53_defconfig index 451b48d3c4..d1b533141a 100644 --- a/configs/kp_imx53_defconfig +++ b/configs/kp_imx53_defconfig @@ -6,10 +6,14 @@ CONFIG_TARGET_KP_IMX53=y CONFIG_DEFAULT_DEVICE_TREE="imx53-kp" CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53loco/imximage.cfg" +CONFIG_SILENT_CONSOLE=y +# CONFIG_SILENT_CONSOLE_UPDATE_ON_SET is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_SUPPORT_RAW_INITRD=y CONFIG_HUSH_PARSER=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_STOP_STR="." CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y @@ -18,6 +22,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_PMIC=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y @@ -26,6 +31,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y CONFIG_I2C_DEFAULT_BUS_NUMBER=0x1 CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=1 CONFIG_PHY_SMSC=y CONFIG_FEC_MXC=y CONFIG_PINCTRL=y -- cgit v1.2.3 From 18053a8505d353336ae784d70a52e1f96f8bae7e Mon Sep 17 00:00:00 2001 From: Jagan Teki Date: Mon, 18 Jun 2018 11:12:19 +0530 Subject: imx6ul: geam: Fix fdt_file mismatch fdt_file is looking for imx6ul-geam-kit.dtb but Linux has imx6ul-geam.dtb, since Linux skipped -kit on file name by below commit. "ARM: dts: imx6ul-geam: Skip suffix -kit from dts name" (sha1: 182de5ebce71e469cfa686fcdf08c9cbe11ece97) So, due to this mismatch U-Boot failed to pick the proper dtb which eventually break the Linux boot. This patch fixed this mismatch by - renaming dts files - update config option to use new dtb file - update fdt_file to new dtb file name Signed-off-by: Jagan Teki Reviewed-by: Fabio Estevam --- configs/imx6ul_geam_mmc_defconfig | 2 +- configs/imx6ul_geam_nand_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'configs') diff --git a/configs/imx6ul_geam_mmc_defconfig b/configs/imx6ul_geam_mmc_defconfig index 4ae09fff11..6cd1bfd15e 100644 --- a/configs/imx6ul_geam_mmc_defconfig +++ b/configs/imx6ul_geam_mmc_defconfig @@ -10,7 +10,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y CONFIG_SPL_LIBDISK_SUPPORT=y # CONFIG_CMD_BMODE is not set -CONFIG_DEFAULT_DEVICE_TREE="imx6ul-geam-kit" +CONFIG_DEFAULT_DEVICE_TREE="imx6ul-geam" CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y diff --git a/configs/imx6ul_geam_nand_defconfig b/configs/imx6ul_geam_nand_defconfig index e8f9cb4478..d3364a790f 100644 --- a/configs/imx6ul_geam_nand_defconfig +++ b/configs/imx6ul_geam_nand_defconfig @@ -8,7 +8,7 @@ CONFIG_TARGET_MX6UL_ENGICAM=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y # CONFIG_CMD_BMODE is not set -CONFIG_DEFAULT_DEVICE_TREE="imx6ul-geam-kit" +CONFIG_DEFAULT_DEVICE_TREE="imx6ul-geam" CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -- cgit v1.2.3 From 02bbe2aaa28fe2dde79b6d0e9ed5ed8963f79a8b Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 18 Jun 2018 12:57:35 -0300 Subject: cl-som-imx7: Remove CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y Since commit 1da1938d57b3 ("spl: Add default values for ARCH_MX7") CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is selected by default on i.MX7 platforms, so remove it from the board defconfig. Signed-off-by: Fabio Estevam --- configs/cl-som-imx7_defconfig | 1 - 1 file changed, 1 deletion(-) (limited to 'configs') diff --git a/configs/cl-som-imx7_defconfig b/configs/cl-som-imx7_defconfig index 6d403eed7a..38be7dbe7e 100644 --- a/configs/cl-som-imx7_defconfig +++ b/configs/cl-som-imx7_defconfig @@ -17,7 +17,6 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_SPI_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_SPL_BOARD_INIT=y -CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x80 CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_SPI_LOAD=y -- cgit v1.2.3