Re: [U-Boot] Some tegra cleanups and Kconfig migrations
Tom, > The SYS_I2C patch doesn't apply cleanly to TOT u-boot-tegra/master (see below > git am spew). Please take a look & let me know when you've resent a fixed > patchset and I'll retry. I'm not sure where u-boot-tegra/master is but I just applied the patches to 2019.01-rc1 upstream and they all applied fine with git am so I'm not sure the difference between your branch and upstream. Peter > tom@tom-lt2:~/denx/uboot-tegra$ git am -s --whitespace=strip > ~/Downloads/bundle-17667-Peter-cleanup-6.mbox > Applying: tegra: cleanup dangling comments in include/configs > Applying: tegra20: common: fix USB_EHCI_TXFIFO_THRESH value > Applying: Kconfig: tegra: Migrate SYS_I2C_TEGRA > error: patch failed: configs/apalis-tk1_defconfig:29 > error: configs/apalis-tk1_defconfig: patch does not apply > error: patch failed: configs/apalis_t30_defconfig:26 > error: configs/apalis_t30_defconfig: patch does not apply > error: patch failed: configs/beaver_defconfig:26 > error: configs/beaver_defconfig: patch does not apply > error: patch failed: configs/cardhu_defconfig:23 > error: configs/cardhu_defconfig: patch does not apply > error: patch failed: configs/cei-tk1-som_defconfig:25 > error: configs/cei-tk1-som_defconfig: patch does not apply > error: patch failed: configs/colibri_t20_defconfig:33 > error: configs/colibri_t20_defconfig: patch does not apply > error: patch failed: configs/colibri_t30_defconfig:25 > error: configs/colibri_t30_defconfig: patch does not apply > error: patch failed: configs/dalmore_defconfig:25 > error: configs/dalmore_defconfig: patch does not apply > error: patch failed: configs/jetson-tk1_defconfig:26 > error: configs/jetson-tk1_defconfig: patch does not apply > error: patch failed: configs/nyan-big_defconfig:41 > error: configs/nyan-big_defconfig: patch does not apply > error: patch failed: configs/p2771--000_defconfig:20 > error: configs/p2771--000_defconfig: patch does not apply > error: patch failed: configs/p2771--500_defconfig:20 > error: configs/p2771--500_defconfig: patch does not apply > error: patch failed: configs/seaboard_defconfig:22 > error: configs/seaboard_defconfig: patch does not apply > error: patch failed: configs/tec-ng_defconfig:23 > error: configs/tec-ng_defconfig: patch does not apply > error: patch failed: configs/trimslice_defconfig:24 > error: configs/trimslice_defconfig: patch does not apply > error: patch failed: configs/venice2_defconfig:24 > error: configs/venice2_defconfig: patch does not apply > Patch failed at 0003 Kconfig: tegra: Migrate SYS_I2C_TEGRA > The copy of the patch that failed is found in: >/home/tom/denx/uboot-tegra/.git/rebase-apply/patch > When you have resolved this problem, run "git am --resolved". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > > -Original Message- > From: Tom Warren > Sent: Wednesday, November 7, 2018 8:17 AM > To: Peter Robinson ; u-boot@lists.denx.de; Tom Rini > > Subject: RE: Some tegra cleanups and Kconfig migrations > > Sorry, Peter. I missed these. I'll take a look today and get a PR out to Tom > before EOW. > > -Original Message- > From: Peter Robinson > Sent: Wednesday, November 7, 2018 7:12 AM > To: u-boot@lists.denx.de; Tom Warren ; Tom Rini > > Subject: Re: Some tegra cleanups and Kconfig migrations > > Tom or Tom, > > Any chance we could get these reviewed and merged, mostly generic cleanups so > I don't think most of them are controversial. > > Peter > > On Sun, Sep 16, 2018 at 6:23 PM Peter Robinson wrote: > > > > The following patches are a few cleanups to dangling comments from > > Kconfig cleanups and migrations of SYS_I2C_TEGRA, USB_EHCI_TEGRA and > > TEGRA_KEYBOARD. > > There's also a couple of other minors fixes and cleanups as well. > > --- > This email message is for the sole use of the intended recipient(s) and may > contain > confidential information. Any unauthorized review, use, disclosure or > distribution > is prohibited. If you are not the intended recipient, please contact the > sender by > reply email and destroy all copies of the original message. > --- ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] Some tegra cleanups and Kconfig migrations
Peter, The SYS_I2C patch doesn't apply cleanly to TOT u-boot-tegra/master (see below git am spew). Please take a look & let me know when you've resent a fixed patchset and I'll retry. Tom tom@tom-lt2:~/denx/uboot-tegra$ git am -s --whitespace=strip ~/Downloads/bundle-17667-Peter-cleanup-6.mbox Applying: tegra: cleanup dangling comments in include/configs Applying: tegra20: common: fix USB_EHCI_TXFIFO_THRESH value Applying: Kconfig: tegra: Migrate SYS_I2C_TEGRA error: patch failed: configs/apalis-tk1_defconfig:29 error: configs/apalis-tk1_defconfig: patch does not apply error: patch failed: configs/apalis_t30_defconfig:26 error: configs/apalis_t30_defconfig: patch does not apply error: patch failed: configs/beaver_defconfig:26 error: configs/beaver_defconfig: patch does not apply error: patch failed: configs/cardhu_defconfig:23 error: configs/cardhu_defconfig: patch does not apply error: patch failed: configs/cei-tk1-som_defconfig:25 error: configs/cei-tk1-som_defconfig: patch does not apply error: patch failed: configs/colibri_t20_defconfig:33 error: configs/colibri_t20_defconfig: patch does not apply error: patch failed: configs/colibri_t30_defconfig:25 error: configs/colibri_t30_defconfig: patch does not apply error: patch failed: configs/dalmore_defconfig:25 error: configs/dalmore_defconfig: patch does not apply error: patch failed: configs/jetson-tk1_defconfig:26 error: configs/jetson-tk1_defconfig: patch does not apply error: patch failed: configs/nyan-big_defconfig:41 error: configs/nyan-big_defconfig: patch does not apply error: patch failed: configs/p2771--000_defconfig:20 error: configs/p2771--000_defconfig: patch does not apply error: patch failed: configs/p2771--500_defconfig:20 error: configs/p2771--500_defconfig: patch does not apply error: patch failed: configs/seaboard_defconfig:22 error: configs/seaboard_defconfig: patch does not apply error: patch failed: configs/tec-ng_defconfig:23 error: configs/tec-ng_defconfig: patch does not apply error: patch failed: configs/trimslice_defconfig:24 error: configs/trimslice_defconfig: patch does not apply error: patch failed: configs/venice2_defconfig:24 error: configs/venice2_defconfig: patch does not apply Patch failed at 0003 Kconfig: tegra: Migrate SYS_I2C_TEGRA The copy of the patch that failed is found in: /home/tom/denx/uboot-tegra/.git/rebase-apply/patch When you have resolved this problem, run "git am --resolved". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". -Original Message- From: Tom Warren Sent: Wednesday, November 7, 2018 8:17 AM To: Peter Robinson ; u-boot@lists.denx.de; Tom Rini Subject: RE: Some tegra cleanups and Kconfig migrations Sorry, Peter. I missed these. I'll take a look today and get a PR out to Tom before EOW. -Original Message- From: Peter Robinson Sent: Wednesday, November 7, 2018 7:12 AM To: u-boot@lists.denx.de; Tom Warren ; Tom Rini Subject: Re: Some tegra cleanups and Kconfig migrations Tom or Tom, Any chance we could get these reviewed and merged, mostly generic cleanups so I don't think most of them are controversial. Peter On Sun, Sep 16, 2018 at 6:23 PM Peter Robinson wrote: > > The following patches are a few cleanups to dangling comments from > Kconfig cleanups and migrations of SYS_I2C_TEGRA, USB_EHCI_TEGRA and > TEGRA_KEYBOARD. > There's also a couple of other minors fixes and cleanups as well. --- This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. --- ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] Some tegra cleanups and Kconfig migrations
Sorry, Peter. I missed these. I'll take a look today and get a PR out to Tom before EOW. -Original Message- From: Peter Robinson Sent: Wednesday, November 7, 2018 7:12 AM To: u-boot@lists.denx.de; Tom Warren ; Tom Rini Subject: Re: Some tegra cleanups and Kconfig migrations Tom or Tom, Any chance we could get these reviewed and merged, mostly generic cleanups so I don't think most of them are controversial. Peter On Sun, Sep 16, 2018 at 6:23 PM Peter Robinson wrote: > > The following patches are a few cleanups to dangling comments from > Kconfig cleanups and migrations of SYS_I2C_TEGRA, USB_EHCI_TEGRA and > TEGRA_KEYBOARD. > There's also a couple of other minors fixes and cleanups as well. --- This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. --- ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] Some tegra cleanups and Kconfig migrations
Tom or Tom, Any chance we could get these reviewed and merged, mostly generic cleanups so I don't think most of them are controversial. Peter On Sun, Sep 16, 2018 at 6:23 PM Peter Robinson wrote: > > The following patches are a few cleanups to dangling comments from Kconfig > cleanups and migrations of SYS_I2C_TEGRA, USB_EHCI_TEGRA and TEGRA_KEYBOARD. > There's also a couple of other minors fixes and cleanups as well. ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot