Remove HMI10 board support
Subsystems (2)
PATCH 1/3 Remove HMI10 board support
Recent changes caused that the HMI10 board now is included in the boards built by MAKEALL, which revealed that compilation for this board has been broken for a long time:
ps2ser.c: In function 'ps2ser_init':
ps2ser.c:155: error: 'UART_LCR' undeclared (first use in this function) ps2ser.c:155: error: (Each undeclared identifier is reported only once ps2ser.c:155: error: for each function it appears in.)
ps2ser.c:156: error: 'UART_DLL' undeclared (first use in this function) ps2ser.c:157: error: 'UART_DLM' undeclared (first use in this function) ps2ser.c:159: error: 'UART_IER' undeclared (first use in this function) ps2ser.c:160: error: 'UART_MCR' undeclared (first use in this function) ps2ser.c:161: error: 'UART_FCR' undeclared (first use in this function) ps2ser.c:162: error: 'UART_FCR_ENABLE_FIFO' undeclared (first use in this function) ps2ser.c:166: error: 'UART_LSR' undeclared (first use in this function) ps2ser.c: In function 'ps2ser_putc':
ps2ser.c:198: error: 'UART_LSR' undeclared (first use in this function) ps2ser.c:200: error: 'UART_TX' undeclared (first use in this function) ps2ser.c: In function 'ps2ser_getc_hw':
ps2ser.c:224: error: 'UART_LSR' undeclared (first use in this function) ps2ser.c:225: error: 'UART_RX' undeclared (first use in this function) ps2ser.c: In function 'ps2ser_interrupt':
ps2ser.c:293: error: 'UART_IIR' undeclared (first use in this function)
The board is orphaned, and AFAICT has reached EOL. Drop support for it.
--- board/mbx8xx/pcmcia.c | 4 - board/tqc/tqm8xx/tqm8xx.c | 23 -- boards.cfg | 1 - common/cmd_ide.c | 11 +- drivers/input/ps2ser.c | 109 ++-------- drivers/pcmcia/mpc8xx_pcmcia.c | 29 --- drivers/pcmcia/tqm8xx_pcmcia.c | 42 ---- include/configs/HMI10.h | 504 ---------------------------------------- include/status_led.h | 17 +-- 9 files changed, 23 insertions(+), 717 deletions(-) delete mode 100644 include/configs/HMI10.h
board/mbx8xx/pcmcia.c +0 -4
@@ -117,11 +117,7 @@ int pcmcia_hardware_enable (int slot)debug ("[%d] %s: PIPR(%p)=0x%x\n" , __LINE__,__FUNCTION__, &(pcmp->pcmc_pipr),pcmp->pcmc_pipr); -#ifndef CONFIG_HMI10 -if (pcmp->pcmc_pipr & (0x18000000 >> (slot <<4 ))) { -#else if (pcmp->pcmc_pipr & (0x10000000 >> (slot <<4 ))) { -#endif /* CONFIG_HMI10 */ printf (" No Card found\n" );return (1 ); }
board/tqc/tqm8xx/tqm8xx.c +0 -23
@@ -430,29 +430,6 @@ static long int dram_size (long int mamr_value, long int *base, long int maxsize/* ------------------------------------------------------------------------- */ -#ifdef CONFIG_PS2MULT - -#ifdef CONFIG_HMI10 -#define BASE_BAUD ( 1843200 / 16 ) -struct serial_state rs_table[] = { - {BASE_BAUD ,4 , (void *)0xec140000 }, - {BASE_BAUD ,2 , (void *)0xec150000 }, - {BASE_BAUD ,6 , (void *)0xec160000 }, - {BASE_BAUD ,10 , (void *)0xec170000 }, -}; - -#ifdef CONFIG_BOARD_EARLY_INIT_R -int board_early_init_r (void ) -{ -ps2mult_early_init (); -return (0 ); -} -#endif -#endif /* CONFIG_HMI10 */ - -#endif /* CONFIG_PS2MULT */ - -#ifdef CONFIG_MISC_INIT_R extern void load_sernum_ethaddr (void );int misc_init_r (void )
boards.cfg +0 -1
@@ -170,7 +170,6 @@ QS823 powerpc mpc8xx qs850 snmc QS850 powerpc mpc8xx qs850 snmc QS860T powerpc mpc8xx qs860t snmc stxxtc powerpc mpc8xx stxxtc stx -HMI10 powerpc mpc8xx tqm8xx tqc SM850 powerpc mpc8xx tqm8xx tqc AMX860 powerpc mpc8xx amx860 westel csb272 powerpc ppc4xx
common/cmd_ide.c +5 -6
@@ -818,7 +818,7 @@ set_pcmcia_timing (int pmode)static void input_swap_data (int dev,ulong *sect_buf,int words) { -#if defined(CONFIG_HMI10 ) || defined(CONFIG_CPC45 ) +#if defined(CONFIG_CPC45 )uchar i;volatile uchar *pbuf_even = (uchar *)(ATA_CURR_BASE (dev)+ATA_DATA_EVEN );volatile uchar *pbuf_odd = (uchar *)(ATA_CURR_BASE (dev)+ATA_DATA_ODD );
@@ -858,7 +858,7 @@ input_swap_data(int dev, ulong *sect_buf, int words)static void output_data (int dev,ulong *sect_buf,int words) { -#if defined(CONFIG_HMI10 ) || defined(CONFIG_CPC45 ) +#if defined(CONFIG_CPC45 )uchar *dbuf;volatile uchar *pbuf_even;volatile uchar *pbuf_odd;
@@ -910,7 +910,7 @@ output_data(int dev, ulong *sect_buf, int words)static void input_data (int dev,ulong *sect_buf,int words) { -#if defined(CONFIG_HMI10 ) || defined(CONFIG_CPC45 ) +#if defined(CONFIG_CPC45 )uchar *dbuf;volatile uchar *pbuf_even;volatile uchar *pbuf_odd;
@@ -1544,7 +1544,6 @@ static void ide_reset (void)#if defined(CONFIG_IDE_LED ) && \ !defined(CONFIG_CPC45 ) && \ - !defined(CONFIG_HMI10 ) && \ !defined(CONFIG_KUP4K ) && \ !defined(CONFIG_KUP4X )
@@ -1586,7 +1585,7 @@ int ide_device_present(int dev)static void output_data_shorts (int dev,ushort *sect_buf,int shorts) { -#if defined(CONFIG_HMI10 ) || defined(CONFIG_CPC45 ) +#if defined(CONFIG_CPC45 )uchar *dbuf;volatile uchar *pbuf_even;volatile uchar *pbuf_odd;
@@ -1618,7 +1617,7 @@ output_data_shorts(int dev, ushort *sect_buf, int shorts)static void input_data_shorts (int dev,ushort *sect_buf,int shorts) { -#if defined(CONFIG_HMI10 ) || defined(CONFIG_CPC45 ) +#if defined(CONFIG_CPC45 )uchar *dbuf;volatile uchar *pbuf_even;volatile uchar *pbuf_odd;
drivers/input/ps2ser.c +17 -92
201 lines not on this page · raw message
drivers/pcmcia/mpc8xx_pcmcia.c +0 -29
@@ -57,12 +57,6 @@ static const u_int m8xx_size_to_gray[M8XX_SIZES_NO] =/* -------------------------------------------------------------------- */ -#ifdef CONFIG_HMI10 -#define HMI10_FRAM_TIMING ( PCMCIA_SHT(2) \ - | PCMCIA_SST(2) \ - | PCMCIA_SL(4)) -#endif -#if defined(CONFIG_LWMON ) || defined(CONFIG_NSCU )#define CONFIG_SYS_PCMCIA_TIMING ( PCMCIA_SHT(9) \ | PCMCIA_SST(3) \
@@ -106,17 +100,6 @@ int pcmcia_on (void)switch (i) {#ifdef CONFIG_IDE_8xx_PCCARDcase 4 : -#ifdef CONFIG_HMI10 - {/* map FRAM area */ - win->or = (PCMCIA_BSIZE_256K - |PCMCIA_PPS_8 - |PCMCIA_PRS_ATTR - | slotbit - |PCMCIA_PV - |HMI10_FRAM_TIMING ); -break ; - } -#endif case 0 : {/* map attribute memory */ win->or = (PCMCIA_BSIZE_64M | PCMCIA_PPS_8
@@ -147,18 +130,6 @@ int pcmcia_on (void) break; }#endif /* CONFIG_IDE_8xx_PCCARD */ -#ifdef CONFIG_HMI10 -case 3 : {/* map I/O window for 4xUART data/ctrl */ - win->br +=0x40000 ; - win->or = (PCMCIA_BSIZE_256K - |PCMCIA_PPS_8 - |PCMCIA_PRS_IO - | slotbit - |PCMCIA_PV - |CONFIG_SYS_PCMCIA_TIMING ); -break ; - } -#endif /* CONFIG_HMI10 */ default :/* set to not valid */ win->or =0 ;break ;
drivers/pcmcia/tqm8xx_pcmcia.c +0 -42
60 lines not on this page · raw message
include/configs/HMI10.h deleted +0 -504
504 lines not on this page · raw message
include/status_led.h +1 -16
@@ -43,7 +43,7 @@ void status_led_tick (unsigned long timestamp);void status_led_set (int led,int state);/***** TQM8xxL ********************************************************/ -#if defined(CONFIG_TQM8xxL) && !defined(CONFIG_HMI10 ) +#if defined(CONFIG_TQM8xxL)# define STATUS_LED_PAR im_cpm.cp_pbpar# define STATUS_LED_DIR im_cpm.cp_pbdir# define STATUS_LED_ODR im_cpm.cp_pbodr
@@ -318,21 +318,6 @@ void status_led_set (int led, int state);# define STATUS_LED_BOOT 0/* LED 0 used for boot status */ -/***** HMI10 **********************************************************/ -#elif defined(CONFIG_HMI10 ) -# define STATUS_LED_PAR im_ioport.iop_papar -# define STATUS_LED_DIR im_ioport.iop_padir -# define STATUS_LED_ODR im_ioport.iop_paodr -# define STATUS_LED_DAT im_ioport.iop_padat - -# define STATUS_LED_BIT 0x00000001/* LED is on PA15 */ -# define STATUS_LED_PERIOD (CONFIG_SYS_HZ / 2) -# define STATUS_LED_STATE STATUS_LED_BLINKING - -# define STATUS_LED_ACTIVE 1/* LED on for bit == 1 */ - -# define STATUS_LED_BOOT 0/* LED 0 used for boot status */ -/***** NetPhone ********************************************************/ #elif defined(CONFIG_NETPHONE ) || defined(CONFIG_NETTA2 )/* XXX empty just to avoid the error */
Signature · 1 line
1.7.2.3
PATCH 2/3 Remove smmaco4 board support
Recent changes caused that the smmaco4 board now is included in the boards built by MAKEALL, which revealed that compilation for this board has been broken for a long time:
mpc5xxx_fec.c:899:2: error: #error fec->xcv_type not initialized.
The board is orphaned. Drop support for it.
--- boards.cfg | 1 - include/configs/smmaco4.h | 379 --------------------------------------------- 2 files changed, 0 insertions(+), 380 deletions(-) delete mode 100644 include/configs/smmaco4.h
boards.cfg +0 -1
@@ -104,7 +104,6 @@ uc101 powerpc mpc5xxx v38b powerpc mpc5xxx pf5200 powerpc mpc5xxx - esd aev powerpc mpc5xxx tqm5200 tqc -smmaco4 powerpc mpc5xxx tqm5200 tqc spieval powerpc mpc5xxx tqm5200 tqc sorcery powerpc mpc8220 A3000 powerpc mpc824x a3000
include/configs/smmaco4.h deleted +0 -379
379 lines not on this page · raw message
Signature · 1 line
1.7.2.3
PATCH 3/3 Remove spieval board support
In reply to Wolfgang DenkRecent changes caused that the spieval board now is included in the boards built by MAKEALL, which revealed that compilation for this board has been broken for a long time:
mpc5xxx_fec.c:899:2: error: #error fec->xcv_type not initialized. mpc5xxx_fec.c:899:2: error: #error fec->xcv_type not initialized.
The board is orphaned. Drop support for it.
--- boards.cfg | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
boards.cfg +0 -1
@@ -104,7 +104,6 @@ uc101 powerpc mpc5xxx v38b powerpc mpc5xxx pf5200 powerpc mpc5xxx - esd aev powerpc mpc5xxx tqm5200 tqc -spieval powerpc mpc5xxx tqm5200 tqc sorcery powerpc mpc8220 A3000 powerpc mpc824x a3000 barco powerpc mpc824x
Signature · 1 line
1.7.2.3