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>

diff --cc arch/arm/mach-tegra/board.c
Simple merge

diff --cc arch/arm/mach-tegra/board2.c
Simple merge

diff --cc board/nvidia/p3450-0000/p3450-0000.env
index 0000000000000000000000000000000000000000,a7d7ab3c43bd5290fc65c23a7a8e9ba349da5f30..f21d2fc463e264390e1a28131dc436304d660f74
mode 000000,100644..100644
--- /dev/null
--- 2/board/nvidia/p3450-0000/p3450-0000.env
+++ b/board/nvidia/p3450-0000/p3450-0000.env
@@@ -1,0 -1,7 +1,7 @@@
 -preboot=if test -e mmc 1:1 /u-boot-preboot.scr; then 
+ /* 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
+       load mmc 1:1 ${scriptaddr} /u-boot-preboot.scr;
+               source ${scriptaddr};
+       fi

diff --cc board/toradex/apalis-tk1/apalis-tk1.env
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..9c2d9a92f0bdff4e163c35d3a6a69127008db616
new file mode 100644 (file)
--- /dev/null
--- /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 0000000000000000000000000000000000000000,2e5161e3b8b505ebafc25d9d15cdefe8293c7e17..a8f2904bcd7ecf6b455ea904a33223f495f4c2c8
mode 000000,100644..100644
--- /dev/null
--- 2/board/toradex/apalis_t30/apalis_t30.env
+++ b/board/toradex/apalis_t30/apalis_t30.env
@@@ -1,0 -1,9 +1,9 @@@
 -set_blkcnt=setexpr blkcnt ${filesize} + 0x1ff && 
+ uboot_hwpart=1
+ uboot_blk=0
+ 
 -update_uboot=run set_blkcnt && mmc dev 0 ${uboot_hwpart} && 
++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}
+ 
+ boot_script_dhcp=boot.scr

diff --cc board/toradex/colibri_t30/colibri_t30.env
index 0000000000000000000000000000000000000000,2e5161e3b8b505ebafc25d9d15cdefe8293c7e17..a8f2904bcd7ecf6b455ea904a33223f495f4c2c8
mode 000000,100644..100644
--- /dev/null
--- 2/board/toradex/colibri_t30/colibri_t30.env
+++ b/board/toradex/colibri_t30/colibri_t30.env
@@@ -1,0 -1,9 +1,9 @@@
 -set_blkcnt=setexpr blkcnt ${filesize} + 0x1ff && 
+ uboot_hwpart=1
+ uboot_blk=0
+ 
 -update_uboot=run set_blkcnt && mmc dev 0 ${uboot_hwpart} && 
++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}
+ 
+ boot_script_dhcp=boot.scr

diff --cc disk/part_efi.c
index 580821a6ee9c6a5bd755d6b960574c989d1708e8,12f28aec92c5c792188041e748597c80d552aef1..7f04c6ecd69ea7f768de6d15e9b1b6694f10fa56
--- 1/disk/part_efi.c
--- 2/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;

diff --cc drivers/gpio/tegra_gpio.c
Simple merge

diff --cc drivers/video/Makefile
Simple merge