* [U-Boot-Users] 1.3.3-rc2 typo clean up patch
@ 2008-05-02 12:31 Adrian Filipi
2008-05-02 16:03 ` Jean-Christophe PLAGNIOL-VILLARD
2008-05-02 16:47 ` [U-Boot-Users] [PATCH] three text/comment typos in 1.3.3-rc2 Adrian Filipi
0 siblings, 2 replies; 6+ messages in thread
From: Adrian Filipi @ 2008-05-02 12:31 UTC (permalink / raw)
To: u-boot
Hi folks,
Attached is a patch for a few typos I came accross.
Adrian
--
Linux Software Engineer | EuroTech, Inc. | www.eurotech-inc.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: typos.diff
Type: text/x-diff
Size: 1710 bytes
Desc:
Url : http://lists.denx.de/pipermail/u-boot/attachments/20080502/b4a582f3/attachment.diff
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot-Users] 1.3.3-rc2 typo clean up patch
2008-05-02 12:31 [U-Boot-Users] 1.3.3-rc2 typo clean up patch Adrian Filipi
@ 2008-05-02 16:03 ` Jean-Christophe PLAGNIOL-VILLARD
2008-05-02 16:47 ` [U-Boot-Users] [PATCH] three text/comment typos in 1.3.3-rc2 Adrian Filipi
1 sibling, 0 replies; 6+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2008-05-02 16:03 UTC (permalink / raw)
To: u-boot
On 08:31 Fri 02 May , Adrian Filipi wrote:
> Hi folks,
>
> Attached is a patch for a few typos I came accross.
>
> Adrian
> --
> Linux Software Engineer | EuroTech, Inc. | www.eurotech-inc.com
Signed-off missing and do not send patch as attachement please.
Best Regards,
J.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot-Users] [PATCH] three text/comment typos in 1.3.3-rc2
2008-05-02 12:31 [U-Boot-Users] 1.3.3-rc2 typo clean up patch Adrian Filipi
2008-05-02 16:03 ` Jean-Christophe PLAGNIOL-VILLARD
@ 2008-05-02 16:47 ` Adrian Filipi
2008-05-03 22:14 ` Wolfgang Denk
1 sibling, 1 reply; 6+ messages in thread
From: Adrian Filipi @ 2008-05-02 16:47 UTC (permalink / raw)
To: u-boot
This patch fixes three typos.
The first is a repetition of CONFIG_CMD_BSP.
The second makes the #endif comment match its #if.
The third is a spelling error.
Signed-off-by: Adrian Filipi <adrian.filipi@eurotech.com>
Adrian
--
Linux Software Engineer | EuroTech, Inc. | www.eurotech-inc.com
diff -u -ru u-boot-1.3.3-rc2.orig/README u-boot-1.3.3-rc2/README
--- u-boot-1.3.3-rc2.orig/README 2008-04-29 17:41:06.000000000 -0400
+++ u-boot-1.3.3-rc2/README 2008-05-02 08:29:20.000000000 -0400
@@ -623,7 +623,6 @@
CONFIG_CMD_SPI * SPI serial bus support
CONFIG_CMD_USB * USB support
CONFIG_CMD_VFD * VFD support (TRAB)
- CONFIG_CMD_BSP * Board SPecific functions
CONFIG_CMD_CDP * Cisco Discover Protocol support
CONFIG_CMD_FSL * Microblaze FSL support
Only in u-boot-1.3.3-rc2: README.orig
diff -u -ru u-boot-1.3.3-rc2.orig/cpu/arm920t/s3c24x0/usb.c u-boot-1.3.3-rc2/cpu/arm920t/s3c24x0/usb.c
--- u-boot-1.3.3-rc2.orig/cpu/arm920t/s3c24x0/usb.c 2008-04-29 17:41:06.000000000 -0400
+++ u-boot-1.3.3-rc2/cpu/arm920t/s3c24x0/usb.c 2008-05-02 08:29:20.000000000 -0400
@@ -69,4 +69,4 @@
}
# endif /* defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) */
-#endif /* defined(CONFIG_USB_OHCI) && defined(CFG_USB_OHCI_CPU_INIT) */
+#endif /* defined(CONFIG_USB_OHCI_NEW) && defined(CFG_USB_OHCI_CPU_INIT) */
diff -u -ru u-boot-1.3.3-rc2.orig/doc/README.nand-boot-ppc440 u-boot-1.3.3-rc2/doc/README.nand-boot-ppc440
--- u-boot-1.3.3-rc2.orig/doc/README.nand-boot-ppc440 2008-04-29 17:41:06.000000000 -0400
+++ u-boot-1.3.3-rc2/doc/README.nand-boot-ppc440 2008-05-02 08:29:20.000000000 -0400
@@ -9,7 +9,7 @@
completely without NOR FLASH. This can be done by using the NAND
boot feature of the 440 NAND flash controller (NDFC).
-Here a short desciption of the different boot stages:
+Here a short description of the different boot stages:
a) IPL (Initial Program Loader, integrated inside CPU)
------------------------------------------------------
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot-Users] [PATCH] three text/comment typos in 1.3.3-rc2
2008-05-02 16:47 ` [U-Boot-Users] [PATCH] three text/comment typos in 1.3.3-rc2 Adrian Filipi
@ 2008-05-03 22:14 ` Wolfgang Denk
2008-05-06 20:46 ` [U-Boot-Users] [PATCH][resubmission] " Adrian Filipi
0 siblings, 1 reply; 6+ messages in thread
From: Wolfgang Denk @ 2008-05-03 22:14 UTC (permalink / raw)
To: u-boot
In message <alpine.DEB.1.10.0805021239480.12870@pmy.adscville> you wrote:
>
> This patch fixes three typos.
>
> The first is a repetition of CONFIG_CMD_BSP.
>
> The second makes the #endif comment match its #if.
>
> The third is a spelling error.
>
> Signed-off-by: Adrian Filipi <adrian.filipi@eurotech.com>
>
> Adrian
> --
> Linux Software Engineer | EuroTech, Inc. | www.eurotech-inc.com
Sorry, patch does not apply:
error: patch failed: README:623
error: README: patch does not apply
error: patch failed: cpu/arm920t/s3c24x0/usb.c:69
error: cpu/arm920t/s3c24x0/usb.c: patch does not apply
error: patch failed: doc/README.nand-boot-ppc440:9
error: doc/README.nand-boot-ppc440: patch does not apply
fatal: sha1 information is lacking or useless (README).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001.
Please clean up and resubmit.
I strongly recommend to use git-format-patch to generate trhe patch,
and use git-send-email to send it.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
For every complex problem, there is a solution that is simple, neat,
and wrong. -- H. L. Mencken
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot-Users] [PATCH][resubmission] three text/comment typos in 1.3.3-rc2
2008-05-03 22:14 ` Wolfgang Denk
@ 2008-05-06 20:46 ` Adrian Filipi
2008-05-09 18:55 ` Wolfgang Denk
0 siblings, 1 reply; 6+ messages in thread
From: Adrian Filipi @ 2008-05-06 20:46 UTC (permalink / raw)
To: u-boot
On Sun, 4 May 2008, Wolfgang Denk wrote:
> Sorry, patch does not apply:
>
> error: patch failed: README:623
> error: README: patch does not apply
> error: patch failed: cpu/arm920t/s3c24x0/usb.c:69
> error: cpu/arm920t/s3c24x0/usb.c: patch does not apply
> error: patch failed: doc/README.nand-boot-ppc440:9
> error: doc/README.nand-boot-ppc440: patch does not apply
> fatal: sha1 information is lacking or useless (README).
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
> Patch failed at 0001.
>
>
> Please clean up and resubmit.
>
> I strongly recommend to use git-format-patch to generate trhe patch,
> and use git-send-email to send it.
>
> Best regards,
>
> Wolfgang Denk
Sorry about that. This patch applies cleanly to 1.3.3-rc3.
I'm starting to familiarize myself with git, so I'll try to send
git-diffs next time.
Adrian
--
Linux Software Engineer | EuroTech, Inc. | www.eurotech-inc.com
----------------------------
This patch fixes three typos.
The first is a repetition of CONFIG_CMD_BSP.
The second makes the #endif comment match its #if.
The third is a spelling error.
Signed-off-by: Adrian Filipi <adrian.filipi@eurotech.com>
diff -u -ruN u-boot-1.3.3-rc3.orig/README u-boot-1.3.3-rc3/README
--- u-boot-1.3.3-rc3.orig/README 2008-05-04 06:10:33.000000000 -0400
+++ u-boot-1.3.3-rc3/README 2008-05-05 09:20:45.000000000 -0400
@@ -623,7 +623,6 @@
CONFIG_CMD_SPI * SPI serial bus support
CONFIG_CMD_USB * USB support
CONFIG_CMD_VFD * VFD support (TRAB)
- CONFIG_CMD_BSP * Board SPecific functions
CONFIG_CMD_CDP * Cisco Discover Protocol support
CONFIG_CMD_FSL * Microblaze FSL support
diff -u -ruN u-boot-1.3.3-rc3.orig/cpu/arm920t/s3c24x0/usb.c u-boot-1.3.3-rc3/cpu/arm920t/s3c24x0/usb.c
--- u-boot-1.3.3-rc3.orig/cpu/arm920t/s3c24x0/usb.c 2008-05-04 06:10:33.000000000 -0400
+++ u-boot-1.3.3-rc3/cpu/arm920t/s3c24x0/usb.c 2008-05-06 14:24:16.000000000 -0400
@@ -69,4 +69,4 @@
}
# endif /* defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) */
-#endif /* defined(CONFIG_USB_OHCI) && defined(CFG_USB_OHCI_CPU_INIT) */
+#endif /* defined(CONFIG_USB_OHCI_NEW) && defined(CFG_USB_OHCI_CPU_INIT) */
diff -u -ruN u-boot-1.3.3-rc3.orig/doc/README.nand-boot-ppc440 u-boot-1.3.3-rc3/doc/README.nand-boot-ppc440
--- u-boot-1.3.3-rc3.orig/doc/README.nand-boot-ppc440 2008-05-04 06:10:33.000000000 -0400
+++ u-boot-1.3.3-rc3/doc/README.nand-boot-ppc440 2008-05-05 09:19:11.000000000 -0400
@@ -9,7 +9,7 @@
completely without NOR FLASH. This can be done by using the NAND
boot feature of the 440 NAND flash controller (NDFC).
-Here a short desciption of the different boot stages:
+Here a short description of the different boot stages:
a) IPL (Initial Program Loader, integrated inside CPU)
------------------------------------------------------
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot-Users] [PATCH][resubmission] three text/comment typos in 1.3.3-rc2
2008-05-06 20:46 ` [U-Boot-Users] [PATCH][resubmission] " Adrian Filipi
@ 2008-05-09 18:55 ` Wolfgang Denk
0 siblings, 0 replies; 6+ messages in thread
From: Wolfgang Denk @ 2008-05-09 18:55 UTC (permalink / raw)
To: u-boot
In message <alpine.DEB.1.10.0805061643180.24720@pmy.adscville> you wrote:
>
> > I strongly recommend to use git-format-patch to generate trhe patch,
> > and use git-send-email to send it.
...
> Sorry about that. This patch applies cleanly to 1.3.3-rc3.
Maybe it did before you sent it by e-mail...
Now it fails again:
Applying Fix some typos
error: patch failed: README:623
error: README: patch does not apply
error: patch failed: cpu/arm920t/s3c24x0/usb.c:69
error: cpu/arm920t/s3c24x0/usb.c: patch does not apply
error: patch failed: doc/README.nand-boot-ppc440:9
error: doc/README.nand-boot-ppc440: patch does not apply
fatal: sha1 information is lacking or useless (README).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001.
> I'm starting to familiarize myself with git, so I'll try to send
> git-diffs next time.
Thanks in advancve.
I applied the few modifications manually this time, to limit your
frustration ;-)
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
I have made mistakes, but have never made the mistake of claiming I
never made one. - James G. Bennet
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-05-09 18:55 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-02 12:31 [U-Boot-Users] 1.3.3-rc2 typo clean up patch Adrian Filipi
2008-05-02 16:03 ` Jean-Christophe PLAGNIOL-VILLARD
2008-05-02 16:47 ` [U-Boot-Users] [PATCH] three text/comment typos in 1.3.3-rc2 Adrian Filipi
2008-05-03 22:14 ` Wolfgang Denk
2008-05-06 20:46 ` [U-Boot-Users] [PATCH][resubmission] " Adrian Filipi
2008-05-09 18:55 ` Wolfgang Denk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox