Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68knommu: allow 4 coldfire serial ports m68knommu: fix coldfire tcdrain m68knommu: remove a duplicate vector setting line for 68360 Fix m68k-uclinux's rt_sigreturn trampoline m68knommu: correct the CC flags for Coldfire M5272 targets uclinux: error message when FLAT reloc symbol is invalid, v2
This commit is contained in:
commit
1ef6ce7a34
|
@ -212,5 +212,10 @@ struct mcf_platform_uart {
|
|||
#define MCFUART_URF_RXS 0xc0 /* Receiver status */
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_M5272)
|
||||
#define MCFUART_TXFIFOSIZE 25
|
||||
#else
|
||||
#define MCFUART_TXFIFOSIZE 1
|
||||
#endif
|
||||
/****************************************************************************/
|
||||
#endif /* mcfuart_h */
|
||||
|
|
|
@ -94,7 +94,7 @@ cflags-$(CONFIG_M520x) := $(call cc-option,-mcpu=5208,-m5200)
|
|||
cflags-$(CONFIG_M523x) := $(call cc-option,-mcpu=523x,-m5307)
|
||||
cflags-$(CONFIG_M5249) := $(call cc-option,-mcpu=5249,-m5200)
|
||||
cflags-$(CONFIG_M5271) := $(call cc-option,-mcpu=5271,-m5307)
|
||||
cflags-$(CONFIG_M5272) := $(call cc-option,-mcpu=5271,-m5200)
|
||||
cflags-$(CONFIG_M5272) := $(call cc-option,-mcpu=5272,-m5307)
|
||||
cflags-$(CONFIG_M5275) := $(call cc-option,-mcpu=5275,-m5307)
|
||||
cflags-$(CONFIG_M528x) := $(call cc-option,-m528x,-m5307)
|
||||
cflags-$(CONFIG_M5307) := $(call cc-option,-m5307,-m5200)
|
||||
|
|
|
@ -145,6 +145,6 @@ ENTRY(ret_from_user_signal)
|
|||
trap #0
|
||||
|
||||
ENTRY(ret_from_user_rt_signal)
|
||||
move #__NR_rt_sigreturn,%d0
|
||||
movel #__NR_rt_sigreturn,%d0
|
||||
trap #0
|
||||
|
||||
|
|
|
@ -107,7 +107,6 @@ void init_IRQ(void)
|
|||
_ramvec[vba+CPMVEC_PIO_PC7] = inthandler; /* pio - pc7 */
|
||||
_ramvec[vba+CPMVEC_PIO_PC6] = inthandler; /* pio - pc6 */
|
||||
_ramvec[vba+CPMVEC_TIMER3] = inthandler; /* timer 3 */
|
||||
_ramvec[vba+CPMVEC_RISCTIMER] = inthandler; /* reserved */
|
||||
_ramvec[vba+CPMVEC_PIO_PC5] = inthandler; /* pio - pc5 */
|
||||
_ramvec[vba+CPMVEC_PIO_PC4] = inthandler; /* pio - pc4 */
|
||||
_ramvec[vba+CPMVEC_RESERVED2] = inthandler; /* reserved */
|
||||
|
|
|
@ -263,6 +263,7 @@ static void mcf_set_termios(struct uart_port *port, struct ktermios *termios,
|
|||
}
|
||||
|
||||
spin_lock_irqsave(&port->lock, flags);
|
||||
uart_update_timeout(port, termios->c_cflag, baud);
|
||||
writeb(MCFUART_UCR_CMDRESETRX, port->membase + MCFUART_UCR);
|
||||
writeb(MCFUART_UCR_CMDRESETTX, port->membase + MCFUART_UCR);
|
||||
writeb(MCFUART_UCR_CMDRESETMRPTR, port->membase + MCFUART_UCR);
|
||||
|
@ -379,6 +380,7 @@ static irqreturn_t mcf_interrupt(int irq, void *data)
|
|||
static void mcf_config_port(struct uart_port *port, int flags)
|
||||
{
|
||||
port->type = PORT_MCF;
|
||||
port->fifosize = MCFUART_TXFIFOSIZE;
|
||||
|
||||
/* Clear mask, so no surprise interrupts. */
|
||||
writeb(0, port->membase + MCFUART_UIMR);
|
||||
|
@ -424,7 +426,7 @@ static int mcf_verify_port(struct uart_port *port, struct serial_struct *ser)
|
|||
/*
|
||||
* Define the basic serial functions we support.
|
||||
*/
|
||||
static struct uart_ops mcf_uart_ops = {
|
||||
static const struct uart_ops mcf_uart_ops = {
|
||||
.tx_empty = mcf_tx_empty,
|
||||
.get_mctrl = mcf_get_mctrl,
|
||||
.set_mctrl = mcf_set_mctrl,
|
||||
|
@ -443,7 +445,7 @@ static struct uart_ops mcf_uart_ops = {
|
|||
.verify_port = mcf_verify_port,
|
||||
};
|
||||
|
||||
static struct mcf_uart mcf_ports[3];
|
||||
static struct mcf_uart mcf_ports[4];
|
||||
|
||||
#define MCF_MAXPORTS ARRAY_SIZE(mcf_ports)
|
||||
|
||||
|
|
|
@ -355,7 +355,7 @@ calc_reloc(unsigned long r, struct lib_info *p, int curid, int internalp)
|
|||
|
||||
if (!flat_reloc_valid(r, start_brk - start_data + text_len)) {
|
||||
printk("BINFMT_FLAT: reloc outside program 0x%x (0 - 0x%x/0x%x)",
|
||||
(int) r,(int)(start_brk-start_code),(int)text_len);
|
||||
(int) r,(int)(start_brk-start_data+text_len),(int)text_len);
|
||||
goto failed;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue