OK, let me retry on u-boot-tegra/master.
-----Original Message-----
From: Svyatoslav Ryhel <clamo...@gmail.com>
Sent: Friday, February 17, 2023 9:07 AM
To: Tom Warren <twar...@nvidia.com>
Cc: u-boot@lists.denx.de
Subject: Re: [PATCH v4 00/16] General Tegra improvements
External email: Use caution opening links or attachments
I was able to git am it on top of u-boot/master without any errors
clamor@xeon:/media/clamor/work/u-boot$ git am bundle-23303-Svyatoslav-16-v4.mbox
Застосування: tegra30: clock: add EXTPERIPH
Застосування: ARM: t20/t30: swap host1x and disp1 clock parents
Застосування: ARM: tegra: clock: add clk_id_to_pll_id helper
Застосування: ARM: tegra: clock: add clock_decode_pair helper
Застосування: ARM: tegra30: add PLLD to pll setup
Застосування: ARM: tegra: Fix Tegra PWM parent clock
Застосування: spi: tegra20_slink: accept any word length
Застосування: ARM: tegra: provide default USB gadget setup
Застосування: ARM: tegra: add late init support
Застосування: ARM: tegra: create common pre-dm i2c write
Застосування: board: tegra124: switch to updated pre-dm i2c write
Застосування: board: tegra30: switch to updated pre-dm i2c write
Застосування: ARM: tegra: expose crypto module for all Tegra SoCs
Застосування: ARM: tegra: crypto: extend crypto functional
Застосування: ARM: tegra30: implement BCT patching
Застосування: ARM: tegra20: implement BCT patching
.git/rebase-apply/patch:249: new blank line at EOF.
+
warning: 1 рядок додав помилки в пробільних символах.
clamor@xeon:/media/clamor/work/u-boot$
пт, 17 лют. 2023 р. о 17:57 Tom Warren <twar...@nvidia.com> пише:
>
> I've got a bundle with your 16 patches, created using PatchWork/U-Boot, and
> the patches are ordered correctly within that bundle. Attached here - see if
> it works for you.
>
> Tom
>
> -----Original Message-----
> From: Svyatoslav Ryhel <clamo...@gmail.com>
> Sent: Friday, February 17, 2023 1:39 AM
> To: Tom Warren <twar...@nvidia.com>
> Cc: u-boot@lists.denx.de
> Subject: Re: [PATCH v4 00/16] General Tegra improvements
>
> External email: Use caution opening links or attachments
>
>
> You have NOT applied patch 13 ARM: tegra: expose crypto module for all Tegra
> SoCs or applied it after patch 14 which brakes order. PTAL.
>
> вт, 14 лют. 2023 р. о 23:45 Tom Warren <twar...@nvidia.com> пише:
> >
> > <reducing audience>
> >
> > Svyatoslav,
> >
> > Taking TOT u-boot-tegra/master, and fast-forwarding to TOT u-boot/master, I
> > then try to apply your 16 patch series and get the following failures
> > (using patch). Note that I retargeted the crypto.c patch by hand to point
> > to tegra20/crypto.c, which I believe one of your patches moves to
> > arch/arm/tegra. PTAL.
> >
> > tom@tom-ThinkPad-T580:~/denx/uboot-tegra$ patch -p1 -i
> > ~/Downloads/bundle-23303-Svyatoslav-16-v4.mbox --dry-run checking
> > file arch/arm/include/asm/arch-tegra30/clock-tables.h
> > checking file arch/arm/mach-tegra/tegra30/clock.c
> > checking file arch/arm/mach-tegra/tegra20/clock.c
> > checking file arch/arm/mach-tegra/tegra30/clock.c
> > checking file arch/arm/include/asm/arch-tegra/clock.h
> > checking file arch/arm/mach-tegra/tegra114/clock.c
> > checking file arch/arm/mach-tegra/tegra124/clock.c
> > checking file arch/arm/mach-tegra/tegra20/clock.c
> > checking file arch/arm/mach-tegra/tegra210/clock.c
> > checking file arch/arm/mach-tegra/tegra30/clock.c
> > checking file arch/arm/include/asm/arch-tegra/clock.h
> > checking file arch/arm/mach-tegra/clock.c checking file
> > arch/arm/mach-tegra/tegra30/clock.c
> > Hunk #1 succeeded at 632 (offset -37 lines).
> > checking file arch/arm/dts/tegra114.dtsi checking file
> > arch/arm/dts/tegra124.dtsi checking file
> > arch/arm/mach-tegra/tegra114/clock.c
> > Hunk #1 succeeded at 745 (offset -37 lines).
> > checking file arch/arm/mach-tegra/tegra124/clock.c
> > Hunk #1 succeeded at 1170 (offset -38 lines).
> > checking file arch/arm/mach-tegra/tegra20/clock.c
> > Hunk #1 succeeded at 767 (offset -37 lines).
> > checking file arch/arm/mach-tegra/tegra210/clock.c
> > Hunk #1 succeeded at 1241 (offset -37 lines).
> > checking file arch/arm/mach-tegra/tegra30/clock.c
> > Hunk #1 succeeded at 806 (offset -78 lines).
> > checking file drivers/pwm/tegra_pwm.c checking file
> > drivers/spi/tegra20_slink.c checking file configs/beaver_defconfig
> > checking file configs/cei-tk1-som_defconfig checking file
> > configs/dalmore_defconfig checking file configs/jetson-tk1_defconfig
> > checking file configs/nyan-big_defconfig checking file
> > configs/p2371-0000_defconfig checking file
> > configs/p2371-2180_defconfig checking file configs/p2571_defconfig
> > checking file configs/p3450-0000_defconfig checking file
> > configs/venice2_defconfig checking file drivers/usb/gadget/Kconfig
> > checking file arch/arm/include/asm/arch-tegra/sys_proto.h
> > checking file arch/arm/mach-tegra/board2.c checking file
> > arch/arm/include/asm/arch-tegra/tegra_i2c.h
> > checking file arch/arm/mach-tegra/cpu.h checking file
> > arch/arm/mach-tegra/tegra124/cpu.c
> > checking file arch/arm/mach-tegra/tegra30/cpu.c checking file
> > board/nvidia/venice2/as3722_init.c
> > checking file board/nvidia/venice2/as3722_init.h
> > checking file board/toradex/apalis-tk1/as3722_init.c
> > checking file board/toradex/apalis-tk1/as3722_init.h
> > checking file arch/arm/mach-tegra/tegra30/Kconfig
> > checking file arch/arm/mach-tegra/tegra30/cpu.c Hunk #1 FAILED at 15.
> > Hunk #2 FAILED at 41.
> > 2 out of 2 hunks FAILED
> > checking file board/avionic-design/tec-ng/Makefile
> > checking file board/avionic-design/tec-ng/tec-ng-spl.c
> > checking file board/nvidia/beaver/Makefile checking file
> > board/nvidia/beaver/beaver-spl.c checking file
> > board/nvidia/cardhu/Makefile checking file
> > board/nvidia/cardhu/cardhu-spl.c checking file
> > board/toradex/apalis_t30/Makefile checking file
> > board/toradex/apalis_t30/apalis_t30-spl.c
> > checking file board/toradex/colibri_t30/Makefile
> > checking file board/toradex/colibri_t30/colibri_t30-spl.c
> > checking file arch/arm/mach-tegra/Kconfig checking file
> > arch/arm/mach-tegra/Makefile checking file
> > arch/arm/mach-tegra/crypto.c (renamed from
> > arch/arm/mach-tegra/tegra20/crypto.c)
> > checking file arch/arm/mach-tegra/crypto.h (renamed from
> > arch/arm/mach-tegra/tegra20/crypto.h)
> > checking file arch/arm/mach-tegra/tegra20/Kconfig
> > checking file arch/arm/mach-tegra/tegra20/Makefile
> > checking file arch/arm/include/asm/arch-tegra/crypto.h
> > can't find file to patch at input line 3811 Perhaps you used the
> > wrong -p or --strip option?
> > The text leading up to this was:
> > --------------------------
> > |diff --git a/arch/arm/mach-tegra/crypto.c
> > |b/arch/arm/mach-tegra/crypto.c index 1efaa5c3ec..893da35e0b 100644
> > |--- a/arch/arm/mach-tegra/crypto.c
> > |+++ b/arch/arm/mach-tegra/crypto.c
> > --------------------------
> > File to patch: arch/arm/mach-tegra/tegra20/crypto.c
> > checking file arch/arm/mach-tegra/tegra20/crypto.c
> > The next patch would delete the file arch/arm/mach-tegra/crypto.h,
> > which does not exist! Assume -R? [n] Apply anyway? [n] Skipping
> > patch.
> > 1 out of 1 hunk ignored
> > checking file arch/arm/mach-tegra/Kconfig Hunk #1 succeeded at 224
> > (offset -5 lines).
> > checking file arch/arm/mach-tegra/tegra30/Makefile
> > checking file arch/arm/mach-tegra/tegra30/bct.c checking file
> > arch/arm/mach-tegra/tegra30/bct.h checking file
> > arch/arm/mach-tegra/Kconfig Hunk #1 FAILED at 231.
> > 1 out of 1 hunk FAILED
> > checking file arch/arm/mach-tegra/tegra20/Makefile
> > checking file arch/arm/mach-tegra/tegra20/bct.c checking file
> > arch/arm/mach-tegra/tegra20/bct.h checking file
> > doc/usage/cmd/ebtupdate.rst
> > tom@tom-ThinkPad-T580:~/denx/uboot-tegra$
> >
> > -----Original Message-----
> > From: Svyatoslav Ryhel <clamo...@gmail.com>
> > Sent: Tuesday, February 14, 2023 10:35 AM
> > To: Tom Warren <twar...@nvidia.com>; Marcel Ziswiler
> > <marcel.ziswi...@toradex.com>; Allen Martin <amar...@nvidia.com>;
> > Jagan Teki <ja...@amarulasolutions.com>; Lukasz Majewski
> > <lu...@denx.de>; Marek Vasut <ma...@denx.de>; Svyatoslav Ryhel
> > <clamo...@gmail.com>; Ramin Khonsari <raminte...@yahoo.com>; Thierry
> > Reding <thierry.red...@gmail.com>; Maxim Schwalm
> > <maxim.schw...@gmail.com>; Dmitry Osipenko <dig...@gmail.com>; Simon
> > Glass <s...@chromium.org>
> > Cc: u-boot@lists.denx.de
> > Subject: [PATCH v4 00/16] General Tegra improvements
> >
> > External email: Use caution opening links or attachments
> >
> >
> > List of changes in patch set:
> > - add missing EXTPERIPH clocks for t30
> > - swap host1x and disp1 clock parents (as they should be)
> > - add clk_id_to_pll_id and clock_decode_pair helpers to use
> > dts deeper (in tegra clocks often go in pair child - parent)
> > - include PLLD setup in T30 (DISP1 may use it as parent on
> > some devices)
> > - fix Tegra PWM parent clock inline with linux
> > - Tegra SLINK: patch to accept any word length (unlike 8bit
> > aligned which was before)
> > - provide default USB gadget setup for existing Nvidia boards
> > - add late init function to be able to configure pre-boot stage
> > (like uncovering serial number or setting mac address)
> > - create common pre-dm i2c write for PMIC (used on T30 and T124
> > to configure basic PMIC voltages required to boot like cpu and
> > core voltages)
> > - expose crypto module for all Tegra SoCs and implement BCT patching
> > (ability to update bootloader from u-boot on production devices
> > without need in host PC)
> >
> > ---
> > Changelog from v3
> > - added tested-by
> >
> > Changelog from v2
> > - fixed T114 TEGRA114_CLK_PLL_E_OUT0
> > - adjusted pre-dm i2c write commit description
> > - added description file for ebtupdate command
> > - minor improvements of bct.c comments
> >
> > Changelog from v1
> > - rebased to latest u-boot master
> > - PLLD setup for T30 moved specifically into T30 area
> > ---
> >
> > Maxim Schwalm (1):
> > ARM: tegra: provide default USB gadget setup
> >
> > Ramin Khonsari (1):
> > ARM: tegra30: implement BCT patching
> >
> > Svyatoslav Ryhel (14):
> > tegra30: clock: add EXTPERIPH
> > ARM: t20/t30: swap host1x and disp1 clock parents
> > ARM: tegra: clock: add clk_id_to_pll_id helper
> > ARM: tegra: clock: add clock_decode_pair helper
> > ARM: tegra30: add PLLD to pll setup
> > ARM: tegra: Fix Tegra PWM parent clock
> > spi: tegra20_slink: accept any word length
> > ARM: tegra: add late init support
> > ARM: tegra: create common pre-dm i2c write
> > board: tegra124: switch to updated pre-dm i2c write
> > board: tegra30: switch to updated pre-dm i2c write
> > ARM: tegra: expose crypto module for all Tegra SoCs
> > ARM: tegra: crypto: extend crypto functional
> > ARM: tegra20: implement BCT patching
> >
> > arch/arm/dts/tegra114.dtsi | 2 +-
> > arch/arm/dts/tegra124.dtsi | 2 +-
> > arch/arm/include/asm/arch-tegra/clock.h | 21 +++++
> > arch/arm/include/asm/arch-tegra/crypto.h | 47 ++++++++++
> > arch/arm/include/asm/arch-tegra/sys_proto.h | 6 ++
> > arch/arm/include/asm/arch-tegra/tegra_i2c.h | 17 ++++
> > .../include/asm/arch-tegra30/clock-tables.h | 6 +-
> > arch/arm/mach-tegra/Kconfig | 14 +++
> > arch/arm/mach-tegra/Makefile | 1 +
> > arch/arm/mach-tegra/board2.c | 2 +
> > arch/arm/mach-tegra/clock.c | 23 +++++
> > arch/arm/mach-tegra/cpu.h | 1 -
> > arch/arm/mach-tegra/{tegra20 => }/crypto.c | 63 +++++++++----
> > arch/arm/mach-tegra/tegra114/clock.c | 39 +++++++-
> > arch/arm/mach-tegra/tegra124/clock.c | 40 ++++++++-
> > arch/arm/mach-tegra/tegra124/cpu.c | 4 +
> > arch/arm/mach-tegra/tegra20/Kconfig | 1 +
> > arch/arm/mach-tegra/tegra20/Makefile | 7 +-
> > arch/arm/mach-tegra/tegra20/bct.c | 79 ++++++++++++++++
> > arch/arm/mach-tegra/tegra20/bct.h | 42 +++++++++
> > arch/arm/mach-tegra/tegra20/clock.c | 43 ++++++++-
> > arch/arm/mach-tegra/tegra20/crypto.h | 19 ----
> > arch/arm/mach-tegra/tegra210/clock.c | 39 +++++++-
> > arch/arm/mach-tegra/tegra30/Kconfig | 8 --
> > arch/arm/mach-tegra/tegra30/Makefile | 1 +
> > arch/arm/mach-tegra/tegra30/bct.c | 79 ++++++++++++++++
> > arch/arm/mach-tegra/tegra30/bct.h | 42 +++++++++
> > arch/arm/mach-tegra/tegra30/clock.c | 90 +++++++++++++++++--
> > arch/arm/mach-tegra/tegra30/cpu.c | 55 +-----------
> > board/avionic-design/tec-ng/Makefile | 4 +-
> > board/avionic-design/tec-ng/tec-ng-spl.c | 34 +++++++
> > board/nvidia/beaver/Makefile | 2 +
> > board/nvidia/beaver/beaver-spl.c | 43 +++++++++
> > board/nvidia/cardhu/Makefile | 4 +-
> > board/nvidia/cardhu/cardhu-spl.c | 43 +++++++++
> > board/nvidia/venice2/as3722_init.c | 65 +++++++++-----
> > board/nvidia/venice2/as3722_init.h | 43 ---------
> > board/toradex/apalis-tk1/as3722_init.c | 85 ++++++++++--------
> > board/toradex/apalis-tk1/as3722_init.h | 40 ---------
> > board/toradex/apalis_t30/Makefile | 2 +
> > board/toradex/apalis_t30/apalis_t30-spl.c | 34 +++++++
> > board/toradex/colibri_t30/Makefile | 2 +
> > board/toradex/colibri_t30/colibri_t30-spl.c | 34 +++++++
> > configs/beaver_defconfig | 3 -
> > configs/cei-tk1-som_defconfig | 3 -
> > configs/dalmore_defconfig | 3 -
> > configs/jetson-tk1_defconfig | 3 -
> > configs/nyan-big_defconfig | 3 -
> > configs/p2371-0000_defconfig | 3 -
> > configs/p2371-2180_defconfig | 3 -
> > configs/p2571_defconfig | 3 -
> > configs/p3450-0000_defconfig | 3 -
> > configs/venice2_defconfig | 3 -
> > doc/usage/cmd/ebtupdate.rst | 70 +++++++++++++++
> > drivers/pwm/tegra_pwm.c | 10 ++-
> > drivers/spi/tegra20_slink.c | 19 ++--
> > drivers/usb/gadget/Kconfig | 3 +
> > 57 files changed, 1051 insertions(+), 309 deletions(-) create mode
> > 100644 arch/arm/include/asm/arch-tegra/crypto.h
> > rename arch/arm/mach-tegra/{tegra20 => }/crypto.c (68%) create
> > mode
> > 100644 arch/arm/mach-tegra/tegra20/bct.c create mode 100644
> > arch/arm/mach-tegra/tegra20/bct.h delete mode 100644
> > arch/arm/mach-tegra/tegra20/crypto.h
> > create mode 100644 arch/arm/mach-tegra/tegra30/bct.c create mode
> > 100644 arch/arm/mach-tegra/tegra30/bct.h create mode 100644
> > board/avionic-design/tec-ng/tec-ng-spl.c
> > create mode 100644 board/nvidia/beaver/beaver-spl.c create mode
> > 100644 board/nvidia/cardhu/cardhu-spl.c delete mode 100644
> > board/nvidia/venice2/as3722_init.h
> > delete mode 100644 board/toradex/apalis-tk1/as3722_init.h
> > create mode 100644 board/toradex/apalis_t30/apalis_t30-spl.c
> > create mode 100644 board/toradex/colibri_t30/colibri_t30-spl.c
> > create mode 100644 doc/usage/cmd/ebtupdate.rst
> >
> > --
> > 2.37.2
> >
