Changeset 32717


Ignore:
Timestamp:
2012-07-15T01:54:20+02:00 (6 years ago)
Author:
luka
Message:

[package] uboot-kirkwood: update to 2012.04.01

iConnect board tested by:

Tim Fletcher <tim@…>
Wojciech Dubowik <wojciech.dubowik@…>

DockStar board tested by:

Martin Mueller <mm@…>

RaidSonic ICY BOX NAS6210 board tested by:

Luka Perkov <uboot@…>

SheevaPlug was not tested but support for SheevaPlug is taken from upstream
uboot and it is not reported to be broken there.

Location:
trunk/package/uboot-kirkwood
Files:
8 added
10 deleted
2 edited
3 moved

Legend:

Unmodified
Added
Removed
  • trunk/package/uboot-kirkwood/Makefile

    r23567 r32717  
    11# 
    2 # Copyright (C) 2010 OpenWrt.org 
     2# Copyright (C) 2010-2012 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010 
    1111PKG_NAME:=u-boot 
    12 PKG_VERSION:=2010.09 
     12PKG_VERSION:=2012.04.01 
    1313PKG_RELEASE:=1 
    1414 
     
    1616PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    1717PKG_SOURCE_URL:=ftp://ftp.denx.de/pub/u-boot 
    18 PKG_MD5SUM:= 
     18PKG_MD5SUM:=192bb231082d9159fb6e16de3039b6b2 
    1919PKG_TARGETS:=bin 
    2020 
     
    2828 
    2929define uboot/sheevaplug 
    30   TITLE:=U-boot for the Sheevaplug 
     30  TITLE:=U-Boot for the SheevaPlug 
    3131endef 
    3232 
    3333define uboot/dockstar 
    34   TITLE:=U-boot for the Seagate Dockstar 
     34  TITLE:=U-Boot for the Seagate DockStar 
    3535endef 
    3636 
    3737define uboot/iconnect 
    38   TITLE:=U-boot for the Iomega iConnect Wireless 
     38  TITLE:=U-Boot for the Iomega iConnect Wireless 
    3939endef 
    4040 
    41 UBOOTS:=sheevaplug dockstar iconnect 
     41define uboot/ib62x0 
     42  TITLE:=U-Boot for the RaidSonic ICY BOX NAS6210 and NAS6220 
     43endef 
     44 
     45UBOOTS:=sheevaplug dockstar iconnect ib62x0 
    4246 
    4347define Package/uboot/template 
     
    5256endef 
    5357 
    54 define BuildUbootPackage 
     58define BuildUBootPackage 
    5559        $(eval $(uboot/Default)) 
    5660        $(eval $(uboot/$(1))) 
    5761        $(call Package/uboot/template,$(1),$(TITLE)) 
    5862endef 
    59  
    6063 
    6164ifdef BUILD_VARIANT 
     
    6770define Build/Prepare 
    6871        $(call Build/Prepare/Default) 
    69         $(CP) ./files/* $(PKG_BUILD_DIR) || true 
    70         find $(PKG_BUILD_DIR) -name .svn | $(XARGS) rm -rf 
     72        $(CP) ./files/* $(PKG_BUILD_DIR) 
    7173endef 
    7274 
     
    8890        $(CP) $(PKG_BUILD_DIR)/u-boot.kwb \ 
    8991                $(BIN_DIR)/openwrt-$(BOARD)-$(1)-u-boot.kwb 
     92        $(INSTALL_DIR) $(BIN_DIR)/u-boot-kwboot/ 
     93        $(CP) $(PKG_BUILD_DIR)/tools/kwboot \ 
     94                $(BIN_DIR)/u-boot-kwboot/ 
    9095endef 
    9196 
     
    101106 
    102107$(foreach u,$(UBOOTS), \ 
    103         $(eval $(call BuildUbootPackage,$(u))) \ 
     108        $(eval $(call BuildUBootPackage,$(u))) \ 
    104109        $(eval $(call BuildPackage,uboot-kirkwood-$(u))) \ 
    105110) 
  • trunk/package/uboot-kirkwood/files/board/iomega/iconnect/Makefile

    r32714 r32717  
    1414# This program is distributed in the hope that it will be useful, 
    1515# but WITHOUT ANY WARRANTY; without even the implied warranty of 
    16 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     16# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
    1717# GNU General Public License for more details. 
    1818# 
    1919# You should have received a copy of the GNU General Public License 
    20 # along with this program; if not, write to the Free Software 
    21 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
    22 # MA 02110-1301 USA 
     20# along with this program. If not, see <http://www.gnu.org/licenses/>. 
    2321# 
    2422 
    2523include $(TOPDIR)/config.mk 
    2624 
    27 LIB     = $(obj)lib$(BOARD).a 
     25LIB     = $(obj)lib$(BOARD).o 
    2826 
    2927COBJS   := iconnect.o 
     
    3432 
    3533$(LIB): $(obj).depend $(OBJS) $(SOBJS) 
    36         $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) 
    37  
    38 clean: 
    39         rm -f $(SOBJS) $(OBJS) 
    40  
    41 distclean:      clean 
    42         rm -f $(LIB) core *.bak .depend 
     34        $(call cmd_link_o_target, $(OBJS) $(SOBJS)) 
    4335 
    4436######################################################################### 
  • trunk/package/uboot-kirkwood/files/board/iomega/iconnect/iconnect.c

    r32714 r32717  
    11/* 
    2  * (C) Copyright 2009 
    3  * Marvell Semiconductor <www.marvell.com> 
    4  * Written-by: Prafulla Wadaskar <prafulla@marvell.com> 
     2 * Copyright (C) 2009-2012 
     3 * Wojciech Dubowik <wojciech.dubowik@neratec.com> 
     4 * Luka Perkov <uboot@lukaperkov.net> 
    55 * 
    66 * See file CREDITS for list of people who contributed to this 
     
    1818 * 
    1919 * You should have received a copy of the GNU General Public License 
    20  * along with this program; if not, write to the Free Software 
    21  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
    22  * MA 02110-1301 USA 
     20 * along with this program. If not, see <http://www.gnu.org/licenses/>. 
    2321 */ 
    2422 
    2523#include <common.h> 
    2624#include <miiphy.h> 
     25#include <asm/arch/cpu.h> 
    2726#include <asm/arch/kirkwood.h> 
    2827#include <asm/arch/mpp.h> 
     
    3130DECLARE_GLOBAL_DATA_PTR; 
    3231 
    33 int board_init(void) 
     32int board_early_init_f(void) 
    3433{ 
    3534        /* 
    3635         * default gpio configuration 
    3736         * There are maximum 64 gpios controlled through 2 sets of registers 
    38          * the  below configuration configures mainly initial LED status 
     37         * the below configuration configures mainly initial LED status 
    3938         */ 
    4039        kw_config_gpio(ICONNECT_OE_VAL_LOW, 
     
    9594                MPP49_GPIO, 
    9695                0 
    97 }; 
     96        }; 
    9897        kirkwood_mpp_conf(kwmpp_config); 
     98        return 0; 
     99} 
    99100 
    100         /* 
    101          * arch number of board 
    102          */ 
    103         gd->bd->bi_arch_number = MACH_TYPE_ICONNECT; 
    104  
    105         /* adress of boot parameters */ 
     101int board_init(void) 
     102{ 
     103        /* Boot parameters address */ 
    106104        gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100; 
    107105 
     
    109107} 
    110108 
    111 int dram_init(void) 
    112 { 
    113         int i; 
    114  
    115         for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) { 
    116                 gd->bd->bi_dram[i].start = kw_sdram_bar(i); 
    117                 gd->bd->bi_dram[i].size = kw_sdram_bs(i); 
    118         } 
    119         return 0; 
    120 } 
    121  
    122109#ifdef CONFIG_RESET_PHY_R 
    123 /* Configure and enable MV88E1116 PHY */ 
     110/* Configure and initialize PHY */ 
    124111void reset_phy(void) 
    125112{ 
     
    133120        /* command to read PHY dev address */ 
    134121        if (miiphy_read(name, 0xEE, 0xEE, (u16 *) &devadr)) { 
    135                 printf("Err..%s could not read PHY dev address\n", 
    136                         __FUNCTION__); 
     122                printf("Err..(%s) could not read PHY dev address\n", __func__); 
    137123                return; 
    138124        } 
     
    151137        miiphy_reset(name, devadr); 
    152138 
    153         printf("88E1116 Initialized on %s\n", name); 
     139        debug("88E1116 Initialized on %s\n", name); 
    154140} 
    155141#endif /* CONFIG_RESET_PHY_R */ 
  • trunk/package/uboot-kirkwood/files/board/iomega/iconnect/iconnect.h

    r32714 r32717  
    11/* 
    2  * (C) Copyright 2009 
    3  * Marvell Semiconductor <www.marvell.com> 
    4  * Written-by: Prafulla Wadaskar <prafulla@marvell.com> 
     2 * Copyright (C) 2009-2012 
     3 * Wojciech Dubowik <wojciech.dubowik@neratec.com> 
     4 * Luka Perkov <uboot@lukaperkov.net> 
    55 * 
    66 * See file CREDITS for list of people who contributed to this 
     
    1818 * 
    1919 * You should have received a copy of the GNU General Public License 
    20  * along with this program; if not, write to the Free Software 
    21  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
    22  * MA 02110-1301 USA 
     20 * along with this program. If not, see <http://www.gnu.org/licenses/>. 
    2321 */ 
    2422 
     
    2725 
    2826#define ICONNECT_OE_LOW                 (~(1 << 7)) 
    29 #define ICONNECT_OE_HIGH                        (~(1 << 10)) 
     27#define ICONNECT_OE_HIGH                (~(1 << 10)) 
    3028#define ICONNECT_OE_VAL_LOW             (0) 
    3129#define ICONNECT_OE_VAL_HIGH            (1 << 10) 
  • trunk/package/uboot-kirkwood/files/include/configs/iconnect.h

    r23683 r32717  
    11/* 
    2  * (C) Copyright 2009 
    3  * Marvell Semiconductor <www.marvell.com> 
    4  * Written-by: Prafulla Wadaskar <prafulla@marvell.com> 
     2 * (C) Copyright 2009-2012 
     3 * Wojciech Dubowik <wojciech.dubowik@neratec.com> 
     4 * Luka Perkov <uboot@lukaperkov.net> 
    55 * 
    66 * See file CREDITS for list of people who contributed to this 
     
    1818 * 
    1919 * You should have received a copy of the GNU General Public License 
    20  * along with this program; if not, write to the Free Software 
    21  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
    22  * MA 02110-1301 USA 
     20 * along with this program. If not, see <http://www.gnu.org/licenses/>. 
    2321 */ 
    2422 
     
    2927 * Version number information 
    3028 */ 
    31 #define CONFIG_IDENT_STRING     "\nIomega iConnect Wireless" 
    32  
    33  
    34 //#define DEBUG 
    35  
     29#define CONFIG_IDENT_STRING     " Iomega iConnect Wireless" 
    3630 
    3731/* 
    38  * High Level Configuration Options (easy to change) 
     32 * High level configuration options 
    3933 */ 
    40 #define CONFIG_MARVELL          1 
    41 #define CONFIG_ARM926EJS        1       /* Basic Architecture */ 
    42 #define CONFIG_FEROCEON_88FR131 1       /* CPU Core subversion */ 
    43 #define CONFIG_KIRKWOOD         1       /* SOC Family Name */ 
    44 #define CONFIG_KW88F6281        1       /* SOC Name */ 
    45 #define CONFIG_MACH_ICONNECT    /* Machine type */ 
    46  
    47 #define CONFIG_MD5      /* get_random_hex on krikwood needs MD5 support */ 
     34#define CONFIG_FEROCEON_88FR131         /* CPU Core subversion */ 
     35#define CONFIG_KIRKWOOD                 /* SOC Family Name */ 
     36#define CONFIG_KW88F6281                /* SOC Name */ 
    4837#define CONFIG_SKIP_LOWLEVEL_INIT       /* disable board lowlevel_init */ 
    4938#define CONFIG_KIRKWOOD_EGIGA_INIT      /* Enable GbePort0/1 for kernel */ 
    50 #define CONFIG_KIRKWOOD_RGMII_PAD_1V8   /* Set RGMII Pad voltage to 1.8V */ 
    51 #define CONFIG_KIRKWOOD_PCIE_INIT       /*enable pci express on iconnect board*/ 
    5239 
    5340/* 
    54  * CLKs configurations 
     41 * Machine type 
    5542 */ 
    56 #define CONFIG_SYS_HZ           1000 
     43#define CONFIG_MACH_TYPE        MACH_TYPE_ICONNECT 
    5744 
    58 /* 
    59  * NS16550 Configuration 
    60  */ 
    61 #define CONFIG_SYS_NS16550 
    62 #define CONFIG_SYS_NS16550_SERIAL 
    63 #define CONFIG_SYS_NS16550_REG_SIZE     (-4) 
    64 #define CONFIG_SYS_NS16550_CLK          CONFIG_SYS_TCLK 
    65 #define CONFIG_SYS_NS16550_COM1         KW_UART0_BASE 
    66  
    67 /* 
    68  * Serial Port configuration 
    69  * The following definitions let you select what serial you want to use 
    70  * for your console driver. 
    71  */ 
    72  
    73 #define CONFIG_CONS_INDEX       1       /*Console on UART0 */ 
    74 #define CONFIG_BAUDRATE                 115200 
    75 #define CONFIG_SYS_BAUDRATE_TABLE       { 9600, 19200, 38400, 57600, \ 
    76                                           115200,230400, 460800, 921600 } 
    77 /* auto boot */ 
    78 #define CONFIG_BOOTDELAY        3       /* default enable autoboot */ 
    79  
    80 /* 
    81  * For booting Linux, the board info and command line data 
    82  * have to be in the first 8 MB of memory, since this is 
    83  * the maximum mapped by the Linux kernel during initialization. 
    84  */ 
    85 #define CONFIG_CMDLINE_TAG      1       /* enable passing of ATAGs  */ 
    86 #define CONFIG_INITRD_TAG       1       /* enable INITRD tag */ 
    87 #define CONFIG_SETUP_MEMORY_TAGS 1      /* enable memory tag */ 
    88  
    89 #define CONFIG_SYS_PROMPT       "Marvell>> "    /* Command Prompt */ 
    90 #define CONFIG_SYS_CBSIZE       1024    /* Console I/O Buff Size */ 
    91 #define CONFIG_SYS_PBSIZE       (CONFIG_SYS_CBSIZE \ 
    92                 +sizeof(CONFIG_SYS_PROMPT) + 16)        /* Print Buff */ 
    9345 
    9446/* 
    9547 * Commands configuration 
    9648 */ 
    97 #define CONFIG_SYS_NO_FLASH             /* Declare no flash (NOR/SPI) */ 
     49#define CONFIG_SYS_NO_FLASH             /* declare no flash (NOR/SPI) */ 
     50#define CONFIG_SYS_MVFS 
    9851#include <config_cmd_default.h> 
    99 #define CONFIG_CMD_AUTOSCRIPT 
    100 #define CONFIG_CMD_DHCP 
    10152#define CONFIG_CMD_ENV 
    10253#define CONFIG_CMD_MII 
     
    10657 
    10758/* 
    108  * NAND configuration 
     59 * mv-common.h should be defined after CMD configs since it used them 
     60 * to enable certain macros 
     61 */ 
     62#include "mv-common.h" 
     63 
     64#undef CONFIG_SYS_PROMPT 
     65#define CONFIG_SYS_PROMPT       "iconnect => " 
     66 
     67/* 
     68 * Environment variables configuration 
    10969 */ 
    11070#ifdef CONFIG_CMD_NAND 
    111 #define CONFIG_NAND_KIRKWOOD 
    112 #define CONFIG_SYS_MAX_NAND_DEVICE      1 
    113 #define NAND_MAX_CHIPS                  1 
    114 #define CONFIG_SYS_NAND_BASE            0xD8000000      /* KW_DEFADR_NANDF */ 
    115 #define NAND_ALLOW_ERASE_ALL            1 
     71#define CONFIG_ENV_IS_IN_NAND 
     72#define CONFIG_ENV_SECT_SIZE    0x20000 
     73#else 
     74#define CONFIG_ENV_IS_NOWHERE 
    11675#endif 
    117  
    118 /* 
    119  *  Environment variables configurations 
    120  */ 
    121 #ifdef CONFIG_CMD_NAND 
    122 #define CONFIG_ENV_IS_IN_NAND           1 
    123 #define CONFIG_ENV_SECT_SIZE            0x20000 /* 128K */ 
    124 #else 
    125 #define CONFIG_ENV_IS_NOWHERE           1       /* if env in SDRAM */ 
    126 #endif 
    127 /* 
    128  * max 4k env size is enough, but in case of nand 
    129  * it has to be rounded to sector size 
    130  */ 
    131 #define CONFIG_ENV_SIZE                 0x20000 /* 128k */ 
    132 #define CONFIG_ENV_ADDR                 0xc0000  /*it's above original iConnect u-boot envirinment 0xa0000 */ 
    133 #define CONFIG_ENV_OFFSET               0xc0000 /* env starts here */ 
     76#define CONFIG_ENV_SIZE                 0x20000 
     77#define CONFIG_ENV_OFFSET               0xc0000 
    13478 
    13579/* 
    13680 * Default environment variables 
    13781 */ 
    138 #define CONFIG_BOOTCOMMAND              "${x_bootcmd_kernel}; " \ 
     82#define CONFIG_BOOTCOMMAND      "${x_bootcmd_kernel}; "         \ 
    13983        "setenv bootargs ${x_bootargs} ${x_bootargs_root}; "    \ 
    14084        "${x_bootcmd_usb}; bootm 0x6400000;" 
     
    14488 
    14589#define CONFIG_EXTRA_ENV_SETTINGS       "x_bootargs=console"    \ 
    146         "=ttyS0,115200 mtdparts="CONFIG_MTDPARTS        \ 
     90        "=ttyS0,115200 mtdparts="CONFIG_MTDPARTS                \ 
    14791        "x_bootcmd_kernel=nand read 0x6400000 0x100000 0x300000\0" \ 
    14892        "x_bootcmd_usb=usb start\0" \ 
     
    15094 
    15195/* 
    152  * Size of malloc() pool 
    153  */ 
    154 #define CONFIG_SYS_MALLOC_LEN   (1024 * 1024) /* 1 MiB for malloc() */ 
    155 /* size in bytes reserved for initial data */ 
    156 #define CONFIG_SYS_GBL_DATA_SIZE        128 
    157  
    158 /* 
    159  * Other required minimal configurations 
    160  */ 
    161 #define CONFIG_SYS_LONGHELP 
    162 #define CONFIG_AUTO_COMPLETE 
    163 #define CONFIG_CMDLINE_EDITING 
    164 #define CONFIG_ARCH_CPU_INIT    /* call arch_cpu_init() */ 
    165 #define CONFIG_ARCH_MISC_INIT   /* call arch_misc_init() */ 
    166 #define CONFIG_DISPLAY_CPUINFO  /* Display cpu info */ 
    167 #define CONFIG_NR_DRAM_BANKS    4 
    168 #define CONFIG_STACKSIZE        0x00100000      /* regular stack- 1M */ 
    169 #define CONFIG_SYS_LOAD_ADDR    0x00800000      /* default load adr- 8M */ 
    170 #define CONFIG_SYS_MEMTEST_START 0x00400000     /* 4M */ 
    171 #define CONFIG_SYS_MEMTEST_END  0x007fffff      /*(_8M -1) */ 
    172 #define CONFIG_SYS_RESET_ADDRESS 0xffff0000     /* Rst Vector Adr */ 
    173 #define CONFIG_SYS_MAXARGS      16      /* max number of command args */ 
    174  
    175 /* 
    176  * Ethernet Driver configuration 
     96 * Ethernet driver configuration 
    17797 */ 
    17898#ifdef CONFIG_CMD_NET 
    179 #define CONFIG_NETCONSOLE       /* include NetConsole support   */ 
    180 #define CONFIG_NET_MULTI        /* specify more that one ports available */ 
    181 #define CONFIG_MII              /* expose smi ove miiphy interface */ 
    182 #define CONFIG_MVGBE    /* Enable kirkwood Gbe Controller Driver */ 
    183 #define CONFIG_SYS_FAULT_ECHO_LINK_DOWN /* detect link using phy */ 
    184 #define CONFIG_MVGBE_PORTS      {1,0}   /* enable port 0 only */ 
     99#define CONFIG_MVGBE_PORTS      {1, 0}  /* enable port 0 only */ 
    185100#define CONFIG_PHY_BASE_ADR     11 
    186 #define CONFIG_ENV_OVERWRITE    /* ethaddr can be reprogrammed */ 
    187 #define CONFIG_RESET_PHY_R      /* use reset_phy() to init mv8831116 PHY */ 
    188101#endif /* CONFIG_CMD_NET */ 
    189102 
    190103/* 
    191  * USB/EHCI 
     104 * SATA driver configuration 
    192105 */ 
    193 #ifdef CONFIG_CMD_USB 
    194 #define CONFIG_USB_EHCI                 /* Enable EHCI USB support */ 
    195 #define CONFIG_USB_EHCI_KIRKWOOD        /* on Kirkwood platform */ 
    196 #define CONFIG_EHCI_IS_TDI 
    197 #define CONFIG_USB_STORAGE 
    198 #define CONFIG_DOS_PARTITION 
    199 #define CONFIG_ISO_PARTITION 
    200 #define CONFIG_SUPPORT_VFAT 
    201 #endif /* CONFIG_CMD_USB */ 
     106#ifdef CONFIG_CMD_IDE 
     107#define CONFIG_SYS_ATA_IDE0_OFFSET      MV_SATA_PORT0_OFFSET 
     108#define CONFIG_SYS_ATA_IDE1_OFFSET      MV_SATA_PORT1_OFFSET 
     109#endif /* CONFIG_CMD_IDE */ 
    202110 
    203111/* 
     
    210118#define CONFIG_CMD_UBIFS 
    211119#define CONFIG_RBTREE 
    212 #define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */ 
     120#define CONFIG_MTD_DEVICE 
    213121#define CONFIG_MTD_PARTITIONS 
    214122#define CONFIG_CMD_MTDPARTS 
    215 #define CONFIG_LZO 
    216123 
    217 #endif /* _CONFIG_SHEEVAPLUG_H */ 
    218 /* 
    219  * (C) Copyright 2009 
    220  * Marvell Semiconductor <www.marvell.com> 
    221  * Written-by: Prafulla Wadaskar <prafulla@marvell.com> 
    222  * 
    223  * See file CREDITS for list of people who contributed to this 
    224  * project. 
    225  * 
    226  * This program is free software; you can redistribute it and/or 
    227  * modify it under the terms of the GNU General Public License as 
    228  * published by the Free Software Foundation; either version 2 of 
    229  * the License, or (at your option) any later version. 
    230  * 
    231  * This program is distributed in the hope that it will be useful, 
    232  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
    233  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
    234  * GNU General Public License for more details. 
    235  * 
    236  * You should have received a copy of the GNU General Public License 
    237  * along with this program; if not, write to the Free Software 
    238  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
    239  * MA 02110-1301 USA 
    240  */ 
    241  
    242 #ifndef _CONFIG_ICONNECT_H 
    243 #define _CONFIG_ICONNECT_H 
    244  
    245 /* 
    246  * Version number information 
    247  */ 
    248 #define CONFIG_IDENT_STRING     "\nIomega iConnect Wireless" 
    249  
    250  
    251 //#define DEBUG 
    252  
    253  
    254 /* 
    255  * High Level Configuration Options (easy to change) 
    256  */ 
    257 #define CONFIG_MARVELL          1 
    258 #define CONFIG_ARM926EJS        1       /* Basic Architecture */ 
    259 #define CONFIG_FEROCEON_88FR131 1       /* CPU Core subversion */ 
    260 #define CONFIG_KIRKWOOD         1       /* SOC Family Name */ 
    261 #define CONFIG_KW88F6281        1       /* SOC Name */ 
    262 #define CONFIG_MACH_ICONNECT    /* Machine type */ 
    263  
    264 #define CONFIG_MD5      /* get_random_hex on krikwood needs MD5 support */ 
    265 #define CONFIG_SKIP_LOWLEVEL_INIT       /* disable board lowlevel_init */ 
    266 #define CONFIG_KIRKWOOD_EGIGA_INIT      /* Enable GbePort0/1 for kernel */ 
    267 #define CONFIG_KIRKWOOD_RGMII_PAD_1V8   /* Set RGMII Pad voltage to 1.8V */ 
    268  
    269 /* 
    270  * CLKs configurations 
    271  */ 
    272 #define CONFIG_SYS_HZ           1000 
    273  
    274 /* 
    275  * NS16550 Configuration 
    276  */ 
    277 #define CONFIG_SYS_NS16550 
    278 #define CONFIG_SYS_NS16550_SERIAL 
    279 #define CONFIG_SYS_NS16550_REG_SIZE     (-4) 
    280 #define CONFIG_SYS_NS16550_CLK          CONFIG_SYS_TCLK 
    281 #define CONFIG_SYS_NS16550_COM1         KW_UART0_BASE 
    282  
    283 /* 
    284  * Serial Port configuration 
    285  * The following definitions let you select what serial you want to use 
    286  * for your console driver. 
    287  */ 
    288  
    289 #define CONFIG_CONS_INDEX       1       /*Console on UART0 */ 
    290 #define CONFIG_BAUDRATE                 115200 
    291 #define CONFIG_SYS_BAUDRATE_TABLE       { 9600, 19200, 38400, 57600, \ 
    292                                           115200,230400, 460800, 921600 } 
    293 /* auto boot */ 
    294 #define CONFIG_BOOTDELAY        3       /* default enable autoboot */ 
    295  
    296 /* 
    297  * For booting Linux, the board info and command line data 
    298  * have to be in the first 8 MB of memory, since this is 
    299  * the maximum mapped by the Linux kernel during initialization. 
    300  */ 
    301 #define CONFIG_CMDLINE_TAG      1       /* enable passing of ATAGs  */ 
    302 #define CONFIG_INITRD_TAG       1       /* enable INITRD tag */ 
    303 #define CONFIG_SETUP_MEMORY_TAGS 1      /* enable memory tag */ 
    304  
    305 #define CONFIG_SYS_PROMPT       "Marvell>> "    /* Command Prompt */ 
    306 #define CONFIG_SYS_CBSIZE       1024    /* Console I/O Buff Size */ 
    307 #define CONFIG_SYS_PBSIZE       (CONFIG_SYS_CBSIZE \ 
    308                 +sizeof(CONFIG_SYS_PROMPT) + 16)        /* Print Buff */ 
    309  
    310 /* 
    311  * Commands configuration 
    312  */ 
    313 #define CONFIG_SYS_NO_FLASH             /* Declare no flash (NOR/SPI) */ 
    314 #include <config_cmd_default.h> 
    315 #define CONFIG_CMD_AUTOSCRIPT 
    316 #define CONFIG_CMD_DHCP 
    317 #define CONFIG_CMD_ENV 
    318 #define CONFIG_CMD_MII 
    319 #define CONFIG_CMD_NAND 
    320 #define CONFIG_CMD_PING 
    321 #define CONFIG_CMD_USB 
    322  
    323 /* 
    324  * NAND configuration 
    325  */ 
    326 #ifdef CONFIG_CMD_NAND 
    327 #define CONFIG_NAND_KIRKWOOD 
    328 #define CONFIG_SYS_MAX_NAND_DEVICE      1 
    329 #define NAND_MAX_CHIPS                  1 
    330 #define CONFIG_SYS_NAND_BASE            0xD8000000      /* KW_DEFADR_NANDF */ 
    331 #define NAND_ALLOW_ERASE_ALL            1 
    332 #endif 
    333  
    334 /* 
    335  *  Environment variables configurations 
    336  */ 
    337 #ifdef CONFIG_CMD_NAND 
    338 #define CONFIG_ENV_IS_IN_NAND           1 
    339 #define CONFIG_ENV_SECT_SIZE            0x20000 /* 128K */ 
    340 #else 
    341 #define CONFIG_ENV_IS_NOWHERE           1       /* if env in SDRAM */ 
    342 #endif 
    343 /* 
    344  * max 4k env size is enough, but in case of nand 
    345  * it has to be rounded to sector size 
    346  */ 
    347 #define CONFIG_ENV_SIZE                 0x20000 /* 128k */ 
    348 #define CONFIG_ENV_ADDR                 0xc0000  /*it's above original iConnect u-boot envirinment 0xa0000 */ 
    349 #define CONFIG_ENV_OFFSET               0xc0000 /* env starts here */ 
    350  
    351 /* 
    352  * Default environment variables 
    353  */ 
    354 #define CONFIG_BOOTCOMMAND              "${x_bootcmd_kernel}; " \ 
    355         "setenv bootargs ${x_bootargs} ${x_bootargs_root}; "    \ 
    356         "${x_bootcmd_usb}; bootm 0x6400000;" 
    357  
    358 #define CONFIG_MTDPARTS         "orion_nand:1M(u-boot),"        \ 
    359         "3M@1M(kernel),64M@4M(rootfs),443M@68M(data) rw\0" 
    360  
    361 #define CONFIG_EXTRA_ENV_SETTINGS       "x_bootargs=console"    \ 
    362         "=ttyS0,115200 mtdparts="CONFIG_MTDPARTS        \ 
    363         "x_bootcmd_kernel=nand read 0x6400000 0x100000 0x300000\0" \ 
    364         "x_bootcmd_usb=usb start\0" \ 
    365         "x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0" 
    366  
    367 /* 
    368  * Size of malloc() pool 
    369  */ 
    370 #define CONFIG_SYS_MALLOC_LEN   (1024 * 1024) /* 1 MiB for malloc() */ 
    371 /* size in bytes reserved for initial data */ 
    372 #define CONFIG_SYS_GBL_DATA_SIZE        128 
    373  
    374 /* 
    375  * Other required minimal configurations 
    376  */ 
    377 #define CONFIG_SYS_LONGHELP 
    378 #define CONFIG_AUTO_COMPLETE 
    379 #define CONFIG_CMDLINE_EDITING 
    380 #define CONFIG_ARCH_CPU_INIT    /* call arch_cpu_init() */ 
    381 #define CONFIG_ARCH_MISC_INIT   /* call arch_misc_init() */ 
    382 #define CONFIG_DISPLAY_CPUINFO  /* Display cpu info */ 
    383 #define CONFIG_NR_DRAM_BANKS    4 
    384 #define CONFIG_STACKSIZE        0x00100000      /* regular stack- 1M */ 
    385 #define CONFIG_SYS_LOAD_ADDR    0x00800000      /* default load adr- 8M */ 
    386 #define CONFIG_SYS_MEMTEST_START 0x00400000     /* 4M */ 
    387 #define CONFIG_SYS_MEMTEST_END  0x007fffff      /*(_8M -1) */ 
    388 #define CONFIG_SYS_RESET_ADDRESS 0xffff0000     /* Rst Vector Adr */ 
    389 #define CONFIG_SYS_MAXARGS      16      /* max number of command args */ 
    390  
    391 /* 
    392  * Ethernet Driver configuration 
    393  */ 
    394 #ifdef CONFIG_CMD_NET 
    395 #define CONFIG_NETCONSOLE       /* include NetConsole support   */ 
    396 #define CONFIG_NET_MULTI        /* specify more that one ports available */ 
    397 #define CONFIG_MII              /* expose smi ove miiphy interface */ 
    398 #define CONFIG_MVGBE    /* Enable kirkwood Gbe Controller Driver */ 
    399 #define CONFIG_SYS_FAULT_ECHO_LINK_DOWN /* detect link using phy */ 
    400 #define CONFIG_MVGBE_PORTS      {1,0}   /* enable port 0 only */ 
    401 #define CONFIG_PHY_BASE_ADR     11 
    402 #define CONFIG_ENV_OVERWRITE    /* ethaddr can be reprogrammed */ 
    403 #define CONFIG_RESET_PHY_R      /* use reset_phy() to init mv8831116 PHY */ 
    404 #endif /* CONFIG_CMD_NET */ 
    405  
    406 /* 
    407  * USB/EHCI 
    408  */ 
    409 #ifdef CONFIG_CMD_USB 
    410 #define CONFIG_USB_EHCI                 /* Enable EHCI USB support */ 
    411 #define CONFIG_USB_EHCI_KIRKWOOD        /* on Kirkwood platform */ 
    412 #define CONFIG_EHCI_IS_TDI 
    413 #define CONFIG_USB_STORAGE 
    414 #define CONFIG_DOS_PARTITION 
    415 #define CONFIG_ISO_PARTITION 
    416 #define CONFIG_SUPPORT_VFAT 
    417 #endif /* CONFIG_CMD_USB */ 
    418  
    419 /* 
    420  * File system 
    421  */ 
    422 #define CONFIG_CMD_EXT2 
    423 #define CONFIG_CMD_FAT 
    424 #define CONFIG_CMD_JFFS2 
    425 #define CONFIG_CMD_UBI 
    426 #define CONFIG_CMD_UBIFS 
    427 #define CONFIG_RBTREE 
    428 #define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */ 
    429 #define CONFIG_MTD_PARTITIONS 
    430 #define CONFIG_CMD_MTDPARTS 
    431 #define CONFIG_LZO 
    432  
    433 #endif /* _CONFIG_SHEEVAPLUG_H */ 
     124#endif /* _CONFIG_ICONNECT_H */ 
Note: See TracChangeset for help on using the changeset viewer.