[uboot-lantiq]

* adds stage1 lzma
* new boards
* fixes settings for PSC ram
* lost of cleanups


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

9 files changed, 98 insertions, 33 deletions

diff --git a/package/uboot-lantiq/files/include/configs/arcadyan-common.h b/package/uboot-lantiq/files/include/configs/arcadyan-common.h
index 71ad24943..75f5c3863 100644
--- a/package/uboot-lantiq/files/include/configs/arcadyan-common.h
+++ b/package/uboot-lantiq/files/include/configs/arcadyan-common.h
@@ -28,8 +28,6 @@
 #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		*/
@@ -67,7 +65,7 @@
 #undef CONFIG_EXTRA_ENV_SETTINGS                                       
 #define CONFIG_EXTRA_ENV_SETTINGS                                       \
         "ram_addr=0x80500000\0"                                         \
-        "kernel_addr=0xb0050000\0"                                      \
+        "kernel_addr=0xb0020000\0"                                      \
         "flashargs=setenv bootargs rootfstype=squashfs,jffs2\0"         \
         "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
                 "nfsroot=${serverip}:${rootpath} \0"                    \
@@ -89,7 +87,7 @@
         "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-lantiq-xway-" CONFIG_ARCADYAN "-squashfs.image;"            \
+                "${tftppath}" CONFIG_ARCADYAN "-squashfs.image;"            \
                 "era ${kernel_addr} +${filesize};"                      \
                 "cp.b ${ram_addr} ${kernel_addr} ${filesize}\0"
 
@@ -107,7 +105,7 @@
 //#define CLK_OUT2_25MHZ
 
 #define CONFIG_MII
-#define CONFIG_CMD_MII
+#undef CONFIG_CMD_MII
 
 #define CONFIG_IFX_ASC
 
@@ -135,4 +133,14 @@
 #define CONFIG_NETMASK		255.255.255.0
 #define CONFIG_ROOTPATH		"/export"
 
+#ifdef CONFIG_BOOTSTRAP
+#define CONFIG_BOOTSTRAP_BASE			CONFIG_BOOTSTRAP_TEXT_BASE
+#define CONFIG_BOOTSTRAP_BAUDRATE		CONFIG_BAUDRATE
+#define CONFIG_SKIP_LOWLEVEL_INIT
+#define CONFIG_BOOTSTRAP_LZMA
+//#define CONFIG_BOOTSTRAP_SERIAL
+#endif
+
+
+
 #endif	/* __CONFIG_H */
diff --git a/package/uboot-lantiq/files/include/configs/arv3527P.h b/package/uboot-lantiq/files/include/configs/arv3527P.h
new file mode 100644
index 000000000..f282fc816
--- /dev/null
+++ b/package/uboot-lantiq/files/include/configs/arv3527P.h
@@ -0,0 +1,17 @@
+#ifndef __CONFIG_H_3527
+#define __CONFIG_H_3527
+
+#define CONFIG_ARV3527		1
+#define CONFIG_ARCADYAN		"ARV3527P"
+
+#define CONFIG_SYS_MAX_RAM	32*1024*1024
+#define CONFIG_USE_DDR_PSC_32   1
+#define	CONFIG_SYS_PROMPT	"ARV3527 => "
+
+/*#define CONFIG_BUTTON_PORT1
+#define CONFIG_BUTTON_PIN	13
+#define CONFIG_BUTTON_LEVEL	0
+*/
+#include "arcadyan-common.h"
+
+#endif
diff --git a/package/uboot-lantiq/files/include/configs/arv4518PW.h b/package/uboot-lantiq/files/include/configs/arv4518PW.h
index 4c40f0542..30bbf6e46 100644
--- a/package/uboot-lantiq/files/include/configs/arv4518PW.h
+++ b/package/uboot-lantiq/files/include/configs/arv4518PW.h
@@ -5,9 +5,11 @@
 #define CONFIG_ARCADYAN		"ARV4518PW"
 
 #define CONFIG_SYS_MAX_RAM	64*1024*1024
+#define CONFIG_USE_DDR_PSC_64	1
 #define	CONFIG_SYS_PROMPT	"ARV4518 => "
-//#define CONFIG_RMII
-#define CONFIG_AR8216_SWITCH	1
+
+//#define CONFIG_RMII		1
+#define CONFIG_RTL8306_SWITCH	1
 
 #include "arcadyan-common.h"
 
diff --git a/package/uboot-lantiq/files/include/configs/arv4520PW.h b/package/uboot-lantiq/files/include/configs/arv4520PW.h
new file mode 100644
index 000000000..d4b130b9d
--- /dev/null
+++ b/package/uboot-lantiq/files/include/configs/arv4520PW.h
@@ -0,0 +1,20 @@
+#ifndef __CONFIG_H_4520
+#define __CONFIG_H_4520
+
+#define CONFIG_ARV4520		1
+#define CONFIG_ARCADYAN		"ARV4520PW"
+
+#define CONFIG_SYS_MAX_RAM	32*1024*1024
+#define CONFIG_USE_DDR_PSC_32   1
+#define	CONFIG_SYS_PROMPT	"ARV4520 => "
+#define CONFIG_RMII		1
+#define CONFIG_ADM6996_SWITCH	1
+#define CONFIG_EBU_GPIO		0x400
+
+#define CONFIG_BUTTON_PORT0
+#define CONFIG_BUTTON_PIN	11
+#define CONFIG_BUTTON_LEVEL	0
+
+#include "arcadyan-common.h"
+
+#endif
diff --git a/package/uboot-lantiq/files/include/configs/arv4525PW.h b/package/uboot-lantiq/files/include/configs/arv4525PW.h
new file mode 100644
index 000000000..63e7d32b4
--- /dev/null
+++ b/package/uboot-lantiq/files/include/configs/arv4525PW.h
@@ -0,0 +1,18 @@
+#ifndef __CONFIG_H_4525
+#define __CONFIG_H_4525
+
+#define CONFIG_ARV4525		1
+#define CONFIG_ARCADYAN		"ARV4525PW"
+
+#define CONFIG_SYS_MAX_RAM	32*1024*1024
+#define CONFIG_USE_DDR_PSC_32   1
+#define	CONFIG_SYS_PROMPT	"ARV4525 => "
+
+#define CONFIG_BUTTON_PORT1
+#define CONFIG_BUTTON_PIN	13
+#define CONFIG_BUTTON_LEVEL	0
+
+
+#include "arcadyan-common.h"
+
+#endif
diff --git a/package/uboot-lantiq/files/include/configs/arv452CPW.h b/package/uboot-lantiq/files/include/configs/arv452CPW.h
index c4970a229..579105f97 100644
--- a/package/uboot-lantiq/files/include/configs/arv452CPW.h
+++ b/package/uboot-lantiq/files/include/configs/arv452CPW.h
@@ -1,13 +1,19 @@
 #ifndef __CONFIG_H_452C
 #define __CONFIG_H_452C
 
-#define CONFIG_ARV4518		1
+#define CONFIG_ARV452C		1
 #define CONFIG_ARCADYAN		"ARV452CPW"
 
 #define CONFIG_SYS_MAX_RAM	32*1024*1024
+#define CONFIG_USE_DDR_PSC_32   1
 #define	CONFIG_SYS_PROMPT	"ARV452c => "
 #define CONFIG_RMII		1
 #define CONFIG_RTL8306_SWITCH	1
+#define CONFIG_EBU_GPIO		0xf00
+
+#define CONFIG_BUTTON_PORT0
+#define CONFIG_BUTTON_PIN	11
+#define CONFIG_BUTTON_LEVEL	0
 
 #include "arcadyan-common.h"
 
diff --git a/package/uboot-lantiq/files/include/configs/arv752DPW.h b/package/uboot-lantiq/files/include/configs/arv752DPW.h
index a73a87c5c..7bf5fa5fa 100644
--- a/package/uboot-lantiq/files/include/configs/arv752DPW.h
+++ b/package/uboot-lantiq/files/include/configs/arv752DPW.h
@@ -5,10 +5,11 @@
 #define CONFIG_ARCADYAN		"ARV752DPW"
 
 #define CONFIG_SYS_MAX_RAM	64*1024*1024
+#define CONFIG_USE_DDR_PSC_64	1
 #define	CONFIG_SYS_PROMPT	"ARV752DPW => "
 
-//#define CONFIG_RMII
-#define CONFIG_RTL8306_SWITCH	1
+#define CONFIG_RMII
+#define CONFIG_RTL8306G_SWITCH	1
 //#define CONFIG_EBU_GPIO		0x2
 #define CONFIG_SWITCH_PORT1
 #define CONFIG_SWITCH_PIN	3
diff --git a/package/uboot-lantiq/files/include/configs/arv752DPW22.h b/package/uboot-lantiq/files/include/configs/arv752DPW22.h
index 5a1a5ada1..294628dbe 100644
--- a/package/uboot-lantiq/files/include/configs/arv752DPW22.h
+++ b/package/uboot-lantiq/files/include/configs/arv752DPW22.h
@@ -5,6 +5,7 @@
 #define CONFIG_ARCADYAN		"ARV752DPW22"
 
 #define CONFIG_SYS_MAX_RAM	64*1024*1024
+#define CONFIG_USE_DDR_PSC_64	1
 #define	CONFIG_SYS_PROMPT	"ARV752DPW22 => "
 
 #define CONFIG_AR8216_SWITCH	1
diff --git a/package/uboot-lantiq/files/include/configs/ifx-common.h b/package/uboot-lantiq/files/include/configs/ifx-common.h
index c0a1b6b20..6307e707e 100644
--- a/package/uboot-lantiq/files/include/configs/ifx-common.h
+++ b/package/uboot-lantiq/files/include/configs/ifx-common.h
@@ -32,14 +32,12 @@
 
 #define CONFIG_TIMESTAMP		/* Print image info with timestamp */
 
-#define CONFIG_PREBOOT	"echo;"	\
-	"echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
-	"echo"
+#undef CONFIG_PREBOOT
 
 #undef	CONFIG_BOOTARGS
 #define CONFIG_EXTRA_ENV_SETTINGS					\
 	"ram_addr=0x80500000\0"						\
-	"kernel_addr=0xb0050000\0"					\
+	"kernel_addr=0xb0020000\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 "			\
@@ -85,23 +83,17 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
-#undef CONFIG_CMD_CONSOLE
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_LOADB
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_NFS
-#undef CONFIG_CMD_XIMG
-
-//#define CONFIG_CMD_ASKENV
-//#define CONFIG_CMD_DHCP
-//#define CONFIG_CMD_ELF
-#define CONFIG_CMD_PING
-//#define CONFIG_CMD_JFFS2
-//#define CONFIG_CMD_SNTP
 
+#define CONFIG_CMD_FLASH        /* flinfo, erase, protect       */
+#define CONFIG_CMD_MEMORY       /* md mm nm mw cp cmp crc base loop mtest */
+#define CONFIG_CMD_NET          /* bootp, tftpboot, rarpboot    */
+#define CONFIG_CMD_RUN          /* run command in env variable  */
+#define CONFIG_CMD_SAVEENV      /* saveenv                      */
+#define CONFIG_CMD_IMI
+#undef CONFIG_CMD_PING
+#undef CONFIG_ZLIB
+#undef CONFIG_GZIP
+#undef CONFIG_SYS_HUSH_PARSER
 
 /*
  * Miscellaneous configurable options
@@ -109,7 +101,7 @@
 
 #define CONFIG_LZMA
 
-#define CONFIG_SYS_LONGHELP				/* undef to save memory */
+#undef CONFIG_SYS_LONGHELP				/* undef to save memory */
 #ifndef CONFIG_SYS_PROMPT
 #define CONFIG_SYS_PROMPT		"=> "		/* Monitor Command Prompt */
 #endif
@@ -129,7 +121,7 @@
 #define CONFIG_SYS_MEMTEST_END		0x80800000
 
 #define CONFIG_CMDLINE_EDITING		/* add command line history	*/
-#define CONFIG_AUTO_COMPLETE		/* add autocompletion support	*/
+#undef CONFIG_AUTO_COMPLETE		/* add autocompletion support	*/
 
 #define CONFIG_ZERO_BOOTDELAY_CHECK	/* check for keypress on bootdelay==0 */
 #define CONFIG_VERSION_VARIABLE		/* include version env variable */
@@ -166,7 +158,7 @@
 #define CONFIG_ENV_IS_IN_FLASH		1
 
 /* Address and size of Primary Environment Sector	*/
-#define CONFIG_ENV_ADDR			0xB0040000
+#define CONFIG_ENV_ADDR			0xB0010000
 #define CONFIG_ENV_SIZE			0x10000
 
 #ifdef CONFIG_FLASH_CFI_DRIVER