powerpc: remove orphaned boards mcc200 and prs200
PATCH 1/1 powerpc: remove orphaned boards mcc200 and prs200
mcc200 and prs200 are old and have no maintainer. Remove the boards.
This also removes the mcc200 specific 1bpp BMP support from common/lcd.c
--- arch/powerpc/cpu/mpc5xxx/Kconfig | 4 - board/mcc200/Kconfig | 9 - board/mcc200/MAINTAINERS | 17 - board/mcc200/Makefile | 8 - board/mcc200/auto_update.c | 521 -------------------------- board/mcc200/lcd.c | 200 ---------- board/mcc200/mcc200.c | 314 ---------------- board/mcc200/mt46v16m16-75.h | 16 - board/mcc200/mt48lc16m16a2-75.h | 14 - board/mcc200/mt48lc16m32s2-75.h | 14 - board/mcc200/mt48lc8m32b2-6-7.h | 12 - common/lcd.c | 24 +- configs/mcc200_COM12_SDRAM_defconfig | 4 - configs/mcc200_COM12_defconfig | 4 - configs/mcc200_COM12_highboot_SDRAM_defconfig | 4 - configs/mcc200_COM12_highboot_defconfig | 4 - configs/mcc200_SDRAM_defconfig | 4 - configs/mcc200_defconfig | 3 - configs/mcc200_highboot_SDRAM_defconfig | 4 - configs/mcc200_highboot_defconfig | 4 - configs/prs200_DDR_defconfig | 4 - configs/prs200_defconfig | 4 - configs/prs200_highboot_DDR_defconfig | 4 - configs/prs200_highboot_defconfig | 4 - doc/README.scrapyard | 2 + include/configs/mcc200.h | 397 -------------------- include/lcd.h | 2 +- 27 files changed, 4 insertions(+), 1597 deletions(-) delete mode 100644 board/mcc200/Kconfig delete mode 100644 board/mcc200/MAINTAINERS delete mode 100644 board/mcc200/Makefile delete mode 100644 board/mcc200/auto_update.c delete mode 100644 board/mcc200/lcd.c delete mode 100644 board/mcc200/mcc200.c delete mode 100644 board/mcc200/mt46v16m16-75.h delete mode 100644 board/mcc200/mt48lc16m16a2-75.h delete mode 100644 board/mcc200/mt48lc16m32s2-75.h delete mode 100644 board/mcc200/mt48lc8m32b2-6-7.h delete mode 100644 configs/mcc200_COM12_SDRAM_defconfig delete mode 100644 configs/mcc200_COM12_defconfig delete mode 100644 configs/mcc200_COM12_highboot_SDRAM_defconfig delete mode 100644 configs/mcc200_COM12_highboot_defconfig delete mode 100644 configs/mcc200_SDRAM_defconfig delete mode 100644 configs/mcc200_defconfig delete mode 100644 configs/mcc200_highboot_SDRAM_defconfig delete mode 100644 configs/mcc200_highboot_defconfig delete mode 100644 configs/prs200_DDR_defconfig delete mode 100644 configs/prs200_defconfig delete mode 100644 configs/prs200_highboot_DDR_defconfig delete mode 100644 configs/prs200_highboot_defconfig delete mode 100644 include/configs/mcc200.h
arch/powerpc/cpu/mpc5xxx/Kconfig +0 -4
@@ -38,9 +38,6 @@ config TARGET_IPEK01 config TARGET_JUPITER bool "Support jupiter" -config TARGET_MCC200 - bool "Support mcc200" - config TARGET_MOTIONPRO bool "Support motionpro"
@@ -130,7 +127,6 @@ source "board/jupiter/Kconfig" source "board/manroland/hmi1001/Kconfig" source "board/manroland/mucmc52/Kconfig" source "board/manroland/uc101/Kconfig" -source "board/mcc200/Kconfig" source "board/motionpro/Kconfig" source "board/munices/Kconfig" source "board/phytec/pcm030/Kconfig"
board/mcc200/Kconfig deleted +0 -9
@@ -1,9 +0,0 @@ -if TARGET_MCC200 - -config SYS_BOARD - default "mcc200" - -config SYS_CONFIG_NAME - default "mcc200" - -endif
board/mcc200/MAINTAINERS deleted +0 -17
@@ -1,17 +0,0 @@ -MCC200 BOARD -#M: - -S: Maintained -F: board/mcc200/ -F: include/configs/mcc200.h -F: configs/mcc200_defconfig -F: configs/mcc200_COM12_defconfig -F: configs/mcc200_COM12_highboot_defconfig -F: configs/mcc200_COM12_highboot_SDRAM_defconfig -F: configs/mcc200_COM12_SDRAM_defconfig -F: configs/mcc200_highboot_defconfig -F: configs/mcc200_highboot_SDRAM_defconfig -F: configs/mcc200_SDRAM_defconfig -F: configs/prs200_defconfig -F: configs/prs200_DDR_defconfig -F: configs/prs200_highboot_defconfig -F: configs/prs200_highboot_DDR_defconfig
board/mcc200/Makefile deleted +0 -8
@@ -1,8 +0,0 @@ -# -# (C) Copyright 2003-2006 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y := mcc200.o lcd.o auto_update.o
board/mcc200/auto_update.c deleted +0 -521
521 lines not on this page · raw message
board/mcc200/lcd.c deleted +0 -200
200 lines not on this page · raw message
board/mcc200/mcc200.c deleted +0 -314
314 lines not on this page · raw message
board/mcc200/mt46v16m16-75.h deleted +0 -16
@@ -1,16 +0,0 @@ -/* -* (C) Copyright 2004 -* Mark Jonas, Freescale Semiconductor, mark.jonas at motorola.com. -* -* SPDX-License-Identifier: GPL-2.0+ -*/ - -#define SDRAM_DDR 1/* is DDR */ - -/* Settings for XLB = 132 MHz */ -#define SDRAM_MODE 0x018D0000 -#define SDRAM_EMODE 0x40090000 -#define SDRAM_CONTROL 0x714f0f00 -#define SDRAM_CONFIG1 0x73722930 -#define SDRAM_CONFIG2 0x47770000 -#define SDRAM_TAPDELAY 0x10000000
board/mcc200/mt48lc16m16a2-75.h deleted +0 -14
@@ -1,14 +0,0 @@ -/* -* (C) Copyright 2004 -* Mark Jonas, Freescale Semiconductor, mark.jonas at motorola.com. -* -* SPDX-License-Identifier: GPL-2.0+ -*/ - -#define SDRAM_DDR 0/* is SDR */ - -/* Settings for XLB = 132 MHz */ -#define SDRAM_MODE 0x00CD0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xD2322800 -#define SDRAM_CONFIG2 0x8AD70000
board/mcc200/mt48lc16m32s2-75.h deleted +0 -14
@@ -1,14 +0,0 @@ -/* -* (C) Copyright 2004 -* Mark Jonas, Freescale Semiconductor, [email protected]. -* -* SPDX-License-Identifier: GPL-2.0+ -*/ - -#define SDRAM_DDR 0/* is SDR */ - -/* Settings for XLB = 132 MHz */ -#define SDRAM_MODE 0x00CD0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xD2322800 -#define SDRAM_CONFIG2 0x8AD70000
board/mcc200/mt48lc8m32b2-6-7.h deleted +0 -12
@@ -1,12 +0,0 @@ -/* -* Configuration Registers for the MT48LC8M32B2 SDRAM on the MPC5200 platform -*/ - -#define SDRAM_DDR 0/* is SDR */ - -/* Settings for XLB = 132 MHz */ - -#define SDRAM_MODE 0x008d0000/* CL-3 BURST-8 -> Mode Register MBAR + 0x0100 */ -#define SDRAM_CONTROL 0x504f0000/* Control Register MBAR + 0x0104 */ -#define SDRAM_CONFIG1 0xc2222900/* Delays between commands -> Configuration Register 1 MBAR + 0x0108 */ -#define SDRAM_CONFIG2 0x88c70000/* Delays between commands -> Configuration Register 2 MBAR + 0x010C */
common/lcd.c +1 -23
@@ -881,7 +881,7 @@ static void lcd_display_rle8_bitmap(bmp_image_t *bmp, ushort *cmap, uchar *fb, }#endif -#if defined(CONFIG_MPC823 ) || defined(CONFIG_MCC200 ) +#if defined(CONFIG_MPC823 )#define FB_PUT_BYTE (fb, from) *(fb)++ = (255 - *(from)++)#else #define FB_PUT_BYTE (fb, from) *(fb)++ = *(from)++
@@ -906,9 +906,7 @@ static inline void fb_put_word(uchar **fb, uchar **from)int lcd_display_bitmap (ulong bmp_image,int x,int y) { -#if !defined(CONFIG_MCC200 )ushort *cmap =NULL ; -#endif ushort *cmap_base =NULL ;ushort i, j;uchar *fb;
@@ -956,8 +954,6 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)debug ("Display-bmp: %d x %d with %d colors\n" , (int )width, (int )height, (int )colors); -#if !defined(CONFIG_MCC200 ) -/* MCC200 LCD doesn't need CMAP, supports 1bpp b&w only */ if (bmp_bpix ==8 ) { cmap =configuration_get_cmap (); cmap_base = cmap;
@@ -985,24 +981,6 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)#endif } } -#endif -/* -* BMP format for Monochrome assumes that the state of a -* pixel is described on a per Bit basis, not per Byte. -* So, in case of Monochrome BMP we should align widths -* on a byte boundary and convert them from Bit to Byte -* units. -* Probably, PXA250 and MPC823 process 1bpp BMP images in -* their own ways, so make the converting to be MCC200 -* specific. -*/ -#if defined(CONFIG_MCC200 ) -if (bpix ==1 ) { - width = ((width +7 ) & ~7 ) >>3 ; - x = ((x +7 ) & ~7 ) >>3 ; - pwidth= ((pwidth +7 ) & ~7 ) >>3 ; - } -#endif padded_width = (width &0x3 ? (width & ~0x3 ) +4 : width);
configs/mcc200_COM12_SDRAM_defconfig deleted +0 -4
@@ -1,4 +0,0 @@ -CONFIG_SYS_EXTRA_OPTIONS="CONSOLE_COM12,MCC200_SDRAM" -CONFIG_PPC=y -CONFIG_MPC5xxx=y -CONFIG_TARGET_MCC200=y
configs/mcc200_COM12_defconfig deleted +0 -4
@@ -1,4 +0,0 @@ -CONFIG_SYS_EXTRA_OPTIONS="CONSOLE_COM12" -CONFIG_PPC=y -CONFIG_MPC5xxx=y -CONFIG_TARGET_MCC200=y
configs/mcc200_COM12_highboot_SDRAM_defconfig deleted +0 -4
@@ -1,4 +0,0 @@ -CONFIG_SYS_EXTRA_OPTIONS="CONSOLE_COM12,SYS_TEXT_BASE=0xFFF00000,MCC200_SDRAM" -CONFIG_PPC=y -CONFIG_MPC5xxx=y -CONFIG_TARGET_MCC200=y
configs/mcc200_COM12_highboot_defconfig deleted +0 -4
@@ -1,4 +0,0 @@ -CONFIG_SYS_EXTRA_OPTIONS="CONSOLE_COM12,SYS_TEXT_BASE=0xFFF00000" -CONFIG_PPC=y -CONFIG_MPC5xxx=y -CONFIG_TARGET_MCC200=y
configs/mcc200_SDRAM_defconfig deleted +0 -4
@@ -1,4 +0,0 @@ -CONFIG_SYS_EXTRA_OPTIONS="MCC200_SDRAM" -CONFIG_PPC=y -CONFIG_MPC5xxx=y -CONFIG_TARGET_MCC200=y
configs/mcc200_defconfig deleted +0 -3
@@ -1,3 +0,0 @@ -CONFIG_PPC=y -CONFIG_MPC5xxx=y -CONFIG_TARGET_MCC200=y
configs/mcc200_highboot_SDRAM_defconfig deleted +0 -4
@@ -1,4 +0,0 @@ -CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFFF00000,MCC200_SDRAM" -CONFIG_PPC=y -CONFIG_MPC5xxx=y -CONFIG_TARGET_MCC200=y
configs/mcc200_highboot_defconfig deleted +0 -4
@@ -1,4 +0,0 @@ -CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFFF00000" -CONFIG_PPC=y -CONFIG_MPC5xxx=y -CONFIG_TARGET_MCC200=y
configs/prs200_DDR_defconfig deleted +0 -4
@@ -1,4 +0,0 @@ -CONFIG_SYS_EXTRA_OPTIONS="PRS200" -CONFIG_PPC=y -CONFIG_MPC5xxx=y -CONFIG_TARGET_MCC200=y
configs/prs200_defconfig deleted +0 -4
@@ -1,4 +0,0 @@ -CONFIG_SYS_EXTRA_OPTIONS="PRS200,MCC200_SDRAM" -CONFIG_PPC=y -CONFIG_MPC5xxx=y -CONFIG_TARGET_MCC200=y
configs/prs200_highboot_DDR_defconfig deleted +0 -4
@@ -1,4 +0,0 @@ -CONFIG_SYS_EXTRA_OPTIONS="PRS200,SYS_TEXT_BASE=0xFFF00000" -CONFIG_PPC=y -CONFIG_MPC5xxx=y -CONFIG_TARGET_MCC200=y
configs/prs200_highboot_defconfig deleted +0 -4
@@ -1,4 +0,0 @@ -CONFIG_SYS_EXTRA_OPTIONS="PRS200,SYS_TEXT_BASE=0xFFF00000,MCC200_SDRAM" -CONFIG_PPC=y -CONFIG_MPC5xxx=y -CONFIG_TARGET_MCC200=y
doc/README.scrapyard +2 -0
@@ -15,6 +15,8 @@ Board Arch CPU Commit Removed Last known m TOP5200 powerpc mpc5200 - - Reinhard Meyer <[email protected]> TOP860 powerpc mpc860 - - Reinhard Meyer <[email protected]> TOP9000 arm at91sam9xeXXX - - Reinhard Meyer <[email protected]> +PRS200 powerpc mpc5200 - 2014-11-05 +MCC200 powerpc mpc5200 - 2014-11-05 TQM8272 powerpc mpc8260 f06f9a1 2014-10-27 Wolfgang Denk <[email protected]> TQM8260 powerpc mpc8260 ccc1950 2014-10-27 Wolfgang Denk <[email protected]> IDS8247 powerpc mpc8260 6afb357 2014-10-27 Heiko Schocher <[email protected]>
include/configs/mcc200.h deleted +0 -397
397 lines not on this page · raw message
include/lcd.h +1 -1
@@ -250,7 +250,7 @@ typedef struct vidinfo { void *priv; /* Pointer to driver-specific data */ } vidinfo_t; -#endif /* CONFIG_MPC823, CONFIG_CPU_PXA25X, CONFIG_MCC200, CONFIG_ATMEL_LCD */ +#endif /* CONFIG_MPC823, CONFIG_CPU_PXA25X, CONFIG_ATMEL_LCD */ extern vidinfo_t panel_info;
Signature · 1 line
1.9.1
PATCH 1/1 powerpc: remove orphaned boards mcc200 and prs200
Hi Nikita,
Thanks for cleaning up!
doc/README.scrapyard Board Arch CPU Commit Removed Last known m · line 22
Quoted 13 lines · On Fri, 7 Nov 2014 14:17:18 +0200 Nikita Kiryanov <[email protected]>…
doc/README.scrapyard +2
-0@@ -15,6 +15,8 @@ Board Arch CPU Commit Removed Last known m TOP5200 powerpc mpc5200 - - Reinhard Meyer <[email protected]> TOP860 powerpc mpc860 - - Reinhard Meyer <[email protected]> TOP9000 arm at91sam9xeXXX - - Reinhard Meyer <[email protected]> +PRS200 powerpc mpc5200 - 2014-11-05 +MCC200 powerpc mpc5200 - 2014-11-05 TQM8272 powerpc mpc8260 f06f9a1 2014-10-27 Wolfgang Denk <[email protected]> TQM8260 powerpc mpc8260 ccc1950 2014-10-27 Wolfgang Denk <[email protected]> IDS8247 powerpc mpc8260 6afb357 2014-10-27 Heiko Schocher <[email protected]>
I think we are supposed to fill blank fields that have been added by former commits (in this case, Commit/Removed fields of TOP*)
and then add new lines at the top of them.
(i.e. eventually this list is sorted in reverse chronological order.)
At the moment, nobody knows when PRS200/MCC200 will be removed (= when this patch will be applied).
Best Regards
Masahiro Yamada
PATCH 1/1 powerpc: remove orphaned boards mcc200 and prs200
Hi Masahiro,
Quoted 18 lines · Masahiro Yamada
Hi Nikita,
Thanks for cleaning up!
Quoted 10 lines · On Fri, 7 Nov 2014 14:17:18 +0200 Nikita Kiryanov <[email protected]>…
doc/README.scrapyard +2
-0@@ -15,6 +15,8 @@ Board Arch CPU Commit Removed Last known m TOP5200 powerpc mpc5200 - - Reinhard Meyer <[email protected]> TOP860 powerpc mpc860 - - Reinhard Meyer <[email protected]> TOP9000 arm at91sam9xeXXX - - Reinhard Meyer <[email protected]> +PRS200 powerpc mpc5200 - 2014-11-05 +MCC200 powerpc mpc5200 - 2014-11-05
Quoted 8 lines
doc/README.scrapyard Board Arch CPU Commit Removed Last known m · line 22
Quoted 3 lines
doc/README.scrapyard +0
-0TQM8272 powerpc mpc8260 f06f9a1 2014-10-27 Wolfgang Denk <[email protected]> TQM8260 powerpc mpc8260 ccc1950 2014-10-27 Wolfgang Denk <[email protected]> IDS8247 powerpc mpc8260 6afb357 2014-10-27 Heiko Schocher <[email protected]>I think we are supposed to fill blank fields that have been added by former commits (in this case, Commit/Removed fields of TOP*)
git log on the scrapyard file shows me that the commit IDs were always filled in using a dedicated patch. Was there a decision to change this M.O.?
Quoted 2 lines
and then add new lines at the top of them.
(i.e. eventually this list is sorted in reverse chronological order.)
OK
Quoted 3 lines
At the moment, nobody knows when PRS200/MCC200 will be removed (= when this patch will be applied).
I'll remove the date then..
Quoted 4 lines
Best Regards
Masahiro Yamada
Signature · 2 lines
Regards, Nikita Kiryanov
PATCH 1/1 powerpc: remove orphaned boards mcc200 and prs200
Hello Nikita,
2014-11-11 1:24 GMT+09:00 Nikita Kiryanov <[email protected]>:
Quoted 9 lines
Quoted 4 lines
I think we are supposed to fill blank fields that have been added by former commits
(in this case, Commit/Removed fields of TOP*)git log on the scrapyard file shows me that the commit IDs were always filled in using a dedicated patch. Was there a decision to change this M.O.?
I think we used to insert blank columns and add new lines at the same time. For example,
commit 3569571db27589f9b3d92b5ab2c59a50dac9387f
commit 79c5c08d7c560aef2d5706501557b7907c2829bb
although it looks like we sometimes play it by ear.
If you want to split it into two patches, that's OK, of course.
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH 1/1 powerpc: remove orphaned boards mcc200 and prs200
In reply to Nikita KiryanovDear Nikita,
Quoted 15 lines · In message <[email protected]> you wrote:
Quoted 14 lines
doc/README.scrapyard Board Arch CPU Commit Removed Last known m · line 22
Quoted 9 lines
TOP5200 powerpc mpc5200 - - Reinhard Meyer <[email protected]>
TOP860 powerpc mpc860 - - Reinhard Meyer <[email protected]>
TOP9000 arm at91sam9xeXXX - - Reinhard Meyer <[email protected]>doc/README.scrapyard +2
-0+PRS200 powerpc mpc5200 - 2014-11-05 +MCC200 powerpc mpc5200 - 2014-11-05 TQM8272 powerpc mpc8260 f06f9a1 2014-10-27 Wolfgang Denk <[email protected]> TQM8260 powerpc mpc8260 ccc1950 2014-10-27 Wolfgang Denk <[email protected]> IDS8247 powerpc mpc8260 6afb357 2014-10-27 Heiko Schocher <[email protected]>I think we are supposed to fill blank fields that have been added by former commits (in this case, Commit/Removed fields of TOP*)
Quoted 3 lines
git log on the scrapyard file shows me that the commit IDs were always filled in using a dedicated patch. Was there a decision to change this M.O.?
Your additions should go to the top of the file, with '-' place holders for both commit ID and date (as we cannot know in advance when they will get merged into mainline).
You are also supposed to check if older commits which still have place holders might have made it in to mainline, and if so, replace these by the respective commit IDs and dates.
Yes, this is a bit cumbersome, but not too much.
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
"An open mind has but one disadvantage: it collects dirt."
- a saying at RPI