Re: [U-Boot] [PATCH 4/7] powerpc/82xx: move km/km82xx-common.h within km82xx.h

2012-08-02 Thread Gerlando Falauto 

On 07/30/2012 09:12 PM, Wolfgang Denk wrote:

Dear Gerlando,

In message5016d241.4030...@keymile.com  you wrote:



Please also try with -M -C and see if this changes anything.


For this one patch I can't get git to detect renames.


Neither can I.  Thanks for trying, though.


It turns out you also need to use -B, see an excellent thorough 
explanation at

http://article.gmane.org/gmane.comp.version-control.git/202723

Even though this patch was already applied, I'm posting a v2 version 
for whoever is curious to see a smaller patch.

It won't make any difference on the repository, anyway.

Thanks,
Gerlando
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH 4/7] powerpc/82xx: move km/km82xx-common.h within km82xx.h

2012-07-31 Thread Wolfgang Denk 
Dear Gerlando Falauto,

In message 1343402200-32020-5-git-send-email-gerlando.fala...@keymile.com you 
wrote:
 The only file including km82xx-common.h is km82xx.h.
 So there is no need to have it as a separate file.
 
 Signed-off-by: Gerlando Falauto gerlando.fala...@keymile.com
 ---
  include/configs/km/km82xx-common.h |  317 
 
  include/configs/km82xx.h   |  290 -
  2 files changed, 289 insertions(+), 318 deletions(-)
  delete mode 100644 include/configs/km/km82xx-common.h

Applied, thanks.

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: w...@denx.de
I am not now, nor have I ever been, a member of the demigodic party.
   -- Dennis Ritchie
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH 4/7] powerpc/82xx: move km/km82xx-common.h within km82xx.h

2012-07-30 Thread Gerlando Falauto 

On 07/27/2012 07:31 PM, Wolfgang Denk wrote:

Dear Gerlando Falauto,

In message1343402200-32020-5-git-send-email-gerlando.fala...@keymile.com  you 
wrote:

The only file including km82xx-common.h is km82xx.h.
So there is no need to have it as a separate file.

Signed-off-by: Gerlando Falautogerlando.fala...@keymile.com
---
  include/configs/km/km82xx-common.h |  317 
  include/configs/km82xx.h   |  290 -
  2 files changed, 289 insertions(+), 318 deletions(-)
  delete mode 100644 include/configs/km/km82xx-common.h


Please also try with -M -C and see if this changes anything.


For this one patch I can't get git to detect renames.
I tried with git 1.7.1, 1.7.10.4, 1.7.11.3:

- git commit --amend
[xxx f9981ff] powerpc/82xx: move km/km82xx-common.h within km82xx.h
 1 files changed, 124 insertions(+), 4 deletions(-)
 rename include/configs/{km/km82xx-common.h = km82xx.h} (75%)

Notice how git commit DOES detect the rename, but the following 
format-patch does NOT:


- git format-patch -M -C --stdout -1
From f9981ff849562c9d466d9429e0ec9a510a0d4b3c Mon Sep 17 00:00:00 2001
From: Gerlando Falauto gerlando.fala...@keymile.com
Date: Tue, 10 Jul 2012 18:13:27 +0200
Subject: [PATCH] ...
...
---
 include/configs/km/km82xx-common.h |  317 

 include/configs/km82xx.h   |  290 
-

 2 files changed, 289 insertions(+), 318 deletions(-)
 delete mode 100644 include/configs/km/km82xx-common.h
...
 #endif /* __CONFIG_H */
--
1.7.10.4

I guess the reason behind this is that km82xx.h is already existing.
Again, git can somehow track renames (i.e. one file's gone, another 
one's brand new), but it does not detect merging of files.


As a matter of fact, if I rename the target file, i.e.:
- git mv include/configs/km82xx.h include/configs/km82xx-tmp.h
- git commit --amend
[xxx 49c85c3] powerpc/82xx: move km/km82xx-common.h within km82xx.h
 2 files changed, 124 insertions(+), 153 deletions(-)
 rename include/configs/{km/km82xx-common.h = km82xx-tmp.h} (75%)
 delete mode 100644 include/configs/km82xx.h

- ~/bin/git format-patch -M -C -1 --stdout

From 49c85c351f65330746836bf90a06443a6b095b1e Mon Sep 17 00:00:00 2001
From: Gerlando Falauto gerlando.fala...@keymile.com
Date: Tue, 10 Jul 2012 18:13:27 +0200
Subject: [PATCH] ...

...
---
 .../configs/{km/km82xx-common.h = km82xx-tmp.h}   |  128 
-
 include/configs/km82xx.h   |  149 


 2 files changed, 124 insertions(+), 153 deletions(-)
 rename include/configs/{km/km82xx-common.h = km82xx-tmp.h} (75%)
 delete mode 100644 include/configs/km82xx.h

diff --git a/include/configs/km/km82xx-common.h 
b/include/configs/km82xx-tmp.h

similarity index 75%
rename from include/configs/km/km82xx-common.h
rename to include/configs/km82xx-tmp.h
index 2c763bb..9bfb8df 100644

THEN, AND ONLY THEN, do I get a rename detected.
And we would need an extra patch to rename it back...

Anyway, I believe the above patch, if applied to a tree with a slightly 
different (let's say updated) km82xx.h, would fail upon the deletion of 
km82xx.h, but would apply cleanly on km82xx-common.h (introducing 
outdated chunks of km82xx.h though). Is that what we really want?


Thanks,
Gerlando
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH 4/7] powerpc/82xx: move km/km82xx-common.h within km82xx.h

2012-07-30 Thread Wolfgang Denk 
Dear Gerlando,

In message 5016d241.4030...@keymile.com you wrote:

  Please also try with -M -C and see if this changes anything.
 
 For this one patch I can't get git to detect renames.

Neither can I.  Thanks for trying, though.

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: w...@denx.de
How many Unix hacks does it take to change a light bulb?  Let's  see,
   can you use a shell script for that or does it need a C program?
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 4/7] powerpc/82xx: move km/km82xx-common.h within km82xx.h

2012-07-27 Thread Gerlando Falauto 
The only file including km82xx-common.h is km82xx.h.
So there is no need to have it as a separate file.

Signed-off-by: Gerlando Falauto gerlando.fala...@keymile.com
---
 include/configs/km/km82xx-common.h |  317 
 include/configs/km82xx.h   |  290 -
 2 files changed, 289 insertions(+), 318 deletions(-)
 delete mode 100644 include/configs/km/km82xx-common.h

diff --git a/include/configs/km/km82xx-common.h 
b/include/configs/km/km82xx-common.h
deleted file mode 100644
index 2c763bb..000
--- a/include/configs/km/km82xx-common.h
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * (C) Copyright 2007-2010
- * Heiko Schocher, DENX Software Engineering, h...@denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#ifndef __KM82XX_COMMON
-#define __KM82XX_COMMON
-
-/*
- * Select serial console configuration
- *
- * If either CONFIG_CONS_ON_SMC or CONFIG_CONS_ON_SCC is selected, then
- * CONFIG_CONS_INDEX must be set to the channel number (1-2 for SMC, 1-4
- * for SCC).
- */
-#defineCONFIG_CONS_ON_SMC  /* Console is on SMC */
-#undef  CONFIG_CONS_ON_SCC /* It's not on SCC   */
-#undef CONFIG_CONS_NONE/* It's not on external UART */
-#define CONFIG_CONS_INDEX  2   /* SMC2 is used for console  */
-#define CONFIG_SYS_SMC_RXBUFLEN128
-#define CONFIG_SYS_MAXIDLE 10
-
-/*
- * Select ethernet configuration
- *
- * If either CONFIG_ETHER_ON_SCC or CONFIG_ETHER_ON_FCC is selected,
- * then CONFIG_ETHER_INDEX must be set to the channel number (1-4 for
- * SCC, 1-3 for FCC)
- *
- * If CONFIG_ETHER_NONE is defined, then either the ethernet routines
- * must be defined elsewhere (as for the console), or CONFIG_CMD_NET
- * must be unset.
- */
-#defineCONFIG_ETHER_ON_SCC /* Ethernet is on SCC */
-#undef CONFIG_ETHER_ON_FCC /* Ethernet is not on FCC */
-#undef CONFIG_ETHER_NONE   /* No external Ethernet   */
-
-#define CONFIG_ETHER_INDEX 4
-#define CONFIG_HAS_ETH0
-#define CONFIG_SYS_SCC_TOUT_LOOP   1000
-
-#define CONFIG_SYS_CMXSCR_VALUE(CMXSCR_RS4CS_CLK7 | CMXSCR_TS4CS_CLK8)
-
-#ifndef CONFIG_8260_CLKIN
-#define CONFIG_8260_CLKIN  6600/* in Hz */
-#endif
-
-#define BOOTFLASH_START0xFE00
-
-#define CONFIG_KM_CONSOLE_TTY  ttyCPM0
-
-#define MTDPARTS_DEFAULT   mtdparts= \
-   app:  \
-   768k(u-boot), \
-   128k(env),\
-   128k(envred), \
-   3072k(free),  \
-   -( CONFIG_KM_UBI_PARTITION_NAME_BOOT )
-
-/*
- * Default environment settings
- */
-#defineCONFIG_EXTRA_ENV_SETTINGS   
\
-   CONFIG_KM_BOARD_EXTRA_ENV   \
-   CONFIG_KM_DEF_ENV   \
-   EEprom_ivm=pca9544a:70:4 \0   \
-   unlock=yes\0  \
-   newenv=   \
-   prot off 0xFE0C +0x4\
-   era 0xFE0C +0x4\0 \
-   arch=ppc_82xx\0   \
-   
-
-#define CONFIG_SYS_MONITOR_BASECONFIG_SYS_TEXT_BASE
-#if (CONFIG_SYS_MONITOR_BASE  CONFIG_SYS_FLASH_BASE)
-#define CONFIG_SYS_RAMBOOT
-#endif
-
-#define CONFIG_SYS_MONITOR_LEN (768  10)
-
-#define CONFIG_ENV_IS_IN_FLASH
-
-#ifdef CONFIG_ENV_IS_IN_FLASH
-#define CONFIG_ENV_SECT_SIZE   0x2
-#define CONFIG_ENV_ADDR(CONFIG_SYS_MONITOR_BASE + \
-   CONFIG_SYS_MONITOR_LEN)
-#define CONFIG_ENV_OFFSET  CONFIG_SYS_MONITOR_LEN
-
-/* Address and size of Redundant Environment Sector*/
-#define CONFIG_ENV_OFFSET_REDUND   (CONFIG_ENV_OFFSET + \

Re: [U-Boot] [PATCH 4/7] powerpc/82xx: move km/km82xx-common.h within km82xx.h

2012-07-27 Thread Wolfgang Denk 
Dear Gerlando Falauto,

In message 1343402200-32020-5-git-send-email-gerlando.fala...@keymile.com you 
wrote:
 The only file including km82xx-common.h is km82xx.h.
 So there is no need to have it as a separate file.
 
 Signed-off-by: Gerlando Falauto gerlando.fala...@keymile.com
 ---
  include/configs/km/km82xx-common.h |  317 
 
  include/configs/km82xx.h   |  290 -
  2 files changed, 289 insertions(+), 318 deletions(-)
  delete mode 100644 include/configs/km/km82xx-common.h

Please also try with -M -C and see if this changes anything.

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: w...@denx.de
Obviously, a major malfunction has occurred.
  -- Steve Nesbitt, voice of Mission Control, January 28,
 1986, as the shuttle Challenger exploded within view
 of the grandstands.
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot