projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix the tgz image build
[openwrt.git]
/
target
/
linux
/
adm5120-2.6
/
image
/
lzma-loader
/
src
/
board.c
diff --git
a/target/linux/adm5120-2.6/image/lzma-loader/src/board.c
b/target/linux/adm5120-2.6/image/lzma-loader/src/board.c
index
616e756
..
2425b7d
100644
(file)
--- a/
target/linux/adm5120-2.6/image/lzma-loader/src/board.c
+++ b/
target/linux/adm5120-2.6/image/lzma-loader/src/board.c
@@
-1,5
+1,5
@@
/*
/*
- * ADM5120 specific board support for LZMA decompressor
+ * ADM5120 specific board support for LZMA decompressor
*
* Copyright (C) 2007 OpenWrt.org
* Copyright (C) 2007 Gabor Juhos <juhosg@freemail.hu>
*
* Copyright (C) 2007 OpenWrt.org
* Copyright (C) 2007 Gabor Juhos <juhosg@freemail.hu>
@@
-24,7
+24,7
@@
#define READREG(r) *(volatile unsigned int *)(r)
#define WRITEREG(r,v) *(volatile unsigned int *)(r) = v
#define READREG(r) *(volatile unsigned int *)(r)
#define WRITEREG(r,v) *(volatile unsigned int *)(r) = v
-/*
+/*
* INTC definitions
*/
#define INTC_BASE 0xB2200000
* INTC definitions
*/
#define INTC_BASE 0xB2200000
@@
-32,7
+32,7
@@
/* INTC registers */
#define INTC_REG_IRQ_DISABLE 0x0C
/* INTC registers */
#define INTC_REG_IRQ_DISABLE 0x0C
-/*
+/*
* UART definitions
*/
#define UART_BASE 0xB2600000
* UART definitions
*/
#define UART_BASE 0xB2600000
@@
-61,7
+61,7
@@
#define UART_FLAG_RXFF ( 1 << 6 ) /* RX FIFO full */
#define UART_FLAG_TXFE ( 1 << 7 ) /* TX FIFO empty */
#define UART_FLAG_RXFF ( 1 << 6 ) /* RX FIFO full */
#define UART_FLAG_TXFE ( 1 << 7 ) /* TX FIFO empty */
-/*
+/*
* SWITCH definitions
*/
#define SWITCH_BASE 0xB2000000
* SWITCH definitions
*/
#define SWITCH_BASE 0xB2000000
@@
-96,8
+96,9
@@
static void uart_init(void)
{
static void uart_init(void)
{
+#if 0
unsigned int t;
unsigned int t;
-
+
/* disable uart */
UART_WRITE(UART_REG_CTRL, 0);
/* disable uart */
UART_WRITE(UART_REG_CTRL, 0);
@@
-106,7
+107,7
@@
static void uart_init(void)
UART_WRITE(UART_REG_LCRM, t);
t = UART_READ(UART_REG_LCRL);
UART_WRITE(UART_REG_LCRL, t);
UART_WRITE(UART_REG_LCRM, t);
t = UART_READ(UART_REG_LCRL);
UART_WRITE(UART_REG_LCRL, t);
-
+
/* keep data, stop, and parity bits, but disable FIFO */
t = UART_READ(UART_REG_LCRH);
t &= ~(UART_LCRH_FEN);
/* keep data, stop, and parity bits, but disable FIFO */
t = UART_READ(UART_REG_LCRH);
t &= ~(UART_LCRH_FEN);
@@
-117,15
+118,7
@@
static void uart_init(void)
/* enable uart, and disable interrupts */
UART_WRITE(UART_REG_CTRL, UART_CTRL_EN);
/* enable uart, and disable interrupts */
UART_WRITE(UART_REG_CTRL, UART_CTRL_EN);
-}
-
-static void uart_putc(int ch)
-{
- while ((UART_READ(UART_REG_FLAG) & UART_FLAG_TXFE) == 0);
-
- UART_WRITE(UART_REG_DATA, ch);
-
- while ((UART_READ(UART_REG_FLAG) & UART_FLAG_TXFF) != 0);
+#endif
}
/*
}
/*
@@
-150,7
+143,7
@@
static void intc_init(void)
static void switch_init(void)
{
/* disable PHYS ports */
static void switch_init(void)
{
/* disable PHYS ports */
- SWITCH_WRITE(SWITCH_REG_PORT_CONF0,
+ SWITCH_WRITE(SWITCH_REG_PORT_CONF0,
(SWITCH_PORTS_HW << PORT_CONF0_DP_SHIFT));
/* disable CPU port */
(SWITCH_PORTS_HW << PORT_CONF0_DP_SHIFT));
/* disable CPU port */
@@
-159,7
+152,7
@@
static void switch_init(void)
/* disable GPIO lines */
SWITCH_WRITE(SWITCH_REG_GPIO_CONF0, 0);
SWITCH_WRITE(SWITCH_REG_GPIO_CONF2, 0);
/* disable GPIO lines */
SWITCH_WRITE(SWITCH_REG_GPIO_CONF0, 0);
SWITCH_WRITE(SWITCH_REG_GPIO_CONF2, 0);
-
+
/* disable LED lines */
SWITCH_WRITE(SWITCH_REG_PORT0_LED, 0);
SWITCH_WRITE(SWITCH_REG_PORT1_LED, 0);
/* disable LED lines */
SWITCH_WRITE(SWITCH_REG_PORT0_LED, 0);
SWITCH_WRITE(SWITCH_REG_PORT1_LED, 0);
@@
-168,12
+161,13
@@
static void switch_init(void)
SWITCH_WRITE(SWITCH_REG_PORT4_LED, 0);
}
SWITCH_WRITE(SWITCH_REG_PORT4_LED, 0);
}
-/*
- * routines needed by decompress.c
- */
void board_putc(int ch)
{
void board_putc(int ch)
{
- uart_putc(ch);
+ while ((UART_READ(UART_REG_FLAG) & UART_FLAG_TXFE) == 0);
+
+ UART_WRITE(UART_REG_DATA, ch);
+
+ while ((UART_READ(UART_REG_FLAG) & UART_FLAG_TXFE) == 0);
}
void board_init(void)
}
void board_init(void)
This page took
0.03126 seconds
and
4
git commands to generate.