[PATCH] rename keymile boards to ABB wcom

Marek Vasut marex at denx.de
Wed Feb 19 15:36:08 CET 2020


On 2/19/20 2:09 PM, Heiko Schocher wrote:
> Hello Holger,

Hi,

> Am 19.02.2020 um 13:53 schrieb Holger Brunck:
>> The ownership has changed to ABB wiredcom for these boards.
>> Therefore rename the keymile folder, headerfiles and vendor strings
>> to wcom.
>>
>> Signed-off-by: Holger Brunck <holger.brunck at ch.abb.com>
>> CC: Marek Vasut <marex at denx.de>
>> CC: Heiko Schocher <hs at denx.de>
>> CC: Wolfgang Denk <wd at denx.de>
>> CC: Valentin Longchamp <valentin.longchamp at ch.abb.com>
>> ---
>>   arch/arm/dts/kirkwood-km_kirkwood.dts         |  4 +--
>>   arch/arm/mach-kirkwood/Kconfig                |  2 +-
>>   arch/powerpc/cpu/mpc83xx/Kconfig              |  2 +-
>>   arch/powerpc/cpu/mpc85xx/Kconfig              |  2 +-
>>   board/{keymile => wcom}/Kconfig               |  6 ++--
>>   board/{keymile => wcom}/common/common.c       |  0
>>   board/{keymile => wcom}/common/common.h       |  0
>>   board/{keymile => wcom}/common/ivm.c          |  0
>>   board/{keymile => wcom}/common/qrio.c         |  2 +-
>>   board/{keymile => wcom}/common/qrio.h         |  0
>>   board/{keymile => wcom}/kmp204x/Kconfig       |  2 +-
>>   board/{keymile => wcom}/kmp204x/MAINTAINERS   |  2 +-
>>   board/{keymile => wcom}/kmp204x/Makefile      |  0
>>   board/{keymile => wcom}/kmp204x/ddr.c         |  0
>>   board/{keymile => wcom}/kmp204x/eth.c         |  0
>>   board/{keymile => wcom}/kmp204x/kmp204x.c     |  0
>>   board/{keymile => wcom}/kmp204x/kmp204x.h     |  0
>>   board/{keymile => wcom}/kmp204x/law.c         |  0
>>   board/{keymile => wcom}/kmp204x/pbi.cfg       |  0
>>   board/{keymile => wcom}/kmp204x/pci.c         |  0
>>   .../{keymile => wcom}/kmp204x/rcw_kmp204x.cfg |  0
>>   board/{keymile => wcom}/kmp204x/tlb.c         |  0
>>   board/{keymile => wcom}/scripts/README        |  2 +-
>>   .../{keymile => wcom}/scripts/develop-arm.txt |  0
>>   .../scripts/develop-common.txt                |  0
>>   .../scripts/develop-ppc_82xx.txt              |  0
>>   .../scripts/develop-ppc_8xx.txt               |  0
>>   board/{keymile => wcom}/scripts/ramfs-arm.txt |  0
>>   .../scripts/ramfs-common.txt                  |  0
>>   .../scripts/ramfs-ppc_82xx.txt                |  0
>>   .../scripts/ramfs-ppc_8xx.txt                 |  0
>>   .../{keymile/km83xx => wcom/wcom83xx}/Kconfig | 36 +++++++++----------
>>   .../km83xx => wcom/wcom83xx}/MAINTAINERS      |  2 +-
>>   .../km83xx => wcom/wcom83xx}/Makefile         |  2 +-
>>   .../km83xx => wcom/wcom83xx}/README.kmeter1   |  0
>>   .../km83xx.c => wcom/wcom83xx/wcom83xx.c}     |  0
>>   .../wcom83xx/wcom83xx_i2c.c}                  |  0
>>   .../{keymile/km_arm => wcom/wcom_arm}/Kconfig |  4 +--
>>   .../km_arm => wcom/wcom_arm}/MAINTAINERS      |  2 +-
>>   .../km_arm => wcom/wcom_arm}/Makefile         |  2 +-
>>   .../km_arm => wcom/wcom_arm}/fpga_config.c    |  0
>>   .../wcom_arm}/kwbimage-memphis.cfg            |  0
>>   .../km_arm => wcom/wcom_arm}/kwbimage.cfg     |  0
>>   .../wcom_arm}/kwbimage_128M16_1.cfg           |  0
>>   .../wcom_arm}/kwbimage_256M8_1.cfg            |  0
>>   .../km_arm.c => wcom/wcom_arm/wcom_arm.c}     |  0
>>   configs/km_kirkwood_128m16_defconfig          |  2 +-
>>   configs/km_kirkwood_defconfig                 |  2 +-
>>   configs/km_kirkwood_pci_defconfig             |  2 +-
>>   configs/kmcoge5un_defconfig                   |  2 +-
>>   configs/kmnusa_defconfig                      |  2 +-
>>   include/configs/km_kirkwood.h                 |  6 ++--
>>   include/configs/kmcoge5ne.h                   | 10 +++---
>>   include/configs/kmeter1.h                     | 10 +++---
>>   include/configs/kmopti2.h                     | 10 +++---
>>   include/configs/kmp204x.h                     |  8 ++---
>>   include/configs/kmsupx5.h                     | 10 +++---
>>   include/configs/kmtegr1.h                     | 10 +++---
>>   include/configs/kmtepr2.h                     | 10 +++---
>>   include/configs/suvd3.h                       | 10 +++---
> 
> This may now confilcts with my suvd3 remove patch, see:
> 
> http://patchwork.ozlabs.org/patch/1240178/
> 
> May you rebase this patch based on it?

This also conflicts with the secu1 patch, so I would wait until that one
lands with sending a V2 and rebase the V2 on top of that. Otherwise this
rename will only cause a terrible headache in merging all the patches in.


More information about the U-Boot mailing list