Skip to contentSkip to conversation

PowerPC: drop some 74xx_7xx boards and related code

PATCH New Wolfgang Denk 2 participants 3 messages Oct 21, 2014 – Oct 24, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 2/2 PowerPC: drop some 74xx_7xx boards and related code

The file board/Marvell/include/mv_gen_reg.h is incompatible with the GPL (see for example the "MARVELL RESERVES THE RIGHT AT ITS SOLE DISCRETION TO REQUEST THAT THIS CODE BE IMMEDIATELY RETURNED TO MARVELL" clause). As this cannot be fixed, we remove the file and all code that depends on it. Fortunately this only affects some very old boards that have long reached EOL:

	CPCI750
	DB64360
	DB64460
	p3m750
	p3m7448
Cc Reinhard Arlt <[email protected]>
Cc Stefan Roese <[email protected]>
Cc Roger Meier <[email protected]>
---
 arch/powerpc/cpu/74xx_7xx/Kconfig  |   16 -
 arch/powerpc/cpu/74xx_7xx/start.S  |   13 +-
 board/Marvell/common/flash.c       | 1056 ------------
 board/Marvell/common/i2c.c         |  521 ------
 board/Marvell/common/intel_flash.c |  253 ---
 board/Marvell/common/misc.S        |  235 ---
 board/Marvell/common/serial.c      |    8 -
 board/Marvell/db64360/64360.h      |   36 -
 board/Marvell/db64360/Kconfig      |   12 -
 board/Marvell/db64360/MAINTAINERS  |    6 -
 board/Marvell/db64360/Makefile     |   13 -
 board/Marvell/db64360/README       |  105 --
 board/Marvell/db64360/db64360.c    |  922 ----------
 board/Marvell/db64360/eth.h        |   28 -
 board/Marvell/db64360/mpsc.c       | 1001 -----------
 board/Marvell/db64360/mpsc.h       |  140 --
 board/Marvell/db64360/mv_eth.c     | 3128 ----------------------------------
 board/Marvell/db64360/mv_eth.h     |  818 ---------
 board/Marvell/db64360/mv_regs.h    | 1108 ------------
 board/Marvell/db64360/pci.c        |  923 ----------
 board/Marvell/db64360/sdram_init.c | 1945 ---------------------
 board/Marvell/db64460/64460.h      |   36 -
 board/Marvell/db64460/Kconfig      |   12 -
 board/Marvell/db64460/MAINTAINERS  |    6 -
 board/Marvell/db64460/Makefile     |   13 -
 board/Marvell/db64460/README       |  105 --
 board/Marvell/db64460/db64460.c    |  922 ----------
 board/Marvell/db64460/eth.h        |   27 -
 board/Marvell/db64460/mpsc.c       | 1001 -----------
 board/Marvell/db64460/mpsc.h       |  140 --
 board/Marvell/db64460/mv_eth.c     | 3127 ----------------------------------
 board/Marvell/db64460/mv_eth.h     |  815 ---------
 board/Marvell/db64460/mv_regs.h    | 1108 ------------
 board/Marvell/db64460/pci.c        |  923 ----------
 board/Marvell/db64460/sdram_init.c | 1950 ---------------------
 board/Marvell/include/core.h       |  236 ---
 board/Marvell/include/mv_gen_reg.h | 2296 -------------------------
 board/esd/cpci750/64360.h          |   37 -
 board/esd/cpci750/Kconfig          |   12 -
 board/esd/cpci750/MAINTAINERS      |    6 -
 board/esd/cpci750/Makefile         |   14 -
 board/esd/cpci750/cpci750.c        | 1088 ------------
 board/esd/cpci750/eth.h            |   28 -
 board/esd/cpci750/i2c.c            |  475 ------
 board/esd/cpci750/i2c.h            |   16 -
 board/esd/cpci750/ide.c            |   74 -
 board/esd/cpci750/local.h          |   69 -
 board/esd/cpci750/misc.S           |  245 ---
 board/esd/cpci750/mpsc.c           | 1002 -----------
 board/esd/cpci750/mpsc.h           |  140 --
 board/esd/cpci750/mv_eth.c         | 3131 ----------------------------------
 board/esd/cpci750/mv_eth.h         |  819 ---------
 board/esd/cpci750/mv_regs.h        | 1108 ------------
 board/esd/cpci750/pci.c            | 1028 -----------
 board/esd/cpci750/sdram_init.c     | 1702 -------------------
 board/esd/cpci750/serial.c         |  106 --
 board/prodrive/p3mx/64460.h        |   36 -
 board/prodrive/p3mx/Kconfig        |   12 -
 board/prodrive/p3mx/MAINTAINERS    |    7 -
 board/prodrive/p3mx/Makefile       |   10 -
 board/prodrive/p3mx/eth.h          |   28 -
 board/prodrive/p3mx/misc.S         |  245 ---
 board/prodrive/p3mx/mpsc.c         |  997 -----------
 board/prodrive/p3mx/mpsc.h         |  140 --
 board/prodrive/p3mx/mv_eth.c       | 3291 ------------------------------------
 board/prodrive/p3mx/mv_eth.h       |  815 ---------
 board/prodrive/p3mx/mv_regs.h      | 1109 ------------
 board/prodrive/p3mx/p3mx.c         |  838 ---------
 board/prodrive/p3mx/p3mx.h         |   17 -
 board/prodrive/p3mx/pci.c          | 1003 -----------
 board/prodrive/p3mx/sdram_init.c   |  418 -----
 board/prodrive/p3mx/serial.c       |  106 --
 configs/CPCI750_defconfig          |    3 -
 configs/DB64360_defconfig          |    3 -
 configs/DB64460_defconfig          |    3 -
 configs/p3m7448_defconfig          |    4 -
 configs/p3m750_defconfig           |    4 -
 doc/README.scrapyard               |    5 +
 drivers/net/eepro100.c             |    2 +-
 include/configs/CPCI750.h          |  609 -------
 include/configs/DB64360.h          |  579 -------
 include/configs/DB64460.h          |  517 ------
 include/configs/p3mx.h             |  434 -----
 83 files changed, 7 insertions(+), 47332 deletions(-)
 delete mode 100644 board/Marvell/common/flash.c
 delete mode 100644 board/Marvell/common/i2c.c
 delete mode 100644 board/Marvell/common/intel_flash.c
 delete mode 100644 board/Marvell/common/misc.S
 delete mode 100644 board/Marvell/db64360/64360.h
 delete mode 100644 board/Marvell/db64360/Kconfig
 delete mode 100644 board/Marvell/db64360/MAINTAINERS
 delete mode 100644 board/Marvell/db64360/Makefile
 delete mode 100644 board/Marvell/db64360/README
 delete mode 100644 board/Marvell/db64360/db64360.c
 delete mode 100644 board/Marvell/db64360/eth.h
 delete mode 100644 board/Marvell/db64360/mpsc.c
 delete mode 100644 board/Marvell/db64360/mpsc.h
 delete mode 100644 board/Marvell/db64360/mv_eth.c
 delete mode 100644 board/Marvell/db64360/mv_eth.h
 delete mode 100644 board/Marvell/db64360/mv_regs.h
 delete mode 100644 board/Marvell/db64360/pci.c
 delete mode 100644 board/Marvell/db64360/sdram_init.c
 delete mode 100644 board/Marvell/db64460/64460.h
 delete mode 100644 board/Marvell/db64460/Kconfig
 delete mode 100644 board/Marvell/db64460/MAINTAINERS
 delete mode 100644 board/Marvell/db64460/Makefile
 delete mode 100644 board/Marvell/db64460/README
 delete mode 100644 board/Marvell/db64460/db64460.c
 delete mode 100644 board/Marvell/db64460/eth.h
 delete mode 100644 board/Marvell/db64460/mpsc.c
 delete mode 100644 board/Marvell/db64460/mpsc.h
 delete mode 100644 board/Marvell/db64460/mv_eth.c
 delete mode 100644 board/Marvell/db64460/mv_eth.h
 delete mode 100644 board/Marvell/db64460/mv_regs.h
 delete mode 100644 board/Marvell/db64460/pci.c
 delete mode 100644 board/Marvell/db64460/sdram_init.c
 delete mode 100644 board/Marvell/include/core.h
 delete mode 100644 board/Marvell/include/mv_gen_reg.h
 delete mode 100644 board/esd/cpci750/64360.h
 delete mode 100644 board/esd/cpci750/Kconfig
 delete mode 100644 board/esd/cpci750/MAINTAINERS
 delete mode 100644 board/esd/cpci750/Makefile
 delete mode 100644 board/esd/cpci750/cpci750.c
 delete mode 100644 board/esd/cpci750/eth.h
 delete mode 100644 board/esd/cpci750/i2c.c
 delete mode 100644 board/esd/cpci750/i2c.h
 delete mode 100644 board/esd/cpci750/ide.c
 delete mode 100644 board/esd/cpci750/local.h
 delete mode 100644 board/esd/cpci750/misc.S
 delete mode 100644 board/esd/cpci750/mpsc.c
 delete mode 100644 board/esd/cpci750/mpsc.h
 delete mode 100644 board/esd/cpci750/mv_eth.c
 delete mode 100644 board/esd/cpci750/mv_eth.h
 delete mode 100644 board/esd/cpci750/mv_regs.h
 delete mode 100644 board/esd/cpci750/pci.c
 delete mode 100644 board/esd/cpci750/sdram_init.c
 delete mode 100644 board/esd/cpci750/serial.c
 delete mode 100644 board/prodrive/p3mx/64460.h
 delete mode 100644 board/prodrive/p3mx/Kconfig
 delete mode 100644 board/prodrive/p3mx/MAINTAINERS
 delete mode 100644 board/prodrive/p3mx/Makefile
 delete mode 100644 board/prodrive/p3mx/eth.h
 delete mode 100644 board/prodrive/p3mx/misc.S
 delete mode 100644 board/prodrive/p3mx/mpsc.c
 delete mode 100644 board/prodrive/p3mx/mpsc.h
 delete mode 100644 board/prodrive/p3mx/mv_eth.c
 delete mode 100644 board/prodrive/p3mx/mv_eth.h
 delete mode 100644 board/prodrive/p3mx/mv_regs.h
 delete mode 100644 board/prodrive/p3mx/p3mx.c
 delete mode 100644 board/prodrive/p3mx/p3mx.h
 delete mode 100644 board/prodrive/p3mx/pci.c
 delete mode 100644 board/prodrive/p3mx/sdram_init.c
 delete mode 100644 board/prodrive/p3mx/serial.c
 delete mode 100644 configs/CPCI750_defconfig
 delete mode 100644 configs/DB64360_defconfig
 delete mode 100644 configs/DB64460_defconfig
 delete mode 100644 configs/p3m7448_defconfig
 delete mode 100644 configs/p3m750_defconfig
 delete mode 100644 include/configs/CPCI750.h
 delete mode 100644 include/configs/DB64360.h
 delete mode 100644 include/configs/DB64460.h
 delete mode 100644 include/configs/p3mx.h

[Patch deleted due to size - 1.6 MB]

See branch "ppc-cruft-removal" in git://git.denx.de/u-boot-denx.git
or [1]

[1] http://www.denx.de/wiki/pub/U-Boot/TooBigPatches/0002-PowerPC-drop-some-74xx_7xx-boards-and-related-code.patch

#1 lore raw

PATCH 2/2 PowerPC: drop some 74xx_7xx boards and related code

Quoted 12 lines · Wolfgang Denk

The file board/Marvell/include/mv_gen_reg.h is incompatible with the GPL (see for example the "MARVELL RESERVES THE RIGHT AT ITS SOLE DISCRETION TO REQUEST THAT THIS CODE BE IMMEDIATELY RETURNED TO MARVELL" clause). As this cannot be fixed, we remove the file and all code that depends on it. Fortunately this only affects some very old boards that have long reached EOL:

	CPCI750
	DB64360
	DB64460
	p3m750
	p3m7448
Quoted 4 lines
Cc Reinhard Arlt <[email protected]>
Cc Stefan Roese <[email protected]>
Cc Roger Meier <[email protected]>

For the Prodrive boards (p3m750 / p3m7448):

Thanks,
Stefan

#2 lore raw

PATCH 2/2 PowerPC: drop some 74xx_7xx boards and related code

In reply to Wolfgang Denk

Dear Wolfgang Denk,

Quoted 171 lines · In message <[email protected]> you wrote:

The file board/Marvell/include/mv_gen_reg.h is incompatible with the GPL (see for example the "MARVELL RESERVES THE RIGHT AT ITS SOLE DISCRETION TO REQUEST THAT THIS CODE BE IMMEDIATELY RETURNED TO MARVELL" clause). As this cannot be fixed, we remove the file and all code that depends on it. Fortunately this only affects some very old boards that have long reached EOL:

	CPCI750
	DB64360
	DB64460
	p3m750
	p3m7448
Cc Reinhard Arlt <[email protected]>
Cc Stefan Roese <[email protected]>
Cc Roger Meier <[email protected]>
---
 arch/powerpc/cpu/74xx_7xx/Kconfig  |   16 -
 arch/powerpc/cpu/74xx_7xx/start.S  |   13 +-
 board/Marvell/common/flash.c       | 1056 ------------
 board/Marvell/common/i2c.c         |  521 ------
 board/Marvell/common/intel_flash.c |  253 ---
 board/Marvell/common/misc.S        |  235 ---
 board/Marvell/common/serial.c      |    8 -
 board/Marvell/db64360/64360.h      |   36 -
 board/Marvell/db64360/Kconfig      |   12 -
 board/Marvell/db64360/MAINTAINERS  |    6 -
 board/Marvell/db64360/Makefile     |   13 -
 board/Marvell/db64360/README       |  105 --
 board/Marvell/db64360/db64360.c    |  922 ----------
 board/Marvell/db64360/eth.h        |   28 -
 board/Marvell/db64360/mpsc.c       | 1001 -----------
 board/Marvell/db64360/mpsc.h       |  140 --
 board/Marvell/db64360/mv_eth.c     | 3128 ----------------------------------
 board/Marvell/db64360/mv_eth.h     |  818 ---------
 board/Marvell/db64360/mv_regs.h    | 1108 ------------
 board/Marvell/db64360/pci.c        |  923 ----------
 board/Marvell/db64360/sdram_init.c | 1945 ---------------------
 board/Marvell/db64460/64460.h      |   36 -
 board/Marvell/db64460/Kconfig      |   12 -
 board/Marvell/db64460/MAINTAINERS  |    6 -
 board/Marvell/db64460/Makefile     |   13 -
 board/Marvell/db64460/README       |  105 --
 board/Marvell/db64460/db64460.c    |  922 ----------
 board/Marvell/db64460/eth.h        |   27 -
 board/Marvell/db64460/mpsc.c       | 1001 -----------
 board/Marvell/db64460/mpsc.h       |  140 --
 board/Marvell/db64460/mv_eth.c     | 3127 ----------------------------------
 board/Marvell/db64460/mv_eth.h     |  815 ---------
 board/Marvell/db64460/mv_regs.h    | 1108 ------------
 board/Marvell/db64460/pci.c        |  923 ----------
 board/Marvell/db64460/sdram_init.c | 1950 ---------------------
 board/Marvell/include/core.h       |  236 ---
 board/Marvell/include/mv_gen_reg.h | 2296 -------------------------
 board/esd/cpci750/64360.h          |   37 -
 board/esd/cpci750/Kconfig          |   12 -
 board/esd/cpci750/MAINTAINERS      |    6 -
 board/esd/cpci750/Makefile         |   14 -
 board/esd/cpci750/cpci750.c        | 1088 ------------
 board/esd/cpci750/eth.h            |   28 -
 board/esd/cpci750/i2c.c            |  475 ------
 board/esd/cpci750/i2c.h            |   16 -
 board/esd/cpci750/ide.c            |   74 -
 board/esd/cpci750/local.h          |   69 -
 board/esd/cpci750/misc.S           |  245 ---
 board/esd/cpci750/mpsc.c           | 1002 -----------
 board/esd/cpci750/mpsc.h           |  140 --
 board/esd/cpci750/mv_eth.c         | 3131 ----------------------------------
 board/esd/cpci750/mv_eth.h         |  819 ---------
 board/esd/cpci750/mv_regs.h        | 1108 ------------
 board/esd/cpci750/pci.c            | 1028 -----------
 board/esd/cpci750/sdram_init.c     | 1702 -------------------
 board/esd/cpci750/serial.c         |  106 --
 board/prodrive/p3mx/64460.h        |   36 -
 board/prodrive/p3mx/Kconfig        |   12 -
 board/prodrive/p3mx/MAINTAINERS    |    7 -
 board/prodrive/p3mx/Makefile       |   10 -
 board/prodrive/p3mx/eth.h          |   28 -
 board/prodrive/p3mx/misc.S         |  245 ---
 board/prodrive/p3mx/mpsc.c         |  997 -----------
 board/prodrive/p3mx/mpsc.h         |  140 --
 board/prodrive/p3mx/mv_eth.c       | 3291 ------------------------------------
 board/prodrive/p3mx/mv_eth.h       |  815 ---------
 board/prodrive/p3mx/mv_regs.h      | 1109 ------------
 board/prodrive/p3mx/p3mx.c         |  838 ---------
 board/prodrive/p3mx/p3mx.h         |   17 -
 board/prodrive/p3mx/pci.c          | 1003 -----------
 board/prodrive/p3mx/sdram_init.c   |  418 -----
 board/prodrive/p3mx/serial.c       |  106 --
 configs/CPCI750_defconfig          |    3 -
 configs/DB64360_defconfig          |    3 -
 configs/DB64460_defconfig          |    3 -
 configs/p3m7448_defconfig          |    4 -
 configs/p3m750_defconfig           |    4 -
 doc/README.scrapyard               |    5 +
 drivers/net/eepro100.c             |    2 +-
 include/configs/CPCI750.h          |  609 -------
 include/configs/DB64360.h          |  579 -------
 include/configs/DB64460.h          |  517 ------
 include/configs/p3mx.h             |  434 -----
 83 files changed, 7 insertions(+), 47332 deletions(-)
 delete mode 100644 board/Marvell/common/flash.c
 delete mode 100644 board/Marvell/common/i2c.c
 delete mode 100644 board/Marvell/common/intel_flash.c
 delete mode 100644 board/Marvell/common/misc.S
 delete mode 100644 board/Marvell/db64360/64360.h
 delete mode 100644 board/Marvell/db64360/Kconfig
 delete mode 100644 board/Marvell/db64360/MAINTAINERS
 delete mode 100644 board/Marvell/db64360/Makefile
 delete mode 100644 board/Marvell/db64360/README
 delete mode 100644 board/Marvell/db64360/db64360.c
 delete mode 100644 board/Marvell/db64360/eth.h
 delete mode 100644 board/Marvell/db64360/mpsc.c
 delete mode 100644 board/Marvell/db64360/mpsc.h
 delete mode 100644 board/Marvell/db64360/mv_eth.c
 delete mode 100644 board/Marvell/db64360/mv_eth.h
 delete mode 100644 board/Marvell/db64360/mv_regs.h
 delete mode 100644 board/Marvell/db64360/pci.c
 delete mode 100644 board/Marvell/db64360/sdram_init.c
 delete mode 100644 board/Marvell/db64460/64460.h
 delete mode 100644 board/Marvell/db64460/Kconfig
 delete mode 100644 board/Marvell/db64460/MAINTAINERS
 delete mode 100644 board/Marvell/db64460/Makefile
 delete mode 100644 board/Marvell/db64460/README
 delete mode 100644 board/Marvell/db64460/db64460.c
 delete mode 100644 board/Marvell/db64460/eth.h
 delete mode 100644 board/Marvell/db64460/mpsc.c
 delete mode 100644 board/Marvell/db64460/mpsc.h
 delete mode 100644 board/Marvell/db64460/mv_eth.c
 delete mode 100644 board/Marvell/db64460/mv_eth.h
 delete mode 100644 board/Marvell/db64460/mv_regs.h
 delete mode 100644 board/Marvell/db64460/pci.c
 delete mode 100644 board/Marvell/db64460/sdram_init.c
 delete mode 100644 board/Marvell/include/core.h
 delete mode 100644 board/Marvell/include/mv_gen_reg.h
 delete mode 100644 board/esd/cpci750/64360.h
 delete mode 100644 board/esd/cpci750/Kconfig
 delete mode 100644 board/esd/cpci750/MAINTAINERS
 delete mode 100644 board/esd/cpci750/Makefile
 delete mode 100644 board/esd/cpci750/cpci750.c
 delete mode 100644 board/esd/cpci750/eth.h
 delete mode 100644 board/esd/cpci750/i2c.c
 delete mode 100644 board/esd/cpci750/i2c.h
 delete mode 100644 board/esd/cpci750/ide.c
 delete mode 100644 board/esd/cpci750/local.h
 delete mode 100644 board/esd/cpci750/misc.S
 delete mode 100644 board/esd/cpci750/mpsc.c
 delete mode 100644 board/esd/cpci750/mpsc.h
 delete mode 100644 board/esd/cpci750/mv_eth.c
 delete mode 100644 board/esd/cpci750/mv_eth.h
 delete mode 100644 board/esd/cpci750/mv_regs.h
 delete mode 100644 board/esd/cpci750/pci.c
 delete mode 100644 board/esd/cpci750/sdram_init.c
 delete mode 100644 board/esd/cpci750/serial.c
 delete mode 100644 board/prodrive/p3mx/64460.h
 delete mode 100644 board/prodrive/p3mx/Kconfig
 delete mode 100644 board/prodrive/p3mx/MAINTAINERS
 delete mode 100644 board/prodrive/p3mx/Makefile
 delete mode 100644 board/prodrive/p3mx/eth.h
 delete mode 100644 board/prodrive/p3mx/misc.S
 delete mode 100644 board/prodrive/p3mx/mpsc.c
 delete mode 100644 board/prodrive/p3mx/mpsc.h
 delete mode 100644 board/prodrive/p3mx/mv_eth.c
 delete mode 100644 board/prodrive/p3mx/mv_eth.h
 delete mode 100644 board/prodrive/p3mx/mv_regs.h
 delete mode 100644 board/prodrive/p3mx/p3mx.c
 delete mode 100644 board/prodrive/p3mx/p3mx.h
 delete mode 100644 board/prodrive/p3mx/pci.c
 delete mode 100644 board/prodrive/p3mx/sdram_init.c
 delete mode 100644 board/prodrive/p3mx/serial.c
 delete mode 100644 configs/CPCI750_defconfig
Quoted 8 lines
 delete mode 100644 configs/DB64360_defconfig
 delete mode 100644 configs/DB64460_defconfig
 delete mode 100644 configs/p3m7448_defconfig
 delete mode 100644 configs/p3m750_defconfig
 delete mode 100644 include/configs/CPCI750.h
 delete mode 100644 include/configs/DB64360.h
 delete mode 100644 include/configs/DB64460.h
 delete mode 100644 include/configs/p3mx.h

Applied to u-boot-mpc5xxx, thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
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
In English, every word can be verbed.  Would that it were  so  in our
programming languages.