[uboot-lantiq]

* rework the arcadyan sku support
* adds a few new boards and switches


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25273 3c298f89-4303-0410-b956-a3cf2f4a3e73

6 files changed, 68 insertions, 166 deletions

diff --git a/package/uboot-lantiq/files/include/configs/arv752DWP22.h b/package/uboot-lantiq/files/include/configs/arcadyan-common.h
index 386a2380c..3bb64312e 100644
--- a/package/uboot-lantiq/files/include/configs/arv752DWP22.h
+++ b/package/uboot-lantiq/files/include/configs/arcadyan-common.h
@@ -33,12 +33,10 @@
 #define CONFIG_MIPS32		1	/* MIPS32 CPU compatible		*/
 #define CONFIG_MIPS24KEC	1	/* MIPS 24KEc CPU core			*/
 #define CONFIG_DANUBE		1	/* in a Danube/Twinpass Chip		*/
-#define CONFIG_ARV752DWP22	1	/* on the arv752DWP22 Board		*/
 
 #define CONFIG_SYS_MIPS_MULTI_CPU	1	/* This is a multi cpu system */
 
 #define CONFIG_USE_DDR_RAM
-#define CONFIG_SYS_MAX_RAM	64*1024*1024
 
 #define CONFIG_FLASH_CFI_DRIVER	1
 
@@ -58,8 +56,6 @@
 #endif
 #endif
 
-#define	CONFIG_SYS_PROMPT	"ARV752DWP22 => "	/* Monitor Command Prompt */
-
 #undef CONFIG_SYS_HUSH_PARSER		/* Use the HUSH parser		*/
 
 /*
@@ -72,7 +68,6 @@
 #define CONFIG_EXTRA_ENV_SETTINGS                                       \
         "ram_addr=0x80500000\0"                                         \
         "kernel_addr=0xb0050000\0"                                      \
-        "mtdparts=mtdparts=ifx-nor:256k(uboot)ro,64k(uboot_env)ro,64k(kernel),-(rootfs)\0" \
         "flashargs=setenv bootargs rootfstype=squashfs,jffs2\0"         \
         "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
                 "nfsroot=${serverip}:${rootpath} \0"                    \
@@ -91,10 +86,10 @@
                 "bootm ${ram_addr}\0"                                   \
         "load_kernel=tftp ${ram_addr} "                                 \
                 "${tftppath}openwrt-ifxmips-uImage\0"                   \
-        "update_uboot=tftp 0x80500000 ${tftppath}u-boot.bin;era 0xb0000000 +${filesize};" \
+        "update_uboot=tftp 0x80500000 ${tftppath}u-boot-" CONFIG_ARCADYAN ".bin;era 0xb0000000 +${filesize};" \
                 "cp.b 0x80500000 0xb0000000 ${filesize}\0" \
         "update_openwrt=tftp ${ram_addr} "                              \
-                "${tftppath}openwrt-ifxmips-squashfs.image;"            \
+                "${tftppath}openwrt-lantiq-" CONFIG_ARCADYAN "-squashfs.image;"            \
                 "era ${kernel_addr} +${filesize};"                      \
                 "cp.b ${ram_addr} ${kernel_addr} ${filesize}\0"
 
@@ -107,16 +102,9 @@
 #define CONFIG_SYS_MIPS_CACHE_OPER_MODE	CONF_CM_CACHABLE_NO_WA
 
 #define CONFIG_NET_MULTI
-#if 0
-#define CONFIG_M4530_ETH
-#define CONFIG_M4530_FPGA
-#endif
 
 #define CONFIG_IFX_ETOP
 //#define CLK_OUT2_25MHZ
-#define CONFIG_EXTRA_SWITCH
-
-//#define CONFIG_RMII			/*  use interface in RMII mode */
 
 #define CONFIG_MII
 #define CONFIG_CMD_MII
@@ -141,11 +129,9 @@
 
 #define CONFIG_CMD_HTTPD		/* enable upgrade via HTTPD */
 
-//#define CONFIG_ETHADDR		00:13:f7:df:1c:80
-//#define CONFIG_ETHADDR		11:22:33:44:55:66
-#define CONFIG_IPADDR		192.168.2.1
-#define CONFIG_SERVERIP		192.168.2.101
-#define CONFIG_GATEWAYIP	192.168.2.254
+#define CONFIG_IPADDR		192.168.1.1
+#define CONFIG_SERVERIP		192.168.1.101
+#define CONFIG_GATEWAYIP	192.168.1.254
 #define CONFIG_NETMASK		255.255.255.0
 #define CONFIG_ROOTPATH		"/export"
 
diff --git a/package/uboot-lantiq/files/include/configs/arv4518.h b/package/uboot-lantiq/files/include/configs/arv4518.h
index c4a9842c7..4c40f0542 100644
--- a/package/uboot-lantiq/files/include/configs/arv4518.h
+++ b/package/uboot-lantiq/files/include/configs/arv4518.h
@@ -1,152 +1,14 @@
-/*
- * (C) Copyright 2003-2005
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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 the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
+#ifndef __CONFIG_H_4518
+#define __CONFIG_H_4518
 
-/*
- * This file contains the configuration parameters for the Danube reference board.
- */
+#define CONFIG_ARV4518		1
+#define CONFIG_ARCADYAN		"ARV4518PW"
 
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-/* #define DEBUG */
-
-#define CONFIG_MIPS32		1	/* MIPS32 CPU compatible		*/
-#define CONFIG_MIPS24KEC	1	/* MIPS 24KEc CPU core			*/
-#define CONFIG_DANUBE		1	/* in a Danube/Twinpass Chip		*/
-#define CONFIG_ARV4518		1	/* on the arv4518 Board			*/
-
-#define CONFIG_SYS_MIPS_MULTI_CPU	1	/* This is a multi cpu system */
-
-#define CONFIG_USE_DDR_RAM
 #define CONFIG_SYS_MAX_RAM	64*1024*1024
+#define	CONFIG_SYS_PROMPT	"ARV4518 => "
+//#define CONFIG_RMII
+#define CONFIG_AR8216_SWITCH	1
 
-#define CONFIG_FLASH_CFI_DRIVER	1
-
-#define CONFIG_SYS_INIT_RAM_LOCK_MIPS
-
-#ifdef CONFIG_SYS_RAMBOOT
-	//#warning CONFIG_SYS_RAMBOOT
-	#define CONFIG_SKIP_LOWLEVEL_INIT
-#else /* CONFIG_SYS_RAMBOOT */
-	#define CONFIG_SYS_EBU_BOOT
-	#define INFINEON_EBU_BOOTCFG	0x688C688C	/* CMULT = 8 for 150 MHz */
-#endif /* CONFIG_SYS_RAMBOOT */
-
-#if 1
-#ifndef	CPU_CLOCK_RATE
-#define CPU_CLOCK_RATE	(ifx_get_cpuclk())
-#endif
-#endif
-
-#define	CONFIG_SYS_PROMPT	"ARV4518 => "	/* Monitor Command Prompt */
-
-#undef CONFIG_SYS_HUSH_PARSER		/* Use the HUSH parser		*/
-
-/*
- * Include common defines/options for all Infineon boards
- */
-#include "ifx-common.h"
-
+#include "arcadyan-common.h"
 
-#undef CONFIG_EXTRA_ENV_SETTINGS                                       
-#define CONFIG_EXTRA_ENV_SETTINGS                                       \
-        "ram_addr=0x80500000\0"                                         \
-        "kernel_addr=0xb0050000\0"                                      \
-        "mtdparts=mtdparts=ifx-nor:256k(uboot)ro,64k(uboot_env)ro,64k(kernel),-(rootfs)\0" \
-        "flashargs=setenv bootargs rootfstype=squashfs,jffs2\0"         \
-        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-                "nfsroot=${serverip}:${rootpath} \0"                    \
-        "addip=setenv bootargs ${bootargs} "                            \
-                "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
-                ":${hostname}:${netdev}:off\0"                          \
-        "addmisc=setenv bootargs ${bootargs} init=/etc/preinit "        \
-                "console=ttyS1,115200 ethaddr=${ethaddr} "              \
-                "${mtdparts}\0"                                         \
-        "flash_flash=run flashargs addip addmisc;"                      \
-                "bootm ${kernel_addr}\0"                                \
-        "flash_nfs=run nfsargs addip addmisc;bootm ${kernel_addr}\0"    \
-        "net_flash=run load_kernel flashargs addip addmisc;"            \
-                "bootm ${ram_addr}\0"                                   \
-        "net_nfs=run load_kernel nfsargs addip addmisc;"                \
-                "bootm ${ram_addr}\0"                                   \
-        "load_kernel=tftp ${ram_addr} "                                 \
-                "${tftppath}openwrt-ifxmips-uImage\0"                   \
-        "update_uboot=tftp 0x80500000 ${tftppath}u-boot.bin;era 0xb0000000 +${filesize};" \
-                "cp.b 0x80500000 0xb0000000 ${filesize}\0" \
-        "update_openwrt=tftp ${ram_addr} "                              \
-                "${tftppath}openwrt-ifxmips-squashfs.image;"            \
-                "era ${kernel_addr} +${filesize};"                      \
-                "cp.b ${ram_addr} ${kernel_addr} ${filesize}\0"
-
-/*
- * Cache Configuration (cpu/chip specific, Danube)
- */
-#define CONFIG_SYS_DCACHE_SIZE		16384
-#define CONFIG_SYS_ICACHE_SIZE		16384
-#define CONFIG_SYS_CACHELINE_SIZE	32
-#define CONFIG_SYS_MIPS_CACHE_OPER_MODE	CONF_CM_CACHABLE_NO_WA
-
-#define CONFIG_NET_MULTI
-#if 0
-#define CONFIG_M4530_ETH
-#define CONFIG_M4530_FPGA
 #endif
-
-#define CONFIG_IFX_ETOP
-//#define CLK_OUT2_25MHZ
-#define CONFIG_EXTRA_SWITCH
-
-//#define CONFIG_RMII			/*  use interface in RMII mode */
-
-#define CONFIG_MII
-#define CONFIG_CMD_MII
-
-#define CONFIG_IFX_ASC
-
-#ifdef CONFIG_USE_ASC0
-#define CONFIG_SYS_IFX_ASC_BASE		0x1E100400
-#else
-#define CONFIG_SYS_IFX_ASC_BASE		0x1E100C00
-#endif
-
-#ifdef CONFIG_SYS_RAMBOOT
-/* Configuration of EBU: */
-/* starting address from 0xb0000000 */
-/* make the flash available from RAM boot */
-#	define CONFIG_EBU_ADDSEL0		0x10000031
-#	define CONFIG_EBU_BUSCON0		0x0001D7FF
-#	define CONFIG_EBU_ADDSEL1		0x14000001
-#	define CONFIG_EBU_BUSCON1		0x4041D7FD
-#endif
-
-#define CONFIG_CMD_HTTPD		/* enable upgrade via HTTPD */
-
-//#define CONFIG_ETHADDR		00:13:f7:df:1c:80
-//#define CONFIG_ETHADDR		11:22:33:44:55:66
-#define CONFIG_IPADDR		192.168.2.1
-#define CONFIG_SERVERIP		192.168.2.101
-#define CONFIG_GATEWAYIP	192.168.2.254
-#define CONFIG_NETMASK		255.255.255.0
-#define CONFIG_ROOTPATH		"/export"
-
-#endif	/* __CONFIG_H */
diff --git a/package/uboot-lantiq/files/include/configs/arv452c.h b/package/uboot-lantiq/files/include/configs/arv452c.h
new file mode 100644
index 000000000..c4970a229
--- /dev/null
+++ b/package/uboot-lantiq/files/include/configs/arv452c.h
@@ -0,0 +1,14 @@
+#ifndef __CONFIG_H_452C
+#define __CONFIG_H_452C
+
+#define CONFIG_ARV4518		1
+#define CONFIG_ARCADYAN		"ARV452CPW"
+
+#define CONFIG_SYS_MAX_RAM	32*1024*1024
+#define	CONFIG_SYS_PROMPT	"ARV452c => "
+#define CONFIG_RMII		1
+#define CONFIG_RTL8306_SWITCH	1
+
+#include "arcadyan-common.h"
+
+#endif
diff --git a/package/uboot-lantiq/files/include/configs/arv752DPW.h b/package/uboot-lantiq/files/include/configs/arv752DPW.h
new file mode 100644
index 000000000..a73a87c5c
--- /dev/null
+++ b/package/uboot-lantiq/files/include/configs/arv752DPW.h
@@ -0,0 +1,20 @@
+#ifndef __CONFIG_H_752DPW
+#define __CONFIG_H_752DPW
+
+#define CONFIG_ARV752DPW	1
+#define CONFIG_ARCADYAN		"ARV752DPW"
+
+#define CONFIG_SYS_MAX_RAM	64*1024*1024
+#define	CONFIG_SYS_PROMPT	"ARV752DPW => "
+
+//#define CONFIG_RMII
+#define CONFIG_RTL8306_SWITCH	1
+//#define CONFIG_EBU_GPIO		0x2
+#define CONFIG_SWITCH_PORT1
+#define CONFIG_SWITCH_PIN	3
+//#define CONFIG_BUTTON_PORT0
+//#define CONFIG_BUTTON_PIN	12
+
+#include "arcadyan-common.h"
+
+#endif
diff --git a/package/uboot-lantiq/files/include/configs/arv752DPW22.h b/package/uboot-lantiq/files/include/configs/arv752DPW22.h
new file mode 100644
index 000000000..5a1a5ada1
--- /dev/null
+++ b/package/uboot-lantiq/files/include/configs/arv752DPW22.h
@@ -0,0 +1,20 @@
+#ifndef __CONFIG_H_752DPW22
+#define __CONFIG_H_752DPW22
+
+#define CONFIG_ARV752DPW22	1
+#define CONFIG_ARCADYAN		"ARV752DPW22"
+
+#define CONFIG_SYS_MAX_RAM	64*1024*1024
+#define	CONFIG_SYS_PROMPT	"ARV752DPW22 => "
+
+#define CONFIG_AR8216_SWITCH	1
+#define CONFIG_EBU_GPIO		0x2
+#define CONFIG_SWITCH_PORT1
+#define CONFIG_SWITCH_PIN	3
+#define CONFIG_BUTTON_PORT0
+#define CONFIG_BUTTON_PIN	13
+#define CONFIG_BUTTON_LEVEL	0
+
+#include "arcadyan-common.h"
+
+#endif
diff --git a/package/uboot-lantiq/files/include/configs/ifx-common.h b/package/uboot-lantiq/files/include/configs/ifx-common.h
index e4e8067d7..c0a1b6b20 100644
--- a/package/uboot-lantiq/files/include/configs/ifx-common.h
+++ b/package/uboot-lantiq/files/include/configs/ifx-common.h
@@ -23,7 +23,7 @@
 #ifndef __IFX_COMMON_H
 #define __IFX_COMMON_H
 
-#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds	*/
+#define CONFIG_BOOTDELAY	2	/* autoboot after 5 seconds	*/
 
 #define CONFIG_BAUDRATE		115200