ppc4xx: Remove ML2 board support

As the board seems to be unmaintained for some time, lets remove the support in mainline completely.

---
 MAINTAINERS                       |   4 -
 arch/powerpc/include/asm/ppc4xx.h |   2 +-
 board/ml2/Makefile                |  45 ------
 board/ml2/flash.c                 | 300 --------------------------------------
 board/ml2/init.S                  |  30 ----
 board/ml2/ml2.c                   |  62 --------
 board/ml2/serial.c                | 115 ---------------
 board/ml2/u-boot.lds              |  94 ------------
 board/ml2/u-boot.lds.debug        | 135 -----------------
 boards.cfg                        |   1 -
 include/configs/ML2.h             | 257 --------------------------------
 11 files changed, 1 insertion(+), 1044 deletions(-)
 delete mode 100644 board/ml2/Makefile
 delete mode 100644 board/ml2/flash.c
 delete mode 100644 board/ml2/init.S
 delete mode 100644 board/ml2/ml2.c
 delete mode 100644 board/ml2/serial.c
 delete mode 100644 board/ml2/u-boot.lds
 delete mode 100644 board/ml2/u-boot.lds.debug
 delete mode 100644 include/configs/ML2.h

index 07dc789..e5ac741 100644
@@ -452,10 +452,6 @@ Heiko Schocher <[email protected]>
 	uc101		MPC5200
 	ve8313		MPC8313
 
-Peter De Schrijver <[email protected]>
-
-	ML2		PPC4xx
-
 Andre Schwarz <[email protected]>
 
 	mergerbox	MPC8377

index 633f793..55eb4d6 100644
@@ -86,7 +86,7 @@
 /*
  * Configure which SDRAM/DDR/DDR2 controller is equipped
  */
-#if defined(CONFIG_AP1000) || defined(CONFIG_ML2)
+#if defined(CONFIG_AP1000)
 #define CONFIG_SDRAM_PPC4xx_IBM_SDRAM	/* IBM SDRAM controller */
 #endif
 

deleted file mode 100644
index 91d053c..0000000
@@ -1,30 +0,0 @@
-/*
- * init.S: Stubs for U-Boot initialization
- *
- * Copyright 2002 Mind NV
- *
- * http://www.mind.be/
- *
- * Author : Peter De Schrijver ([email protected])
- *
- * This software may be used and distributed according to the terms of
- * the GNU General Public License (GPL) version 2, incorporated herein by
- * reference. Drivers based on or derived from this code fall under the GPL
- * and must retain the authorship, copyright and this license notice. This
- * file is not a complete program and may only be used when the entire
- * program is licensed under the GPL.
- *
- */
-
-#include <asm/ppc4xx.h>
-
-#include <ppc_asm.tmpl>
-#include <ppc_defs.h>
-
-#include <asm/cache.h>
-#include <asm/mmu.h>
-
-
-	.globl	ext_bus_cntlr_init
-ext_bus_cntlr_init:
-	blr

index 343859e..226c7cb 100644
@@ -958,7 +958,6 @@ JSE                          powerpc     ppc4xx      jse
 korat                        powerpc     ppc4xx
 korat_perm                   powerpc     ppc4xx      korat               -              -           korat:KORAT_PERMANENT
 lwmon5                       powerpc     ppc4xx
-ML2                          powerpc     ppc4xx      ml2
 pcs440ep                     powerpc     ppc4xx
 quad100hd                    powerpc     ppc4xx
 sbc405                       powerpc     ppc4xx

1.7.12.1

As the board seems to be unmaintained for some time, lets remove the support in mainline completely.

---
 arch/powerpc/cpu/ppc4xx/speed.c   |   8 -
 arch/powerpc/include/asm/ppc4xx.h |   7 -
 board/amirix/ap1000/Makefile      |  47 --
 board/amirix/ap1000/ap1000.c      | 709 ------------------------------
 board/amirix/ap1000/ap1000.h      | 173 --------
 board/amirix/ap1000/flash.c       | 900 --------------------------------------
 board/amirix/ap1000/init.S        |  30 --
 board/amirix/ap1000/pci.c         | 318 --------------
 board/amirix/ap1000/powerspan.c   | 750 -------------------------------
 board/amirix/ap1000/powerspan.h   | 170 -------
 board/amirix/ap1000/serial.c      | 111 -----
 board/amirix/ap1000/u-boot.lds    |  96 ----
 boards.cfg                        |   1 -
 drivers/net/e1000.c               |  42 +-
 include/common.h                  |   4 +-
 include/configs/AP1000.h          | 247 -----------
 16 files changed, 3 insertions(+), 3610 deletions(-)
 delete mode 100644 board/amirix/ap1000/Makefile
 delete mode 100644 board/amirix/ap1000/ap1000.c
 delete mode 100644 board/amirix/ap1000/ap1000.h
 delete mode 100644 board/amirix/ap1000/flash.c
 delete mode 100644 board/amirix/ap1000/init.S
 delete mode 100644 board/amirix/ap1000/pci.c
 delete mode 100644 board/amirix/ap1000/powerspan.c
 delete mode 100644 board/amirix/ap1000/powerspan.h
 delete mode 100644 board/amirix/ap1000/serial.c
 delete mode 100644 board/amirix/ap1000/u-boot.lds
 delete mode 100644 include/configs/AP1000.h

index 6156ac9..45ef035 100644
@@ -812,14 +812,6 @@ unsigned long determine_pci_clock_per(void)
 extern void get_sys_info (sys_info_t * sysInfo);
 extern ulong get_PCI_freq (void);
 
-#elif defined(CONFIG_AP1000)
-void get_sys_info (sys_info_t * sysInfo)
-{
-	sysInfo->freqProcessor = 240 * 1000 * 1000;
-	sysInfo->freqPLB = 80 * 1000 * 1000;
-	sysInfo->freqPCI = 33 * 1000 * 1000;
-}
-
 #elif defined(CONFIG_405)
 
 void get_sys_info (sys_info_t * sysInfo)

index 55eb4d6..9f2a08b 100644
@@ -84,13 +84,6 @@
 #endif
 
 /*
- * Configure which SDRAM/DDR/DDR2 controller is equipped
- */
-#if defined(CONFIG_AP1000)
-#define CONFIG_SDRAM_PPC4xx_IBM_SDRAM	/* IBM SDRAM controller */
-#endif
-
-/*
  * Common registers for all SoC's
  */
 /* DCR registers */

deleted file mode 100644
index eac7cd3..0000000
@@ -1,30 +0,0 @@
-/*
- * init.S: Stubs for ppcboot initialization
- *
- * Copyright 2002 Mind NV
- *
- * http://www.mind.be/
- *
- * Author : Peter De Schrijver (p2 at mind.be)
- *
- * This software may be used and distributed according to the terms of
- * the GNU General Public License (GPL) version 2, incorporated herein by
- * reference. Drivers based on or derived from this code fall under the GPL
- * and must retain the authorship, copyright and this license notice. This
- * file is not a complete program and may only be used when the entire
- * program is licensed under the GPL.
- *
- */
-
-#include <asm/ppc4xx.h>
-
-#include <ppc_asm.tmpl>
-#include <ppc_defs.h>
-
-#include <asm/cache.h>
-#include <asm/mmu.h>
-
-
-	.globl	ext_bus_cntlr_init
-ext_bus_cntlr_init:
-	blr

index 226c7cb..7d4fe39 100644

index 100e550..fc48d3b 100644

1.7.12.1

Part of the diff is not shown here. View the raw message.

Dear Stefan Roese,

[...]

All for it, one less serial driver to care for.

Best regards,
Marek Vasut

As the board seems to be unmaintained for some time, lets remove the support in mainline completely.

---
 arch/powerpc/cpu/mpc824x/cpu_init.c |    4 +-
 arch/powerpc/cpu/mpc824x/start.S    |    9 +-
 board/bmw/Makefile                  |   50 --
 board/bmw/README                    |  331 ----------
 board/bmw/bmw.c                     |  159 -----
 board/bmw/bmw.h                     |   86 ---
 board/bmw/config.mk                 |   30 -
 board/bmw/early_init.S              | 1170 -----------------------------------
 board/bmw/flash.c                   |  779 -----------------------
 board/bmw/m48t59y.c                 |  324 ----------
 board/bmw/m48t59y.h                 |   57 --
 board/bmw/ns16550.c                 |   57 --
 board/bmw/ns16550.h                 |   79 ---
 board/bmw/serial.c                  |   81 ---
 boards.cfg                          |    1 -
 include/configs/BMW.h               |  302 ---------
 16 files changed, 4 insertions(+), 3515 deletions(-)
 delete mode 100644 board/bmw/Makefile
 delete mode 100644 board/bmw/README
 delete mode 100644 board/bmw/bmw.c
 delete mode 100644 board/bmw/bmw.h
 delete mode 100644 board/bmw/config.mk
 delete mode 100644 board/bmw/early_init.S
 delete mode 100644 board/bmw/flash.c
 delete mode 100644 board/bmw/m48t59y.c
 delete mode 100644 board/bmw/m48t59y.h
 delete mode 100644 board/bmw/ns16550.c
 delete mode 100644 board/bmw/ns16550.h
 delete mode 100644 board/bmw/serial.c
 delete mode 100644 include/configs/BMW.h

index 395f776..cfc665d 100644
@@ -63,7 +63,7 @@ void
 cpu_init_f (void)
 {
 /* MOUSSE board is initialized in asm */
-#if !defined(CONFIG_MOUSSE) && !defined(CONFIG_BMW)
+#if !defined(CONFIG_MOUSSE)
     register unsigned long val;
     CONFIG_WRITE_HALFWORD(PCICR, 0x06); /* Bus Master, respond to PCI memory space acesses*/
 /*    CONFIG_WRITE_HALFWORD(PCISR, 0xffff); */ /*reset PCISR*/

@@ -321,7 +321,7 @@ cpu_init_f (void)
 	CONFIG_WRITE_WORD(MCCR1, val | MCCR1_MEMGO); /* set memory access going */
 	__asm__ __volatile__("eieio");
 
-#endif /* !CONFIG_MOUSSE && !CONFIG_BMW */
+#endif /* !CONFIG_MOUSSE */
 }
 
 

index 70db73e..076df70 100644
@@ -113,9 +113,6 @@ _start:
 
 
 in_flash:
-#if defined(CONFIG_BMW)
-	bl early_init_f /* Must be ASM: no stack yet! */
-#endif
 	/*
 	 * Setup BATs - cannot be done in C since we don't have a stack yet
 	 */

@@ -126,7 +123,7 @@ in_flash:
 	mfmsr	r3
 	ori	r3, r3, (MSR_IR | MSR_DR)
 	mtmsr	r3
-#if !defined(CONFIG_BMW)
+
 	/* Enable and invalidate data cache.
 	 */
 	mfspr	r3, HID0

@@ -158,7 +155,7 @@ in_flash:
 	ori	r3, r3, 0x0080
 	sync
 	mtspr	1011, r3
-#endif /* !CONFIG_BMW */
+
 	/*
 	 * Thisk the stack pointer *somewhere* sensible. Doesnt
 	 * matter much where as we'll move it when we relocate

@@ -498,7 +495,6 @@ relocate_code:
 	bdnz	3b
 
 4:
-#if !defined(CONFIG_BMW)
 /* Unlock the data cache and invalidate locked area */
 	xor	r0, r0, r0
 	mtspr	1011, r0

@@ -510,7 +506,6 @@ relocate_code:
 	dcbi	r0, r4
 	addi	r4, r4, 32
 	bdnz	41b
-#endif
 
 /*
  * Now flush the cache: note that we must start from a cache aligned

deleted file mode 100644
index a1a44e5..0000000
@@ -1,30 +0,0 @@
-#
-# (C) Copyright 2001
-# Wolfgang Denk, DENX Software Engineering, wd at 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
-#
-
-#
-# BMW board
-#
-
-# NOTE: The flags below affect how the BCM570x driver is compiled
-PLATFORM_CPPFLAGS += -DEMBEDDED -DBIG_ENDIAN_HOST -DINCLUDE_5701_AX_FIX=1\
-		     -DDBG=0 -DT3_JUMBO_RCV_RCB_ENTRY_COUNT=256

index 7d4fe39..cdc01cb 100644

1.7.12.1

Part of the diff is not shown here. View the raw message.

Dear Stefan Roese,

[...]

One less serial driver to care for. Stefan, good job!

btw what about git format-patch -D ? ;-)

Best regards,
Marek Vasut

Applied to u-boot/master, thanks!

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20121017/49acadd5/attachment.pgp>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Well, the original message you were cc'd on went about a month without reply. If you wish to bring the board back and be the responsible MAINTAINER, that's fine, but with me, but it is a commitment. Thanks!

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iQIcBAEBAgAGBQJQgI/YAAoJENk4IS6UOR1WPGkP+gK6en2/k+xaDxSxQ6iVyhoC ifkcTshtm/e0LKW3AnWcLsr6M54r7TvVz+7mjsHZ/XJ0NWiGOSmEtEjSGXjYF4e1 LkZfsC8+80aUVMeUUiWZaBRzbDtB7rnwr0tVu5ERC7LsU6rE0zMGDjxhqST2EEtW dOLyY98fo/IEhEx6KZ+X5VMhNZ4tvqW3QQD4f+/Z+3RRMew3wxxiQdDThLotQZSn q8A2Q29p8xs0apenfFWPyRMsdm9aBiyogxGEH5ZmwtWriEJ3FQmdymZ4H3uCm92X +CFmkr9LAQVpDdi74makkWKt3GtmlqwTXE+dbSXTYIw6wKoUVJ+C32QP6UNdWlh1 m2JVmYZydLULKaJav9cERVd19BLFq5PZCEwpVKilugb/fcBqePQ5LZtT5jraA2J5 iz+ALzlU20omvgRecxR0YpvzWtJANDnDsrbAgjJPrbF8mTp9r8r5lLSb0nPheNiJ EO/e3uKz8/Er8wbgAbFPz3Sqxdhfvuz0JSCdJYJkM9gWkfkGl4uGjFjgTjsOHMQb TQ25Ws1Vug2HW/KA2YokQofSZrjIeYWgl1tjr+SPWqMuwOcjsuffEZl9vbUcBNiA mo256ZNl0TUgwqLbadiU8SvNCYuETMv3to8XX2mxSYZ9K6gGwGOGu4A9u3o3E/TJ FkPMZKJa8ROonFKAAPZx
=NXr6
-----END PGP SIGNATURE-----

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Welp, lets move forward. If you want to be the maintainer, submit a patch that brings the board back and adds yourself and the baord to the MAINTAINERS file. The biggest expectation, aside from dealing with breakage when reported, is to test the releases, at least a little bit, on the hardware. Thanks!

- --
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iQIcBAEBAgAGBQJQgOOoAAoJENk4IS6UOR1Wqm4P/0rZafkYizqMnVkNk0gl0snl pw1JJTFsnyKTZ3k/qc4yltJIaDO7hNhW7D28k7hyvQ+ysV5hSPsgVtsSZCcMu72e Jmirn2WxlExjO25aovsxmmz8GLDN4Dz0D3iKkrXlhDVwht2RBErqOb7R9dw+XtRA LRRhU2wMAPyZk0cPMI1WzC4kxKBJzcQzksqNhm4P0rB9it1eBjWXJrBQUyuiVMfN G8355FCZw49/8EebwYSjxhShYF5iPXxBiLgqJXjuOD3iCun6yfLVe2qXoI+vX3Gs U9x8FdLQCuzOrj85LttWAEH6zEbxuZxi+85jHZ4aUdej2+MHMuDltM4gP9LBw1Dk 4FAYsE9O2acRERDJUmeazJhKRbyn5ks+Wad8mEqsAyvBOurwLuIbLGSqjs+6x2ej EvxtCnLc20+zIIMR/8l8BFSmYVX4jCqamWeJg1VRfu0ptUwvk3L3/0JSVv2tfUu+ fY2G9XDqxHJAQmQvkf9B2xFAUB8Nu3cO1DZOc+I5ay/nPfdnjhIOpmOWZhwS8bJm /C9qF0TYpvr61mv5KEllfAyBoYSQ4AdL4vn9lc07SUVR2ByR+CR7lHb5VWojCZhS S+GHZh//jJ2BBA1IyD2aMfxr2Ko8PWmLBW3xSrlB7rFQWacp9xqoRTQMl71jVnS9 pHRYlup0dNgW0k1Rk2cX
=7P4V
-----END PGP SIGNATURE-----

Dear James,

it appears you wrote (as Tom quotes so):

It appears you have a major problem with your e-mail setup, then, because none of your messages reached the mailing list either.

Please check your mail configuration.

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 yet to add the ESP-driver to the kernel to read  the  mind  of
the user...                                       - Linus Torvalds in
      <[email protected]>

Dear Stefan Roese,

[...]

And one less :)

Best regards,
Marek Vasut