diff options
26 files changed, 250 insertions, 1456 deletions
diff --git a/package/uboot-lantiq/Config.in b/package/uboot-lantiq/Config.in deleted file mode 100644 index d434667afa..0000000000 --- a/package/uboot-lantiq/Config.in +++ /dev/null @@ -1,32 +0,0 @@ -menu "Configuration" - depends on PACKAGE_uboot-lantiq - -config UBOOT_TARGET - string "target" - default "easy50712_DDR166M" - help - The configuration reflects the settings for a dedicated board hardware. - Select for Danube evaluation board easy50712_DDR166M . - Select for AR9 evaluation board easy50812_DDR166M . - -config UBOOT_RAMBOOT - bool "Enable RAM boot image" - help - Using the UART boot mode of the ROM code this image could be loaded to the RAM. - While executing the image in the RAM the functionality of the uboot image can be - tested first without touching the original flash. - Note: Be carefull, by saving the environment the flash will be modified. - The OWRT flash layout differs from the layout provided by Lantiq / Infineon. - -config UBOOT_RAMBOOT_DDR_CONFIG - string "DDR configuration file" - default "easy50712_DDR166M.conf" - depends on UBOOT_RAMBOOT - help - The DDR configuration file should reflect the DDR memory device configuration . - It will be used to create a RAM boot image - Select for Danube evalution board easy50712_DDR166M.conf . - Select for AR9 evalution board easy50812.conf . - Select for arcadyan PSC RAM board arcadyan.conf . - -endmenu diff --git a/package/uboot-lantiq/Makefile b/package/uboot-lantiq/Makefile index 9b037f4d8a..d90e322909 100644 --- a/package/uboot-lantiq/Makefile +++ b/package/uboot-lantiq/Makefile @@ -22,17 +22,48 @@ PKG_TARGETS:=bin include $(INCLUDE_DIR)/package.mk ifeq ($(DUMP),) - STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell $(SH_FUNC) grep '^CONFIG_UBOOT_' $(TOPDIR)/.config | md5s) + STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/$(BUILD_VARIANT)/.configured + STAMP_BUILT:=$(PKG_BUILD_DIR)/$(BUILD_VARIANT)/.built endif -define Package/uboot-lantiq +define Package/uboot-lantiq-template SECTION:=boot CATEGORY:=Boot Loaders DEPENDS:=@TARGET_lantiq - TITLE:=U-Boot for Lantiq reference boards URL:=http://www.denx.de/wiki/U-Boot + VARIANT:=$(1) + TITLE:=$(1) ($(2)) + MAINTAINER:=John Crispin <blogic@openwrt.org> endef +#Lantiq +Package/uboot-lantiq-easy50712_DDR166M=$(call Package/uboot-lantiq-template,easy50712_DDR166M,NOR) +Package/uboot-lantiq-easy50712_DDR166M_ramboot=$(call Package/uboot-lantiq-template,easy50712_DDR166M_ramboot,RAM) +Package/uboot-lantiq-easy50812_DDR166M=$(call Package/uboot-lantiq-template,easy50812_DDR166M,NOR) +Package/uboot-lantiq-easy50812_DDR166M_ramboot=$(call Package/uboot-lantiq-template,easy50812_DDR166M_ramboot,RAM) + +DDR_CONFIG_easy50712_DDR166M_ramboot:=easy50712_DDR166M +DDR_CONFIG_easy50812_DDR166M_ramboot:=easy50812 + +#Arcadyan +Package/uboot-lantiq-arv4518=$(call Package/uboot-lantiq-template,arv4518,NOR) +Package/uboot-lantiq-arv4518_ramboot=$(call Package/uboot-lantiq-template,arv4518_ramboot,RAM) +Package/uboot-lantiq-arv4518_brnboot=$(call Package/uboot-lantiq-template,arv4518_brnboot,BRN) +Package/uboot-lantiq-arv452C=$(call Package/uboot-lantiq-template,arv452C,NOR) +Package/uboot-lantiq-arv452C_ramboot=$(call Package/uboot-lantiq-template,arv452C_ramboot,RAM) +Package/uboot-lantiq-arv452C_brnboot=$(call Package/uboot-lantiq-template,arv452C_brnboot,BRN) +Package/uboot-lantiq-arv752DPW=$(call Package/uboot-lantiq-template,arv752DPW,NOR) +Package/uboot-lantiq-arv752DPW_ramboot=$(call Package/uboot-lantiq-template,arv752DPW_ramboot,RAM) +Package/uboot-lantiq-arv752DPW_brnboot=$(call Package/uboot-lantiq-template,arv752DPW_brnboot,BRN) +Package/uboot-lantiq-arv752DPW22=$(call Package/uboot-lantiq-template,arv752DPW22,NOR) +Package/uboot-lantiq-arv752DPW22_ramboot=$(call Package/uboot-lantiq-template,arv752DPW22_ramboot,RAM) +Package/uboot-lantiq-arv752DPW22_brnboot=$(call Package/uboot-lantiq-template,arv752DPW22_brnboot,BRN) + +DDR_CONFIG_arv4518_ramboot:=arcadyan_psc166 +DDR_CONFIG_arv452C_ramboot:=arcadyan_psc166 +DDR_CONFIG_arv752DPW_ramboot:=arcadyan_psc166 +DDR_CONFIG_arv752DPW22_ramboot:=arcadyan_psc166 + define Build/Prepare $(PKG_UNPACK) cp -r $(CP_OPTS) $(FILES_DIR)/* $(PKG_BUILD_DIR)/ @@ -40,30 +71,20 @@ define Build/Prepare find $(PKG_BUILD_DIR) -name .svn | $(XARGS) rm -rf endef -UBOOT_TARGET:=$(call qstrip,$(CONFIG_UBOOT_TARGET)) -UBOOT_RAMBOOT_DDR_CONFIG:=$(call qstrip,$(CONFIG_UBOOT_RAMBOOT_DDR_CONFIG)) - UBOOT_MAKE_OPTS:= \ CROSS_COMPILE=$(TARGET_CROSS) \ ENDIANNESS= \ V=1 -define Package/uboot-lantiq/config - source "$(SOURCE)/Config.in" -endef - define Build/Configure/Target $(MAKE) -s -C $(PKG_BUILD_DIR) \ $(UBOOT_MAKE_OPTS) \ - O=$(PKG_BUILD_DIR)/$(1) \ + O=$(PKG_BUILD_DIR)/$(BUILD_VARIANT) \ $(1)_config endef define Build/Configure - $(call Build/Configure/Target,$(UBOOT_TARGET)) -ifeq ($(CONFIG_UBOOT_RAMBOOT),y) - $(call Build/Configure/Target,$(UBOOT_TARGET)_ramboot) -endif + $(call Build/Configure/Target,$(BUILD_VARIANT)) endef define Build/Compile/Target @@ -74,26 +95,39 @@ define Build/Compile/Target endef define Build/Compile - $(call Build/Compile/Target,$(UBOOT_TARGET)) -ifeq ($(CONFIG_UBOOT_RAMBOOT),y) - $(call Build/Compile/Target,$(UBOOT_TARGET)_ramboot) -endif + $(call Build/Compile/Target,$(BUILD_VARIANT)) endef -define Package/uboot-lantiq/install - mkdir -p $(1)/$(UBOOT_TARGET) +define Package/uboot-lantiq-$(BUILD_VARIANT)/install + mkdir -p $(1) dd \ - if=$(PKG_BUILD_DIR)/$(UBOOT_TARGET)/u-boot.bin \ - of=$(1)/$(UBOOT_TARGET)/u-boot.bin \ + if=$(PKG_BUILD_DIR)/$(BUILD_VARIANT)/u-boot.bin \ + of=$(1)/u-boot.bin \ bs=64k conv=sync -ifeq ($(CONFIG_UBOOT_RAMBOOT),y) - if [ -e $(UBOOT_RAMBOOT_DDR_CONFIG) ]; then \ +ifneq ($(findstring ramboot,$(BUILD_VARIANT)),) + if [ -e $(DDR_CONFIG_$(BUILD_VARIANT)).conf ]; then \ perl ./gct \ - $(UBOOT_RAMBOOT_DDR_CONFIG) \ - $(PKG_BUILD_DIR)/$(UBOOT_TARGET)_ramboot/u-boot.srec \ - $(1)/$(UBOOT_TARGET)/u-boot.asc; \ + $(DDR_CONFIG_$(BUILD_VARIANT)).conf \ + $(PKG_BUILD_DIR)/$(BUILD_VARIANT)/u-boot.srec \ + $(1)/u-boot.asc; \ fi endif endef -$(eval $(call BuildPackage,uboot-lantiq)) +$(eval $(call BuildPackage,uboot-lantiq-easy50712_DDR166M)) +$(eval $(call BuildPackage,uboot-lantiq-easy50712_DDR166M_ramboot)) +$(eval $(call BuildPackage,uboot-lantiq-easy50812_DDR166M)) +$(eval $(call BuildPackage,uboot-lantiq-easy50812_DDR166M_ramboot)) +$(eval $(call BuildPackage,uboot-lantiq-arv4518)) +$(eval $(call BuildPackage,uboot-lantiq-arv4518_brnboot)) +$(eval $(call BuildPackage,uboot-lantiq-arv4518_ramboot)) +$(eval $(call BuildPackage,uboot-lantiq-arv452C)) +$(eval $(call BuildPackage,uboot-lantiq-arv452C_brnboot)) +$(eval $(call BuildPackage,uboot-lantiq-arv452C_ramboot)) +$(eval $(call BuildPackage,uboot-lantiq-arv752DPW)) +$(eval $(call BuildPackage,uboot-lantiq-arv752DPW_brnboot)) +$(eval $(call BuildPackage,uboot-lantiq-arv752DPW_ramboot)) +$(eval $(call BuildPackage,uboot-lantiq-arv752DPW22)) +$(eval $(call BuildPackage,uboot-lantiq-arv752DPW22_brnboot)) +$(eval $(call BuildPackage,uboot-lantiq-arv752DPW22_ramboot)) + diff --git a/package/uboot-lantiq/files/board/arcadyan/arv4518/Makefile b/package/uboot-lantiq/files/board/arcadyan/Makefile index 61f383b8dd..fb9027c655 100644 --- a/package/uboot-lantiq/files/board/arcadyan/arv4518/Makefile +++ b/package/uboot-lantiq/files/board/arcadyan/Makefile @@ -25,8 +25,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a -#COBJS := $(BOARD).o -COBJS-y += arv4518.o +COBJS-y += board.o athrs26_phy.o SOBJS = lowlevel_init.o pmuenable.o diff --git a/package/uboot-lantiq/files/board/arcadyan/arv4518/lowlevel_init.S b/package/uboot-lantiq/files/board/arcadyan/arv4518/lowlevel_init.S deleted file mode 100644 index c4570d0154..0000000000 --- a/package/uboot-lantiq/files/board/arcadyan/arv4518/lowlevel_init.S +++ /dev/null @@ -1,622 +0,0 @@ -/* - * Memory sub-system initialization code for Danube board. - * Andre Messerschmidt - * Copyright (c) 2005 Infineon Technologies AG - * - * Based on Inca-IP code - * Copyright (c) 2003 Wolfgang Denk <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 - */ -/* History: - peng liu May 25, 2006, for PLL setting after reset, 05252006 - */ -#include <config.h> -#include <version.h> -#include <asm/regdef.h> - -#if 0 - -#if defined(CONFIG_USE_DDR_RAM) - -#if defined(CONFIG_USE_DDR_RAM_CFG_111M) -#include "ddr_settings_r111.h" -#define DDR111 -#elif defined(CONFIG_USE_DDR_RAM_CFG_166M) -#include "ddr_settings_r166.h" -#define DDR166 -#elif defined(CONFIG_USE_DDR_RAM_CFG_e111M) -#include "ddr_settings_e111.h" -#define DDR111 -#elif defined(CONFIG_USE_DDR_RAM_CFG_e166M) -#include "ddr_settings_e166.h" -#define DDR166 -#elif defined(CONFIG_USE_DDR_RAM_CFG_promos400) -#include "ddr_settings_PROMOSDDR400.h" -#define DDR166 -#elif defined(CONFIG_USE_DDR_RAM_CFG_samsung166) -#include "ddr_settings_Samsung_166.h" -#define DDR166 -#elif defined(CONFIG_USE_DDR_RAM_CFG_psc166) -#include "ddr_settings_psc_166.h" -#define DDR166 -#else -#warning "missing definition for ddr_settings.h, use default!" -#include "ddr_settings.h" -#endif -#endif /* CONFIG_USE_DDR_RAM */ - -#else - -#include "ddr_settings.h" -#define DDR166 - -#endif - -#if defined(CONFIG_USE_DDR_RAM) && !defined(MC_DC0_VALUE) -#error "missing include of ddr_settings.h" -#endif - -#define EBU_MODUL_BASE 0xBE105300 -#define EBU_CLC(value) 0x0000(value) -#define EBU_CON(value) 0x0010(value) -#define EBU_ADDSEL0(value) 0x0020(value) -#define EBU_ADDSEL1(value) 0x0024(value) -#define EBU_ADDSEL2(value) 0x0028(value) -#define EBU_ADDSEL3(value) 0x002C(value) -#define EBU_BUSCON0(value) 0x0060(value) -#define EBU_BUSCON1(value) 0x0064(value) -#define EBU_BUSCON2(value) 0x0068(value) -#define EBU_BUSCON3(value) 0x006C(value) - -#define MC_MODUL_BASE 0xBF800000 -#define MC_ERRCAUSE(value) 0x0010(value) -#define MC_ERRADDR(value) 0x0020(value) -#define MC_CON(value) 0x0060(value) - -#define MC_SRAM_ENABLE 0x00000004 -#define MC_SDRAM_ENABLE 0x00000002 -#define MC_DDRRAM_ENABLE 0x00000001 - -#define MC_SDR_MODUL_BASE 0xBF800200 -#define MC_IOGP(value) 0x0000(value) -#define MC_CTRLENA(value) 0x0010(value) -#define MC_MRSCODE(value) 0x0020(value) -#define MC_CFGDW(value) 0x0030(value) -#define MC_CFGPB0(value) 0x0040(value) -#define MC_LATENCY(value) 0x0080(value) -#define MC_TREFRESH(value) 0x0090(value) -#define MC_SELFRFSH(value) 0x00A0(value) - -#define MC_DDR_MODUL_BASE 0xBF801000 -#define MC_DC00(value) 0x0000(value) -#define MC_DC01(value) 0x0010(value) -#define MC_DC02(value) 0x0020(value) -#define MC_DC03(value) 0x0030(value) -#define MC_DC04(value) 0x0040(value) -#define MC_DC05(value) 0x0050(value) -#define MC_DC06(value) 0x0060(value) -#define MC_DC07(value) 0x0070(value) -#define MC_DC08(value) 0x0080(value) -#define MC_DC09(value) 0x0090(value) -#define MC_DC10(value) 0x00A0(value) -#define MC_DC11(value) 0x00B0(value) -#define MC_DC12(value) 0x00C0(value) -#define MC_DC13(value) 0x00D0(value) -#define MC_DC14(value) 0x00E0(value) -#define MC_DC15(value) 0x00F0(value) -#define MC_DC16(value) 0x0100(value) -#define MC_DC17(value) 0x0110(value) -#define MC_DC18(value) 0x0120(value) -#define MC_DC19(value) 0x0130(value) -#define MC_DC20(value) 0x0140(value) -#define MC_DC21(value) 0x0150(value) -#define MC_DC22(value) 0x0160(value) -#define MC_DC23(value) 0x0170(value) -#define MC_DC24(value) 0x0180(value) -#define MC_DC25(value) 0x0190(value) -#define MC_DC26(value) 0x01A0(value) -#define MC_DC27(value) 0x01B0(value) -#define MC_DC28(value) 0x01C0(value) -#define MC_DC29(value) 0x01D0(value) -#define MC_DC30(value) 0x01E0(value) -#define MC_DC31(value) 0x01F0(value) -#define MC_DC32(value) 0x0200(value) -#define MC_DC33(value) 0x0210(value) -#define MC_DC34(value) 0x0220(value) -#define MC_DC35(value) 0x0230(value) -#define MC_DC36(value) 0x0240(value) -#define MC_DC37(value) 0x0250(value) -#define MC_DC38(value) 0x0260(value) -#define MC_DC39(value) 0x0270(value) -#define MC_DC40(value) 0x0280(value) -#define MC_DC41(value) 0x0290(value) -#define MC_DC42(value) 0x02A0(value) -#define MC_DC43(value) 0x02B0(value) -#define MC_DC44(value) 0x02C0(value) -#define MC_DC45(value) 0x02D0(value) -#define MC_DC46(value) 0x02E0(value) - -#define RCU_OFFSET 0xBF203000 -#define RCU_RST_REQ (RCU_OFFSET + 0x0010) -#define RCU_STS (RCU_OFFSET + 0x0014) - -#define CGU_OFFSET 0xBF103000 -#define PLL0_CFG (CGU_OFFSET + 0x0004) -#define PLL1_CFG (CGU_OFFSET + 0x0008) -#define PLL2_CFG (CGU_OFFSET + 0x000C) -#define CGU_SYS (CGU_OFFSET + 0x0010) -#define CGU_UPDATE (CGU_OFFSET + 0x0014) -#define IF_CLK (CGU_OFFSET + 0x0018) -#define CGU_SMD (CGU_OFFSET + 0x0020) -#define CGU_CT1SR (CGU_OFFSET + 0x0028) -#define CGU_CT2SR (CGU_OFFSET + 0x002C) -#define CGU_PCMCR (CGU_OFFSET + 0x0030) -#define PCI_CR_PCI (CGU_OFFSET + 0x0034) -#define CGU_OSC_CTRL (CGU_OFFSET + 0x001C) -#define CGU_MIPS_PWR_DWN (CGU_OFFSET + 0x0038) -#define CLK_MEASURE (CGU_OFFSET + 0x003C) - -//05252006 -#define pll0_35MHz_CONFIG 0x9D861059 -#define pll1_35MHz_CONFIG 0x1A260CD9 -#define pll2_35MHz_CONFIG 0x8000f1e5 -#define pll0_36MHz_CONFIG 0x1000125D -#define pll1_36MHz_CONFIG 0x1B1E0C99 -#define pll2_36MHz_CONFIG 0x8002f2a1 -//05252006 - -//06063001-joelin disable the PCI CFRAME mask -start -/*CFRAME is an I/O signal, in the chip, the output CFRAME is selected via GPIO altsel pins, so if you select MII1 RXD1, the CFRAME will not come out. -But the CFRAME input still take the signal from the pad and not disabled when altsel choose other function. So when MII1_RXD1 is low from other device, the EBU interface will be disabled. - -The chip function in such a way that disable the CFRAME mask mean EBU not longer check CFRAME to be the device using the bus. -The side effect is the entire PCI block will see CFRAME low all the time meaning PCI cannot use the bus at all so no more PCI function. -*/ -#define PCI_CR_PR_OFFSET 0xBE105400 -#define PCI_CR_PCI_MOD_REG (PCI_CR_PR_OFFSET + 0x0030) -#define PCI_CONFIG_SPACE 0xB7000000 -#define CS_CFM (PCI_CONFIG_SPACE + 0x6C) -//06063001-joelin disable the PCI CFRAME mask -end - .set noreorder - - -/* - * void ebu_init(void) - */ - .globl ebu_init - .ent ebu_init -ebu_init: - -#if defined(CONFIG_EBU_ADDSEL0) || defined(CONFIG_EBU_ADDSEL1) || \ - defined(CONFIG_EBU_ADDSEL2) || defined(CONFIG_EBU_ADDSEL3) || \ - defined(CONFIG_EBU_BUSCON0) || defined(CONFIG_EBU_BUSCON1) || \ - defined(CONFIG_EBU_BUSCON2) || defined(CONFIG_EBU_BUSCON3) - - li t1, EBU_MODUL_BASE -#if defined(CONFIG_EBU_ADDSEL0) - li t2, CONFIG_EBU_ADDSEL0 - sw t2, EBU_ADDSEL0(t1) -#endif -#if defined(CONFIG_EBU_ADDSEL1) - li t2, CONFIG_EBU_ADDSEL1 - sw t2, EBU_ADDSEL1(t1) -#endif -#if defined(CONFIG_EBU_ADDSEL2) - li t2, CONFIG_EBU_ADDSEL2 - sw t2, EBU_ADDSEL2(t1) -#endif -#if defined(CONFIG_EBU_ADDSEL3) - li t2, CONFIG_EBU_ADDSEL3 - sw t2, EBU_ADDSEL3(t1) -#endif - -#if defined(CONFIG_EBU_BUSCON0) - li t2, CONFIG_EBU_BUSCON0 - sw t2, EBU_BUSCON0(t1) -#endif -#if defined(CONFIG_EBU_BUSCON1) - li t2, CONFIG_EBU_BUSCON1 - sw t2, EBU_BUSCON1(t1) -#endif -#if defined(CONFIG_EBU_BUSCON2) - li t2, CONFIG_EBU_BUSCON2 - sw t2, EBU_BUSCON2(t1) -#endif -#if defined(CONFIG_EBU_BUSCON3) - li t2, CONFIG_EBU_BUSCON3 - sw t2, EBU_BUSCON3(t1) -#endif - -#endif - - j ra - nop - - .end ebu_init - - -/* - * void cgu_init(long) - * - * a0 has the clock value - */ - .globl cgu_init - .ent cgu_init -cgu_init: - li t2, CGU_SYS - lw t2,0(t2) - beq t2,a0,freq_up2date - nop - - li t2, RCU_STS - lw t2, 0(t2) - and t2,0x00020000 - beq t2,0x00020000,boot_36MHZ - nop -//05252006 - li t1, PLL0_CFG - li t2, pll0_35MHz_CONFIG - sw t2,0(t1) - li t1, PLL1_CFG - li t2, pll1_35MHz_CONFIG - sw t2,0(t1) - li t1, PLL2_CFG - li t2, pll2_35MHz_CONFIG - sw t2,0(t1) - li t1, CGU_SYS - sw a0,0(t1) - li t1, RCU_RST_REQ - li t2, 0x40000008 - sw t2,0(t1) - b wait_reset - nop -boot_36MHZ: - li t1, PLL0_CFG - li t2, pll0_36MHz_CONFIG - sw t2,0(t1) - li t1, PLL1_CFG - li t2, pll1_36MHz_CONFIG - sw t2,0(t1) - li t1, PLL2_CFG - li t2, pll2_36MHz_CONFIG - sw t2,0(t1) - li t1, CGU_SYS - sw a0,0(t1) - li t1, RCU_RST_REQ - li t2, 0x40000008 - sw t2,0(t1) -//05252006 - -wait_reset: - b wait_reset - nop -freq_up2date: - j ra - nop - - .end cgu_init - -#ifndef CONFIG_USE_DDR_RAM -/* - * void sdram_init(long) - * - * a0 has the clock value - */ - .globl sdram_init - .ent sdram_init -sdram_init: - - /* SDRAM Initialization - */ - li t1, MC_MODUL_BASE - - /* Clear Error log registers */ - sw zero, MC_ERRCAUSE(t1) - sw zero, MC_ERRADDR(t1) - - /* Enable SDRAM module in memory controller */ - li t3, MC_SDRAM_ENABLE - lw t2, MC_CON(t1) - or t3, t2, t3 - sw t3, MC_CON(t1) - - li t1, MC_SDR_MODUL_BASE - - /* disable the controller */ - li t2, 0 - sw t2, MC_CTRLENA(t1) - - li t2, 0x822 - sw t2, MC_IOGP(t1) - - li t2, 0x2 - sw t2, MC_CFGDW(t1) - - /* Set CAS Latency */ - li t2, 0x00000020 - sw t2, MC_MRSCODE(t1) - - /* Set CS0 to SDRAM parameters */ - li t2, 0x000014d8 - sw t2, MC_CFGPB0(t1) - - /* Set SDRAM latency parameters */ - li t2, 0x00036325; /* BC PC100 */ - sw t2, MC_LATENCY(t1) - - /* Set SDRAM refresh rate */ - li t2, 0x00000C30 - sw t2, MC_TREFRESH(t1) - - /* Clear Power-down registers */ - sw zero, MC_SELFRFSH(t1) - - /* Finally enable the controller */ - li t2, 1 - sw t2, MC_CTRLENA(t1) - - j ra - nop - - .end sdram_init - -#endif /* !CONFIG_USE_DDR_RAM */ - -#ifdef CONFIG_USE_DDR_RAM -/* - * void ddrram_init(long) - * - * a0 has the clock value - */ - .globl ddrram_init - .ent ddrram_init -ddrram_init: - - /* DDR-DRAM Initialization - */ - li t1, MC_MODUL_BASE - - /* Clear Error log registers */ - sw zero, MC_ERRCAUSE(t1) - sw zero, MC_ERRADDR(t1) - - /* Enable DDR module in memory controller */ - li t3, MC_DDRRAM_ENABLE - lw t2, MC_CON(t1) - or t3, t2, t3 - sw t3, MC_CON(t1) - - li t1, MC_DDR_MODUL_BASE - - /* Write configuration to DDR controller registers */ - li t2, MC_DC0_VALUE - sw t2, MC_DC00(t1) - - li t2, MC_DC1_VALUE - sw t2, MC_DC01(t1) - - li t2, MC_DC2_VALUE - sw t2, MC_DC02(t1) - - li t2, MC_DC3_VALUE - sw t2, MC_DC03(t1) - - li t2, MC_DC4_VALUE - sw t2, MC_DC04(t1) - - li t2, MC_DC5_VALUE - sw t2, MC_DC05(t1) - - li t2, MC_DC6_VALUE - sw t2, MC_DC06(t1) - - li t2, MC_DC7_VALUE - sw t2, MC_DC07(t1) - - li t2, MC_DC8_VALUE - sw t2, MC_DC08(t1) - - li t2, MC_DC9_VALUE - sw t2, MC_DC09(t1) - - li t2, MC_DC10_VALUE - sw t2, MC_DC10(t1) - - li t2, MC_DC11_VALUE - sw t2, MC_DC11(t1) - - li t2, MC_DC12_VALUE - sw t2, MC_DC12(t1) - - li t2, MC_DC13_VALUE - sw t2, MC_DC13(t1) - - li t2, MC_DC14_VALUE - sw t2, MC_DC14(t1) - - li t2, MC_DC15_VALUE - sw t2, MC_DC15(t1) - - li t2, MC_DC16_VALUE - sw t2, MC_DC16(t1) - - li t2, MC_DC17_VALUE - sw t2, MC_DC17(t1) - - li t2, MC_DC18_VALUE - sw t2, MC_DC18(t1) - - li t2, MC_DC19_VALUE - sw t2, MC_DC19(t1) - - li t2, MC_DC20_VALUE - sw t2, MC_DC20(t1) - - li t2, MC_DC21_VALUE - sw t2, MC_DC21(t1) - - li t2, MC_DC22_VALUE - sw t2, MC_DC22(t1) - - li t2, MC_DC23_VALUE - sw t2, MC_DC23(t1) - - li t2, MC_DC24_VALUE - sw t2, MC_DC24(t1) - - li t2, MC_DC25_VALUE - sw t2, MC_DC25(t1) - - li t2, MC_DC26_VALUE - sw t2, MC_DC26(t1) - - li t2, MC_DC27_VALUE - sw t2, MC_DC27(t1) - - li t2, MC_DC28_VALUE - sw t2, MC_DC28(t1) - - li t2, MC_DC29_VALUE - sw t2, MC_DC29(t1) - - li t2, MC_DC30_VALUE - sw t2, MC_DC30(t1) - - li t2, MC_DC31_VALUE - sw t2, MC_DC31(t1) - - li t2, MC_DC32_VALUE - sw t2, MC_DC32(t1) - - li t2, MC_DC33_VALUE - sw t2, MC_DC33(t1) - - li t2, MC_DC34_VALUE - sw t2, MC_DC34(t1) - - li t2, MC_DC35_VALUE - sw t2, MC_DC35(t1) - - li t2, MC_DC36_VALUE - sw t2, MC_DC36(t1) - - li t2, MC_DC37_VALUE - sw t2, MC_DC37(t1) - - li t2, MC_DC38_VALUE - sw t2, MC_DC38(t1) - - li t2, MC_DC39_VALUE - sw t2, MC_DC39(t1) - - li t2, MC_DC40_VALUE - sw t2, MC_DC40(t1) - - li t2, MC_DC41_VALUE - sw t2, MC_DC41(t1) - - li t2, MC_DC42_VALUE - sw t2, MC_DC42(t1) - - li t2, MC_DC43_VALUE - sw t2, MC_DC43(t1) - - li t2, MC_DC44_VALUE - sw t2, MC_DC44(t1) - - li t2, MC_DC45_VALUE - sw t2, MC_DC45(t1) - - li t2, MC_DC46_VALUE - sw t2, MC_DC46(t1) - - li t2, 0x00000100 - sw t2, MC_DC03(t1) - - j ra - nop - - .end ddrram_init -#endif /* CONFIG_USE_DDR_RAM */ - - .globl lowlevel_init - .ent lowlevel_init -lowlevel_init: - /* EBU, CGU and SDRAM/DDR-RAM Initialization. - */ - move t0, ra - /* We rely on the fact that non of the following ..._init() functions - * modify t0 - */ -#if defined(CONFIG_SYS_EBU_BOOT) -#if defined(DDR166) - /* 0xe8 means CPU0/CPU1 333M, DDR 167M, FPI 83M, PPE 240M */ - li a0,0xe8 -#elif defined(DDR133) - /* 0xe9 means CPU0/CPU1 333M, DDR 133M, FPI 83M, PPE 240M */ - li a0,0xe9 -#else /* defined(DDR111) */ - /* 0xea means CPU0/CPU1 333M, DDR 111M, FPI 83M, PPE 240M */ - li a0,0xea -#endif - bal cgu_init - nop -#endif /* CONFIG_SYS_EBU_BOOT */ - - bal ebu_init - nop - -//06063001-joelin disable the PCI CFRAME mask-start -#ifdef DISABLE_CFRAME - li t1, PCI_CR_PCI //mw bf103034 80000000 - li t2, 0x80000000 - sw t2,0(t1) - - li t1, PCI_CR_PCI_MOD_REG //mw be105430 103 - li t2, 0x103 - sw t2,0(t1) - - li t1, CS_CFM //mw b700006c 0 - li t2, 0x00 - sw t2, 0(t1) - - li t1, PCI_CR_PCI_MOD_REG //mw be105430 103 - li t2, 0x1000103 - sw t2, 0(t1) -#endif -//06063001-joelin disable the PCI CFRAME mask-end - -#ifdef CONFIG_SYS_EBU_BOOT -#ifndef CONFIG_SYS_RAMBOOT -#ifdef CONFIG_USE_DDR_RAM - bal ddrram_init - nop -#else - bal sdram_init - nop -#endif -#endif /* CONFIG_SYS_RAMBOOT */ -#endif /* CONFIG_SYS_EBU_BOOT */ - - move ra, t0 - j ra - nop - - .end lowlevel_init diff --git a/package/uboot-lantiq/files/board/arcadyan/arv752DWP22/Makefile b/package/uboot-lantiq/files/board/arcadyan/arv752DWP22/Makefile deleted file mode 100644 index 2d0115f8ed..0000000000 --- a/package/uboot-lantiq/files/board/arcadyan/arv752DWP22/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# -# (C) Copyright 2003-2006 -# 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 -# - -include $(TOPDIR)/config.mk - -LIB = $(obj)lib$(BOARD).a - -#COBJS := $(BOARD).o -COBJS-y += arv752.o athrs26_phy.o - -SOBJS = lowlevel_init.o pmuenable.o - -SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS-y)) -SOBJS := $(addprefix $(obj),$(SOBJS)) - -$(LIB): $(obj).depend $(OBJS) $(SOBJS) - $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### diff --git a/package/uboot-lantiq/files/board/arcadyan/arv752DWP22/arv752.c b/package/uboot-lantiq/files/board/arcadyan/arv752DWP22/arv752.c deleted file mode 100644 index 5b68de9589..0000000000 --- a/package/uboot-lantiq/files/board/arcadyan/arv752DWP22/arv752.c +++ /dev/null @@ -1,325 +0,0 @@ -/* - * (C) Copyright 2003 - * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * (C) Copyright 2010 - * Thomas Langer, Ralph Hempel - * - * 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 - */ - -#include <common.h> -#include <command.h> -#include <netdev.h> -#include <miiphy.h> -#include <asm/addrspace.h> -#include <asm/danube.h> -#include <asm/reboot.h> -#include <asm/io.h> -#if defined(CONFIG_CMD_HTTPD) -#include <httpd.h> -#endif -#if defined(CONFIG_PCI) -#include <pci.h> -#endif -#include "athrs26_phy.h" - -extern ulong ifx_get_ddr_hz(void); -extern ulong ifx_get_cpuclk(void); - -/* IDs and registers of known external switches */ -void _machine_restart(void) -{ - *DANUBE_RCU_RST_REQ |=1<<30; -} - -#ifdef CONFIG_SYS_RAMBOOT -phys_size_t initdram(int board_type) -{ - return get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_MAX_RAM); -} -#elif defined(CONFIG_USE_DDR_RAM) -phys_size_t initdram(int board_type) -{ - return (CONFIG_SYS_MAX_RAM); -} -#else - -static ulong max_sdram_size(void) /* per Chip Select */ -{ - /* The only supported SDRAM data width is 16bit. - */ -#define CFG_DW 4 - - /* The only supported number of SDRAM banks is 4. - */ -#define CFG_NB 4 - - ulong cfgpb0 = *DANUBE_SDRAM_MC_CFGPB0; - int cols = cfgpb0 & 0xF; - int rows = (cfgpb0 & 0xF0) >> 4; - ulong size = (1 << (rows + cols)) * CFG_DW * CFG_NB; - - return size; -} - -/* - * Check memory range for valid RAM. A simple memory test determines - * the actually available RAM size between addresses `base' and - * `base + maxsize'. - */ - -static long int dram_size(long int *base, long int maxsize) -{ - volatile long int *addr; - ulong cnt, val; - ulong save[32]; /* to make test non-destructive */ - unsigned char i = 0; - - for (cnt = (maxsize / sizeof (long)) >> 1; cnt > 0; cnt >>= 1) { - addr = base + cnt; /* pointer arith! */ - - save[i++] = *addr; - *addr = ~cnt; - } - - /* write 0 to base address */ - addr = base; - save[i] = *addr; - *addr = 0; - - /* check at base address */ - if ((val = *addr) != 0) { - *addr = save[i]; - return (0); - } - - for (cnt = 1; cnt < maxsize / sizeof (long); cnt <<= 1) { - addr = base + cnt; /* pointer arith! */ - - val = *addr; - *addr = save[--i]; - - if (val != (~cnt)) { - return (cnt * sizeof (long)); - } - } - return (maxsize); -} - -phys_size_t initdram(int board_type) -{ - int rows, cols, best_val = *DANUBE_SDRAM_MC_CFGPB0; - ulong size, max_size = 0; - ulong our_address; - - /* load t9 into our_address */ - asm volatile ("move %0, $25" : "=r" (our_address) :); - - /* Can't probe for RAM size unless we are running from Flash. - * find out whether running from DRAM or Flash. - */ - if (CPHYSADDR(our_address) < CPHYSADDR(PHYS_FLASH_1)) - { - return max_sdram_size(); - } - - for (cols = 0x8; cols <= 0xC; cols++) - { - for (rows = 0xB; rows <= 0xD; rows++) - { - *DANUBE_SDRAM_MC_CFGPB0 = (0x14 << 8) | - (rows << 4) | cols; - size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, - max_sdram_size()); - - if (size > max_size) - { - best_val = *DANUBE_SDRAM_MC_CFGPB0; - max_size = size; - } - } - } - - *DANUBE_SDRAM_MC_CFGPB0 = best_val; - return max_size; -} -#endif - -int checkboard (void) -{ - unsigned long chipid = *DANUBE_MPS_CHIPID; - int part_num; - - puts ("Board: ARV75DW22 - Easybox 803\n"); - puts ("SoC: "); - - part_num = DANUBE_MPS_CHIPID_PARTNUM_GET(chipid); - switch (part_num) - { - case 0x129: - case 0x12D: - case 0x12b: - puts("Danube/Twinpass/Vinax-VE "); - break; - default: - printf ("unknown, chip part number 0x%03X ", part_num); - break; - } - printf ("V1.%ld, ", DANUBE_MPS_CHIPID_VERSION_GET(chipid)); - - printf("DDR Speed %ld MHz, ", ifx_get_ddr_hz()/1000000); - printf("CPU Speed %ld MHz\n", ifx_get_cpuclk()/1000000); - - return 0; -} - -#ifdef CONFIG_SKIP_LOWLEVEL_INIT -int board_early_init_f(void) -{ -#ifdef CONFIG_EBU_ADDSEL0 - (*DANUBE_EBU_ADDSEL0) = CONFIG_EBU_ADDSEL0; -#endif -#ifdef CONFIG_EBU_ADDSEL1 - (*DANUBE_EBU_ADDSEL1) = CONFIG_EBU_ADDSEL1; -#endif -#ifdef CONFIG_EBU_ADDSEL2 - (*DANUBE_EBU_ADDSEL2) = CONFIG_EBU_ADDSEL2; -#endif -#ifdef CONFIG_EBU_ADDSEL3 - (*DANUBE_EBU_ADDSEL3) = CONFIG_EBU_ADDSEL3; -#endif -#ifdef CONFIG_EBU_BUSCON0 - (*DANUBE_EBU_BUSCON0) = CONFIG_EBU_BUSCON0; -#endif -#ifdef CONFIG_EBU_BUSCON1 - (*DANUBE_EBU_BUSCON1) = CONFIG_EBU_BUSCON1; -#endif -#ifdef CONFIG_EBU_BUSCON2 - (*DANUBE_EBU_BUSCON2) = CONFIG_EBU_BUSCON2; -#endif -#ifdef CONFIG_EBU_BUSCON3 - (*DANUBE_EBU_BUSCON3) = CONFIG_EBU_BUSCON3; -#endif - - return 0; -} -#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ - - -#ifdef CONFIG_EXTRA_SWITCH -static int external_switch_init(void) -{ - // switch reset pin on arv752 - *DANUBE_GPIO_P1_ALTSEL0 &= ~8; - *DANUBE_GPIO_P1_ALTSEL1 &= ~8; - *DANUBE_GPIO_P1_OD |= 8; - *DANUBE_GPIO_P1_DIR |= 8; - *DANUBE_GPIO_P1_OUT |= 8; - - puts("initializing ar8216 switch... "); - if (athrs26_phy_setup(0)==0) { - printf("initialized\n"); - return 0; - } - puts("failed ... \n"); - return 0; -} -#endif /* CONFIG_EXTRA_SWITCH */ - -int board_eth_init(bd_t *bis) -{ -#if defined(CONFIG_IFX_ETOP) - uchar enetaddr[6]; - if (!eth_getenv_enetaddr("ethaddr", enetaddr)) - eth_setenv_enetaddr("ethaddr", (uchar *)0xb03f0016); - - *DANUBE_PMU_PWDCR &= 0xFFFFEFDF; - *DANUBE_PMU_PWDCR &=~(1<<DANUBE_PMU_DMA_SHIFT);/*enable DMA from PMU*/ - - if (lq_eth_initialize(bis)) - return -1; - - *DANUBE_RCU_RST_REQ |=1; - udelay(200000); - *DANUBE_RCU_RST_REQ &=(unsigned long)~1; - udelay(1000); - -#ifdef CONFIG_EXTRA_SWITCH - if (external_switch_init()<0) - return -1; -#endif /* CONFIG_EXTRA_SWITCH */ -#endif /* CONFIG_IFX_ETOP */ - - return 0; -} - -#if defined(CONFIG_CMD_HTTPD) -int do_http_upgrade(const unsigned char *data, const ulong size) -{ - char buf[128]; - - if(getenv ("ram_addr") == NULL) - return -1; - if(getenv ("kernel_addr") == NULL) - return -1; - /* check the image */ - if(run_command("imi ${ram_addr}", 0) < 0) { - return -1; - } - /* write the image to the flash */ - puts("http ugrade ...\n"); - sprintf(buf, "era ${kernel_addr} +0x%lx; cp.b ${ram_addr} ${kernel_addr} 0x%lx", size, size); - return run_command(buf, 0); -} - -int do_http_progress(const int state) -{ - /* toggle LED's here */ - switch(state) { - case HTTP_PROGRESS_START: - puts("http start\n"); - break; - case HTTP_PROGRESS_TIMEOUT: - puts("."); - break; - case HTTP_PROGRESS_UPLOAD_READY: - puts("http upload ready\n"); - break; - case HTTP_PROGRESS_UGRADE_READY: - puts("http ugrade ready\n"); - break; - case HTTP_PROGRESS_UGRADE_FAILED: - puts("http ugrade failed\n"); - break; - } - return 0; -} - -unsigned long do_http_tmp_address(void) -{ - char *s = getenv ("ram_addr"); - if (s) { - ulong tmp = simple_strtoul (s, NULL, 16); - return tmp; - } - return 0 /*0x80a00000*/; -} - -#endif diff --git a/package/uboot-lantiq/files/board/arcadyan/arv752DWP22/config.mk b/package/uboot-lantiq/files/board/arcadyan/arv752DWP22/config.mk deleted file mode 100644 index c0e5d82445..0000000000 --- a/package/uboot-lantiq/files/board/arcadyan/arv752DWP22/config.mk +++ /dev/null @@ -1,60 +0,0 @@ -# -# (C) Copyright 2003 -# 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 -# - -# -# Danube board with MIPS 24Kc CPU core -# -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifdef CONFIG_LZMA_BOOTSTRAP - -ifdef BUILD_BOOTSTRAP - -$(info BUILD_BOOTSTRAP ) -#TEXT_BASE = 0xB0000000 -TEXT_BASE = 0x80010000 - -else # BUILD_BOOTSTRAP - -ifndef TEXT_BASE -$(info redefine TEXT_BASE = 0x80040000 ) -TEXT_BASE = 0x80040000 -endif - -endif # BUILD_BOOTSTRAP - -else - -ifdef BUILD_BOOTSTRAP -$(error BUILD_BOOTSTRAP but not enabled in config) -endif - -ifndef TEXT_BASE -## Standard: boot from ebu -$(info redefine TEXT_BASE = 0xB0000000 ) -TEXT_BASE = 0xB0000000 -## For testing: boot from RAM -# TEXT_BASE = 0x80100000 -endif - -endif # CONFIG_LZMA_BOOTSTRAP diff --git a/package/uboot-lantiq/files/board/arcadyan/arv752DWP22/pmuenable.S b/package/uboot-lantiq/files/board/arcadyan/arv752DWP22/pmuenable.S deleted file mode 100644 index e0d7971d89..0000000000 --- a/package/uboot-lantiq/files/board/arcadyan/arv752DWP22/pmuenable.S +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Power Management unit initialization code for AMAZON development board. - * - * Copyright (c) 2003 Ou Ke, Infineon. - * - * 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 - */ - -#include <config.h> -#include <version.h> -#include <asm/regdef.h> - -#define PMU_PWDCR 0xBF10201C -#define PMU_SR 0xBF102020 - - .globl pmuenable - -pmuenable: - li t0, PMU_PWDCR - li t1, 0x2 /* enable everything */ - sw t1, 0(t0) -#if 0 -1: - li t0, PMU_SR - lw t2, 0(t0) - bne t1, t2, 1b - nop -#endif - j ra - nop - - diff --git a/package/uboot-lantiq/files/board/arcadyan/arv752DWP22/u-boot.lds b/package/uboot-lantiq/files/board/arcadyan/arv752DWP22/u-boot.lds deleted file mode 100644 index 9a6cd1b8a3..0000000000 --- a/package/uboot-lantiq/files/board/arcadyan/arv752DWP22/u-boot.lds +++ /dev/null @@ -1,70 +0,0 @@ -/* - * (C) Copyright 2003 - * Wolfgang Denk 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 - */ - -/* -OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-bigmips") -*/ -OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", "elf32-tradbigmips") -OUTPUT_ARCH(mips) -ENTRY(_start) -SECTIONS -{ - . = 0x00000000; - - . = ALIGN(4); - .text : - { - *(.text) - } - - . = ALIGN(4); - .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } - - . = ALIGN(4); - .data : { *(.data) } - - . = .; - _gp = ALIGN(16) + 0x7ff0; - - .got : { - __got_start = .; - *(.got) - __got_end = .; - } - - .sdata : { *(.sdata) } - - .u_boot_cmd : { - __u_boot_cmd_start = .; - *(.u_boot_cmd) - __u_boot_cmd_end = .; - } - - uboot_end_data = .; - num_got_entries = (__got_end - __got_start) >> 2; - - . = ALIGN(4); - .sbss (NOLOAD) : { *(.sbss) } - .bss (NOLOAD) : { *(.bss) . = ALIGN(4); } - uboot_end = .; -} diff --git a/package/uboot-lantiq/files/board/arcadyan/arv752DWP22/athrs26_phy.c b/package/uboot-lantiq/files/board/arcadyan/athrs26_phy.c index 2f80ee05e6..2f80ee05e6 100644 --- a/package/uboot-lantiq/files/board/arcadyan/arv752DWP22/athrs26_phy.c +++ b/package/uboot-lantiq/files/board/arcadyan/athrs26_phy.c diff --git a/package/uboot-lantiq/files/board/arcadyan/arv752DWP22/athrs26_phy.h b/package/uboot-lantiq/files/board/arcadyan/athrs26_phy.h index 0fdde376eb..0fdde376eb 100644 --- a/package/uboot-lantiq/files/board/arcadyan/arv752DWP22/athrs26_phy.h +++ b/package/uboot-lantiq/files/board/arcadyan/athrs26_phy.h diff --git a/package/uboot-lantiq/files/board/arcadyan/arv4518/arv4518.c b/package/uboot-lantiq/files/board/arcadyan/board.c index c015dd7014..cf0cbce7d6 100644 --- a/package/uboot-lantiq/files/board/arcadyan/arv4518/arv4518.c +++ b/package/uboot-lantiq/files/board/arcadyan/board.c @@ -38,13 +38,14 @@ #if defined(CONFIG_PCI) #include <pci.h> #endif +#if defined(CONFIG_AR8216_SWITCH) +#include "athrs26_phy.h" +#endif extern ulong ifx_get_ddr_hz(void); extern ulong ifx_get_cpuclk(void); /* IDs and registers of known external switches */ -#define ID_RTL8306 0x5988 -#define CONFIG_EXTRA_SWITCH 1 void _machine_restart(void) { *DANUBE_RCU_RST_REQ |=1<<30; @@ -163,12 +164,66 @@ phys_size_t initdram(int board_type) } #endif +static void gpio_default(void) +{ +#ifdef CONFIG_SWITCH_PORT0 + *DANUBE_GPIO_P0_ALTSEL0 &= ~(1<<CONFIG_SWITCH_PIN); + *DANUBE_GPIO_P0_ALTSEL1 &= ~(1<<CONFIG_SWITCH_PIN); + *DANUBE_GPIO_P0_OD |= (1<<CONFIG_SWITCH_PIN); + *DANUBE_GPIO_P0_DIR |= (1<<CONFIG_SWITCH_PIN); + *DANUBE_GPIO_P0_OUT |= (1<<CONFIG_SWITCH_PIN); +#elif defined(CONFIG_SWITCH_PORT1) + *DANUBE_GPIO_P1_ALTSEL0 &= ~(1<<CONFIG_SWITCH_PIN); + *DANUBE_GPIO_P1_ALTSEL1 &= ~(1<<CONFIG_SWITCH_PIN); + *DANUBE_GPIO_P1_OD |= (1<<CONFIG_SWITCH_PIN); + *DANUBE_GPIO_P1_DIR |= (1<<CONFIG_SWITCH_PIN); + *DANUBE_GPIO_P1_OUT |= (1<<CONFIG_SWITCH_PIN); +#endif +#ifdef CONFIG_EBU_GPIO + { + int i = 0; + printf ("bring up ebu gpio\n"); + *DANUBE_EBU_BUSCON1 = 0x1e7ff; + *DANUBE_EBU_ADDSEL1 = 0x14000001; + + *((volatile u16*)0xb4000000) = 0x0; + for(i = 0; i < 1000; i++) + udelay(1000); + *((volatile u16*)0xb4000000) = CONFIG_EBU_GPIO; + *DANUBE_EBU_BUSCON1 = 0x8001e7ff; + } +#endif +#ifdef CONFIG_BUTTON_PORT0 + *DANUBE_GPIO_P0_ALTSEL0 &= ~(1<<CONFIG_BUTTON_PIN); + *DANUBE_GPIO_P0_ALTSEL1 &= ~(1<<CONFIG_BUTTON_PIN); + *DANUBE_GPIO_P0_DIR &= ~(1<<CONFIG_BUTTON_PIN); + if(!!(*DANUBE_GPIO_P0_IN & (1<<CONFIG_BUTTON_PIN)) == CONFIG_BUTTON_LEVEL) + { + printf("button is pressed\n"); + setenv("bootdelay", "0"); + setenv("bootcmd", "httpd"); + } +#elif defined(CONFIG_BUTTON_PORT1) + *DANUBE_GPIO_P1_ALTSEL0 &= ~(1<<CONFIG_BUTTON_PIN); + *DANUBE_GPIO_P1_ALTSEL1 &= ~(1<<CONFIG_BUTTON_PIN); + *DANUBE_GPIO_P1_DIR &= ~(1<<CONFIG_BUTTON_PIN); + if(!!(*DANUBE_GPIO_P1_IN & (1<<CONFIG_BUTTON_PIN)) == CONFIG_BUTTON_LEVEL) + { + printf("button is pressed\n"); + setenv("bootdelay", "0"); + setenv("bootcmd", "httpd"); + } +#endif + +} + int checkboard (void) { unsigned long chipid = *DANUBE_MPS_CHIPID; int part_num; - puts ("Board: "); + puts ("Board: "CONFIG_ARCADYAN"\n"); + puts ("SoC: "); part_num = DANUBE_MPS_CHIPID_PARTNUM_GET(chipid); switch (part_num) @@ -187,6 +242,7 @@ int checkboard (void) printf("DDR Speed %ld MHz, ", ifx_get_ddr_hz()/1000000); printf("CPU Speed %ld MHz\n", ifx_get_cpuclk()/1000000); + return 0; } @@ -222,19 +278,17 @@ int board_early_init_f(void) } #endif /* CONFIG_SKIP_LOWLEVEL_INIT */ - -#ifdef CONFIG_EXTRA_SWITCH -static int external_switch_init(void) +#ifdef CONFIG_RTL8306_SWITCH +#define ID_RTL8306 0x5988 +static int external_switch_rtl8306(void) { unsigned short chipid; static char * const name = "lq_cpe_eth"; - /* earlier no valid response is available, at least on Twinpass & Tantos @ 111MHz, M4530 platform */ udelay(100000); puts("\nsearching for rtl8306 switch ... "); if (miiphy_read(name, 4, 30, &chipid) == 0) { - puts("s1\n"); if (chipid == ID_RTL8306) { puts("found"); /* set led mode */ @@ -250,10 +304,25 @@ static int external_switch_init(void) return 0; } -#endif /* CONFIG_EXTRA_SWITCH */ +#endif + +#ifdef CONFIG_AR8216_SWITCH +static int external_switch_ar8216(void) +{ + puts("initializing ar8216 switch... "); + if (athrs26_phy_setup(0)==0) { + printf("initialized\n"); + return 0; + } + puts("failed ... \n"); + return 0; +} +#endif int board_eth_init(bd_t *bis) { + gpio_default(); + #if defined(CONFIG_IFX_ETOP) uchar enetaddr[6]; if (!eth_getenv_enetaddr("ethaddr", enetaddr)) @@ -270,12 +339,15 @@ int board_eth_init(bd_t *bis) *DANUBE_RCU_RST_REQ &=(unsigned long)~1; udelay(1000); -#ifdef CONFIG_EXTRA_SWITCH - if (external_switch_init()<0) +#ifdef CONFIG_RTL8306_SWITCH + if (external_switch_rtl8306()<0) return -1; -#endif /* CONFIG_EXTRA_SWITCH */ -#endif /* CONFIG_IFX_ETOP */ - +#endif +#ifdef CONFIG_AR8216_SWITCH + if (external_switch_ar8216()<0) + return -1; +#endif +#endif return 0; } diff --git a/package/uboot-lantiq/files/board/arcadyan/arv4518/config.mk b/package/uboot-lantiq/files/board/arcadyan/config.mk index c0e5d82445..c0e5d82445 100644 --- a/package/uboot-lantiq/files/board/arcadyan/arv4518/config.mk +++ b/package/uboot-lantiq/files/board/arcadyan/config.mk diff --git a/package/uboot-lantiq/files/board/arcadyan/arv4518/ddr_settings.h b/package/uboot-lantiq/files/board/arcadyan/ddr_settings.h index 4df6f1170c..4df6f1170c 100644 --- a/package/uboot-lantiq/files/board/arcadyan/arv4518/ddr_settings.h +++ b/package/uboot-lantiq/files/board/arcadyan/ddr_settings.h diff --git a/package/uboot-lantiq/files/board/arcadyan/arv752DWP22/ddr_settings_psc_166.h b/package/uboot-lantiq/files/board/arcadyan/ddr_settings_psc_166.h index 445b7dac1f..445b7dac1f 100644 --- a/package/uboot-lantiq/files/board/arcadyan/arv752DWP22/ddr_settings_psc_166.h +++ b/package/uboot-lantiq/files/board/arcadyan/ddr_settings_psc_166.h diff --git a/package/uboot-lantiq/files/board/arcadyan/arv752DWP22/ddr_settings.h b/package/uboot-lantiq/files/board/arcadyan/ddr_settings_qimonda.h index 4df6f1170c..e1ab36d457 100644 --- a/package/uboot-lantiq/files/board/arcadyan/arv752DWP22/ddr_settings.h +++ b/package/uboot-lantiq/files/board/arcadyan/ddr_settings_qimonda.h @@ -2,11 +2,11 @@ /* Optimise for DDR PSC A3S12D40ETP for arv4518pw Danube Board DDR 166 Mhz - by Ngp 14th Sept. 2010 */ #define MC_DC0_VALUE 0x1B1B -#define MC_DC1_VALUE 0x0 +#define MC_DC1_VALUE 0xc0 #define MC_DC2_VALUE 0x0 -#define MC_DC3_VALUE 0x0 -#define MC_DC4_VALUE 0x0 -#define MC_DC5_VALUE 0x200 +#define MC_DC3_VALUE 0x100 +#define MC_DC4_VALUE 0xd0f +#define MC_DC5_VALUE 0x204 #define MC_DC6_VALUE 0x605 #define MC_DC7_VALUE 0x303 #define MC_DC8_VALUE 0x102 @@ -16,22 +16,22 @@ #define MC_DC12_VALUE 0x1C8 #define MC_DC13_VALUE 0x1 #define MC_DC14_VALUE 0x0 -#define MC_DC15_VALUE 0x130 /* WDQS tuning for clk_wr*/ +#define MC_DC15_VALUE 0xf3c /* WDQS tuning for clk_wr*/ #define MC_DC16_VALUE 0xC800 #define MC_DC17_VALUE 0xd -#define MC_DC18_VALUE 0x301 +#define MC_DC18_VALUE 0x300 #define MC_DC19_VALUE 0x200 -#define MC_DC20_VALUE 0xA03 /* A04 for reference board, A03 for Eval board */ -#define MC_DC21_VALUE 0x1b00 -#define MC_DC22_VALUE 0x1b1b +#define MC_DC20_VALUE 0xA04 /* A04 for reference board, A03 for Eval board */ +#define MC_DC21_VALUE 0xd47 +#define MC_DC22_VALUE 0xd0d #define MC_DC23_VALUE 0x0 -#define MC_DC24_VALUE 0x59 /* WDQS Tuning for DQS */ +#define MC_DC24_VALUE 0x62 /* WDQS Tuning for DQS */ #define MC_DC25_VALUE 0x0 #define MC_DC26_VALUE 0x0 -#define MC_DC27_VALUE 0x0 +#define MC_DC27_VALUE 0x2040 #define MC_DC28_VALUE 0x510 -#define MC_DC29_VALUE 0x4e20 -#define MC_DC30_VALUE 0x8235 +#define MC_DC29_VALUE 0x2d89 +#define MC_DC30_VALUE 0x8300 #define MC_DC31_VALUE 0x0 #define MC_DC32_VALUE 0x0 #define MC_DC33_VALUE 0x0 diff --git a/package/uboot-lantiq/files/board/arcadyan/arv752DWP22/lowlevel_init.S b/package/uboot-lantiq/files/board/arcadyan/lowlevel_init.S index 2f2c2255e0..2f2c2255e0 100644 --- a/package/uboot-lantiq/files/board/arcadyan/arv752DWP22/lowlevel_init.S +++ b/package/uboot-lantiq/files/board/arcadyan/lowlevel_init.S diff --git a/package/uboot-lantiq/files/board/arcadyan/arv4518/pmuenable.S b/package/uboot-lantiq/files/board/arcadyan/pmuenable.S index e0d7971d89..e0d7971d89 100644 --- a/package/uboot-lantiq/files/board/arcadyan/arv4518/pmuenable.S +++ b/package/uboot-lantiq/files/board/arcadyan/pmuenable.S diff --git a/package/uboot-lantiq/files/board/arcadyan/arv4518/u-boot.lds b/package/uboot-lantiq/files/board/arcadyan/u-boot.lds index 9a6cd1b8a3..9a6cd1b8a3 100644 --- a/package/uboot-lantiq/files/board/arcadyan/arv4518/u-boot.lds +++ b/package/uboot-lantiq/files/board/arcadyan/u-boot.lds diff --git a/package/uboot-lantiq/files/include/configs/arv752DWP22.h b/package/uboot-lantiq/files/include/configs/arcadyan-common.h index 386a2380c6..3bb64312ec 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 c4a9842c7a..4c40f0542e 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 0000000000..c4970a2295 --- /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 0000000000..a73a87c5ce --- /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 0000000000..5a1a5ada1e --- /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 e4e8067d74..c0a1b6b208 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 diff --git a/package/uboot-lantiq/patches/500-arcadyan.patch b/package/uboot-lantiq/patches/500-arcadyan.patch index eedd91c7eb..73ae9e32c7 100644 --- a/package/uboot-lantiq/patches/500-arcadyan.patch +++ b/package/uboot-lantiq/patches/500-arcadyan.patch @@ -39,49 +39,40 @@ SRCS := $(COBJS:.o=.c) --- a/Makefile +++ b/Makefile -@@ -3414,6 +3414,46 @@ +@@ -3414,6 +3414,37 @@ ## MIPS32 ifxcpe ######################################################################### -+arv752DWP22%config : unconfig ++define arcadyan ++$(1) : unconfig + @mkdir -p $(obj)include -+ @mkdir -p $(obj)board/arcadyan/arv752DWP22 -+ @[ -z "$(findstring brnboot,$@)" ] || \ -+ { echo "TEXT_BASE = 0x80002000" >$(obj)board/arcadyan/arv752DWP22/config.tmp ; \ ++ @mkdir -p $(obj)board/arcadyan/ ++ @[ -z "$$(findstring brnboot,$$@)" ] || \ ++ { echo "TEXT_BASE = 0x80002000" >$(obj)board/arcadyan/config.tmp ; \ + echo "#define CONFIG_SYS_RAMBOOT" >>$(obj)include/config.h ; \ + echo "#define CONFIG_SYS_BRNBOOT" >>$(obj)include/config.h ; \ + $(XECHO) "... with brnboot configuration" ; \ + } -+ @[ -z "$(findstring ramboot,$@)" ] || \ -+ { echo "TEXT_BASE = 0xA0400000" >$(obj)board/arcadyan/arv752DWP22/config.tmp ; \ ++ @[ -z "$$(findstring ramboot,$$@)" ] || \ ++ { echo "TEXT_BASE = 0xA0400000" >$(obj)board/arcadyan/config.tmp ; \ + echo "#define CONFIG_SYS_RAMBOOT" >>$(obj)include/config.h ; \ + $(XECHO) "... with ramboot configuration" ; \ + } -+ @if [ "$(findstring flash,$@)" ] ; then \ ++ @if [ "$$(findstring flash,$$@)" ] ; then \ + echo "#define CONFIG_USE_DDR_RAM" >>$(obj)include/config.h ; \ + echo "#define CONFIG_USE_DDR_RAM_CFG_DDR_psc166" >>$(obj)include/config.h ; \ + fi -+ @$(MKCONFIG) -a $(word 1,$(subst _, ,$@)) mips mips arv752DWP22 arcadyan danube ++ @$(MKCONFIG) -a $$(word 1,$$(subst _, ,$$@)) mips mips arcadyan "" danube ++endef + -+arv4518%config : unconfig -+ @mkdir -p $(obj)include -+ @mkdir -p $(obj)board/arcadyan/arv4518 -+ @[ -z "$(findstring brnboot,$@)" ] || \ -+ { echo "TEXT_BASE = 0x80002000" >$(obj)board/arcadyan/arv4518/config.tmp ; \ -+ echo "#define CONFIG_SYS_RAMBOOT" >>$(obj)include/config.h ; \ -+ echo "#define CONFIG_SYS_BRNBOOT" >>$(obj)include/config.h ; \ -+ $(XECHO) "... with brnboot configuration" ; \ -+ } -+ @[ -z "$(findstring ramboot,$@)" ] || \ -+ { echo "TEXT_BASE = 0xA0400000" >$(obj)board/arcadyan/arv4518/config.tmp ; \ -+ echo "#define CONFIG_SYS_RAMBOOT" >>$(obj)include/config.h ; \ -+ $(XECHO) "... with ramboot configuration" ; \ -+ } -+ @if [ "$(findstring flash,$@)" ] ; then \ -+ echo "#define CONFIG_USE_DDR_RAM" >>$(obj)include/config.h ; \ -+ echo "#define CONFIG_USE_DDR_RAM_CFG_DDR_psc166" >>$(obj)include/config.h ; \ -+ fi -+ @$(MKCONFIG) -a $(word 1,$(subst _, ,$@)) mips mips arv4518 arcadyan danube ++$(eval $(call arcadyan, arv4520PW%config)) ++$(eval $(call arcadyan, arv452CPW%config)) ++$(eval $(call arcadyan, arv4525PW%config)) ++$(eval $(call arcadyan, arv4510PW%config)) ++$(eval $(call arcadyan, arv4518PW%config)) ++$(eval $(call arcadyan, arv7518PW%config)) ++$(eval $(call arcadyan, arv752DPW%config)) ++$(eval $(call arcadyan, arv752DPW22%config)) + easy50712%config : unconfig @mkdir -p $(obj)include |