mirror of
https://github.com/u-boot/u-boot.git
synced 2025-01-26 12:43:26 +08:00
arm/km: convert mgcoge3un target to km_kirkwood
Use the generic header km_kirkwood.h and get rid of the board specific header. changes for v2: rebased because of changes in other patches Signed-off-by: Holger Brunck <holger.brunck@keymile.com> Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com> cc: Gerlando Falauto <gerlando.falauto@keymile.com> cc: Prafulla Wadaskar <prafulla@marvell.com>
This commit is contained in:
Holger Brunck
Albert ARIBAUD
parent
d9354530fe
commit
f945439af9
@ -114,7 +114,7 @@ u32 kwmpp_config[] = {
|
||||
0
|
||||
};
|
||||
|
||||
#if defined(CONFIG_MGCOGE3UN)
|
||||
#if defined(CONFIG_KM_MGCOGE3UN)
|
||||
/*
|
||||
* Wait for startup OK from mgcoge3ne
|
||||
*/
|
||||
@ -134,8 +134,7 @@ int startup_allowed(void)
|
||||
}
|
||||
#endif
|
||||
|
||||
#if (defined(CONFIG_MGCOGE3UN)|defined(CONFIG_PORTL2)| \
|
||||
defined(CONFIG_KM_PIGGY4_88E6352))
|
||||
#if (defined(CONFIG_KM_PIGGY4_88E6061)|defined(CONFIG_KM_PIGGY4_88E6352))
|
||||
/*
|
||||
* All boards with PIGGY4 connected via a simple switch have ethernet always
|
||||
* present.
|
||||
@ -203,7 +202,7 @@ int misc_init_r(void)
|
||||
printf("Overwriting MACH_TYPE with %d!!!\n", mach_type);
|
||||
gd->bd->bi_arch_number = mach_type;
|
||||
}
|
||||
#if defined(CONFIG_MGCOGE3UN)
|
||||
#if defined(CONFIG_KM_MGCOGE3UN)
|
||||
char *wait_for_ne;
|
||||
wait_for_ne = getenv("waitforne");
|
||||
if (wait_for_ne != NULL) {
|
||||
@ -318,7 +317,7 @@ void dram_init_banksize(void)
|
||||
}
|
||||
}
|
||||
|
||||
#if (defined(CONFIG_MGCOGE3UN)|defined(CONFIG_PORTL2))
|
||||
#if (defined(CONFIG_KM_MGCOGE3UN)|defined(CONFIG_PORTL2))
|
||||
|
||||
#define PHY_LED_SEL 0x18
|
||||
#define PHY_LED0_LINK (0x5)
|
||||
|
||||
@ -143,7 +143,7 @@ lsxhl arm arm926ejs lsxl buffalo
|
||||
km_kirkwood arm arm926ejs km_arm keymile kirkwood km_kirkwood:KM_KIRKWOOD,KM_DISABLE_PCI
|
||||
km_kirkwood_pci arm arm926ejs km_arm keymile kirkwood km_kirkwood:KM_KIRKWOOD_PCI,KM_RECONFIG_XLX
|
||||
kmnusa arm arm926ejs km_arm keymile kirkwood km_kirkwood:KM_NUSA
|
||||
mgcoge3un arm arm926ejs km_arm keymile kirkwood
|
||||
mgcoge3un arm arm926ejs km_arm keymile kirkwood km_kirkwood:KM_MGCOGE3UN
|
||||
kmcoge5un arm arm926ejs km_arm keymile kirkwood km_kirkwood:KM_COGE5UN
|
||||
portl2 arm arm926ejs km_arm keymile kirkwood
|
||||
inetspace_v2 arm arm926ejs netspace_v2 LaCie kirkwood lacie_kw:INETSPACE_V2
|
||||
|
||||
@ -58,6 +58,20 @@
|
||||
#define CONFIG_KM_FPGA_CONFIG
|
||||
#define CONFIG_KM_PIGGY4_88E6352
|
||||
|
||||
/* KM_MGCOGE3UN */
|
||||
#elif defined(CONFIG_KM_MGCOGE3UN)
|
||||
#define CONFIG_IDENT_STRING "\nKeymile COGE3UN"
|
||||
#define CONFIG_HOSTNAME mgcoge3un
|
||||
#define KM_IVM_BUS "pca9547:70:9" /* I2C2 (Mux-Port 1)*/
|
||||
#undef CONFIG_SYS_KWD_CONFIG
|
||||
#define CONFIG_SYS_KWD_CONFIG \
|
||||
$(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage-memphis.cfg
|
||||
#define CONFIG_KM_BOARD_EXTRA_ENV "waitforne=true\0"
|
||||
#define CONFIG_PIGGY_MAC_ADRESS_OFFSET 3
|
||||
#define CONFIG_KM_DISABLE_PCIE
|
||||
#define CONFIG_KM_PIGGY4_88E6061
|
||||
|
||||
/* KMCOGE5UN */
|
||||
#elif defined(CONFIG_KM_COGE5UN)
|
||||
#define CONFIG_IDENT_STRING "\nKeymile COGE5UN"
|
||||
#define KM_IVM_BUS "pca9547:70:9" /* I2C2 (Mux-Port 1)*/
|
||||
@ -111,7 +125,39 @@
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_KM_PIGGY4_88E6061
|
||||
/*
|
||||
* Some keymile boards like mgcoge3un have their PIGGY4 connected via
|
||||
* an Marvell 88E6061 simple switch.
|
||||
* In this case we have to change the default settings for the
|
||||
* ethernet phy connected to the kirkwood.
|
||||
* In this case 100MB full duplex and autoneg off
|
||||
*/
|
||||
#define PORT_SERIAL_CONTROL_VALUE ( \
|
||||
MVGBE_FORCE_LINK_PASS | \
|
||||
MVGBE_DIS_AUTO_NEG_FOR_DUPLX | \
|
||||
MVGBE_DIS_AUTO_NEG_FOR_FLOW_CTRL | \
|
||||
MVGBE_ADV_NO_FLOW_CTRL | \
|
||||
MVGBE_FORCE_FC_MODE_NO_PAUSE_DIS_TX | \
|
||||
MVGBE_FORCE_BP_MODE_NO_JAM | \
|
||||
(1 << 9) /* Reserved bit has to be 1 */ | \
|
||||
MVGBE_DO_NOT_FORCE_LINK_FAIL | \
|
||||
MVGBE_DIS_AUTO_NEG_SPEED_GMII | \
|
||||
MVGBE_DTE_ADV_0 | \
|
||||
MVGBE_MIIPHY_MAC_MODE | \
|
||||
MVGBE_AUTO_NEG_NO_CHANGE | \
|
||||
MVGBE_MAX_RX_PACKET_1552BYTE | \
|
||||
MVGBE_CLR_EXT_LOOPBACK | \
|
||||
MVGBE_SET_FULL_DUPLEX_MODE | \
|
||||
MVGBE_DIS_FLOW_CTRL_TX_RX_IN_FULL_DUPLEX |\
|
||||
MVGBE_SET_GMII_SPEED_TO_10_100 |\
|
||||
MVGBE_SET_MII_SPEED_TO_100)
|
||||
#endif
|
||||
|
||||
/* GPIO Pin from kirkwood connected to PROGRAM_B pin of the xilinx FPGA */
|
||||
#define KM_XLX_PROGRAM_B_PIN 39
|
||||
|
||||
#ifdef CONFIG_KM_DISABLE_PCI
|
||||
#undef CONFIG_KIRKWOOD_PCIE_INIT
|
||||
#endif
|
||||
#endif /* _CONFIG_KM_KIRKWOOD */
|
||||
|
||||
@ -1,87 +0,0 @@
|
||||
/*
|
||||
* (C) Copyright 2009
|
||||
* Marvell Semiconductor <www.marvell.com>
|
||||
* Prafulla Wadaskar <prafulla@marvell.com>
|
||||
*
|
||||
* (C) Copyright 2009
|
||||
* Stefan Roese, DENX Software Engineering, sr@denx.de.
|
||||
*
|
||||
* (C) Copyright 2010-2011
|
||||
* Holger Brunck, Keymile GmbH Hannover, holger.brunck@keymile.com
|
||||
*
|
||||
* 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., 51 Franklin Street, Fifth Floor, Boston,
|
||||
* MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
/* for linking errors see
|
||||
* http://lists.denx.de/pipermail/u-boot/2009-July/057350.html */
|
||||
|
||||
#ifndef _CONFIG_MGCOGE3UN_H
|
||||
#define _CONFIG_MGCOGE3UN_H
|
||||
|
||||
/* include common defines/options for all arm based Keymile boards */
|
||||
#include "km/km_arm.h"
|
||||
|
||||
/*
|
||||
* Version number information
|
||||
*/
|
||||
#define CONFIG_IDENT_STRING "\nKeymile MGCOGE3UN"
|
||||
#define CONFIG_HOSTNAME mgcoge3un
|
||||
#define CONFIG_MGCOGE3UN
|
||||
|
||||
#define KM_IVM_BUS "pca9547:70:9" /* I2C2 (Mux-Port 1)*/
|
||||
#define KM_ENV_BUS "pca9547:70:d" /* I2C2 (Mux-Port 5)*/
|
||||
|
||||
/* we use a new RAM type on mgcoge3un board */
|
||||
#undef CONFIG_SYS_KWD_CONFIG
|
||||
#define CONFIG_SYS_KWD_CONFIG $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage-memphis.cfg
|
||||
|
||||
/*
|
||||
* mgcoge3un has a fixed link to the marvell switch
|
||||
* with 100MB full duplex and autoneg off, for this
|
||||
* reason we have to change the default settings
|
||||
*/
|
||||
#define PORT_SERIAL_CONTROL_VALUE ( \
|
||||
MVGBE_FORCE_LINK_PASS | \
|
||||
MVGBE_DIS_AUTO_NEG_FOR_DUPLX | \
|
||||
MVGBE_DIS_AUTO_NEG_FOR_FLOW_CTRL | \
|
||||
MVGBE_ADV_NO_FLOW_CTRL | \
|
||||
MVGBE_FORCE_FC_MODE_NO_PAUSE_DIS_TX | \
|
||||
MVGBE_FORCE_BP_MODE_NO_JAM | \
|
||||
(1 << 9) /* Reserved bit has to be 1 */ | \
|
||||
MVGBE_DO_NOT_FORCE_LINK_FAIL | \
|
||||
MVGBE_DIS_AUTO_NEG_SPEED_GMII | \
|
||||
MVGBE_DTE_ADV_0 | \
|
||||
MVGBE_MIIPHY_MAC_MODE | \
|
||||
MVGBE_AUTO_NEG_NO_CHANGE | \
|
||||
MVGBE_MAX_RX_PACKET_1552BYTE | \
|
||||
MVGBE_CLR_EXT_LOOPBACK | \
|
||||
MVGBE_SET_FULL_DUPLEX_MODE | \
|
||||
MVGBE_DIS_FLOW_CTRL_TX_RX_IN_FULL_DUPLEX |\
|
||||
MVGBE_SET_GMII_SPEED_TO_10_100 |\
|
||||
MVGBE_SET_MII_SPEED_TO_100)
|
||||
|
||||
#define CONFIG_KM_BOARD_EXTRA_ENV "waitforne=true\0"
|
||||
#define CONFIG_PIGGY_MAC_ADRESS_OFFSET 3
|
||||
|
||||
/*
|
||||
* PCIe port not used on mgcoge3un
|
||||
*/
|
||||
#undef CONFIG_KIRKWOOD_PCIE_INIT
|
||||
|
||||
#endif /* _CONFIG_MGCOGE3UN_H */
|
||||
Loading…
Reference in New Issue
Block a user