From: Tom Rini <trini@konsulko.com>
Date: Sun, 13 Oct 2024 16:19:05 +0000 (-0600)
Subject: Merge branch 'staging' of https://source.denx.de/u-boot/custodians/u-boot-tegra
X-Git-Url: http://git.dujemihanovic.xyz/img/sics.gif?a=commitdiff_plain;h=82686e678e1587ddbd9570f82c58cdc3aecf2dbe;p=u-boot.git

Merge branch 'staging' of https://source.denx.de/u-boot/custodians/u-boot-tegra

Assorted Tegra enhancements. Merged with the recent XPL_BUILD changes,
resolve some whitespace issues and fix the name of the new apalis-tk1
env file by Tom.

Signed-off-by: Tom Rini <trini@konsulko.com>
---

82686e678e1587ddbd9570f82c58cdc3aecf2dbe
diff --cc board/nvidia/p3450-0000/p3450-0000.env
index 0000000000,a7d7ab3c43..f21d2fc463
mode 000000,100644..100644
--- a/board/nvidia/p3450-0000/p3450-0000.env
+++ b/board/nvidia/p3450-0000/p3450-0000.env
@@@ -1,0 -1,7 +1,7 @@@
+ /* Only MMC/PXE/DHCP for now, add USB back in later when supported */
+ boot_targets=mmc1 mmc0 pxe dhcp
+ 
 -preboot=if test -e mmc 1:1 /u-boot-preboot.scr; then 
++preboot=if test -e mmc 1:1 /u-boot-preboot.scr; then
+ 	load mmc 1:1 ${scriptaddr} /u-boot-preboot.scr;
+ 		source ${scriptaddr};
+ 	fi
diff --cc board/toradex/apalis-tk1/apalis-tk1.env
index 0000000000,0000000000..9c2d9a92f0
new file mode 100644
--- /dev/null
+++ b/board/toradex/apalis-tk1/apalis-tk1.env
@@@ -1,0 -1,0 +1,45 @@@
++/*
++ * Custom Boot configuration:
++ * 1. 8bit SD port (MMC1)
++ * 2. 4bit SD port (MMC2)
++ * 3. eMMC (MMC0)
++ */
++boot_targets=mmc1 mmc2 mmc0 usb pxe dhcp
++
++boot_file=zImage
++boot_script_dhcp=boot.scr
++console=ttyS0
++defargs=lp0_vec=2064@0xf46ff000 core_edp_mv=1150 core_edp_ma=4000
++	usb_port_owner_info=2 lane_owner_info=6 emc_max_dvfs=0
++	user_debug=30 pcie_aspm=off
++dfu_alt_info=apalis-tk1.img raw 0x0 0x500 mmcpart 1;
++	boot part 0 1 mmcpart 0;
++	rootfs part 0 2 mmcpart 0;
++	zImage fat 0 1 mmcpart 0;
++	tegra124-apalis-eval.dtb fat 0 1 mmcpart 0
++fdt_board=eval
++fdt_fixup=;
++fdt_module=apalis-v1.2
++uboot_hwpart=1
++uboot_blk=0
++set_blkcnt=setexpr blkcnt ${filesize} + 0x1ff &&
++	setexpr blkcnt ${blkcnt} / 0x200
++update_uboot=run set_blkcnt && mmc dev 0 ${uboot_hwpart} &&
++	mmc write ${loadaddr} ${uboot_blk} ${blkcnt}
++setethupdate=if env exists ethaddr; then; else setenv ethaddr
++	00:14:2d:00:00:00; fi; pci enum && tftpboot ${loadaddr}
++	flash_eth.img && source ${loadaddr}
++setsdupdate=setenv interface mmc; setenv drive 1; mmc rescan;
++	load ${interface} ${drive}:1 ${loadaddr} flash_blk.img
++	|| setenv drive 2; mmc rescan; load ${interface} ${drive}:1
++	${loadaddr} flash_blk.img &&
++	source ${loadaddr}
++setup=setenv setupargs igb_mac=${ethaddr}
++	consoleblank=0 no_console_suspend=1 console=tty1
++	console=${console},${baudrate}n8 debug_uartport=lsport,0
++	${memargs}
++setupdate=run setsdupdate || run setusbupdate || run setethupdate
++setusbupdate=usb start && setenv interface usb; setenv drive 0;
++	load ${interface} ${drive}:1 ${loadaddr} flash_blk.img &&
++	source ${loadaddr}
++vidargs=fbcon=map:1
diff --cc board/toradex/apalis_t30/apalis_t30.env
index 0000000000,2e5161e3b8..a8f2904bcd
mode 000000,100644..100644
--- a/board/toradex/apalis_t30/apalis_t30.env
+++ b/board/toradex/apalis_t30/apalis_t30.env
@@@ -1,0 -1,9 +1,9 @@@
+ uboot_hwpart=1
+ uboot_blk=0
+ 
 -set_blkcnt=setexpr blkcnt ${filesize} + 0x1ff && 
++set_blkcnt=setexpr blkcnt ${filesize} + 0x1ff &&
+ 	setexpr blkcnt ${blkcnt} / 0x200
 -update_uboot=run set_blkcnt && mmc dev 0 ${uboot_hwpart} && 
++update_uboot=run set_blkcnt && mmc dev 0 ${uboot_hwpart} &&
+ 	mmc write ${loadaddr} ${uboot_blk} ${blkcnt}
+ 
+ boot_script_dhcp=boot.scr
diff --cc board/toradex/colibri_t30/colibri_t30.env
index 0000000000,2e5161e3b8..a8f2904bcd
mode 000000,100644..100644
--- a/board/toradex/colibri_t30/colibri_t30.env
+++ b/board/toradex/colibri_t30/colibri_t30.env
@@@ -1,0 -1,9 +1,9 @@@
+ uboot_hwpart=1
+ uboot_blk=0
+ 
 -set_blkcnt=setexpr blkcnt ${filesize} + 0x1ff && 
++set_blkcnt=setexpr blkcnt ${filesize} + 0x1ff &&
+ 	setexpr blkcnt ${blkcnt} / 0x200
 -update_uboot=run set_blkcnt && mmc dev 0 ${uboot_hwpart} && 
++update_uboot=run set_blkcnt && mmc dev 0 ${uboot_hwpart} &&
+ 	mmc write ${loadaddr} ${uboot_blk} ${blkcnt}
+ 
+ boot_script_dhcp=boot.scr
diff --cc disk/part_efi.c
index 580821a6ee,12f28aec92..7f04c6ecd6
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@@ -318,6 -318,19 +318,17 @@@ static int part_test_efi(struct blk_des
  	/* Read legacy MBR from block 0 and validate it */
  	if ((blk_dread(desc, 0, 1, (ulong *)legacymbr) != 1)
  		|| (is_pmbr_valid(legacymbr) != 1)) {
 -
+ 		/*
+ 		 * TegraPT is compatible with EFI part, but it
+ 		 * cannot pass the Protective MBR check. Skip it
+ 		 * if CONFIG_TEGRA_PARTITION is enabled and the
+ 		 * device in question is eMMC.
+ 		 */
+ 		if (IS_ENABLED(CONFIG_TEGRA_PARTITION))
+ 			if (!is_pmbr_valid(legacymbr) &&
+ 			    desc->uclass_id == UCLASS_MMC &&
+ 			    !desc->devnum)
+ 				return 0;
 -
  		return -1;
  	}
  	return 0;