Merge branch 'v2021.10/master' into v2021.10/maint

hpalacio · hpalacio · commit 4f6889331352 · 2022-11-22T11:04:42.000+01:00
Signed-off-by: Hector Palacios &lt;hector.palacios@digi.com&gt;
diff --git a/arch/arm/mach-stm32mp/Kconfig.13x b/arch/arm/mach-stm32mp/Kconfig.13x
@@ -67,6 +67,6 @@ config DEBUG_UART_CLOCK
 endif
 
 source "board/st/stm32mp1/Kconfig"
-source "board/digi/ccmp13_dvk/Kconfig"
+source "board/digi/ccmp13-dvk/Kconfig"
 
 endif
diff --git a/arch/arm/mach-stm32mp/Kconfig.15x b/arch/arm/mach-stm32mp/Kconfig.15x
@@ -143,7 +143,7 @@ endif
 
 source "board/st/stm32mp1/Kconfig"
 source "board/dhelectronics/dh_stm32mp1/Kconfig"
-source "board/digi/ccmp15_dvk/Kconfig"
+source "board/digi/ccmp15-dvk/Kconfig"
 source "board/engicam/stm32mp1/Kconfig"
 
 endif
diff --git a/board/digi/ccmp1/ccmp1.c b/board/digi/ccmp1/ccmp1.c
@@ -6,6 +6,7 @@
 #include <env.h>
 #include <env_internal.h>
 #include <nand.h>
+#include <asm/arch/sys_proto.h>
 
 #include "../common/helper.h"
 #include "../common/hwid.h"
@@ -154,3 +155,76 @@ void board_update_hwid(bool is_fuse)
 
 	som_default_environment();
 }
+
+void print_som_info(void)
+{
+	if (my_hwid.variant)
+		printf("%s SOM variant 0x%02X: ", CONFIG_SOM_DESCRIPTION,
+		       my_hwid.variant);
+	else
+		return;
+
+	if (my_hwid.ram) {
+		print_size(gd->ram_size, " DDR3");
+		if (my_hwid.wifi)
+			printf(", Wi-Fi");
+		if (my_hwid.bt)
+			printf(", Bluetooth");
+		if (my_hwid.mca)
+			printf(", MCA");
+		if (my_hwid.crypto)
+			printf(", Crypto-auth");
+	}
+	printf("\n");
+}
+
+void print_bootinfo(void)
+{
+	u32 bootmode = get_bootmode();
+
+	puts("Boot:  ");
+	switch (bootmode & TAMP_BOOT_DEVICE_MASK) {
+		case BOOT_FLASH_SD:
+		case BOOT_FLASH_SD_1:
+		case BOOT_FLASH_SD_2:
+		case BOOT_FLASH_SD_3:
+			puts("SD\n");
+			break;
+		case BOOT_FLASH_EMMC:
+		case BOOT_FLASH_EMMC_1:
+		case BOOT_FLASH_EMMC_2:
+		case BOOT_FLASH_EMMC_3:
+			puts("MMC\n");
+			break;
+		case BOOT_FLASH_NAND:
+		case BOOT_FLASH_NAND_FMC:
+			puts("NAND\n");
+			break;
+		case BOOT_FLASH_NOR:
+		case BOOT_FLASH_NOR_QSPI:
+			puts("NOR\n");
+			break;
+		case BOOT_SERIAL_UART:
+		case BOOT_SERIAL_UART_1:
+		case BOOT_SERIAL_UART_2:
+		case BOOT_SERIAL_UART_3:
+		case BOOT_SERIAL_UART_4:
+		case BOOT_SERIAL_UART_5:
+		case BOOT_SERIAL_UART_6:
+		case BOOT_SERIAL_UART_7:
+		case BOOT_SERIAL_UART_8:
+			puts("SERIAL\n");
+			break;
+		case BOOT_SERIAL_USB:
+		case BOOT_SERIAL_USB_OTG:
+			puts("USB\n");
+			break;
+		case BOOT_FLASH_SPINAND:
+		case BOOT_FLASH_SPINAND_1:
+			puts("SPI-NAND\n");
+			break;
+		default:
+			printf("Unknown device %u\n", bootmode);
+			break;
+	}
+}
diff --git a/board/digi/ccmp1/ccmp1.h b/board/digi/ccmp1/ccmp1.h
@@ -11,5 +11,7 @@
 int ccmp1_init(void);
 void fdt_fixup_ccmp1(void *fdt);
 void som_default_environment(void);
+void print_som_info(void);
+void print_bootinfo(void);
 
 #endif  /* CCMP1_H */
diff --git a/board/digi/ccmp13-dvk/Kconfig b/board/digi/ccmp13-dvk/Kconfig
@@ -1,13 +1,13 @@
 if TARGET_CCMP13_DVK
 
 config SYS_BOARD
-	default "ccmp13_dvk"
+	default "ccmp13-dvk"
 
 config SYS_VENDOR
 	default "digi"
 
 config SYS_CONFIG_NAME
-	default "ccmp13_dvk"
+	default "ccmp13-dvk"
 
 source "board/st/common/Kconfig"
 source "board/digi/common/Kconfig"
diff --git a/board/digi/ccmp13-dvk/Makefile b/board/digi/ccmp13-dvk/Makefile
@@ -7,7 +7,7 @@
 ifdef CONFIG_SPL_BUILD
 obj-y += spl.o
 else
-obj-y += ccmp13_dvk.o
+obj-y += ccmp13-dvk.o
 endif
 
 ifdef CONFIG_HAS_HWID
diff --git a/board/digi/ccmp13-dvk/ccmp13-dvk.c b/board/digi/ccmp13-dvk/ccmp13-dvk.c
@@ -102,24 +102,10 @@ int board_early_init_f(void)
 
 int checkboard(void)
 {
-	char *mode;
-	const char *fdt_compat;
-	int fdt_compat_len;
-
-	if (IS_ENABLED(CONFIG_TFABOOT)) {
-		if (IS_ENABLED(CONFIG_STM32MP15x_STM32IMAGE))
-			mode = "trusted - stm32image";
-		else
-			mode = "trusted";
-	} else {
-		mode = "basic";
-	}
-
-	fdt_compat = fdt_getprop(gd->fdt_blob, 0, "compatible",
-				 &fdt_compat_len);
-
-	log_info("Board: %s in %s mode (%s)\n", CONFIG_SYS_BOARD, mode,
-		 fdt_compat && fdt_compat_len ? fdt_compat : "");
+	board_version = get_carrierboard_version();
+	print_som_info();
+	print_carrierboard_info();
+	print_bootinfo();
 
 	return 0;
 }
diff --git a/board/digi/ccmp13-dvk/spl.c b/board/digi/ccmp13-dvk/spl.c
diff --git a/board/digi/ccmp15-dvk/Kconfig b/board/digi/ccmp15-dvk/Kconfig
@@ -4,12 +4,12 @@ source "board/st/common/Kconfig"
 source "board/digi/common/Kconfig"
 
 config SYS_BOARD
-	default "ccmp15_dvk"
+	default "ccmp15-dvk"
 
 config SYS_VENDOR
 	default "digi"
 
 config SYS_CONFIG_NAME
-	default "ccmp15_dvk"
+	default "ccmp15-dvk"
 
 endif
diff --git a/board/digi/ccmp15-dvk/Makefile b/board/digi/ccmp15-dvk/Makefile
@@ -7,7 +7,7 @@
 ifdef CONFIG_SPL_BUILD
 obj-y += spl.o
 else
-obj-y += ccmp15_dvk.o
+obj-y += ccmp15-dvk.o
 endif
 
 ifdef CONFIG_HAS_HWID
diff --git a/board/digi/ccmp15-dvk/ccmp15-dvk.c b/board/digi/ccmp15-dvk/ccmp15-dvk.c
@@ -104,24 +104,10 @@ int board_early_init_f(void)
 
 int checkboard(void)
 {
-	char *mode;
-	const char *fdt_compat;
-	int fdt_compat_len;
-
-	if (IS_ENABLED(CONFIG_TFABOOT)) {
-		if (IS_ENABLED(CONFIG_STM32MP15x_STM32IMAGE))
-			mode = "trusted - stm32image";
-		else
-			mode = "trusted";
-	} else {
-		mode = "basic";
-	}
-
-	fdt_compat = fdt_getprop(gd->fdt_blob, 0, "compatible",
-				 &fdt_compat_len);
-
-	log_info("Board: %s in %s mode (%s)\n", CONFIG_SYS_BOARD, mode,
-		 fdt_compat && fdt_compat_len ? fdt_compat : "");
+	board_version = get_carrierboard_version();
+	print_som_info();
+	print_carrierboard_info();
+	print_bootinfo();
 
 	return 0;
 }
diff --git a/board/digi/ccmp15-dvk/spl.c b/board/digi/ccmp15-dvk/spl.c
diff --git a/board/digi/common/Kconfig b/board/digi/common/Kconfig
@@ -132,7 +132,7 @@ if HAS_OTP_LOCK_FUSE
 config HWID_LOCK_FUSE
 	hex "HWID lock fuse mask"
 	default 0x100 if CC6UL
-	default 0x100000 if CC8M
+	default 0x4000 if CC8M
 endif
 
 endif
diff --git a/cmd/exit.c b/cmd/exit.c
@@ -10,10 +10,13 @@
 static int do_exit(struct cmd_tbl *cmdtp, int flag, int argc,
 		   char *const argv[])
 {
+	int r;
+
+	r = 0;
 	if (argc > 1)
-		return dectoul(argv[1], NULL);
+		r = simple_strtoul(argv[1], NULL, 10);
 
-	return 0;
+	return -r - 2;
 }
 
 U_BOOT_CMD(
diff --git a/cmd/ubi.c b/cmd/ubi.c
@@ -388,7 +388,8 @@ int ubi_volume_read(char *volume, char *buf, size_t size)
 		size = vol->used_bytes;
 	}
 
-	printf("Read %zu bytes from volume %s to %p\n", size, volume, buf);
+	if (strcmp(volume, CONFIG_ENV_UBI_VOLUME) && strcmp(volume, CONFIG_ENV_UBI_VOLUME_REDUND))
+		printf("Read %zu bytes from volume %s to %p\n", size, volume, buf);
 
 	if (vol->corrupted)
 		printf("read from corrupted volume %d", vol->vol_id);
diff --git a/configs/ccmp13-dvk_defconfig b/configs/ccmp13-dvk_defconfig
@@ -11,6 +11,9 @@ CONFIG_CMD_DBOOT=y
 CONFIG_CMD_UPDATE=y
 CONFIG_DIGI_UBI=y
 CONFIG_HAS_HWID=y
+CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_BOOTLIMIT=3
+CONFIG_BOOTCOUNT_ENV=y
 CONFIG_STM32MP13x=y
 CONFIG_DDR_CACHEABLE_SIZE=0x10000000
 CONFIG_CMD_STM32KEY=y
@@ -24,6 +27,7 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=1
 CONFIG_DEFAULT_FDT_FILE="ccmp133-dvk.dtb"
+CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_FDT_SIMPLEFB=y
 CONFIG_CMD_ADTIMG=y
 CONFIG_CMD_ERASEENV=y
@@ -68,7 +72,7 @@ CONFIG_CLK_SCMI=y
 CONFIG_SET_DFU_ALT_INFO=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0xC0000000
-CONFIG_FASTBOOT_BUF_SIZE=0x02000000
+CONFIG_FASTBOOT_BUF_SIZE=0x0F000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_UUU_SUPPORT=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=1
diff --git a/configs/ccmp15-dvk_defconfig b/configs/ccmp15-dvk_defconfig
@@ -13,6 +13,9 @@ CONFIG_CMD_DBOOT=y
 CONFIG_CMD_UPDATE=y
 CONFIG_DIGI_UBI=y
 CONFIG_HAS_HWID=y
+CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_BOOTLIMIT=3
+CONFIG_BOOTCOUNT_ENV=y
 CONFIG_DDR_CACHEABLE_SIZE=0x10000000
 CONFIG_CMD_STM32KEY=y
 CONFIG_MTDPARTS_NAND0_BOOT="512k(fsbl1),512k(fsbl2),512k(metadata1),512k(metadata2),3m(fip-a),3m(fip-b)"
@@ -25,6 +28,7 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=1
 CONFIG_DEFAULT_FDT_FILE="ccmp157-dvk.dtb"
+CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_FDT_SIMPLEFB=y
 CONFIG_CMD_ADTIMG=y
 CONFIG_CMD_ERASEENV=y
@@ -71,7 +75,7 @@ CONFIG_CLK_SCMI=y
 CONFIG_SET_DFU_ALT_INFO=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0xC0000000
-CONFIG_FASTBOOT_BUF_SIZE=0x02000000
+CONFIG_FASTBOOT_BUF_SIZE=0x0F000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_UUU_SUPPORT=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=1
diff --git a/configs/ccmp15-dvk_trusted_defconfig b/configs/ccmp15-dvk_trusted_defconfig
@@ -13,6 +13,9 @@ CONFIG_CMD_DBOOT=y
 CONFIG_CMD_UPDATE=y
 CONFIG_DIGI_UBI=y
 CONFIG_HAS_HWID=y
+CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_BOOTLIMIT=3
+CONFIG_BOOTCOUNT_ENV=y
 CONFIG_DDR_CACHEABLE_SIZE=0x10000000
 CONFIG_CMD_STM32KEY=y
 CONFIG_STM32MP15x_STM32IMAGE=y
@@ -27,6 +30,7 @@ CONFIG_FIT=y
 CONFIG_BOOTDELAY=1
 CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"
 CONFIG_DEFAULT_FDT_FILE="ccmp157-dvk.dtb"
+CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_FDT_SIMPLEFB=y
 CONFIG_CMD_ADTIMG=y
 CONFIG_CMD_ERASEENV=y
@@ -73,7 +77,7 @@ CONFIG_CLK_SCMI=y
 CONFIG_SET_DFU_ALT_INFO=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0xC0000000
-CONFIG_FASTBOOT_BUF_SIZE=0x02000000
+CONFIG_FASTBOOT_BUF_SIZE=0x0F000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_UUU_SUPPORT=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=1
diff --git a/include/configs/ccmp13-dvk.h b/include/configs/ccmp13-dvk.h
@@ -66,9 +66,18 @@
 	"initrd_addr=0xc4400000\0" \
 	"initrd_file=uramdisk.img\0" \
 	"initrd_high=0xffffffff\0" \
+	"install_linux_fw_sd=if load mmc 1 ${loadaddr} install_linux_fw_sd.scr;then " \
+			"source ${loadaddr};" \
+		"fi;\0" \
+	"install_linux_fw_usb=usb start;" \
+		"if load usb 0 ${loadaddr} install_linux_fw_usb.scr;then " \
+			"source ${loadaddr};" \
+		"fi;\0" \
 	"update_addr=" __stringify(CONFIG_DIGI_UPDATE_ADDR) "\0" \
 	"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+	"linux_file=core-image-base-" CONFIG_SYS_BOARD ".boot.ubifs\0" \
 	"recovery_file=recovery.img\0" \
+	"rootfs_file=core-image-base-" CONFIG_SYS_BOARD ".ubifs\0" \
 	"script=boot.scr\0" \
 	"uboot_file=u-boot.imx\0" \
 	"zimage=zImage-" BOARD_DEY_NAME ".bin\0"
@@ -148,13 +157,13 @@
 #define UBIVOLS_256MB			"ubi create " LINUX_PARTITION " 1800000;" \
 					"ubi create " RECOVERY_PARTITION " 2000000;" \
 					"ubi create " ROOTFS_PARTITION " bb00000;" \
-					"ubi create " DATA_PARTITION "500000;" \
+					"ubi create " DATA_PARTITION " 500000;" \
 					"ubi create update;"
 
 #define UBIVOLS_512MB			"ubi create " LINUX_PARTITION " 1800000;" \
 					"ubi create " RECOVERY_PARTITION " 2000000;" \
 					"ubi create " ROOTFS_PARTITION " 10000000;" \
-					"ubi create " DATA_PARTITION "2000000;" \
+					"ubi create " DATA_PARTITION " 2000000;" \
 					"ubi create update;"
 
 #define UBIVOLS_DUALBOOT_256MB		"ubi create " LINUX_A_PARTITION " c00000;" \
diff --git a/include/configs/ccmp15-dvk.h b/include/configs/ccmp15-dvk.h
diff --git a/include/configs/ccmp1_common.h b/include/configs/ccmp1_common.h
