From d5723b9bc31596d77ad082d16c14ac50ac3988f9 Mon Sep 17 00:00:00 2001
From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 23 Sep 2008 14:56:29 +0000
Subject: [adm5120] experimental support for the Motorola MU Gateway

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12662 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/adm5120/image/lzma-loader/src/board.c      | 17 ++++++++++++-----
 target/linux/adm5120/image/lzma-loader/src/config.h     | 12 ++++++++++++
 target/linux/adm5120/image/lzma-loader/src/decompress.c |  5 +++--
 3 files changed, 27 insertions(+), 7 deletions(-)

(limited to 'target/linux/adm5120/image/lzma-loader/src')

diff --git a/target/linux/adm5120/image/lzma-loader/src/board.c b/target/linux/adm5120/image/lzma-loader/src/board.c
index 22317f968..5ebdbc3b1 100644
--- a/target/linux/adm5120/image/lzma-loader/src/board.c
+++ b/target/linux/adm5120/image/lzma-loader/src/board.c
@@ -1,8 +1,8 @@
 /*
  * ADM5120 specific board support for LZMA decompressor
  *
- * Copyright (C) 2007 OpenWrt.org
- * Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org>
+ * Copyright (C) 2007-2008 OpenWrt.org
+ * Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org>
  *
  * 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
@@ -19,6 +19,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+#include "config.h"
 #include <stddef.h>
 
 #define READREG(r)	*(volatile unsigned int *)(r)
@@ -35,7 +36,8 @@
 /*
  * UART definitions
  */
-#define UART_BASE	0xB2600000
+#define UART0_BASE	0xB2600000
+#define UART1_BASE	0xB2800000
 /* UART registers */
 #define UART_REG_DATA	0x00	/* Data register */
 #define UART_REG_ECR	0x04	/* Error Clear register */
@@ -91,8 +93,13 @@
  * UART routines
  */
 
-#define UART_READ(r)	READREG(UART_BASE+(r))
-#define UART_WRITE(r,v)	WRITEREG(UART_BASE+(r),(v))
+#if defined(CONFIG_USE_UART0)
+#  define UART_READ(r)		READREG(UART0_BASE+(r))
+#  define UART_WRITE(r,v)	WRITEREG(UART0_BASE+(r),(v))
+#else
+#  define UART_READ(r)		READREG(UART1_BASE+(r))
+#  define UART_WRITE(r,v)	WRITEREG(UART1_BASE+(r),(v))
+#endif
 
 static void uart_init(void)
 {
diff --git a/target/linux/adm5120/image/lzma-loader/src/config.h b/target/linux/adm5120/image/lzma-loader/src/config.h
index 74ae9afa2..4e8b5f647 100644
--- a/target/linux/adm5120/image/lzma-loader/src/config.h
+++ b/target/linux/adm5120/image/lzma-loader/src/config.h
@@ -97,6 +97,14 @@
 #  define CONFIG_FLASH_SIZE	FLASH_4M
 #endif
 
+/*
+ * Motorola boards
+ */
+#if defined(CONFIG_BOARD_POWERLINEMUGW)
+#  define CONFIG_BOARD_NAME	"Powerline MU Gateway"
+#  define CONFIG_USE_UART1	1
+#endif
+
 /*
  * ZyXEL boards
  */
@@ -121,4 +129,8 @@
 #  define CONFIG_FLASH_SIZE	FLASH_2M
 #endif
 
+#if !defined(CONFIG_USE_UART0) && !defined(CONFIG_USE_UART1)
+#  define CONFIG_USE_UART0
+#endif
+
 #endif /* _CONFIG_H_ */
diff --git a/target/linux/adm5120/image/lzma-loader/src/decompress.c b/target/linux/adm5120/image/lzma-loader/src/decompress.c
index 4a20a6b42..de6c937d3 100644
--- a/target/linux/adm5120/image/lzma-loader/src/decompress.c
+++ b/target/linux/adm5120/image/lzma-loader/src/decompress.c
@@ -4,7 +4,8 @@
  * LZMA compressed kernel decompressor for ADM5120 boards
  *
  * Copyright (C) 2005 by Oleg I. Vdovikin <oleg@cs.msu.su>
- * Copyright (C) 2007 OpenWrt.org
+ * Copyright (C) 2007-2008 OpenWrt.org
+ * Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org>
  *
  * 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
@@ -293,7 +294,7 @@ void decompress_entry(unsigned long reg_a0, unsigned long reg_a1,
 	board_init();
 
 	printf("\n\nLZMA loader for " CONFIG_BOARD_NAME
-			", Copyright (C) 2007 OpenWrt.org\n\n");
+			", Copyright (C) 2007-2008 OpenWrt.org\n\n");
 
 	decompress_init();
 
-- 
cgit v1.2.3