October 2008 - U-Boot

[U-Boot] [PATCH 1/2] Moved IXP4XX_NPE driver to drivers/net
by Ben Warren 30 Oct '08

30 Oct '08

Signed-off-by: Ben Warren <biggerbadderben(a)gmail.com> --- Makefile | 3 ++- {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxEthAcc.c | 0 .../net/ixp4xx_npe}/IxEthAccCommon.c | 0 .../net/ixp4xx_npe}/IxEthAccControlInterface.c | 0 .../net/ixp4xx_npe}/IxEthAccDataPlane.c | 0 .../npe => drivers/net/ixp4xx_npe}/IxEthAccMac.c | 0 .../npe => drivers/net/ixp4xx_npe}/IxEthAccMii.c | 0 .../npe => drivers/net/ixp4xx_npe}/IxEthDBAPI.c | 0 .../net/ixp4xx_npe}/IxEthDBAPISupport.c | 0 .../npe => drivers/net/ixp4xx_npe}/IxEthDBCore.c | 0 .../npe => drivers/net/ixp4xx_npe}/IxEthDBEvents.c | 0 .../net/ixp4xx_npe}/IxEthDBFeatures.c | 0 .../net/ixp4xx_npe}/IxEthDBFirewall.c | 0 .../net/ixp4xx_npe}/IxEthDBHashtable.c | 0 .../net/ixp4xx_npe}/IxEthDBLearning.c | 0 .../npe => drivers/net/ixp4xx_npe}/IxEthDBMem.c | 0 .../net/ixp4xx_npe}/IxEthDBNPEAdaptor.c | 0 .../net/ixp4xx_npe}/IxEthDBPortUpdate.c | 0 .../net/ixp4xx_npe}/IxEthDBReports.c | 0 .../npe => drivers/net/ixp4xx_npe}/IxEthDBSearch.c | 0 .../net/ixp4xx_npe}/IxEthDBSpanningTree.c | 0 .../npe => drivers/net/ixp4xx_npe}/IxEthDBUtil.c | 0 .../npe => drivers/net/ixp4xx_npe}/IxEthDBVlan.c | 0 .../npe => drivers/net/ixp4xx_npe}/IxEthDBWiFi.c | 0 {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxEthMii.c | 0 .../npe => drivers/net/ixp4xx_npe}/IxFeatureCtrl.c | 0 {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxNpeDl.c | 0 .../net/ixp4xx_npe}/IxNpeDlImageMgr.c | 0 .../npe => drivers/net/ixp4xx_npe}/IxNpeDlNpeMgr.c | 0 .../net/ixp4xx_npe}/IxNpeDlNpeMgrUtils.c | 0 {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxNpeMh.c | 0 .../npe => drivers/net/ixp4xx_npe}/IxNpeMhConfig.c | 0 .../net/ixp4xx_npe}/IxNpeMhReceive.c | 0 .../npe => drivers/net/ixp4xx_npe}/IxNpeMhSend.c | 0 .../net/ixp4xx_npe}/IxNpeMhSolicitedCbMgr.c | 0 .../net/ixp4xx_npe}/IxNpeMhUnsolicitedCbMgr.c | 0 .../net/ixp4xx_npe}/IxOsalBufferMgt.c | 0 .../npe => drivers/net/ixp4xx_npe}/IxOsalIoMem.c | 0 .../net/ixp4xx_npe}/IxOsalOsCacheMMU.c | 0 .../npe => drivers/net/ixp4xx_npe}/IxOsalOsMsgQ.c | 0 .../net/ixp4xx_npe}/IxOsalOsSemaphore.c | 0 .../net/ixp4xx_npe}/IxOsalOsServices.c | 0 .../net/ixp4xx_npe}/IxOsalOsThread.c | 0 .../npe => drivers/net/ixp4xx_npe}/IxQMgrAqmIf.c | 0 .../net/ixp4xx_npe}/IxQMgrDispatcher.c | 0 .../npe => drivers/net/ixp4xx_npe}/IxQMgrInit.c | 0 .../npe => drivers/net/ixp4xx_npe}/IxQMgrQAccess.c | 0 .../npe => drivers/net/ixp4xx_npe}/IxQMgrQCfg.c | 0 {cpu/ixp/npe => drivers/net/ixp4xx_npe}/Makefile | 8 +++++--- .../net/ixp4xx_npe}/include/IxAssert.h | 0 .../net/ixp4xx_npe}/include/IxAtmSch.h | 0 .../net/ixp4xx_npe}/include/IxAtmTypes.h | 0 .../net/ixp4xx_npe}/include/IxAtmdAcc.h | 0 .../net/ixp4xx_npe}/include/IxAtmdAccCtrl.h | 0 .../net/ixp4xx_npe}/include/IxAtmm.h | 0 .../net/ixp4xx_npe}/include/IxDmaAcc.h | 0 .../net/ixp4xx_npe}/include/IxEthAcc.h | 0 .../net/ixp4xx_npe}/include/IxEthAccDataPlane_p.h | 0 .../net/ixp4xx_npe}/include/IxEthAccMac_p.h | 0 .../net/ixp4xx_npe}/include/IxEthAccMii_p.h | 0 .../ixp4xx_npe}/include/IxEthAccQueueAssign_p.h | 0 .../net/ixp4xx_npe}/include/IxEthAcc_p.h | 0 .../net/ixp4xx_npe}/include/IxEthDB.h | 0 .../net/ixp4xx_npe}/include/IxEthDBLocks_p.h | 0 .../net/ixp4xx_npe}/include/IxEthDBLog_p.h | 0 .../net/ixp4xx_npe}/include/IxEthDBMessages_p.h | 0 .../net/ixp4xx_npe}/include/IxEthDBPortDefs.h | 0 .../net/ixp4xx_npe}/include/IxEthDBQoS.h | 0 .../net/ixp4xx_npe}/include/IxEthDB_p.h | 0 .../net/ixp4xx_npe}/include/IxEthMii.h | 0 .../net/ixp4xx_npe}/include/IxEthMii_p.h | 0 .../net/ixp4xx_npe}/include/IxEthNpe.h | 0 .../net/ixp4xx_npe}/include/IxFeatureCtrl.h | 0 .../net/ixp4xx_npe}/include/IxHssAcc.h | 0 .../net/ixp4xx_npe}/include/IxI2cDrv.h | 0 .../net/ixp4xx_npe}/include/IxNpeA.h | 0 .../net/ixp4xx_npe}/include/IxNpeDl.h | 0 .../net/ixp4xx_npe}/include/IxNpeDlImageMgr_p.h | 0 .../net/ixp4xx_npe}/include/IxNpeDlMacros_p.h | 0 .../include/IxNpeDlNpeMgrEcRegisters_p.h | 0 .../net/ixp4xx_npe}/include/IxNpeDlNpeMgrUtils_p.h | 0 .../net/ixp4xx_npe}/include/IxNpeDlNpeMgr_p.h | 0 .../net/ixp4xx_npe}/include/IxNpeMh.h | 0 .../net/ixp4xx_npe}/include/IxNpeMhConfig_p.h | 0 .../net/ixp4xx_npe}/include/IxNpeMhMacros_p.h | 0 .../net/ixp4xx_npe}/include/IxNpeMhReceive_p.h | 0 .../net/ixp4xx_npe}/include/IxNpeMhSend_p.h | 0 .../ixp4xx_npe}/include/IxNpeMhSolicitedCbMgr_p.h | 0 .../include/IxNpeMhUnsolicitedCbMgr_p.h | 0 .../net/ixp4xx_npe}/include/IxNpeMicrocode.h | 0 .../net/ixp4xx_npe}/include/IxOsBufLib.h | 0 .../net/ixp4xx_npe}/include/IxOsBuffMgt.h | 0 .../net/ixp4xx_npe}/include/IxOsBuffPoolMgt.h | 0 .../net/ixp4xx_npe}/include/IxOsCacheMMU.h | 0 .../net/ixp4xx_npe}/include/IxOsPrintf.h | 0 .../net/ixp4xx_npe}/include/IxOsServices.h | 0 .../ixp4xx_npe}/include/IxOsServicesComponents.h | 0 .../ixp4xx_npe}/include/IxOsServicesEndianess.h | 0 .../ixp4xx_npe}/include/IxOsServicesMemAccess.h | 0 .../net/ixp4xx_npe}/include/IxOsServicesMemMap.h | 0 .../net/ixp4xx_npe}/include/IxOsal.h | 0 .../net/ixp4xx_npe}/include/IxOsalAssert.h | 0 .../net/ixp4xx_npe}/include/IxOsalBackward.h | 0 .../net/ixp4xx_npe}/include/IxOsalBackwardAssert.h | 0 .../ixp4xx_npe}/include/IxOsalBackwardBufferMgt.h | 0 .../ixp4xx_npe}/include/IxOsalBackwardCacheMMU.h | 0 .../net/ixp4xx_npe}/include/IxOsalBackwardMemMap.h | 0 .../ixp4xx_npe}/include/IxOsalBackwardOsServices.h | 0 .../net/ixp4xx_npe}/include/IxOsalBackwardOssl.h | 0 .../net/ixp4xx_npe}/include/IxOsalBufferMgt.h | 0 .../ixp4xx_npe}/include/IxOsalBufferMgtDefault.h | 0 .../net/ixp4xx_npe}/include/IxOsalConfig.h | 0 .../net/ixp4xx_npe}/include/IxOsalEndianess.h | 0 .../net/ixp4xx_npe}/include/IxOsalIoMem.h | 0 .../net/ixp4xx_npe}/include/IxOsalMemAccess.h | 0 .../net/ixp4xx_npe}/include/IxOsalOem.h | 0 .../net/ixp4xx_npe}/include/IxOsalOs.h | 0 .../net/ixp4xx_npe}/include/IxOsalOsAssert.h | 0 .../net/ixp4xx_npe}/include/IxOsalOsBufferMgt.h | 0 .../net/ixp4xx_npe}/include/IxOsalOsIxp400.h | 0 .../include/IxOsalOsIxp400CustomizedMapping.h | 0 .../net/ixp4xx_npe}/include/IxOsalOsTypes.h | 0 .../ixp4xx_npe}/include/IxOsalOsUtilitySymbols.h | 0 .../net/ixp4xx_npe}/include/IxOsalTypes.h | 0 .../net/ixp4xx_npe}/include/IxOsalUtilitySymbols.h | 0 .../net/ixp4xx_npe}/include/IxParityENAcc.h | 0 .../net/ixp4xx_npe}/include/IxPerfProfAcc.h | 0 .../net/ixp4xx_npe}/include/IxQMgr.h | 0 .../net/ixp4xx_npe}/include/IxQMgrAqmIf_p.h | 0 .../net/ixp4xx_npe}/include/IxQMgrDefines_p.h | 0 .../net/ixp4xx_npe}/include/IxQMgrDispatcher_p.h | 0 .../net/ixp4xx_npe}/include/IxQMgrLog_p.h | 0 .../net/ixp4xx_npe}/include/IxQMgrQAccess_p.h | 0 .../net/ixp4xx_npe}/include/IxQMgrQCfg_p.h | 0 .../net/ixp4xx_npe}/include/IxQueueAssignments.h | 0 .../net/ixp4xx_npe}/include/IxSspAcc.h | 0 .../net/ixp4xx_npe}/include/IxTimeSyncAcc.h | 0 .../net/ixp4xx_npe}/include/IxTimerCtrl.h | 0 .../net/ixp4xx_npe}/include/IxTypes.h | 0 .../net/ixp4xx_npe}/include/IxUART.h | 0 .../net/ixp4xx_npe}/include/IxVersionId.h | 0 .../net/ixp4xx_npe}/include/ix_error.h | 0 .../net/ixp4xx_npe}/include/ix_macros.h | 0 .../net/ixp4xx_npe}/include/ix_os_type.h | 0 .../net/ixp4xx_npe}/include/ix_ossl.h | 0 .../net/ixp4xx_npe}/include/ix_symbols.h | 0 .../net/ixp4xx_npe}/include/ix_types.h | 0 .../npe => drivers/net/ixp4xx_npe}/include/npe.h | 0 .../net/ixp4xx_npe}/include/os_datatypes.h | 0 {cpu/ixp/npe => drivers/net/ixp4xx_npe}/miiphy.c | 0 {cpu/ixp/npe => drivers/net/ixp4xx_npe}/npe.c | 0 151 files changed, 7 insertions(+), 4 deletions(-) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxEthAcc.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxEthAccCommon.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxEthAccControlInterface.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxEthAccDataPlane.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxEthAccMac.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxEthAccMii.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxEthDBAPI.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxEthDBAPISupport.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxEthDBCore.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxEthDBEvents.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxEthDBFeatures.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxEthDBFirewall.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxEthDBHashtable.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxEthDBLearning.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxEthDBMem.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxEthDBNPEAdaptor.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxEthDBPortUpdate.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxEthDBReports.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxEthDBSearch.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxEthDBSpanningTree.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxEthDBUtil.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxEthDBVlan.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxEthDBWiFi.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxEthMii.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxFeatureCtrl.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxNpeDl.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxNpeDlImageMgr.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxNpeDlNpeMgr.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxNpeDlNpeMgrUtils.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxNpeMh.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxNpeMhConfig.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxNpeMhReceive.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxNpeMhSend.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxNpeMhSolicitedCbMgr.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxNpeMhUnsolicitedCbMgr.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxOsalBufferMgt.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxOsalIoMem.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxOsalOsCacheMMU.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxOsalOsMsgQ.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxOsalOsSemaphore.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxOsalOsServices.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxOsalOsThread.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxQMgrAqmIf.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxQMgrDispatcher.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxQMgrInit.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxQMgrQAccess.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/IxQMgrQCfg.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/Makefile (90%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxAssert.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxAtmSch.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxAtmTypes.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxAtmdAcc.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxAtmdAccCtrl.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxAtmm.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxDmaAcc.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxEthAcc.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxEthAccDataPlane_p.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxEthAccMac_p.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxEthAccMii_p.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxEthAccQueueAssign_p.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxEthAcc_p.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxEthDB.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxEthDBLocks_p.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxEthDBLog_p.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxEthDBMessages_p.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxEthDBPortDefs.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxEthDBQoS.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxEthDB_p.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxEthMii.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxEthMii_p.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxEthNpe.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxFeatureCtrl.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxHssAcc.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxI2cDrv.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxNpeA.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxNpeDl.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxNpeDlImageMgr_p.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxNpeDlMacros_p.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxNpeDlNpeMgrEcRegisters_p.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxNpeDlNpeMgrUtils_p.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxNpeDlNpeMgr_p.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxNpeMh.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxNpeMhConfig_p.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxNpeMhMacros_p.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxNpeMhReceive_p.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxNpeMhSend_p.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxNpeMhSolicitedCbMgr_p.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxNpeMhUnsolicitedCbMgr_p.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxNpeMicrocode.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsBufLib.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsBuffMgt.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsBuffPoolMgt.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsCacheMMU.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsPrintf.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsServices.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsServicesComponents.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsServicesEndianess.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsServicesMemAccess.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsServicesMemMap.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsal.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsalAssert.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsalBackward.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsalBackwardAssert.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsalBackwardBufferMgt.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsalBackwardCacheMMU.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsalBackwardMemMap.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsalBackwardOsServices.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsalBackwardOssl.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsalBufferMgt.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsalBufferMgtDefault.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsalConfig.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsalEndianess.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsalIoMem.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsalMemAccess.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsalOem.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsalOs.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsalOsAssert.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsalOsBufferMgt.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsalOsIxp400.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsalOsIxp400CustomizedMapping.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsalOsTypes.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsalOsUtilitySymbols.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsalTypes.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxOsalUtilitySymbols.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxParityENAcc.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxPerfProfAcc.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxQMgr.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxQMgrAqmIf_p.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxQMgrDefines_p.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxQMgrDispatcher_p.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxQMgrLog_p.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxQMgrQAccess_p.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxQMgrQCfg_p.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxQueueAssignments.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxSspAcc.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxTimeSyncAcc.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxTimerCtrl.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxTypes.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxUART.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/IxVersionId.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/ix_error.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/ix_macros.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/ix_os_type.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/ix_ossl.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/ix_symbols.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/ix_types.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/npe.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/include/os_datatypes.h (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/miiphy.c (100%) rename {cpu/ixp/npe => drivers/net/ixp4xx_npe}/npe.c (100%) diff --git a/Makefile b/Makefile index fceb8a2..3a4dbf1 100644 --- a/Makefile +++ b/Makefile @@ -211,7 +211,7 @@ ifdef SOC LIBS += cpu/$(CPU)/$(SOC)/lib$(SOC).a endif ifeq ($(CPU),ixp) -LIBS += cpu/ixp/npe/libnpe.a +#LIBS += cpu/ixp/npe/libnpe.a endif LIBS += lib_$(ARCH)/lib$(ARCH).a LIBS += fs/cramfs/libcramfs.a fs/fat/libfat.a fs/fdos/libfdos.a fs/jffs2/libjffs2.a \ @@ -234,6 +234,7 @@ LIBS += drivers/mtd/spi/libspi_flash.a LIBS += drivers/net/libnet.a LIBS += drivers/net/phy/libphy.a LIBS += drivers/net/sk98lin/libsk98lin.a +LIBS += drivers/net/ixp4xx_npe/libnpe.a LIBS += drivers/pci/libpci.a LIBS += drivers/pcmcia/libpcmcia.a LIBS += drivers/spi/libspi.a diff --git a/cpu/ixp/npe/IxEthAcc.c b/drivers/net/ixp4xx_npe/IxEthAcc.c similarity index 100% rename from cpu/ixp/npe/IxEthAcc.c rename to drivers/net/ixp4xx_npe/IxEthAcc.c diff --git a/cpu/ixp/npe/IxEthAccCommon.c b/drivers/net/ixp4xx_npe/IxEthAccCommon.c similarity index 100% rename from cpu/ixp/npe/IxEthAccCommon.c rename to drivers/net/ixp4xx_npe/IxEthAccCommon.c diff --git a/cpu/ixp/npe/IxEthAccControlInterface.c b/drivers/net/ixp4xx_npe/IxEthAccControlInterface.c similarity index 100% rename from cpu/ixp/npe/IxEthAccControlInterface.c rename to drivers/net/ixp4xx_npe/IxEthAccControlInterface.c diff --git a/cpu/ixp/npe/IxEthAccDataPlane.c b/drivers/net/ixp4xx_npe/IxEthAccDataPlane.c similarity index 100% rename from cpu/ixp/npe/IxEthAccDataPlane.c rename to drivers/net/ixp4xx_npe/IxEthAccDataPlane.c diff --git a/cpu/ixp/npe/IxEthAccMac.c b/drivers/net/ixp4xx_npe/IxEthAccMac.c similarity index 100% rename from cpu/ixp/npe/IxEthAccMac.c rename to drivers/net/ixp4xx_npe/IxEthAccMac.c diff --git a/cpu/ixp/npe/IxEthAccMii.c b/drivers/net/ixp4xx_npe/IxEthAccMii.c similarity index 100% rename from cpu/ixp/npe/IxEthAccMii.c rename to drivers/net/ixp4xx_npe/IxEthAccMii.c diff --git a/cpu/ixp/npe/IxEthDBAPI.c b/drivers/net/ixp4xx_npe/IxEthDBAPI.c similarity index 100% rename from cpu/ixp/npe/IxEthDBAPI.c rename to drivers/net/ixp4xx_npe/IxEthDBAPI.c diff --git a/cpu/ixp/npe/IxEthDBAPISupport.c b/drivers/net/ixp4xx_npe/IxEthDBAPISupport.c similarity index 100% rename from cpu/ixp/npe/IxEthDBAPISupport.c rename to drivers/net/ixp4xx_npe/IxEthDBAPISupport.c diff --git a/cpu/ixp/npe/IxEthDBCore.c b/drivers/net/ixp4xx_npe/IxEthDBCore.c similarity index 100% rename from cpu/ixp/npe/IxEthDBCore.c rename to drivers/net/ixp4xx_npe/IxEthDBCore.c diff --git a/cpu/ixp/npe/IxEthDBEvents.c b/drivers/net/ixp4xx_npe/IxEthDBEvents.c similarity index 100% rename from cpu/ixp/npe/IxEthDBEvents.c rename to drivers/net/ixp4xx_npe/IxEthDBEvents.c diff --git a/cpu/ixp/npe/IxEthDBFeatures.c b/drivers/net/ixp4xx_npe/IxEthDBFeatures.c similarity index 100% rename from cpu/ixp/npe/IxEthDBFeatures.c rename to drivers/net/ixp4xx_npe/IxEthDBFeatures.c diff --git a/cpu/ixp/npe/IxEthDBFirewall.c b/drivers/net/ixp4xx_npe/IxEthDBFirewall.c similarity index 100% rename from cpu/ixp/npe/IxEthDBFirewall.c rename to drivers/net/ixp4xx_npe/IxEthDBFirewall.c diff --git a/cpu/ixp/npe/IxEthDBHashtable.c b/drivers/net/ixp4xx_npe/IxEthDBHashtable.c similarity index 100% rename from cpu/ixp/npe/IxEthDBHashtable.c rename to drivers/net/ixp4xx_npe/IxEthDBHashtable.c diff --git a/cpu/ixp/npe/IxEthDBLearning.c b/drivers/net/ixp4xx_npe/IxEthDBLearning.c similarity index 100% rename from cpu/ixp/npe/IxEthDBLearning.c rename to drivers/net/ixp4xx_npe/IxEthDBLearning.c diff --git a/cpu/ixp/npe/IxEthDBMem.c b/drivers/net/ixp4xx_npe/IxEthDBMem.c similarity index 100% rename from cpu/ixp/npe/IxEthDBMem.c rename to drivers/net/ixp4xx_npe/IxEthDBMem.c diff --git a/cpu/ixp/npe/IxEthDBNPEAdaptor.c b/drivers/net/ixp4xx_npe/IxEthDBNPEAdaptor.c similarity index 100% rename from cpu/ixp/npe/IxEthDBNPEAdaptor.c rename to drivers/net/ixp4xx_npe/IxEthDBNPEAdaptor.c diff --git a/cpu/ixp/npe/IxEthDBPortUpdate.c b/drivers/net/ixp4xx_npe/IxEthDBPortUpdate.c similarity index 100% rename from cpu/ixp/npe/IxEthDBPortUpdate.c rename to drivers/net/ixp4xx_npe/IxEthDBPortUpdate.c diff --git a/cpu/ixp/npe/IxEthDBReports.c b/drivers/net/ixp4xx_npe/IxEthDBReports.c similarity index 100% rename from cpu/ixp/npe/IxEthDBReports.c rename to drivers/net/ixp4xx_npe/IxEthDBReports.c diff --git a/cpu/ixp/npe/IxEthDBSearch.c b/drivers/net/ixp4xx_npe/IxEthDBSearch.c similarity index 100% rename from cpu/ixp/npe/IxEthDBSearch.c rename to drivers/net/ixp4xx_npe/IxEthDBSearch.c diff --git a/cpu/ixp/npe/IxEthDBSpanningTree.c b/drivers/net/ixp4xx_npe/IxEthDBSpanningTree.c similarity index 100% rename from cpu/ixp/npe/IxEthDBSpanningTree.c rename to drivers/net/ixp4xx_npe/IxEthDBSpanningTree.c diff --git a/cpu/ixp/npe/IxEthDBUtil.c b/drivers/net/ixp4xx_npe/IxEthDBUtil.c similarity index 100% rename from cpu/ixp/npe/IxEthDBUtil.c rename to drivers/net/ixp4xx_npe/IxEthDBUtil.c diff --git a/cpu/ixp/npe/IxEthDBVlan.c b/drivers/net/ixp4xx_npe/IxEthDBVlan.c similarity index 100% rename from cpu/ixp/npe/IxEthDBVlan.c rename to drivers/net/ixp4xx_npe/IxEthDBVlan.c diff --git a/cpu/ixp/npe/IxEthDBWiFi.c b/drivers/net/ixp4xx_npe/IxEthDBWiFi.c similarity index 100% rename from cpu/ixp/npe/IxEthDBWiFi.c rename to drivers/net/ixp4xx_npe/IxEthDBWiFi.c diff --git a/cpu/ixp/npe/IxEthMii.c b/drivers/net/ixp4xx_npe/IxEthMii.c similarity index 100% rename from cpu/ixp/npe/IxEthMii.c rename to drivers/net/ixp4xx_npe/IxEthMii.c diff --git a/cpu/ixp/npe/IxFeatureCtrl.c b/drivers/net/ixp4xx_npe/IxFeatureCtrl.c similarity index 100% rename from cpu/ixp/npe/IxFeatureCtrl.c rename to drivers/net/ixp4xx_npe/IxFeatureCtrl.c diff --git a/cpu/ixp/npe/IxNpeDl.c b/drivers/net/ixp4xx_npe/IxNpeDl.c similarity index 100% rename from cpu/ixp/npe/IxNpeDl.c rename to drivers/net/ixp4xx_npe/IxNpeDl.c diff --git a/cpu/ixp/npe/IxNpeDlImageMgr.c b/drivers/net/ixp4xx_npe/IxNpeDlImageMgr.c similarity index 100% rename from cpu/ixp/npe/IxNpeDlImageMgr.c rename to drivers/net/ixp4xx_npe/IxNpeDlImageMgr.c diff --git a/cpu/ixp/npe/IxNpeDlNpeMgr.c b/drivers/net/ixp4xx_npe/IxNpeDlNpeMgr.c similarity index 100% rename from cpu/ixp/npe/IxNpeDlNpeMgr.c rename to drivers/net/ixp4xx_npe/IxNpeDlNpeMgr.c diff --git a/cpu/ixp/npe/IxNpeDlNpeMgrUtils.c b/drivers/net/ixp4xx_npe/IxNpeDlNpeMgrUtils.c similarity index 100% rename from cpu/ixp/npe/IxNpeDlNpeMgrUtils.c rename to drivers/net/ixp4xx_npe/IxNpeDlNpeMgrUtils.c diff --git a/cpu/ixp/npe/IxNpeMh.c b/drivers/net/ixp4xx_npe/IxNpeMh.c similarity index 100% rename from cpu/ixp/npe/IxNpeMh.c rename to drivers/net/ixp4xx_npe/IxNpeMh.c diff --git a/cpu/ixp/npe/IxNpeMhConfig.c b/drivers/net/ixp4xx_npe/IxNpeMhConfig.c similarity index 100% rename from cpu/ixp/npe/IxNpeMhConfig.c rename to drivers/net/ixp4xx_npe/IxNpeMhConfig.c diff --git a/cpu/ixp/npe/IxNpeMhReceive.c b/drivers/net/ixp4xx_npe/IxNpeMhReceive.c similarity index 100% rename from cpu/ixp/npe/IxNpeMhReceive.c rename to drivers/net/ixp4xx_npe/IxNpeMhReceive.c diff --git a/cpu/ixp/npe/IxNpeMhSend.c b/drivers/net/ixp4xx_npe/IxNpeMhSend.c similarity index 100% rename from cpu/ixp/npe/IxNpeMhSend.c rename to drivers/net/ixp4xx_npe/IxNpeMhSend.c diff --git a/cpu/ixp/npe/IxNpeMhSolicitedCbMgr.c b/drivers/net/ixp4xx_npe/IxNpeMhSolicitedCbMgr.c similarity index 100% rename from cpu/ixp/npe/IxNpeMhSolicitedCbMgr.c rename to drivers/net/ixp4xx_npe/IxNpeMhSolicitedCbMgr.c diff --git a/cpu/ixp/npe/IxNpeMhUnsolicitedCbMgr.c b/drivers/net/ixp4xx_npe/IxNpeMhUnsolicitedCbMgr.c similarity index 100% rename from cpu/ixp/npe/IxNpeMhUnsolicitedCbMgr.c rename to drivers/net/ixp4xx_npe/IxNpeMhUnsolicitedCbMgr.c diff --git a/cpu/ixp/npe/IxOsalBufferMgt.c b/drivers/net/ixp4xx_npe/IxOsalBufferMgt.c similarity index 100% rename from cpu/ixp/npe/IxOsalBufferMgt.c rename to drivers/net/ixp4xx_npe/IxOsalBufferMgt.c diff --git a/cpu/ixp/npe/IxOsalIoMem.c b/drivers/net/ixp4xx_npe/IxOsalIoMem.c similarity index 100% rename from cpu/ixp/npe/IxOsalIoMem.c rename to drivers/net/ixp4xx_npe/IxOsalIoMem.c diff --git a/cpu/ixp/npe/IxOsalOsCacheMMU.c b/drivers/net/ixp4xx_npe/IxOsalOsCacheMMU.c similarity index 100% rename from cpu/ixp/npe/IxOsalOsCacheMMU.c rename to drivers/net/ixp4xx_npe/IxOsalOsCacheMMU.c diff --git a/cpu/ixp/npe/IxOsalOsMsgQ.c b/drivers/net/ixp4xx_npe/IxOsalOsMsgQ.c similarity index 100% rename from cpu/ixp/npe/IxOsalOsMsgQ.c rename to drivers/net/ixp4xx_npe/IxOsalOsMsgQ.c diff --git a/cpu/ixp/npe/IxOsalOsSemaphore.c b/drivers/net/ixp4xx_npe/IxOsalOsSemaphore.c similarity index 100% rename from cpu/ixp/npe/IxOsalOsSemaphore.c rename to drivers/net/ixp4xx_npe/IxOsalOsSemaphore.c diff --git a/cpu/ixp/npe/IxOsalOsServices.c b/drivers/net/ixp4xx_npe/IxOsalOsServices.c similarity index 100% rename from cpu/ixp/npe/IxOsalOsServices.c rename to drivers/net/ixp4xx_npe/IxOsalOsServices.c diff --git a/cpu/ixp/npe/IxOsalOsThread.c b/drivers/net/ixp4xx_npe/IxOsalOsThread.c similarity index 100% rename from cpu/ixp/npe/IxOsalOsThread.c rename to drivers/net/ixp4xx_npe/IxOsalOsThread.c diff --git a/cpu/ixp/npe/IxQMgrAqmIf.c b/drivers/net/ixp4xx_npe/IxQMgrAqmIf.c similarity index 100% rename from cpu/ixp/npe/IxQMgrAqmIf.c rename to drivers/net/ixp4xx_npe/IxQMgrAqmIf.c diff --git a/cpu/ixp/npe/IxQMgrDispatcher.c b/drivers/net/ixp4xx_npe/IxQMgrDispatcher.c similarity index 100% rename from cpu/ixp/npe/IxQMgrDispatcher.c rename to drivers/net/ixp4xx_npe/IxQMgrDispatcher.c diff --git a/cpu/ixp/npe/IxQMgrInit.c b/drivers/net/ixp4xx_npe/IxQMgrInit.c similarity index 100% rename from cpu/ixp/npe/IxQMgrInit.c rename to drivers/net/ixp4xx_npe/IxQMgrInit.c diff --git a/cpu/ixp/npe/IxQMgrQAccess.c b/drivers/net/ixp4xx_npe/IxQMgrQAccess.c similarity index 100% rename from cpu/ixp/npe/IxQMgrQAccess.c rename to drivers/net/ixp4xx_npe/IxQMgrQAccess.c diff --git a/cpu/ixp/npe/IxQMgrQCfg.c b/drivers/net/ixp4xx_npe/IxQMgrQCfg.c similarity index 100% rename from cpu/ixp/npe/IxQMgrQCfg.c rename to drivers/net/ixp4xx_npe/IxQMgrQCfg.c diff --git a/cpu/ixp/npe/Makefile b/drivers/net/ixp4xx_npe/Makefile similarity index 90% rename from cpu/ixp/npe/Makefile rename to drivers/net/ixp4xx_npe/Makefile index 25117d7..935f2a0 100644 --- a/cpu/ixp/npe/Makefile +++ b/drivers/net/ixp4xx_npe/Makefile @@ -25,11 +25,12 @@ include $(TOPDIR)/config.mk LIB := $(obj)libnpe.a -LOCAL_CFLAGS += -I$(TOPDIR)/cpu/ixp/npe/include -DCONFIG_IXP425_COMPONENT_ETHDB +#LOCAL_CFLAGS += -I$(TOPDIR)/cpu/ixp/npe/include -DCONFIG_IXP425_COMPONENT_ETHDB +LOCAL_CFLAGS += -Iinclude -DCONFIG_IXP425_COMPONENT_ETHDB CFLAGS += $(LOCAL_CFLAGS) HOST_CFLAGS += $(LOCAL_CFLAGS) -COBJS := npe.o \ +COBJS-$(CONFIG_IXP4XX_NPE) := npe.o \ miiphy.o \ IxOsalBufferMgt.o \ IxOsalIoMem.o \ @@ -80,9 +81,10 @@ COBJS := npe.o \ IxNpeMhUnsolicitedCbMgr.o ifndef CONFIG_IXP4XX_NPE_EXT_UCODE_BASE -COBJS += IxNpeMicrocode.o +COBJS-$(CONFIG_IXP4XX_NPE) += IxNpeMicrocode.o endif +COBJS := $(COBJS-y) SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) START := $(addprefix $(obj),$(START)) diff --git a/cpu/ixp/npe/include/IxAssert.h b/drivers/net/ixp4xx_npe/include/IxAssert.h similarity index 100% rename from cpu/ixp/npe/include/IxAssert.h rename to drivers/net/ixp4xx_npe/include/IxAssert.h diff --git a/cpu/ixp/npe/include/IxAtmSch.h b/drivers/net/ixp4xx_npe/include/IxAtmSch.h similarity index 100% rename from cpu/ixp/npe/include/IxAtmSch.h rename to drivers/net/ixp4xx_npe/include/IxAtmSch.h diff --git a/cpu/ixp/npe/include/IxAtmTypes.h b/drivers/net/ixp4xx_npe/include/IxAtmTypes.h similarity index 100% rename from cpu/ixp/npe/include/IxAtmTypes.h rename to drivers/net/ixp4xx_npe/include/IxAtmTypes.h diff --git a/cpu/ixp/npe/include/IxAtmdAcc.h b/drivers/net/ixp4xx_npe/include/IxAtmdAcc.h similarity index 100% rename from cpu/ixp/npe/include/IxAtmdAcc.h rename to drivers/net/ixp4xx_npe/include/IxAtmdAcc.h diff --git a/cpu/ixp/npe/include/IxAtmdAccCtrl.h b/drivers/net/ixp4xx_npe/include/IxAtmdAccCtrl.h similarity index 100% rename from cpu/ixp/npe/include/IxAtmdAccCtrl.h rename to drivers/net/ixp4xx_npe/include/IxAtmdAccCtrl.h diff --git a/cpu/ixp/npe/include/IxAtmm.h b/drivers/net/ixp4xx_npe/include/IxAtmm.h similarity index 100% rename from cpu/ixp/npe/include/IxAtmm.h rename to drivers/net/ixp4xx_npe/include/IxAtmm.h diff --git a/cpu/ixp/npe/include/IxDmaAcc.h b/drivers/net/ixp4xx_npe/include/IxDmaAcc.h similarity index 100% rename from cpu/ixp/npe/include/IxDmaAcc.h rename to drivers/net/ixp4xx_npe/include/IxDmaAcc.h diff --git a/cpu/ixp/npe/include/IxEthAcc.h b/drivers/net/ixp4xx_npe/include/IxEthAcc.h similarity index 100% rename from cpu/ixp/npe/include/IxEthAcc.h rename to drivers/net/ixp4xx_npe/include/IxEthAcc.h diff --git a/cpu/ixp/npe/include/IxEthAccDataPlane_p.h b/drivers/net/ixp4xx_npe/include/IxEthAccDataPlane_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthAccDataPlane_p.h rename to drivers/net/ixp4xx_npe/include/IxEthAccDataPlane_p.h diff --git a/cpu/ixp/npe/include/IxEthAccMac_p.h b/drivers/net/ixp4xx_npe/include/IxEthAccMac_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthAccMac_p.h rename to drivers/net/ixp4xx_npe/include/IxEthAccMac_p.h diff --git a/cpu/ixp/npe/include/IxEthAccMii_p.h b/drivers/net/ixp4xx_npe/include/IxEthAccMii_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthAccMii_p.h rename to drivers/net/ixp4xx_npe/include/IxEthAccMii_p.h diff --git a/cpu/ixp/npe/include/IxEthAccQueueAssign_p.h b/drivers/net/ixp4xx_npe/include/IxEthAccQueueAssign_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthAccQueueAssign_p.h rename to drivers/net/ixp4xx_npe/include/IxEthAccQueueAssign_p.h diff --git a/cpu/ixp/npe/include/IxEthAcc_p.h b/drivers/net/ixp4xx_npe/include/IxEthAcc_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthAcc_p.h rename to drivers/net/ixp4xx_npe/include/IxEthAcc_p.h diff --git a/cpu/ixp/npe/include/IxEthDB.h b/drivers/net/ixp4xx_npe/include/IxEthDB.h similarity index 100% rename from cpu/ixp/npe/include/IxEthDB.h rename to drivers/net/ixp4xx_npe/include/IxEthDB.h diff --git a/cpu/ixp/npe/include/IxEthDBLocks_p.h b/drivers/net/ixp4xx_npe/include/IxEthDBLocks_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthDBLocks_p.h rename to drivers/net/ixp4xx_npe/include/IxEthDBLocks_p.h diff --git a/cpu/ixp/npe/include/IxEthDBLog_p.h b/drivers/net/ixp4xx_npe/include/IxEthDBLog_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthDBLog_p.h rename to drivers/net/ixp4xx_npe/include/IxEthDBLog_p.h diff --git a/cpu/ixp/npe/include/IxEthDBMessages_p.h b/drivers/net/ixp4xx_npe/include/IxEthDBMessages_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthDBMessages_p.h rename to drivers/net/ixp4xx_npe/include/IxEthDBMessages_p.h diff --git a/cpu/ixp/npe/include/IxEthDBPortDefs.h b/drivers/net/ixp4xx_npe/include/IxEthDBPortDefs.h similarity index 100% rename from cpu/ixp/npe/include/IxEthDBPortDefs.h rename to drivers/net/ixp4xx_npe/include/IxEthDBPortDefs.h diff --git a/cpu/ixp/npe/include/IxEthDBQoS.h b/drivers/net/ixp4xx_npe/include/IxEthDBQoS.h similarity index 100% rename from cpu/ixp/npe/include/IxEthDBQoS.h rename to drivers/net/ixp4xx_npe/include/IxEthDBQoS.h diff --git a/cpu/ixp/npe/include/IxEthDB_p.h b/drivers/net/ixp4xx_npe/include/IxEthDB_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthDB_p.h rename to drivers/net/ixp4xx_npe/include/IxEthDB_p.h diff --git a/cpu/ixp/npe/include/IxEthMii.h b/drivers/net/ixp4xx_npe/include/IxEthMii.h similarity index 100% rename from cpu/ixp/npe/include/IxEthMii.h rename to drivers/net/ixp4xx_npe/include/IxEthMii.h diff --git a/cpu/ixp/npe/include/IxEthMii_p.h b/drivers/net/ixp4xx_npe/include/IxEthMii_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthMii_p.h rename to drivers/net/ixp4xx_npe/include/IxEthMii_p.h diff --git a/cpu/ixp/npe/include/IxEthNpe.h b/drivers/net/ixp4xx_npe/include/IxEthNpe.h similarity index 100% rename from cpu/ixp/npe/include/IxEthNpe.h rename to drivers/net/ixp4xx_npe/include/IxEthNpe.h diff --git a/cpu/ixp/npe/include/IxFeatureCtrl.h b/drivers/net/ixp4xx_npe/include/IxFeatureCtrl.h similarity index 100% rename from cpu/ixp/npe/include/IxFeatureCtrl.h rename to drivers/net/ixp4xx_npe/include/IxFeatureCtrl.h diff --git a/cpu/ixp/npe/include/IxHssAcc.h b/drivers/net/ixp4xx_npe/include/IxHssAcc.h similarity index 100% rename from cpu/ixp/npe/include/IxHssAcc.h rename to drivers/net/ixp4xx_npe/include/IxHssAcc.h diff --git a/cpu/ixp/npe/include/IxI2cDrv.h b/drivers/net/ixp4xx_npe/include/IxI2cDrv.h similarity index 100% rename from cpu/ixp/npe/include/IxI2cDrv.h rename to drivers/net/ixp4xx_npe/include/IxI2cDrv.h diff --git a/cpu/ixp/npe/include/IxNpeA.h b/drivers/net/ixp4xx_npe/include/IxNpeA.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeA.h rename to drivers/net/ixp4xx_npe/include/IxNpeA.h diff --git a/cpu/ixp/npe/include/IxNpeDl.h b/drivers/net/ixp4xx_npe/include/IxNpeDl.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeDl.h rename to drivers/net/ixp4xx_npe/include/IxNpeDl.h diff --git a/cpu/ixp/npe/include/IxNpeDlImageMgr_p.h b/drivers/net/ixp4xx_npe/include/IxNpeDlImageMgr_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeDlImageMgr_p.h rename to drivers/net/ixp4xx_npe/include/IxNpeDlImageMgr_p.h diff --git a/cpu/ixp/npe/include/IxNpeDlMacros_p.h b/drivers/net/ixp4xx_npe/include/IxNpeDlMacros_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeDlMacros_p.h rename to drivers/net/ixp4xx_npe/include/IxNpeDlMacros_p.h diff --git a/cpu/ixp/npe/include/IxNpeDlNpeMgrEcRegisters_p.h b/drivers/net/ixp4xx_npe/include/IxNpeDlNpeMgrEcRegisters_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeDlNpeMgrEcRegisters_p.h rename to drivers/net/ixp4xx_npe/include/IxNpeDlNpeMgrEcRegisters_p.h diff --git a/cpu/ixp/npe/include/IxNpeDlNpeMgrUtils_p.h b/drivers/net/ixp4xx_npe/include/IxNpeDlNpeMgrUtils_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeDlNpeMgrUtils_p.h rename to drivers/net/ixp4xx_npe/include/IxNpeDlNpeMgrUtils_p.h diff --git a/cpu/ixp/npe/include/IxNpeDlNpeMgr_p.h b/drivers/net/ixp4xx_npe/include/IxNpeDlNpeMgr_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeDlNpeMgr_p.h rename to drivers/net/ixp4xx_npe/include/IxNpeDlNpeMgr_p.h diff --git a/cpu/ixp/npe/include/IxNpeMh.h b/drivers/net/ixp4xx_npe/include/IxNpeMh.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeMh.h rename to drivers/net/ixp4xx_npe/include/IxNpeMh.h diff --git a/cpu/ixp/npe/include/IxNpeMhConfig_p.h b/drivers/net/ixp4xx_npe/include/IxNpeMhConfig_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeMhConfig_p.h rename to drivers/net/ixp4xx_npe/include/IxNpeMhConfig_p.h diff --git a/cpu/ixp/npe/include/IxNpeMhMacros_p.h b/drivers/net/ixp4xx_npe/include/IxNpeMhMacros_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeMhMacros_p.h rename to drivers/net/ixp4xx_npe/include/IxNpeMhMacros_p.h diff --git a/cpu/ixp/npe/include/IxNpeMhReceive_p.h b/drivers/net/ixp4xx_npe/include/IxNpeMhReceive_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeMhReceive_p.h rename to drivers/net/ixp4xx_npe/include/IxNpeMhReceive_p.h diff --git a/cpu/ixp/npe/include/IxNpeMhSend_p.h b/drivers/net/ixp4xx_npe/include/IxNpeMhSend_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeMhSend_p.h rename to drivers/net/ixp4xx_npe/include/IxNpeMhSend_p.h diff --git a/cpu/ixp/npe/include/IxNpeMhSolicitedCbMgr_p.h b/drivers/net/ixp4xx_npe/include/IxNpeMhSolicitedCbMgr_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeMhSolicitedCbMgr_p.h rename to drivers/net/ixp4xx_npe/include/IxNpeMhSolicitedCbMgr_p.h diff --git a/cpu/ixp/npe/include/IxNpeMhUnsolicitedCbMgr_p.h b/drivers/net/ixp4xx_npe/include/IxNpeMhUnsolicitedCbMgr_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeMhUnsolicitedCbMgr_p.h rename to drivers/net/ixp4xx_npe/include/IxNpeMhUnsolicitedCbMgr_p.h diff --git a/cpu/ixp/npe/include/IxNpeMicrocode.h b/drivers/net/ixp4xx_npe/include/IxNpeMicrocode.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeMicrocode.h rename to drivers/net/ixp4xx_npe/include/IxNpeMicrocode.h diff --git a/cpu/ixp/npe/include/IxOsBufLib.h b/drivers/net/ixp4xx_npe/include/IxOsBufLib.h similarity index 100% rename from cpu/ixp/npe/include/IxOsBufLib.h rename to drivers/net/ixp4xx_npe/include/IxOsBufLib.h diff --git a/cpu/ixp/npe/include/IxOsBuffMgt.h b/drivers/net/ixp4xx_npe/include/IxOsBuffMgt.h similarity index 100% rename from cpu/ixp/npe/include/IxOsBuffMgt.h rename to drivers/net/ixp4xx_npe/include/IxOsBuffMgt.h diff --git a/cpu/ixp/npe/include/IxOsBuffPoolMgt.h b/drivers/net/ixp4xx_npe/include/IxOsBuffPoolMgt.h similarity index 100% rename from cpu/ixp/npe/include/IxOsBuffPoolMgt.h rename to drivers/net/ixp4xx_npe/include/IxOsBuffPoolMgt.h diff --git a/cpu/ixp/npe/include/IxOsCacheMMU.h b/drivers/net/ixp4xx_npe/include/IxOsCacheMMU.h similarity index 100% rename from cpu/ixp/npe/include/IxOsCacheMMU.h rename to drivers/net/ixp4xx_npe/include/IxOsCacheMMU.h diff --git a/cpu/ixp/npe/include/IxOsPrintf.h b/drivers/net/ixp4xx_npe/include/IxOsPrintf.h similarity index 100% rename from cpu/ixp/npe/include/IxOsPrintf.h rename to drivers/net/ixp4xx_npe/include/IxOsPrintf.h diff --git a/cpu/ixp/npe/include/IxOsServices.h b/drivers/net/ixp4xx_npe/include/IxOsServices.h similarity index 100% rename from cpu/ixp/npe/include/IxOsServices.h rename to drivers/net/ixp4xx_npe/include/IxOsServices.h diff --git a/cpu/ixp/npe/include/IxOsServicesComponents.h b/drivers/net/ixp4xx_npe/include/IxOsServicesComponents.h similarity index 100% rename from cpu/ixp/npe/include/IxOsServicesComponents.h rename to drivers/net/ixp4xx_npe/include/IxOsServicesComponents.h diff --git a/cpu/ixp/npe/include/IxOsServicesEndianess.h b/drivers/net/ixp4xx_npe/include/IxOsServicesEndianess.h similarity index 100% rename from cpu/ixp/npe/include/IxOsServicesEndianess.h rename to drivers/net/ixp4xx_npe/include/IxOsServicesEndianess.h diff --git a/cpu/ixp/npe/include/IxOsServicesMemAccess.h b/drivers/net/ixp4xx_npe/include/IxOsServicesMemAccess.h similarity index 100% rename from cpu/ixp/npe/include/IxOsServicesMemAccess.h rename to drivers/net/ixp4xx_npe/include/IxOsServicesMemAccess.h diff --git a/cpu/ixp/npe/include/IxOsServicesMemMap.h b/drivers/net/ixp4xx_npe/include/IxOsServicesMemMap.h similarity index 100% rename from cpu/ixp/npe/include/IxOsServicesMemMap.h rename to drivers/net/ixp4xx_npe/include/IxOsServicesMemMap.h diff --git a/cpu/ixp/npe/include/IxOsal.h b/drivers/net/ixp4xx_npe/include/IxOsal.h similarity index 100% rename from cpu/ixp/npe/include/IxOsal.h rename to drivers/net/ixp4xx_npe/include/IxOsal.h diff --git a/cpu/ixp/npe/include/IxOsalAssert.h b/drivers/net/ixp4xx_npe/include/IxOsalAssert.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalAssert.h rename to drivers/net/ixp4xx_npe/include/IxOsalAssert.h diff --git a/cpu/ixp/npe/include/IxOsalBackward.h b/drivers/net/ixp4xx_npe/include/IxOsalBackward.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalBackward.h rename to drivers/net/ixp4xx_npe/include/IxOsalBackward.h diff --git a/cpu/ixp/npe/include/IxOsalBackwardAssert.h b/drivers/net/ixp4xx_npe/include/IxOsalBackwardAssert.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalBackwardAssert.h rename to drivers/net/ixp4xx_npe/include/IxOsalBackwardAssert.h diff --git a/cpu/ixp/npe/include/IxOsalBackwardBufferMgt.h b/drivers/net/ixp4xx_npe/include/IxOsalBackwardBufferMgt.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalBackwardBufferMgt.h rename to drivers/net/ixp4xx_npe/include/IxOsalBackwardBufferMgt.h diff --git a/cpu/ixp/npe/include/IxOsalBackwardCacheMMU.h b/drivers/net/ixp4xx_npe/include/IxOsalBackwardCacheMMU.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalBackwardCacheMMU.h rename to drivers/net/ixp4xx_npe/include/IxOsalBackwardCacheMMU.h diff --git a/cpu/ixp/npe/include/IxOsalBackwardMemMap.h b/drivers/net/ixp4xx_npe/include/IxOsalBackwardMemMap.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalBackwardMemMap.h rename to drivers/net/ixp4xx_npe/include/IxOsalBackwardMemMap.h diff --git a/cpu/ixp/npe/include/IxOsalBackwardOsServices.h b/drivers/net/ixp4xx_npe/include/IxOsalBackwardOsServices.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalBackwardOsServices.h rename to drivers/net/ixp4xx_npe/include/IxOsalBackwardOsServices.h diff --git a/cpu/ixp/npe/include/IxOsalBackwardOssl.h b/drivers/net/ixp4xx_npe/include/IxOsalBackwardOssl.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalBackwardOssl.h rename to drivers/net/ixp4xx_npe/include/IxOsalBackwardOssl.h diff --git a/cpu/ixp/npe/include/IxOsalBufferMgt.h b/drivers/net/ixp4xx_npe/include/IxOsalBufferMgt.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalBufferMgt.h rename to drivers/net/ixp4xx_npe/include/IxOsalBufferMgt.h diff --git a/cpu/ixp/npe/include/IxOsalBufferMgtDefault.h b/drivers/net/ixp4xx_npe/include/IxOsalBufferMgtDefault.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalBufferMgtDefault.h rename to drivers/net/ixp4xx_npe/include/IxOsalBufferMgtDefault.h diff --git a/cpu/ixp/npe/include/IxOsalConfig.h b/drivers/net/ixp4xx_npe/include/IxOsalConfig.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalConfig.h rename to drivers/net/ixp4xx_npe/include/IxOsalConfig.h diff --git a/cpu/ixp/npe/include/IxOsalEndianess.h b/drivers/net/ixp4xx_npe/include/IxOsalEndianess.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalEndianess.h rename to drivers/net/ixp4xx_npe/include/IxOsalEndianess.h diff --git a/cpu/ixp/npe/include/IxOsalIoMem.h b/drivers/net/ixp4xx_npe/include/IxOsalIoMem.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalIoMem.h rename to drivers/net/ixp4xx_npe/include/IxOsalIoMem.h diff --git a/cpu/ixp/npe/include/IxOsalMemAccess.h b/drivers/net/ixp4xx_npe/include/IxOsalMemAccess.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalMemAccess.h rename to drivers/net/ixp4xx_npe/include/IxOsalMemAccess.h diff --git a/cpu/ixp/npe/include/IxOsalOem.h b/drivers/net/ixp4xx_npe/include/IxOsalOem.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalOem.h rename to drivers/net/ixp4xx_npe/include/IxOsalOem.h diff --git a/cpu/ixp/npe/include/IxOsalOs.h b/drivers/net/ixp4xx_npe/include/IxOsalOs.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalOs.h rename to drivers/net/ixp4xx_npe/include/IxOsalOs.h diff --git a/cpu/ixp/npe/include/IxOsalOsAssert.h b/drivers/net/ixp4xx_npe/include/IxOsalOsAssert.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalOsAssert.h rename to drivers/net/ixp4xx_npe/include/IxOsalOsAssert.h diff --git a/cpu/ixp/npe/include/IxOsalOsBufferMgt.h b/drivers/net/ixp4xx_npe/include/IxOsalOsBufferMgt.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalOsBufferMgt.h rename to drivers/net/ixp4xx_npe/include/IxOsalOsBufferMgt.h diff --git a/cpu/ixp/npe/include/IxOsalOsIxp400.h b/drivers/net/ixp4xx_npe/include/IxOsalOsIxp400.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalOsIxp400.h rename to drivers/net/ixp4xx_npe/include/IxOsalOsIxp400.h diff --git a/cpu/ixp/npe/include/IxOsalOsIxp400CustomizedMapping.h b/drivers/net/ixp4xx_npe/include/IxOsalOsIxp400CustomizedMapping.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalOsIxp400CustomizedMapping.h rename to drivers/net/ixp4xx_npe/include/IxOsalOsIxp400CustomizedMapping.h diff --git a/cpu/ixp/npe/include/IxOsalOsTypes.h b/drivers/net/ixp4xx_npe/include/IxOsalOsTypes.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalOsTypes.h rename to drivers/net/ixp4xx_npe/include/IxOsalOsTypes.h diff --git a/cpu/ixp/npe/include/IxOsalOsUtilitySymbols.h b/drivers/net/ixp4xx_npe/include/IxOsalOsUtilitySymbols.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalOsUtilitySymbols.h rename to drivers/net/ixp4xx_npe/include/IxOsalOsUtilitySymbols.h diff --git a/cpu/ixp/npe/include/IxOsalTypes.h b/drivers/net/ixp4xx_npe/include/IxOsalTypes.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalTypes.h rename to drivers/net/ixp4xx_npe/include/IxOsalTypes.h diff --git a/cpu/ixp/npe/include/IxOsalUtilitySymbols.h b/drivers/net/ixp4xx_npe/include/IxOsalUtilitySymbols.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalUtilitySymbols.h rename to drivers/net/ixp4xx_npe/include/IxOsalUtilitySymbols.h diff --git a/cpu/ixp/npe/include/IxParityENAcc.h b/drivers/net/ixp4xx_npe/include/IxParityENAcc.h similarity index 100% rename from cpu/ixp/npe/include/IxParityENAcc.h rename to drivers/net/ixp4xx_npe/include/IxParityENAcc.h diff --git a/cpu/ixp/npe/include/IxPerfProfAcc.h b/drivers/net/ixp4xx_npe/include/IxPerfProfAcc.h similarity index 100% rename from cpu/ixp/npe/include/IxPerfProfAcc.h rename to drivers/net/ixp4xx_npe/include/IxPerfProfAcc.h diff --git a/cpu/ixp/npe/include/IxQMgr.h b/drivers/net/ixp4xx_npe/include/IxQMgr.h similarity index 100% rename from cpu/ixp/npe/include/IxQMgr.h rename to drivers/net/ixp4xx_npe/include/IxQMgr.h diff --git a/cpu/ixp/npe/include/IxQMgrAqmIf_p.h b/drivers/net/ixp4xx_npe/include/IxQMgrAqmIf_p.h similarity index 100% rename from cpu/ixp/npe/include/IxQMgrAqmIf_p.h rename to drivers/net/ixp4xx_npe/include/IxQMgrAqmIf_p.h diff --git a/cpu/ixp/npe/include/IxQMgrDefines_p.h b/drivers/net/ixp4xx_npe/include/IxQMgrDefines_p.h similarity index 100% rename from cpu/ixp/npe/include/IxQMgrDefines_p.h rename to drivers/net/ixp4xx_npe/include/IxQMgrDefines_p.h diff --git a/cpu/ixp/npe/include/IxQMgrDispatcher_p.h b/drivers/net/ixp4xx_npe/include/IxQMgrDispatcher_p.h similarity index 100% rename from cpu/ixp/npe/include/IxQMgrDispatcher_p.h rename to drivers/net/ixp4xx_npe/include/IxQMgrDispatcher_p.h diff --git a/cpu/ixp/npe/include/IxQMgrLog_p.h b/drivers/net/ixp4xx_npe/include/IxQMgrLog_p.h similarity index 100% rename from cpu/ixp/npe/include/IxQMgrLog_p.h rename to drivers/net/ixp4xx_npe/include/IxQMgrLog_p.h diff --git a/cpu/ixp/npe/include/IxQMgrQAccess_p.h b/drivers/net/ixp4xx_npe/include/IxQMgrQAccess_p.h similarity index 100% rename from cpu/ixp/npe/include/IxQMgrQAccess_p.h rename to drivers/net/ixp4xx_npe/include/IxQMgrQAccess_p.h diff --git a/cpu/ixp/npe/include/IxQMgrQCfg_p.h b/drivers/net/ixp4xx_npe/include/IxQMgrQCfg_p.h similarity index 100% rename from cpu/ixp/npe/include/IxQMgrQCfg_p.h rename to drivers/net/ixp4xx_npe/include/IxQMgrQCfg_p.h diff --git a/cpu/ixp/npe/include/IxQueueAssignments.h b/drivers/net/ixp4xx_npe/include/IxQueueAssignments.h similarity index 100% rename from cpu/ixp/npe/include/IxQueueAssignments.h rename to drivers/net/ixp4xx_npe/include/IxQueueAssignments.h diff --git a/cpu/ixp/npe/include/IxSspAcc.h b/drivers/net/ixp4xx_npe/include/IxSspAcc.h similarity index 100% rename from cpu/ixp/npe/include/IxSspAcc.h rename to drivers/net/ixp4xx_npe/include/IxSspAcc.h diff --git a/cpu/ixp/npe/include/IxTimeSyncAcc.h b/drivers/net/ixp4xx_npe/include/IxTimeSyncAcc.h similarity index 100% rename from cpu/ixp/npe/include/IxTimeSyncAcc.h rename to drivers/net/ixp4xx_npe/include/IxTimeSyncAcc.h diff --git a/cpu/ixp/npe/include/IxTimerCtrl.h b/drivers/net/ixp4xx_npe/include/IxTimerCtrl.h similarity index 100% rename from cpu/ixp/npe/include/IxTimerCtrl.h rename to drivers/net/ixp4xx_npe/include/IxTimerCtrl.h diff --git a/cpu/ixp/npe/include/IxTypes.h b/drivers/net/ixp4xx_npe/include/IxTypes.h similarity index 100% rename from cpu/ixp/npe/include/IxTypes.h rename to drivers/net/ixp4xx_npe/include/IxTypes.h diff --git a/cpu/ixp/npe/include/IxUART.h b/drivers/net/ixp4xx_npe/include/IxUART.h similarity index 100% rename from cpu/ixp/npe/include/IxUART.h rename to drivers/net/ixp4xx_npe/include/IxUART.h diff --git a/cpu/ixp/npe/include/IxVersionId.h b/drivers/net/ixp4xx_npe/include/IxVersionId.h similarity index 100% rename from cpu/ixp/npe/include/IxVersionId.h rename to drivers/net/ixp4xx_npe/include/IxVersionId.h diff --git a/cpu/ixp/npe/include/ix_error.h b/drivers/net/ixp4xx_npe/include/ix_error.h similarity index 100% rename from cpu/ixp/npe/include/ix_error.h rename to drivers/net/ixp4xx_npe/include/ix_error.h diff --git a/cpu/ixp/npe/include/ix_macros.h b/drivers/net/ixp4xx_npe/include/ix_macros.h similarity index 100% rename from cpu/ixp/npe/include/ix_macros.h rename to drivers/net/ixp4xx_npe/include/ix_macros.h diff --git a/cpu/ixp/npe/include/ix_os_type.h b/drivers/net/ixp4xx_npe/include/ix_os_type.h similarity index 100% rename from cpu/ixp/npe/include/ix_os_type.h rename to drivers/net/ixp4xx_npe/include/ix_os_type.h diff --git a/cpu/ixp/npe/include/ix_ossl.h b/drivers/net/ixp4xx_npe/include/ix_ossl.h similarity index 100% rename from cpu/ixp/npe/include/ix_ossl.h rename to drivers/net/ixp4xx_npe/include/ix_ossl.h diff --git a/cpu/ixp/npe/include/ix_symbols.h b/drivers/net/ixp4xx_npe/include/ix_symbols.h similarity index 100% rename from cpu/ixp/npe/include/ix_symbols.h rename to drivers/net/ixp4xx_npe/include/ix_symbols.h diff --git a/cpu/ixp/npe/include/ix_types.h b/drivers/net/ixp4xx_npe/include/ix_types.h similarity index 100% rename from cpu/ixp/npe/include/ix_types.h rename to drivers/net/ixp4xx_npe/include/ix_types.h diff --git a/cpu/ixp/npe/include/npe.h b/drivers/net/ixp4xx_npe/include/npe.h similarity index 100% rename from cpu/ixp/npe/include/npe.h rename to drivers/net/ixp4xx_npe/include/npe.h diff --git a/cpu/ixp/npe/include/os_datatypes.h b/drivers/net/ixp4xx_npe/include/os_datatypes.h similarity index 100% rename from cpu/ixp/npe/include/os_datatypes.h rename to drivers/net/ixp4xx_npe/include/os_datatypes.h diff --git a/cpu/ixp/npe/miiphy.c b/drivers/net/ixp4xx_npe/miiphy.c similarity index 100% rename from cpu/ixp/npe/miiphy.c rename to drivers/net/ixp4xx_npe/miiphy.c diff --git a/cpu/ixp/npe/npe.c b/drivers/net/ixp4xx_npe/npe.c similarity index 100% rename from cpu/ixp/npe/npe.c rename to drivers/net/ixp4xx_npe/npe.c -- 1.5.4.3

2 4

[U-Boot] [PATCH] 74xx/7xx/86xx: Rename flush_data_cache to flush_dcache to match 85xx version
by Kumar Gala 30 Oct '08

30 Oct '08

Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- cpu/74xx_7xx/cache.S | 10 +++++----- cpu/mpc86xx/cache.S | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cpu/74xx_7xx/cache.S b/cpu/74xx_7xx/cache.S index eac4544..62a6683 100644 --- a/cpu/74xx_7xx/cache.S +++ b/cpu/74xx_7xx/cache.S @@ -52,7 +52,7 @@ _GLOBAL(invalidate_l1_data_cache) /* * Flush data cache. */ -_GLOBAL(flush_data_cache) +_GLOBAL(flush_dcache) lis r3,0 lis r5,CACHE_LINE_SIZE flush: @@ -303,12 +303,12 @@ _GLOBAL(dcache_enable) /* * Disable data cache(s) - L1 and optionally L2 - * Calls flush_data_cache and l2cache_disable_no_flush. + * Calls flush_dcache and l2cache_disable_no_flush. * LR saved in r4 */ _GLOBAL(dcache_disable) mflr r4 /* save link register */ - bl flush_data_cache /* uses r3 and r5 */ + bl flush_dcache /* uses r3 and r5 */ sync mfspr r3, HID0 li r5, HID0_DCFI|HID0_DLOCK @@ -389,11 +389,11 @@ _GLOBAL(l2cache_enable) /* * Disable L2 cache - * Calls flush_data_cache. LR is saved in r4 + * Calls flush_dcache. LR is saved in r4 */ _GLOBAL(l2cache_disable) mflr r4 /* save link register */ - bl flush_data_cache /* uses r3 and r5 */ + bl flush_dcache /* uses r3 and r5 */ sync mtlr r4 /* restore link register */ l2cache_disable_no_flush: /* provide way to disable L2 w/o flushing */ diff --git a/cpu/mpc86xx/cache.S b/cpu/mpc86xx/cache.S index 80ff688..dd38806 100644 --- a/cpu/mpc86xx/cache.S +++ b/cpu/mpc86xx/cache.S @@ -53,7 +53,7 @@ _GLOBAL(invalidate_l1_data_cache) /* * Flush data cache. */ -_GLOBAL(flush_data_cache) +_GLOBAL(flush_dcache) lis r3,0 lis r5,CACHE_LINE_SIZE flush: @@ -290,12 +290,12 @@ _GLOBAL(dcache_enable) /* * Disable data cache(s) - L1 and optionally L2 - * Calls flush_data_cache and l2cache_disable_no_flush. + * Calls flush_dcache and l2cache_disable_no_flush. * LR saved in r4 */ _GLOBAL(dcache_disable) mflr r4 /* save link register */ - bl flush_data_cache /* uses r3 and r5 */ + bl flush_dcache /* uses r3 and r5 */ sync mfspr r3, HID0 li r5, HID0_DCFI|HID0_DLOCK @@ -363,11 +363,11 @@ _GLOBAL(l2cache_enable) /* * Disable L2 cache - * Calls flush_data_cache. LR is saved in r4 + * Calls flush_dcache. LR is saved in r4 */ _GLOBAL(l2cache_disable) mflr r4 /* save link register */ - bl flush_data_cache /* uses r3 and r5 */ + bl flush_dcache /* uses r3 and r5 */ sync mtlr r4 /* restore link register */ l2cache_disable_no_flush: /* provide way to disable L2 w/o flushing */ -- 1.5.5.1

3 2

[U-Boot] [PATCH] 86xx: remove the unused definition
by Dave Liu 30 Oct '08

30 Oct '08

Signed-off-by: Dave Liu <daveliu(a)freescale.com> --- include/configs/MPC8610HPCD.h | 9 --------- include/configs/MPC8641HPCN.h | 11 ----------- 2 files changed, 0 insertions(+), 20 deletions(-) diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 678e1e1..d92bed9 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -125,15 +125,6 @@ #define CONFIG_SYS_DDR_ERR_DIS 0x00000000 #define CONFIG_SYS_DDR_SBE 0x000f0000 -/* - * FIXME: Not used in fixed_sdram function - */ -#define CONFIG_SYS_DDR_MODE 0x00000022 -#define CONFIG_SYS_DDR_CS1_BNDS 0x00000000 -#define CONFIG_SYS_DDR_CS2_BNDS 0x00000FFF /* Not done */ -#define CONFIG_SYS_DDR_CS3_BNDS 0x00000FFF /* Not done */ -#define CONFIG_SYS_DDR_CS4_BNDS 0x00000FFF /* Not done */ -#define CONFIG_SYS_DDR_CS5_BNDS 0x00000FFF /* Not done */ #endif diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index e5710c0..0114ada 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -138,17 +138,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_DDR_CONTROL 0xe3008000 /* Type = DDR2 */ #define CONFIG_SYS_DDR_CONTROL2 0x04400000 -/* - * FIXME: Not used in fixed_sdram function - */ -#define CONFIG_SYS_DDR_MODE 0x00000022 -#define CONFIG_SYS_DDR_CS1_BNDS 0x00000000 -#define CONFIG_SYS_DDR_CS2_BNDS 0x00000FFF /* Not done */ -#define CONFIG_SYS_DDR_CS3_BNDS 0x00000FFF /* Not done */ -#define CONFIG_SYS_DDR_CS4_BNDS 0x00000FFF /* Not done */ -#define CONFIG_SYS_DDR_CS5_BNDS 0x00000FFF /* Not done */ - - #define CONFIG_ID_EEPROM #define CONFIG_SYS_I2C_EEPROM_NXID #define CONFIG_ID_EEPROM -- 1.5.4

2 1

[U-Boot] [PATCH][AT91] Custom AFEB9260 board support
by Sergey Lapin 30 Oct '08

30 Oct '08

This patch provides support for AFEB9260 board, a product of OpenSource hardware and software. Some commertial projects are made with this design. A board is basically AT91SAM9260-EK with some modifications and different peripherals and different parts used. Main purpose of this project is to gain experience in hardware design. More info: http://groups.google.com/group/arm9fpga-evolution-board (In Russian only, sorry). Subversion repository: svn://194.85.238.22/home/users/george/svn/arm9eb Signed-off-by: Sergey Lapin <slapin(a)ossfans.org> --- Makefile | 3 + board/afeb9260/Makefile | 56 +++++++++++ board/afeb9260/afeb9260.c | 230 ++++++++++++++++++++++++++++++++++++++++++++ board/afeb9260/config.mk | 1 + board/afeb9260/nand.c | 79 +++++++++++++++ board/afeb9260/partition.c | 36 +++++++ include/configs/afeb9260.h | 169 ++++++++++++++++++++++++++++++++ 7 files changed, 574 insertions(+), 0 deletions(-) create mode 100644 board/afeb9260/Makefile create mode 100644 board/afeb9260/afeb9260.c create mode 100644 board/afeb9260/config.mk create mode 100644 board/afeb9260/nand.c create mode 100644 board/afeb9260/partition.c create mode 100644 include/configs/afeb9260.h diff --git a/Makefile b/Makefile index 3179c67..edef217 100644 --- a/Makefile +++ b/Makefile @@ -2387,6 +2387,9 @@ at91cap9adk_config : unconfig at91sam9260ek_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9260ek atmel at91sam9 +afeb9260_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs afeb9260 NULL at91sam9 + ######################################################################## ## ARM Integrator boards - see doc/README-integrator for more info. integratorap_config \ diff --git a/board/afeb9260/Makefile b/board/afeb9260/Makefile new file mode 100644 index 0000000..60c4304 --- /dev/null +++ b/board/afeb9260/Makefile @@ -0,0 +1,56 @@ +# +# (C) Copyright 2003-2008 +# Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. +# +# (C) Copyright 2008 +# Stelian Pop <stelian.pop(a)leadtechdesign.com> +# Lead Tech Design <www.leadtechdesign.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., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +include $(TOPDIR)/config.mk + +LIB = $(obj)lib$(BOARD).a + +COBJS-y += afeb9260.o +COBJS-y += partition.o +COBJS-$(CONFIG_CMD_NAND) += nand.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) + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak .depend + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### diff --git a/board/afeb9260/afeb9260.c b/board/afeb9260/afeb9260.c new file mode 100644 index 0000000..252a1ea --- /dev/null +++ b/board/afeb9260/afeb9260.c @@ -0,0 +1,230 @@ +/* + * (C) Copyright 2008 Sergey Lapin <slapin(a)ossfans.org> + * 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 <asm/arch/at91sam9260.h> +#include <asm/arch/at91sam9260_matrix.h> +#include <asm/arch/at91sam9_smc.h> +#include <asm/arch/at91_pmc.h> +#include <asm/arch/at91_rstc.h> +#include <asm/arch/gpio.h> +#include <asm/arch/io.h> +#if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB) +#include <net.h> +#endif + +DECLARE_GLOBAL_DATA_PTR; + +/* ------------------------------------------------------------------------- */ +/* + * Miscelaneous platform dependent initialisations + */ + +static void afeb9260_serial_hw_init(void) +{ +#ifdef CONFIG_USART0 + at91_set_A_periph(AT91_PIN_PB4, 1); /* TXD0 */ + at91_set_A_periph(AT91_PIN_PB5, 0); /* RXD0 */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US0); +#endif + +#ifdef CONFIG_USART1 + at91_set_A_periph(AT91_PIN_PB6, 1); /* TXD1 */ + at91_set_A_periph(AT91_PIN_PB7, 0); /* RXD1 */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US1); +#endif + +#ifdef CONFIG_USART2 + at91_set_A_periph(AT91_PIN_PB8, 1); /* TXD2 */ + at91_set_A_periph(AT91_PIN_PB9, 0); /* RXD2 */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US2); +#endif + +#ifdef CONFIG_USART3 /* DBGU */ + at91_set_A_periph(AT91_PIN_PB14, 0); /* DRXD */ + at91_set_A_periph(AT91_PIN_PB15, 1); /* DTXD */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_SYS); +#endif +} + +static void afeb9260_nand_hw_init(void) +{ + unsigned long csa; + + /* Enable CS3 */ + csa = at91_sys_read(AT91_MATRIX_EBICSA); + at91_sys_write(AT91_MATRIX_EBICSA, + csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA); + + /* Configure SMC CS3 for NAND/SmartMedia */ + at91_sys_write(AT91_SMC_SETUP(3), + AT91_SMC_NWESETUP_(0) | AT91_SMC_NCS_WRSETUP_(0) | + AT91_SMC_NRDSETUP_(0) | AT91_SMC_NCS_RDSETUP_(0)); + at91_sys_write(AT91_SMC_PULSE(3), + AT91_SMC_NWEPULSE_(3) | AT91_SMC_NCS_WRPULSE_(3) | + AT91_SMC_NRDPULSE_(3) | AT91_SMC_NCS_RDPULSE_(3)); + at91_sys_write(AT91_SMC_CYCLE(3), + AT91_SMC_NWECYCLE_(5) | AT91_SMC_NRDCYCLE_(5)); + at91_sys_write(AT91_SMC_MODE(3), + AT91_SMC_READMODE | AT91_SMC_WRITEMODE | + AT91_SMC_EXNWMODE_DISABLE | + AT91_SMC_DBW_8 | + AT91_SMC_TDF_(2)); + + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_PIOC); + + /* Configure RDY/BSY */ + at91_set_gpio_input(AT91_PIN_PC13, 1); + + /* Enable NandFlash */ + at91_set_gpio_output(AT91_PIN_PC14, 1); +} + +static void afeb9260_spi_hw_init(void) +{ + at91_set_A_periph(AT91_PIN_PA3, 0); /* SPI0_NPCS0 */ + at91_set_B_periph(AT91_PIN_PC11, 0); /* SPI0_NPCS1 */ + + at91_set_A_periph(AT91_PIN_PA0, 0); /* SPI0_MISO */ + at91_set_A_periph(AT91_PIN_PA1, 0); /* SPI0_MOSI */ + at91_set_A_periph(AT91_PIN_PA2, 0); /* SPI0_SPCK */ + + /* Enable clock */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_SPI0); +} + +#ifdef CONFIG_MACB +static void afeb9260_macb_hw_init(void) +{ + /* Enable clock */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_EMAC); + + /* + * Disable pull-up on: + * RXDV (PA17) => PHY normal mode (not Test mode) + * ERX0 (PA14) => PHY ADDR0 + * ERX1 (PA15) => PHY ADDR1 + * ERX2 (PA25) => PHY ADDR2 + * ERX3 (PA26) => PHY ADDR3 + * ECRS (PA28) => PHY ADDR4 => PHYADDR = 0x0 + * + * PHY has internal pull-down + */ + writel(pin_to_mask(AT91_PIN_PA14) | + pin_to_mask(AT91_PIN_PA15) | + pin_to_mask(AT91_PIN_PA17) | + pin_to_mask(AT91_PIN_PA25) | + pin_to_mask(AT91_PIN_PA26) | + pin_to_mask(AT91_PIN_PA28), + pin_to_controller(AT91_PIN_PA0) + PIO_PUDR); + + /* Need to reset PHY -> 500ms reset */ + at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY | + AT91_RSTC_ERSTL | (0x0D << 8) | + AT91_RSTC_URSTEN); + + at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_EXTRST); + + /* Wait for end hardware reset */ + while (!(at91_sys_read(AT91_RSTC_SR) & AT91_RSTC_NRSTL)); + + /* Restore NRST value */ + at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY | + AT91_RSTC_ERSTL | (0x0 << 8) | + AT91_RSTC_URSTEN); + + /* Re-enable pull-up */ + writel(pin_to_mask(AT91_PIN_PA14) | + pin_to_mask(AT91_PIN_PA15) | + pin_to_mask(AT91_PIN_PA17) | + pin_to_mask(AT91_PIN_PA25) | + pin_to_mask(AT91_PIN_PA26) | + pin_to_mask(AT91_PIN_PA28), + pin_to_controller(AT91_PIN_PA0) + PIO_PUER); + + at91_set_A_periph(AT91_PIN_PA19, 0); /* ETXCK_EREFCK */ + at91_set_A_periph(AT91_PIN_PA17, 0); /* ERXDV */ + at91_set_A_periph(AT91_PIN_PA14, 0); /* ERX0 */ + at91_set_A_periph(AT91_PIN_PA15, 0); /* ERX1 */ + at91_set_A_periph(AT91_PIN_PA18, 0); /* ERXER */ + at91_set_A_periph(AT91_PIN_PA16, 0); /* ETXEN */ + at91_set_A_periph(AT91_PIN_PA12, 0); /* ETX0 */ + at91_set_A_periph(AT91_PIN_PA13, 0); /* ETX1 */ + at91_set_A_periph(AT91_PIN_PA21, 0); /* EMDIO */ + at91_set_A_periph(AT91_PIN_PA20, 0); /* EMDC */ + +#ifndef CONFIG_RMII + at91_set_B_periph(AT91_PIN_PA28, 0); /* ECRS */ + at91_set_B_periph(AT91_PIN_PA29, 0); /* ECOL */ + at91_set_B_periph(AT91_PIN_PA25, 0); /* ERX2 */ + at91_set_B_periph(AT91_PIN_PA26, 0); /* ERX3 */ + at91_set_B_periph(AT91_PIN_PA27, 0); /* ERXCK */ + at91_set_B_periph(AT91_PIN_PA10, 0); /* ETX2 */ + at91_set_B_periph(AT91_PIN_PA11, 0); /* ETX3 */ + at91_set_B_periph(AT91_PIN_PA22, 0); /* ETXER */ +#endif + +} +#endif + +int board_init(void) +{ + /* Enable Ctrlc */ + console_init_f(); + + /* arch number of AT91SAM9260EK-Board */ + // gd->bd->bi_arch_number = CONFIG_MACH_AFEB9260 + gd->bd->bi_arch_number = 1859; + /* adress of boot parameters */ + gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; + + afeb9260_serial_hw_init(); +#ifdef CONFIG_CMD_NAND + afeb9260_nand_hw_init(); +#endif + afeb9260_spi_hw_init(); +#ifdef CONFIG_MACB + afeb9260_macb_hw_init(); +#endif + + return 0; +} + +int dram_init(void) +{ + gd->bd->bi_dram[0].start = PHYS_SDRAM; + gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE; + return 0; +} + +#ifdef CONFIG_RESET_PHY_R +void reset_phy(void) +{ +#ifdef CONFIG_MACB + /* + * Initialize ethernet HW addr prior to starting Linux, + * needed for nfsroot + */ + eth_init(gd->bd); +#endif +} +#endif + diff --git a/board/afeb9260/config.mk b/board/afeb9260/config.mk new file mode 100644 index 0000000..9ce161e --- /dev/null +++ b/board/afeb9260/config.mk @@ -0,0 +1 @@ +TEXT_BASE = 0x21f00000 diff --git a/board/afeb9260/nand.c b/board/afeb9260/nand.c new file mode 100644 index 0000000..9738f0f --- /dev/null +++ b/board/afeb9260/nand.c @@ -0,0 +1,79 @@ +/* + * (C) Copyright 2007-2008 + * Stelian Pop <stelian.pop(a)leadtechdesign.com> + * Lead Tech Design <www.leadtechdesign.com> + * + * (C) Copyright 2006 ATMEL Rousset, Lacressonniere Nicolas + * + * 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 <asm/arch/at91sam9260.h> +#include <asm/arch/gpio.h> +#include <asm/arch/at91_pio.h> + +#include <nand.h> + +/* + * hardware specific access to control-lines + */ +#define MASK_ALE (1 << 21) /* our ALE is AD21 */ +#define MASK_CLE (1 << 22) /* our CLE is AD22 */ + +static void at91sam9260ek_nand_hwcontrol(struct mtd_info *mtd, int cmd) +{ + struct nand_chip *this = mtd->priv; + ulong IO_ADDR_W = (ulong) this->IO_ADDR_W; + + IO_ADDR_W &= ~(MASK_ALE|MASK_CLE); + switch (cmd) { + case NAND_CTL_SETCLE: + IO_ADDR_W |= MASK_CLE; + break; + case NAND_CTL_SETALE: + IO_ADDR_W |= MASK_ALE; + break; + case NAND_CTL_CLRNCE: + at91_set_gpio_value(AT91_PIN_PC14, 1); + break; + case NAND_CTL_SETNCE: + at91_set_gpio_value(AT91_PIN_PC14, 0); + break; + } + this->IO_ADDR_W = (void *) IO_ADDR_W; +} + +static int at91sam9260ek_nand_ready(struct mtd_info *mtd) +{ + return at91_get_gpio_value(AT91_PIN_PC13); +} + +int board_nand_init(struct nand_chip *nand) +{ + nand->eccmode = NAND_ECC_SOFT; +#ifdef CFG_NAND_DBW_16 + nand->options = NAND_BUSWIDTH_16; +#endif + nand->hwcontrol = at91sam9260ek_nand_hwcontrol; + nand->dev_ready = at91sam9260ek_nand_ready; + nand->chip_delay = 20; + + return 0; +} diff --git a/board/afeb9260/partition.c b/board/afeb9260/partition.c new file mode 100644 index 0000000..2b99c9b --- /dev/null +++ b/board/afeb9260/partition.c @@ -0,0 +1,36 @@ +/* + * + * 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 <config.h> +#include <asm/hardware.h> +#include <dataflash.h> + +AT91S_DATAFLASH_INFO dataflash_info[CFG_MAX_DATAFLASH_BANKS]; + +struct dataflash_addr cs[CFG_MAX_DATAFLASH_BANKS] = { + {CFG_DATAFLASH_LOGIC_ADDR_CS0, 0}, /* Logical adress, CS */ + {CFG_DATAFLASH_LOGIC_ADDR_CS1, 1} +}; + +/*define the area offsets*/ +dataflash_protect_t area_list[NB_DATAFLASH_AREA] = { + {0x00000000, 0x000041FF, FLAG_PROTECT_CLEAR, 0, "Bootstrap"}, + {0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"}, + {0x00008400, 0x00041FFF, FLAG_PROTECT_CLEAR, 0, "U-Boot"}, +}; diff --git a/include/configs/afeb9260.h b/include/configs/afeb9260.h new file mode 100644 index 0000000..6241687 --- /dev/null +++ b/include/configs/afeb9260.h @@ -0,0 +1,169 @@ +/* + * (C) Copyright 2008 Sergey Lapin + * + * Configuation settings for the AFEB9260 board. + * Based on configuration for AT91SAM9260-EK + * + * 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 +#define __CONFIG_H + +/* ARM asynchronous clock */ +#define AT91_MAIN_CLOCK 18429952 /* from 18.432 MHz crystal */ +#define AT91_MASTER_CLOCK 89999598 /* peripheral = main / 2 */ +#define CFG_HZ 1000000 /* 1us resolution */ + +#define AT91_SLOW_CLOCK 32768 /* slow clock */ + +#define CONFIG_AT91SAM9260 1 /* It's an Atmel AT91SAM9260 SoC*/ +#define CONFIG_AFEB9260 1 /* on an AFEB9260 Board */ +#undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ + +#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ +#define CONFIG_SETUP_MEMORY_TAGS 1 +#define CONFIG_INITRD_TAG 1 + +#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_RELOCATE_UBOOT + +/* + * Hardware drivers + */ +#define CONFIG_ATMEL_USART 1 +#undef CONFIG_USART0 +#undef CONFIG_USART1 +#undef CONFIG_USART2 +#define CONFIG_USART3 1 /* USART 3 is DBGU */ + +#define CONFIG_BOOTDELAY 3 + +/* + * BOOTP options + */ +#define CONFIG_BOOTP_BOOTFILESIZE 1 +#define CONFIG_BOOTP_BOOTPATH 1 +#define CONFIG_BOOTP_GATEWAY 1 +#define CONFIG_BOOTP_HOSTNAME 1 + +/* + * Command line configuration. + */ +#include <config_cmd_default.h> +#undef CONFIG_CMD_BDI +#undef CONFIG_CMD_IMI +#undef CONFIG_CMD_AUTOSCRIPT +#undef CONFIG_CMD_FPGA +#undef CONFIG_CMD_LOADS +#undef CONFIG_CMD_IMLS + +#define CONFIG_CMD_PING 1 +#define CONFIG_CMD_DHCP 1 + +#define CONFIG_CMD_NAND 1 +#define CONFIG_CMD_USB 1 + +/* SDRAM */ +#define CONFIG_NR_DRAM_BANKS 1 +#define PHYS_SDRAM 0x20000000 +#define PHYS_SDRAM_SIZE 0x04000000 /* 64 megs */ + +/* DataFlash */ +#define CONFIG_HAS_DATAFLASH 1 +#define CFG_SPI_WRITE_TOUT (5*CFG_HZ) +#define CFG_MAX_DATAFLASH_BANKS 2 +#define CFG_DATAFLASH_LOGIC_ADDR_CS0 0xC0000000 /* CS0 */ +#define CFG_DATAFLASH_LOGIC_ADDR_CS1 0xD0000000 /* CS1 */ +#define AT91_SPI_CLK 15000000 +#define DATAFLASH_TCSS (0x1a << 16) +#define DATAFLASH_TCHS (0x1 << 24) + +/* NAND flash */ +#define NAND_MAX_CHIPS 1 +#define CFG_MAX_NAND_DEVICE 1 +#define CFG_NAND_BASE 0x40000000 +#define CFG_NAND_DBW_8 1 + +/* NOR flash - no real flash on this board */ +#define CFG_NO_FLASH 1 + +/* Ethernet */ +#define CONFIG_MACB 1 +#undef CONFIG_RMII /* We have full MII there */ +#define CONFIG_RESET_PHY_R 1 + +#define CONFIG_NET_MULTI 1 +#define CONFIG_NET_RETRY_COUNT 20 + +/* USB */ +#define CONFIG_USB_OHCI_NEW 1 +#define LITTLEENDIAN 1 +#define CONFIG_DOS_PARTITION 1 +#define CFG_USB_OHCI_CPU_INIT 1 +#define CFG_USB_OHCI_REGS_BASE 0x00500000 /* AT91SAM9260_UHP_BASE */ +#define CFG_USB_OHCI_SLOT_NAME "at91sam9260" +#define CFG_USB_OHCI_MAX_ROOT_PORTS 1 +#define CONFIG_USB_STORAGE 1 + +#define CFG_LOAD_ADDR 0x21000000 /* load address */ + +#define CFG_MEMTEST_START PHYS_SDRAM +#define CFG_MEMTEST_END 0x21e00000 + +#undef CFG_USE_DATAFLASH_CS0 +#define CFG_USE_DATAFLASH_CS1 1 +#undef CFG_USE_NANDFLASH + +/* bootstrap + u-boot + env + linux in dataflash on CS1 */ +#define CFG_ENV_IS_IN_DATAFLASH 1 +#define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400) +#define CFG_ENV_OFFSET 0x4200 +#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS1 + CFG_ENV_OFFSET) +#define CFG_ENV_SIZE 0x4200 +#define CONFIG_BOOTCOMMAND "nand read 0x21000000 0xa0000 0x200000; bootm" +#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ + "root=/dev/mtdblock2 " \ + "rw rootfstype=jffs2 panic=20" + +#define CONFIG_BAUDRATE 115200 +#define CFG_BAUDRATE_TABLE {115200 , 19200, 38400, 57600, 9600 } + +#define CFG_PROMPT "U-Boot> " +#define CFG_CBSIZE 256 +#define CFG_MAXARGS 16 +#define CFG_PBSIZE (CFG_CBSIZE + sizeof(CFG_PROMPT) + 16) +#define CFG_LONGHELP 1 +#define CONFIG_CMDLINE_EDITING 1 + +#define ROUND(A, B) (((A) + (B)) & ~((B) - 1)) +/* + * Size of malloc() pool + */ +#define CFG_MALLOC_LEN ROUND(3 * CFG_ENV_SIZE + 128*1024, 0x1000) +#define CFG_GBL_DATA_SIZE 128 /* 128 bytes for initial data */ + +#define CONFIG_STACKSIZE (32*1024) /* regular stack */ + +#ifdef CONFIG_USE_IRQ +#error CONFIG_USE_IRQ not supported +#endif + +#endif + -- 1.5.4.1

3 15

[U-Boot] [PATCH 1/5] 86xx: Move the clear_tlbs before MMU turn on
by Dave Liu 30 Oct '08

30 Oct '08

We must invalidate TLBs before MMU turn on, but currently the code is not, if there are some stale TLB entry valid in the TLBs, it will cause strange issue. Signed-off-by: Dave Liu <daveliu(a)freescale.com> --- cpu/mpc86xx/start.S | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/cpu/mpc86xx/start.S b/cpu/mpc86xx/start.S index 159f3e1..30e6047 100644 --- a/cpu/mpc86xx/start.S +++ b/cpu/mpc86xx/start.S @@ -202,8 +202,12 @@ boot_warm: mtmsr 0 #endif + /* Invalidate BATs */ bl invalidate_bats sync + /* Invalidate all of TLB before MMU turn on */ + bl clear_tlbs + sync #ifdef CONFIG_SYS_L2 /* init the L2 cache */ @@ -275,7 +279,6 @@ in_flash: /* setup the rest of the bats */ bl setup_bats - bl clear_tlbs sync #if (CONFIG_SYS_CCSRBAR_DEFAULT != CONFIG_SYS_CCSRBAR) -- 1.5.4

3 2

[U-Boot] [PATCH 1/7] sh: ap325rxa: Moveed ap325rxa board in board/renesas
by Nobuhiro Iwamatsu 30 Oct '08

30 Oct '08

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> --- Makefile | 2 +- board/ap325rxa/Makefile | 51 ------- board/ap325rxa/ap325rxa.c | 162 --------------------- board/ap325rxa/config.mk | 26 ---- board/ap325rxa/cpld-ap325rxa.c | 206 --------------------------- board/ap325rxa/lowlevel_init.S | 243 -------------------------------- board/ap325rxa/u-boot.lds | 105 -------------- board/renesas/ap325rxa/Makefile | 51 +++++++ board/renesas/ap325rxa/ap325rxa.c | 162 +++++++++++++++++++++ board/renesas/ap325rxa/config.mk | 26 ++++ board/renesas/ap325rxa/cpld-ap325rxa.c | 206 +++++++++++++++++++++++++++ board/renesas/ap325rxa/lowlevel_init.S | 243 ++++++++++++++++++++++++++++++++ board/renesas/ap325rxa/u-boot.lds | 105 ++++++++++++++ 13 files changed, 794 insertions(+), 794 deletions(-) delete mode 100644 board/ap325rxa/Makefile delete mode 100644 board/ap325rxa/ap325rxa.c delete mode 100644 board/ap325rxa/config.mk delete mode 100644 board/ap325rxa/cpld-ap325rxa.c delete mode 100644 board/ap325rxa/lowlevel_init.S delete mode 100644 board/ap325rxa/u-boot.lds create mode 100644 board/renesas/ap325rxa/Makefile create mode 100644 board/renesas/ap325rxa/ap325rxa.c create mode 100644 board/renesas/ap325rxa/config.mk create mode 100644 board/renesas/ap325rxa/cpld-ap325rxa.c create mode 100644 board/renesas/ap325rxa/lowlevel_init.S create mode 100644 board/renesas/ap325rxa/u-boot.lds diff --git a/Makefile b/Makefile index fceb8a2..6da4bff 100644 --- a/Makefile +++ b/Makefile @@ -3145,7 +3145,7 @@ sh7785lcr_config : unconfig ap325rxa_config : unconfig @mkdir -p $(obj)include @echo "#define CONFIG_AP325RXA 1" > $(obj)include/config.h - @$(MKCONFIG) -a $(@:_config=) sh sh4 ap325rxa + @$(MKCONFIG) -a $(@:_config=) sh sh4 ap325rxa renesas #======================================================================== # SPARC diff --git a/board/ap325rxa/Makefile b/board/ap325rxa/Makefile deleted file mode 100644 index 21f3e6e..0000000 --- a/board/ap325rxa/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -######################################################################### -# -# Copyright (C) 2008 Renesas Solutions Corp. -# Copyright (C) 2008 Nobuhiro Iwamatsu <iwamatsu.nobuhiro(a)renesas.com> -# -# board/ap325rxa/Makefile -# -# 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 := ap325rxa.o cpld-ap325rxa.o -SOBJS := lowlevel_init.o - -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) -SOBJS := $(addprefix $(obj),$(SOBJS)) - -$(LIB): $(OBJS) $(SOBJS) - $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) - -clean: - rm -f $(SOBJS) $(OBJS) - -distclean: clean - rm -f $(LIB) core *.bak $(obj).depend - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### diff --git a/board/ap325rxa/ap325rxa.c b/board/ap325rxa/ap325rxa.c deleted file mode 100644 index 9f1112a..0000000 --- a/board/ap325rxa/ap325rxa.c +++ /dev/null @@ -1,162 +0,0 @@ -/* - * Copyright (C) 2008 Renesas Solutions Corp. - * Copyright (C) 2008 Nobuhiro Iwamatsu <iwamatsu.nobuhiro(a)renesas.com> - * - * 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 <asm/io.h> -#include <asm/processor.h> - -/* PRI control register */ -#define PRPRICR5 0xFF800048 /* LMB */ -#define PRPRICR5_D 0x2a - -/* FPGA control */ -#define FPGA_NAND_CTL 0xB410020C -#define FPGA_NAND_RST 0x0008 -#define FPGA_NAND_INIT 0x0000 -#define FPGA_NAND_RST_WAIT 10000 - -/* I/O port data */ -#define PACR_D 0x0000 -#define PBCR_D 0x0000 -#define PCCR_D 0x1000 -#define PDCR_D 0x0000 -#define PECR_D 0x0410 -#define PFCR_D 0xffff -#define PGCR_D 0x0000 -#define PHCR_D 0x5011 -#define PJCR_D 0x4400 -#define PKCR_D 0x7c00 -#define PLCR_D 0x0000 -#define PMCR_D 0x0000 -#define PNCR_D 0x0000 -#define PQCR_D 0x0000 -#define PRCR_D 0x0000 -#define PSCR_D 0x0000 -#define PTCR_D 0x0010 -#define PUCR_D 0x0fff -#define PVCR_D 0xffff -#define PWCR_D 0x0000 -#define PXCR_D 0x7500 -#define PYCR_D 0x0000 -#define PZCR_D 0x5540 - -/* Pin Function Controler data */ -#define PSELA_D 0x1410 -#define PSELB_D 0x0140 -#define PSELC_D 0x0000 -#define PSELD_D 0x0400 - -/* I/O Buffer Hi-Z data */ -#define HIZCRA_D 0x0000 -#define HIZCRB_D 0x1000 -#define HIZCRC_D 0x0000 -#define HIZCRD_D 0x0000 - -/* Module select reg data */ -#define MSELCRA_D 0x0014 -#define MSELCRB_D 0x0018 - -/* Module Stop reg Data */ -#define MSTPCR2_D 0xFFD9F280 - -/* CPLD loader */ -extern void init_cpld(void); - -int checkboard(void) -{ - puts("BOARD: AP325RXA\n"); - return 0; -} - -int board_init(void) -{ - /* Pin Function Controler Init */ - outw(PSELA_D, PSELA); - outw(PSELB_D, PSELB); - outw(PSELC_D, PSELC); - outw(PSELD_D, PSELD); - - /* I/O Buffer Hi-Z Init */ - outw(HIZCRA_D, HIZCRA); - outw(HIZCRB_D, HIZCRB); - outw(HIZCRC_D, HIZCRC); - outw(HIZCRD_D, HIZCRD); - - /* Module select reg Init */ - outw(MSELCRA_D, MSELCRA); - outw(MSELCRB_D, MSELCRB); - - /* Module Stop reg Init */ - outl(MSTPCR2_D, MSTPCR2); - - /* I/O ports */ - outw(PACR_D, PACR); - outw(PBCR_D, PBCR); - outw(PCCR_D, PCCR); - outw(PDCR_D, PDCR); - outw(PECR_D, PECR); - outw(PFCR_D, PFCR); - outw(PGCR_D, PGCR); - outw(PHCR_D, PHCR); - outw(PJCR_D, PJCR); - outw(PKCR_D, PKCR); - outw(PLCR_D, PLCR); - outw(PMCR_D, PMCR); - outw(PNCR_D, PNCR); - outw(PQCR_D, PQCR); - outw(PRCR_D, PRCR); - outw(PSCR_D, PSCR); - outw(PTCR_D, PTCR); - outw(PUCR_D, PUCR); - outw(PVCR_D, PVCR); - outw(PWCR_D, PWCR); - outw(PXCR_D, PXCR); - outw(PYCR_D, PYCR); - outw(PZCR_D, PZCR); - - /* PRI control register Init */ - outl(PRPRICR5_D, PRPRICR5); - - /* cpld init */ - init_cpld(); - - return 0; -} - -int dram_init(void) -{ - DECLARE_GLOBAL_DATA_PTR; - - gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE; - gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE; - printf("DRAM: %dMB\n", CONFIG_SYS_SDRAM_SIZE / (1024 * 1024)); - return 0; -} - -void led_set_state(unsigned short value) -{ -} - -void ide_set_reset(int idereset) -{ - outw(FPGA_NAND_RST, FPGA_NAND_CTL); /* NAND RESET */ - udelay(FPGA_NAND_RST_WAIT); - outw(FPGA_NAND_INIT, FPGA_NAND_CTL); -} diff --git a/board/ap325rxa/config.mk b/board/ap325rxa/config.mk deleted file mode 100644 index b52a5e5..0000000 --- a/board/ap325rxa/config.mk +++ /dev/null @@ -1,26 +0,0 @@ -# -# Copyright (C) 2007 -# Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> -# -# 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 - -# -# TEXT_BASE refers to image _after_ relocation. -# -# NOTE: Must match value used in u-boot.lds (in this directory). -# - -TEXT_BASE = 0x8FFC0000 diff --git a/board/ap325rxa/cpld-ap325rxa.c b/board/ap325rxa/cpld-ap325rxa.c deleted file mode 100644 index 16fadcb..0000000 --- a/board/ap325rxa/cpld-ap325rxa.c +++ /dev/null @@ -1,206 +0,0 @@ -/*************************************************************** - * Project: - * CPLD SlaveSerial Configuration via embedded microprocessor. - * - * Copyright info: - * - * This is free software; you can redistribute it and/or modify - * it as you like. - * - * 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. - * - * Description: - * - * This is the main source file that will allow a microprocessor - * to configure Xilinx Virtex, Virtex-E, Virtex-EM, Virtex-II, - * and Spartan-II devices via the SlaveSerial Configuration Mode. - * This code is discussed in Xilinx Application Note, XAPP502. - * - * History: - * 3-October-2001 MN/MP - Created - * 20-August-2008 Renesas Solutions - Modified to SH7723 - ****************************************************************/ - -#include <common.h> - -/* Serial */ -#define SCIF_BASE 0xffe00000 /* SCIF0 */ -#define SCSMR (vu_short *)(SCIF_BASE + 0x00) -#define SCBRR (vu_char *)(SCIF_BASE + 0x04) -#define SCSCR (vu_short *)(SCIF_BASE + 0x08) -#define SC_TDR (vu_char *)(SCIF_BASE + 0x0C) -#define SC_SR (vu_short *)(SCIF_BASE + 0x10) -#define SCFCR (vu_short *)(SCIF_BASE + 0x18) -#define RFCR (vu_long *)0xFE400020 - -#define SCSCR_INIT 0x0038 -#define SCSCR_CLR 0x0000 -#define SCFCR_INIT 0x0006 -#define SCSMR_INIT 0x0080 -#define RFCR_CLR 0xA400 -#define SCI_TD_E 0x0020 -#define SCI_TDRE_CLEAR 0x00df - -#define BPS_SETTING_VALUE 1 /* 12.5MHz */ -#define WAIT_RFCR_COUNTER 500 - -/* CPLD data size */ -#define CPLD_DATA_SIZE 169216 - -/* out */ -#define CPLD_PFC_ADR ((vu_short *)0xA4050112) - -#define CPLD_PROG_ADR ((vu_char *)0xA4050132) -#define CPLD_PROG_DAT 0x80 - -/* in */ -#define CPLD_INIT_ADR ((vu_char *)0xA4050132) -#define CPLD_INIT_DAT 0x40 -#define CPLD_DONE_ADR ((vu_char *)0xA4050132) -#define CPLD_DONE_DAT 0x20 - -#define HIZCRB ((vu_short *)0xA405015A) - -/* data */ -#define CPLD_NOMAL_START 0xA0A80000 -#define CPLD_SAFE_START 0xA0AC0000 -#define MODE_SW (vu_char *)0xA405012A - -static void init_cpld_loader(void) -{ - - *SCSCR = SCSCR_CLR; - *SCFCR = SCFCR_INIT; - *SCSMR = SCSMR_INIT; - - *SCBRR = BPS_SETTING_VALUE; - - *RFCR = RFCR_CLR; /* Refresh counter clear */ - - while (*RFCR < WAIT_RFCR_COUNTER) - ; - - *SCFCR = 0x0; /* RTRG=00, TTRG=00 */ - /* MCE=0,TFRST=0,RFRST=0,LOOP=0 */ - *SCSCR = SCSCR_INIT; -} - -static int check_write_ready(void) -{ - u16 status = *SC_SR; - return status & SCI_TD_E; -} - -static void write_cpld_data(char ch) -{ - while (!check_write_ready()) - ; - - *SC_TDR = ch; - *SC_SR; - *SC_SR = SCI_TDRE_CLEAR; -} - -static int delay(void) -{ - int i; - int c = 0; - for (i = 0; i < 200; i++) { - c = *(volatile int *)0xa0000000; - } - return c; -} - -/*********************************************************************** - * - * Function: slave_serial - * - * Description: Initiates SlaveSerial Configuration. - * Calls ShiftDataOut() to output serial data - * - ***********************************************************************/ -static void slave_serial(void) -{ - int i; - unsigned char *flash; - - *CPLD_PROG_ADR |= CPLD_PROG_DAT; /* PROGRAM_OE HIGH */ - delay(); - - /* - * Toggle Program Pin by Toggling Program_OE bit - * This is accomplished by writing to the Program Register in the CPLD - * - * NOTE: The Program_OE bit should be driven high to bring the Virtex - * Program Pin low. Likewise, it should be driven low - * to bring the Virtex Program Pin to High-Z - */ - - *CPLD_PROG_ADR &= ~CPLD_PROG_DAT; /* PROGRAM_OE LOW */ - delay(); - - /* - * Bring Program High-Z - * (Drive Program_OE bit low to bring Virtex Program Pin to High-Z - */ - - /* Program_OE bit Low brings the Virtex Program Pin to High Z: */ - *CPLD_PROG_ADR |= CPLD_PROG_DAT; /* PROGRAM_OE HIGH */ - - while ((*CPLD_INIT_ADR & CPLD_INIT_DAT) == 0) - delay(); - - /* Begin Slave-Serial Configuration */ - flash = (unsigned char *)CPLD_NOMAL_START; - - for (i = 0; i < CPLD_DATA_SIZE; i++) - write_cpld_data(*flash++); -} - -/*********************************************************************** - * - * Function: check_done_bit - * - * Description: This function takes monitors the CPLD Input Register - * by checking the status of the DONE bit in that Register. - * By doing so, it monitors the Xilinx Virtex device's DONE - * Pin to see if configuration bitstream has been properly - * loaded - * - ***********************************************************************/ -static void check_done_bit(void) -{ - while (!(*CPLD_DONE_ADR & CPLD_DONE_DAT)) - ; -} - -/*********************************************************************** - * - * Function: init_cpld - * - * Description: Begins Slave Serial configuration of Xilinx FPGA - * - ***********************************************************************/ -void init_cpld(void) -{ - /* Init serial device */ - init_cpld_loader(); - - if (*CPLD_DONE_ADR & CPLD_DONE_DAT) /* Already DONE */ - return; - - *HIZCRB = 0x0000; - *CPLD_PFC_ADR = 0x7c00; /* FPGA PROG = OUTPUT */ - - /* write CPLD data from NOR flash to device */ - slave_serial(); - - /* - * Monitor the DONE bit in the CPLD Input Register to see if - * configuration successful - */ - - check_done_bit(); -} diff --git a/board/ap325rxa/lowlevel_init.S b/board/ap325rxa/lowlevel_init.S deleted file mode 100644 index 4f66588..0000000 --- a/board/ap325rxa/lowlevel_init.S +++ /dev/null @@ -1,243 +0,0 @@ -/* - * Copyright (C) 2008 Renesas Solutions Corp. - * Copyright (C) 2008 Nobuhiro Iwamatsu <iwamatsu.nobuhiro(a)renesas.com> - * - * board/ap325rxa/lowlevel_init.S - * - * 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/processor.h> - -/* - * Board specific low level init code, called _very_ early in the - * startup sequence. Relocation to SDRAM has not happened yet, no - * stack is available, bss section has not been initialised, etc. - * - * (Note: As no stack is available, no subroutines can be called...). - */ - - .global lowlevel_init - - .text - .align 2 - -lowlevel_init: - mov.l DRVCRA_A, r1 - mov.l DRVCRA_D, r0 - mov.w r0, @r1 - - mov.l DRVCRB_A, r1 - mov.l DRVCRB_D, r0 - mov.w r0, @r1 - - mov.l RWTCSR_A, r1 - mov.l RWTCSR_D1, r0 - mov.w r0, @r1 - - mov.l RWTCNT_A, r1 - mov.l RWTCNT_D, r0 - mov.w r0, @r1 - - mov.l RWTCSR_A, r1 - mov.l RWTCSR_D2, r0 - mov.w r0, @r1 - - mov.l FRQCR_A, r1 - mov.l FRQCR_D, r0 - mov.l r0, @r1 - - mov.l CMNCR_A, r1 - mov.l CMNCR_D, r0 - mov.l r0, @r1 - - mov.l CS0BCR_A ,r1 - mov.l CS0BCR_D ,r0 - mov.l r0, @r1 - - mov.l CS4BCR_A ,r1 - mov.l CS4BCR_D ,r0 - mov.l r0, @r1 - - mov.l CS5ABCR_A ,r1 - mov.l CS5ABCR_D ,r0 - mov.l r0, @r1 - - mov.l CS5BBCR_A ,r1 - mov.l CS5BBCR_D ,r0 - mov.l r0, @r1 - - mov.l CS6ABCR_A ,r1 - mov.l CS6ABCR_D ,r0 - mov.l r0, @r1 - - mov.l CS6BBCR_A ,r1 - mov.l CS6BBCR_D ,r0 - mov.l r0, @r1 - - mov.l CS0WCR_A ,r1 - mov.l CS0WCR_D ,r0 - mov.l r0, @r1 - - mov.l CS4WCR_A ,r1 - mov.l CS4WCR_D ,r0 - mov.l r0, @r1 - - mov.l CS5AWCR_A ,r1 - mov.l CS5AWCR_D ,r0 - mov.l r0, @r1 - - mov.l CS5BWCR_A ,r1 - mov.l CS5BWCR_D ,r0 - mov.l r0, @r1 - - mov.l CS6AWCR_A ,r1 - mov.l CS6AWCR_D ,r0 - mov.l r0, @r1 - - mov.l CS6BWCR_A ,r1 - mov.l CS6BWCR_D ,r0 - mov.l r0, @r1 - - mov.l SBSC_SDCR_A, r1 - mov.l SBSC_SDCR_D1, r0 - mov.l r0, @r1 - - mov.l SBSC_SDWCR_A, r1 - mov.l SBSC_SDWCR_D, r0 - mov.l r0, @r1 - - mov.l SBSC_SDPCR_A, r1 - mov.l SBSC_SDPCR_D, r0 - mov.l r0, @r1 - - mov.l SBSC_RTCSR_A, r1 - mov.l SBSC_RTCSR_D, r0 - mov.l r0, @r1 - - mov.l SBSC_RTCNT_A, r1 - mov.l SBSC_RTCNT_D, r0 - mov.l r0, @r1 - - mov.l SBSC_RTCOR_A, r1 - mov.l SBSC_RTCOR_D, r0 - mov.l r0, @r1 - - mov.l SBSC_SDMR3_A1, r1 - mov.l SBSC_SDMR3_D, r0 - mov.b r0, @r1 - - mov.l SBSC_SDMR3_A2, r1 - mov.l SBSC_SDMR3_D, r0 - mov.b r0, @r1 - - mov.l SLEEP_CNT, r1 -2: tst r1, r1 - nop - bf/s 2b - dt r1 - - mov.l SBSC_SDMR3_A3, r1 - mov.l SBSC_SDMR3_D, r0 - mov.b r0, @r1 - - mov.l SBSC_SDCR_A, r1 - mov.l SBSC_SDCR_D2, r0 - mov.l r0, @r1 - - mov.l CCR_A, r1 - mov.l CCR_D, r0 - mov.l r0, @r1 - - ! BL bit off (init = ON) (?!?) - - stc sr, r0 ! BL bit off(init=ON) - mov.l SR_MASK_D, r1 - and r1, r0 - ldc r0, sr - - rts - mov #0, r0 - - .align 2 - -DRVCRA_A: .long DRVCRA -DRVCRB_A: .long DRVCRB -DRVCRA_D: .long 0x4555 -DRVCRB_D: .long 0x0005 - -RWTCSR_A: .long RWTCSR -RWTCNT_A: .long RWTCNT -FRQCR_A: .long FRQCR -RWTCSR_D1: .long 0xa507 -RWTCSR_D2: .long 0xa504 -RWTCNT_D: .long 0x5a00 -FRQCR_D: .long 0x0b04474a - -SBSC_SDCR_A: .long SBSC_SDCR -SBSC_SDWCR_A: .long SBSC_SDWCR -SBSC_SDPCR_A: .long SBSC_SDPCR -SBSC_RTCSR_A: .long SBSC_RTCSR -SBSC_RTCNT_A: .long SBSC_RTCNT -SBSC_RTCOR_A: .long SBSC_RTCOR -SBSC_SDMR3_A1: .long 0xfe510000 -SBSC_SDMR3_A2: .long 0xfe500242 -SBSC_SDMR3_A3: .long 0xfe5c0042 - -SBSC_SDCR_D1: .long 0x92810112 -SBSC_SDCR_D2: .long 0x92810912 -SBSC_SDWCR_D: .long 0x05162482 -SBSC_SDPCR_D: .long 0x00300087 -SBSC_RTCSR_D: .long 0xa55a0212 -SBSC_RTCNT_D: .long 0xa55a0000 -SBSC_RTCOR_D: .long 0xa55a0040 -SBSC_SDMR3_D: .long 0x00 - -CMNCR_A: .long CMNCR -CS0BCR_A: .long CS0BCR -CS4BCR_A: .long CS4BCR -CS5ABCR_A: .long CS5ABCR -CS5BBCR_A: .long CS5BBCR -CS6ABCR_A: .long CS6ABCR -CS6BBCR_A: .long CS6BBCR -CS0WCR_A: .long CS0WCR -CS4WCR_A: .long CS4WCR -CS5AWCR_A: .long CS5AWCR -CS5BWCR_A: .long CS5BWCR -CS6AWCR_A: .long CS6AWCR -CS6BWCR_A: .long CS6BWCR - -CMNCR_D: .long 0x00000013 -CS0BCR_D: .long 0x24920400 -CS4BCR_D: .long 0x24920400 -CS5ABCR_D: .long 0x24920400 -CS5BBCR_D: .long 0x7fff0600 -CS6ABCR_D: .long 0x24920400 -CS6BBCR_D: .long 0x24920600 -CS0WCR_D: .long 0x00000480 -CS4WCR_D: .long 0x00000480 -CS5AWCR_D: .long 0x00000380 -CS5BWCR_D: .long 0x00000600 -CS6AWCR_D: .long 0x00000300 -CS6BWCR_D: .long 0x00000540 - -CCR_A: .long 0xff00001c -CCR_D: .long 0x0000090d - -SLEEP_CNT: .long 0x00000800 -SR_MASK_D: .long 0xEFFFFF0F diff --git a/board/ap325rxa/u-boot.lds b/board/ap325rxa/u-boot.lds deleted file mode 100644 index e9f8dc0..0000000 --- a/board/ap325rxa/u-boot.lds +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyrigth (c) 2007 - * Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> - * - * 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-sh-linux", "elf32-sh-linux", "elf32-sh-linux") -OUTPUT_ARCH(sh) -ENTRY(_start) - -SECTIONS -{ - /* - Base address of internal SDRAM is 0x88000000. - Although size of SDRAM can be either 16 or 32 MBytes, - we assume 16 MBytes (ie ignore upper half if the full - 32 MBytes is present). - - NOTE: This address must match with the definition of - TEXT_BASE in config.mk (in this directory). - - */ - . = 0x88000000 + (128*1024*1024) - (256*1024); - - PROVIDE (reloc_dst = .); - - PROVIDE (_ftext = .); - PROVIDE (_fcode = .); - PROVIDE (_start = .); - - .text : - { - cpu/sh4/start.o (.text) - . = ALIGN(8192); - common/env_embedded.o (.ppcenv) - . = ALIGN(8192); - common/env_embedded.o (.ppcenvr) - . = ALIGN(8192); - *(.text) - . = ALIGN(4); - } =0xFF - PROVIDE (_ecode = .); - .rodata : - { - *(.rodata) - . = ALIGN(4); - } - PROVIDE (_etext = .); - - - PROVIDE (_fdata = .); - .data : - { - *(.data) - . = ALIGN(4); - } - PROVIDE (_edata = .); - - PROVIDE (_fgot = .); - .got : - { - *(.got) - . = ALIGN(4); - } - PROVIDE (_egot = .); - - PROVIDE (__u_boot_cmd_start = .); - .u_boot_cmd : - { - *(.u_boot_cmd) - . = ALIGN(4); - } - PROVIDE (__u_boot_cmd_end = .); - - PROVIDE (reloc_dst_end = .); - /* _reloc_dst_end = .; */ - - PROVIDE (bss_start = .); - PROVIDE (__bss_start = .); - .bss : - { - *(.bss) - . = ALIGN(4); - } - PROVIDE (bss_end = .); - - PROVIDE (_end = .); -} diff --git a/board/renesas/ap325rxa/Makefile b/board/renesas/ap325rxa/Makefile new file mode 100644 index 0000000..21f3e6e --- /dev/null +++ b/board/renesas/ap325rxa/Makefile @@ -0,0 +1,51 @@ +######################################################################### +# +# Copyright (C) 2008 Renesas Solutions Corp. +# Copyright (C) 2008 Nobuhiro Iwamatsu <iwamatsu.nobuhiro(a)renesas.com> +# +# board/ap325rxa/Makefile +# +# 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 := ap325rxa.o cpld-ap325rxa.o +SOBJS := lowlevel_init.o + +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak $(obj).depend + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### diff --git a/board/renesas/ap325rxa/ap325rxa.c b/board/renesas/ap325rxa/ap325rxa.c new file mode 100644 index 0000000..9f1112a --- /dev/null +++ b/board/renesas/ap325rxa/ap325rxa.c @@ -0,0 +1,162 @@ +/* + * Copyright (C) 2008 Renesas Solutions Corp. + * Copyright (C) 2008 Nobuhiro Iwamatsu <iwamatsu.nobuhiro(a)renesas.com> + * + * 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 <asm/io.h> +#include <asm/processor.h> + +/* PRI control register */ +#define PRPRICR5 0xFF800048 /* LMB */ +#define PRPRICR5_D 0x2a + +/* FPGA control */ +#define FPGA_NAND_CTL 0xB410020C +#define FPGA_NAND_RST 0x0008 +#define FPGA_NAND_INIT 0x0000 +#define FPGA_NAND_RST_WAIT 10000 + +/* I/O port data */ +#define PACR_D 0x0000 +#define PBCR_D 0x0000 +#define PCCR_D 0x1000 +#define PDCR_D 0x0000 +#define PECR_D 0x0410 +#define PFCR_D 0xffff +#define PGCR_D 0x0000 +#define PHCR_D 0x5011 +#define PJCR_D 0x4400 +#define PKCR_D 0x7c00 +#define PLCR_D 0x0000 +#define PMCR_D 0x0000 +#define PNCR_D 0x0000 +#define PQCR_D 0x0000 +#define PRCR_D 0x0000 +#define PSCR_D 0x0000 +#define PTCR_D 0x0010 +#define PUCR_D 0x0fff +#define PVCR_D 0xffff +#define PWCR_D 0x0000 +#define PXCR_D 0x7500 +#define PYCR_D 0x0000 +#define PZCR_D 0x5540 + +/* Pin Function Controler data */ +#define PSELA_D 0x1410 +#define PSELB_D 0x0140 +#define PSELC_D 0x0000 +#define PSELD_D 0x0400 + +/* I/O Buffer Hi-Z data */ +#define HIZCRA_D 0x0000 +#define HIZCRB_D 0x1000 +#define HIZCRC_D 0x0000 +#define HIZCRD_D 0x0000 + +/* Module select reg data */ +#define MSELCRA_D 0x0014 +#define MSELCRB_D 0x0018 + +/* Module Stop reg Data */ +#define MSTPCR2_D 0xFFD9F280 + +/* CPLD loader */ +extern void init_cpld(void); + +int checkboard(void) +{ + puts("BOARD: AP325RXA\n"); + return 0; +} + +int board_init(void) +{ + /* Pin Function Controler Init */ + outw(PSELA_D, PSELA); + outw(PSELB_D, PSELB); + outw(PSELC_D, PSELC); + outw(PSELD_D, PSELD); + + /* I/O Buffer Hi-Z Init */ + outw(HIZCRA_D, HIZCRA); + outw(HIZCRB_D, HIZCRB); + outw(HIZCRC_D, HIZCRC); + outw(HIZCRD_D, HIZCRD); + + /* Module select reg Init */ + outw(MSELCRA_D, MSELCRA); + outw(MSELCRB_D, MSELCRB); + + /* Module Stop reg Init */ + outl(MSTPCR2_D, MSTPCR2); + + /* I/O ports */ + outw(PACR_D, PACR); + outw(PBCR_D, PBCR); + outw(PCCR_D, PCCR); + outw(PDCR_D, PDCR); + outw(PECR_D, PECR); + outw(PFCR_D, PFCR); + outw(PGCR_D, PGCR); + outw(PHCR_D, PHCR); + outw(PJCR_D, PJCR); + outw(PKCR_D, PKCR); + outw(PLCR_D, PLCR); + outw(PMCR_D, PMCR); + outw(PNCR_D, PNCR); + outw(PQCR_D, PQCR); + outw(PRCR_D, PRCR); + outw(PSCR_D, PSCR); + outw(PTCR_D, PTCR); + outw(PUCR_D, PUCR); + outw(PVCR_D, PVCR); + outw(PWCR_D, PWCR); + outw(PXCR_D, PXCR); + outw(PYCR_D, PYCR); + outw(PZCR_D, PZCR); + + /* PRI control register Init */ + outl(PRPRICR5_D, PRPRICR5); + + /* cpld init */ + init_cpld(); + + return 0; +} + +int dram_init(void) +{ + DECLARE_GLOBAL_DATA_PTR; + + gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE; + gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE; + printf("DRAM: %dMB\n", CONFIG_SYS_SDRAM_SIZE / (1024 * 1024)); + return 0; +} + +void led_set_state(unsigned short value) +{ +} + +void ide_set_reset(int idereset) +{ + outw(FPGA_NAND_RST, FPGA_NAND_CTL); /* NAND RESET */ + udelay(FPGA_NAND_RST_WAIT); + outw(FPGA_NAND_INIT, FPGA_NAND_CTL); +} diff --git a/board/renesas/ap325rxa/config.mk b/board/renesas/ap325rxa/config.mk new file mode 100644 index 0000000..b52a5e5 --- /dev/null +++ b/board/renesas/ap325rxa/config.mk @@ -0,0 +1,26 @@ +# +# Copyright (C) 2007 +# Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> +# +# 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 + +# +# TEXT_BASE refers to image _after_ relocation. +# +# NOTE: Must match value used in u-boot.lds (in this directory). +# + +TEXT_BASE = 0x8FFC0000 diff --git a/board/renesas/ap325rxa/cpld-ap325rxa.c b/board/renesas/ap325rxa/cpld-ap325rxa.c new file mode 100644 index 0000000..16fadcb --- /dev/null +++ b/board/renesas/ap325rxa/cpld-ap325rxa.c @@ -0,0 +1,206 @@ +/*************************************************************** + * Project: + * CPLD SlaveSerial Configuration via embedded microprocessor. + * + * Copyright info: + * + * This is free software; you can redistribute it and/or modify + * it as you like. + * + * 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. + * + * Description: + * + * This is the main source file that will allow a microprocessor + * to configure Xilinx Virtex, Virtex-E, Virtex-EM, Virtex-II, + * and Spartan-II devices via the SlaveSerial Configuration Mode. + * This code is discussed in Xilinx Application Note, XAPP502. + * + * History: + * 3-October-2001 MN/MP - Created + * 20-August-2008 Renesas Solutions - Modified to SH7723 + ****************************************************************/ + +#include <common.h> + +/* Serial */ +#define SCIF_BASE 0xffe00000 /* SCIF0 */ +#define SCSMR (vu_short *)(SCIF_BASE + 0x00) +#define SCBRR (vu_char *)(SCIF_BASE + 0x04) +#define SCSCR (vu_short *)(SCIF_BASE + 0x08) +#define SC_TDR (vu_char *)(SCIF_BASE + 0x0C) +#define SC_SR (vu_short *)(SCIF_BASE + 0x10) +#define SCFCR (vu_short *)(SCIF_BASE + 0x18) +#define RFCR (vu_long *)0xFE400020 + +#define SCSCR_INIT 0x0038 +#define SCSCR_CLR 0x0000 +#define SCFCR_INIT 0x0006 +#define SCSMR_INIT 0x0080 +#define RFCR_CLR 0xA400 +#define SCI_TD_E 0x0020 +#define SCI_TDRE_CLEAR 0x00df + +#define BPS_SETTING_VALUE 1 /* 12.5MHz */ +#define WAIT_RFCR_COUNTER 500 + +/* CPLD data size */ +#define CPLD_DATA_SIZE 169216 + +/* out */ +#define CPLD_PFC_ADR ((vu_short *)0xA4050112) + +#define CPLD_PROG_ADR ((vu_char *)0xA4050132) +#define CPLD_PROG_DAT 0x80 + +/* in */ +#define CPLD_INIT_ADR ((vu_char *)0xA4050132) +#define CPLD_INIT_DAT 0x40 +#define CPLD_DONE_ADR ((vu_char *)0xA4050132) +#define CPLD_DONE_DAT 0x20 + +#define HIZCRB ((vu_short *)0xA405015A) + +/* data */ +#define CPLD_NOMAL_START 0xA0A80000 +#define CPLD_SAFE_START 0xA0AC0000 +#define MODE_SW (vu_char *)0xA405012A + +static void init_cpld_loader(void) +{ + + *SCSCR = SCSCR_CLR; + *SCFCR = SCFCR_INIT; + *SCSMR = SCSMR_INIT; + + *SCBRR = BPS_SETTING_VALUE; + + *RFCR = RFCR_CLR; /* Refresh counter clear */ + + while (*RFCR < WAIT_RFCR_COUNTER) + ; + + *SCFCR = 0x0; /* RTRG=00, TTRG=00 */ + /* MCE=0,TFRST=0,RFRST=0,LOOP=0 */ + *SCSCR = SCSCR_INIT; +} + +static int check_write_ready(void) +{ + u16 status = *SC_SR; + return status & SCI_TD_E; +} + +static void write_cpld_data(char ch) +{ + while (!check_write_ready()) + ; + + *SC_TDR = ch; + *SC_SR; + *SC_SR = SCI_TDRE_CLEAR; +} + +static int delay(void) +{ + int i; + int c = 0; + for (i = 0; i < 200; i++) { + c = *(volatile int *)0xa0000000; + } + return c; +} + +/*********************************************************************** + * + * Function: slave_serial + * + * Description: Initiates SlaveSerial Configuration. + * Calls ShiftDataOut() to output serial data + * + ***********************************************************************/ +static void slave_serial(void) +{ + int i; + unsigned char *flash; + + *CPLD_PROG_ADR |= CPLD_PROG_DAT; /* PROGRAM_OE HIGH */ + delay(); + + /* + * Toggle Program Pin by Toggling Program_OE bit + * This is accomplished by writing to the Program Register in the CPLD + * + * NOTE: The Program_OE bit should be driven high to bring the Virtex + * Program Pin low. Likewise, it should be driven low + * to bring the Virtex Program Pin to High-Z + */ + + *CPLD_PROG_ADR &= ~CPLD_PROG_DAT; /* PROGRAM_OE LOW */ + delay(); + + /* + * Bring Program High-Z + * (Drive Program_OE bit low to bring Virtex Program Pin to High-Z + */ + + /* Program_OE bit Low brings the Virtex Program Pin to High Z: */ + *CPLD_PROG_ADR |= CPLD_PROG_DAT; /* PROGRAM_OE HIGH */ + + while ((*CPLD_INIT_ADR & CPLD_INIT_DAT) == 0) + delay(); + + /* Begin Slave-Serial Configuration */ + flash = (unsigned char *)CPLD_NOMAL_START; + + for (i = 0; i < CPLD_DATA_SIZE; i++) + write_cpld_data(*flash++); +} + +/*********************************************************************** + * + * Function: check_done_bit + * + * Description: This function takes monitors the CPLD Input Register + * by checking the status of the DONE bit in that Register. + * By doing so, it monitors the Xilinx Virtex device's DONE + * Pin to see if configuration bitstream has been properly + * loaded + * + ***********************************************************************/ +static void check_done_bit(void) +{ + while (!(*CPLD_DONE_ADR & CPLD_DONE_DAT)) + ; +} + +/*********************************************************************** + * + * Function: init_cpld + * + * Description: Begins Slave Serial configuration of Xilinx FPGA + * + ***********************************************************************/ +void init_cpld(void) +{ + /* Init serial device */ + init_cpld_loader(); + + if (*CPLD_DONE_ADR & CPLD_DONE_DAT) /* Already DONE */ + return; + + *HIZCRB = 0x0000; + *CPLD_PFC_ADR = 0x7c00; /* FPGA PROG = OUTPUT */ + + /* write CPLD data from NOR flash to device */ + slave_serial(); + + /* + * Monitor the DONE bit in the CPLD Input Register to see if + * configuration successful + */ + + check_done_bit(); +} diff --git a/board/renesas/ap325rxa/lowlevel_init.S b/board/renesas/ap325rxa/lowlevel_init.S new file mode 100644 index 0000000..4f66588 --- /dev/null +++ b/board/renesas/ap325rxa/lowlevel_init.S @@ -0,0 +1,243 @@ +/* + * Copyright (C) 2008 Renesas Solutions Corp. + * Copyright (C) 2008 Nobuhiro Iwamatsu <iwamatsu.nobuhiro(a)renesas.com> + * + * board/ap325rxa/lowlevel_init.S + * + * 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/processor.h> + +/* + * Board specific low level init code, called _very_ early in the + * startup sequence. Relocation to SDRAM has not happened yet, no + * stack is available, bss section has not been initialised, etc. + * + * (Note: As no stack is available, no subroutines can be called...). + */ + + .global lowlevel_init + + .text + .align 2 + +lowlevel_init: + mov.l DRVCRA_A, r1 + mov.l DRVCRA_D, r0 + mov.w r0, @r1 + + mov.l DRVCRB_A, r1 + mov.l DRVCRB_D, r0 + mov.w r0, @r1 + + mov.l RWTCSR_A, r1 + mov.l RWTCSR_D1, r0 + mov.w r0, @r1 + + mov.l RWTCNT_A, r1 + mov.l RWTCNT_D, r0 + mov.w r0, @r1 + + mov.l RWTCSR_A, r1 + mov.l RWTCSR_D2, r0 + mov.w r0, @r1 + + mov.l FRQCR_A, r1 + mov.l FRQCR_D, r0 + mov.l r0, @r1 + + mov.l CMNCR_A, r1 + mov.l CMNCR_D, r0 + mov.l r0, @r1 + + mov.l CS0BCR_A ,r1 + mov.l CS0BCR_D ,r0 + mov.l r0, @r1 + + mov.l CS4BCR_A ,r1 + mov.l CS4BCR_D ,r0 + mov.l r0, @r1 + + mov.l CS5ABCR_A ,r1 + mov.l CS5ABCR_D ,r0 + mov.l r0, @r1 + + mov.l CS5BBCR_A ,r1 + mov.l CS5BBCR_D ,r0 + mov.l r0, @r1 + + mov.l CS6ABCR_A ,r1 + mov.l CS6ABCR_D ,r0 + mov.l r0, @r1 + + mov.l CS6BBCR_A ,r1 + mov.l CS6BBCR_D ,r0 + mov.l r0, @r1 + + mov.l CS0WCR_A ,r1 + mov.l CS0WCR_D ,r0 + mov.l r0, @r1 + + mov.l CS4WCR_A ,r1 + mov.l CS4WCR_D ,r0 + mov.l r0, @r1 + + mov.l CS5AWCR_A ,r1 + mov.l CS5AWCR_D ,r0 + mov.l r0, @r1 + + mov.l CS5BWCR_A ,r1 + mov.l CS5BWCR_D ,r0 + mov.l r0, @r1 + + mov.l CS6AWCR_A ,r1 + mov.l CS6AWCR_D ,r0 + mov.l r0, @r1 + + mov.l CS6BWCR_A ,r1 + mov.l CS6BWCR_D ,r0 + mov.l r0, @r1 + + mov.l SBSC_SDCR_A, r1 + mov.l SBSC_SDCR_D1, r0 + mov.l r0, @r1 + + mov.l SBSC_SDWCR_A, r1 + mov.l SBSC_SDWCR_D, r0 + mov.l r0, @r1 + + mov.l SBSC_SDPCR_A, r1 + mov.l SBSC_SDPCR_D, r0 + mov.l r0, @r1 + + mov.l SBSC_RTCSR_A, r1 + mov.l SBSC_RTCSR_D, r0 + mov.l r0, @r1 + + mov.l SBSC_RTCNT_A, r1 + mov.l SBSC_RTCNT_D, r0 + mov.l r0, @r1 + + mov.l SBSC_RTCOR_A, r1 + mov.l SBSC_RTCOR_D, r0 + mov.l r0, @r1 + + mov.l SBSC_SDMR3_A1, r1 + mov.l SBSC_SDMR3_D, r0 + mov.b r0, @r1 + + mov.l SBSC_SDMR3_A2, r1 + mov.l SBSC_SDMR3_D, r0 + mov.b r0, @r1 + + mov.l SLEEP_CNT, r1 +2: tst r1, r1 + nop + bf/s 2b + dt r1 + + mov.l SBSC_SDMR3_A3, r1 + mov.l SBSC_SDMR3_D, r0 + mov.b r0, @r1 + + mov.l SBSC_SDCR_A, r1 + mov.l SBSC_SDCR_D2, r0 + mov.l r0, @r1 + + mov.l CCR_A, r1 + mov.l CCR_D, r0 + mov.l r0, @r1 + + ! BL bit off (init = ON) (?!?) + + stc sr, r0 ! BL bit off(init=ON) + mov.l SR_MASK_D, r1 + and r1, r0 + ldc r0, sr + + rts + mov #0, r0 + + .align 2 + +DRVCRA_A: .long DRVCRA +DRVCRB_A: .long DRVCRB +DRVCRA_D: .long 0x4555 +DRVCRB_D: .long 0x0005 + +RWTCSR_A: .long RWTCSR +RWTCNT_A: .long RWTCNT +FRQCR_A: .long FRQCR +RWTCSR_D1: .long 0xa507 +RWTCSR_D2: .long 0xa504 +RWTCNT_D: .long 0x5a00 +FRQCR_D: .long 0x0b04474a + +SBSC_SDCR_A: .long SBSC_SDCR +SBSC_SDWCR_A: .long SBSC_SDWCR +SBSC_SDPCR_A: .long SBSC_SDPCR +SBSC_RTCSR_A: .long SBSC_RTCSR +SBSC_RTCNT_A: .long SBSC_RTCNT +SBSC_RTCOR_A: .long SBSC_RTCOR +SBSC_SDMR3_A1: .long 0xfe510000 +SBSC_SDMR3_A2: .long 0xfe500242 +SBSC_SDMR3_A3: .long 0xfe5c0042 + +SBSC_SDCR_D1: .long 0x92810112 +SBSC_SDCR_D2: .long 0x92810912 +SBSC_SDWCR_D: .long 0x05162482 +SBSC_SDPCR_D: .long 0x00300087 +SBSC_RTCSR_D: .long 0xa55a0212 +SBSC_RTCNT_D: .long 0xa55a0000 +SBSC_RTCOR_D: .long 0xa55a0040 +SBSC_SDMR3_D: .long 0x00 + +CMNCR_A: .long CMNCR +CS0BCR_A: .long CS0BCR +CS4BCR_A: .long CS4BCR +CS5ABCR_A: .long CS5ABCR +CS5BBCR_A: .long CS5BBCR +CS6ABCR_A: .long CS6ABCR +CS6BBCR_A: .long CS6BBCR +CS0WCR_A: .long CS0WCR +CS4WCR_A: .long CS4WCR +CS5AWCR_A: .long CS5AWCR +CS5BWCR_A: .long CS5BWCR +CS6AWCR_A: .long CS6AWCR +CS6BWCR_A: .long CS6BWCR + +CMNCR_D: .long 0x00000013 +CS0BCR_D: .long 0x24920400 +CS4BCR_D: .long 0x24920400 +CS5ABCR_D: .long 0x24920400 +CS5BBCR_D: .long 0x7fff0600 +CS6ABCR_D: .long 0x24920400 +CS6BBCR_D: .long 0x24920600 +CS0WCR_D: .long 0x00000480 +CS4WCR_D: .long 0x00000480 +CS5AWCR_D: .long 0x00000380 +CS5BWCR_D: .long 0x00000600 +CS6AWCR_D: .long 0x00000300 +CS6BWCR_D: .long 0x00000540 + +CCR_A: .long 0xff00001c +CCR_D: .long 0x0000090d + +SLEEP_CNT: .long 0x00000800 +SR_MASK_D: .long 0xEFFFFF0F diff --git a/board/renesas/ap325rxa/u-boot.lds b/board/renesas/ap325rxa/u-boot.lds new file mode 100644 index 0000000..e9f8dc0 --- /dev/null +++ b/board/renesas/ap325rxa/u-boot.lds @@ -0,0 +1,105 @@ +/* + * Copyrigth (c) 2007 + * Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> + * + * 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-sh-linux", "elf32-sh-linux", "elf32-sh-linux") +OUTPUT_ARCH(sh) +ENTRY(_start) + +SECTIONS +{ + /* + Base address of internal SDRAM is 0x88000000. + Although size of SDRAM can be either 16 or 32 MBytes, + we assume 16 MBytes (ie ignore upper half if the full + 32 MBytes is present). + + NOTE: This address must match with the definition of + TEXT_BASE in config.mk (in this directory). + + */ + . = 0x88000000 + (128*1024*1024) - (256*1024); + + PROVIDE (reloc_dst = .); + + PROVIDE (_ftext = .); + PROVIDE (_fcode = .); + PROVIDE (_start = .); + + .text : + { + cpu/sh4/start.o (.text) + . = ALIGN(8192); + common/env_embedded.o (.ppcenv) + . = ALIGN(8192); + common/env_embedded.o (.ppcenvr) + . = ALIGN(8192); + *(.text) + . = ALIGN(4); + } =0xFF + PROVIDE (_ecode = .); + .rodata : + { + *(.rodata) + . = ALIGN(4); + } + PROVIDE (_etext = .); + + + PROVIDE (_fdata = .); + .data : + { + *(.data) + . = ALIGN(4); + } + PROVIDE (_edata = .); + + PROVIDE (_fgot = .); + .got : + { + *(.got) + . = ALIGN(4); + } + PROVIDE (_egot = .); + + PROVIDE (__u_boot_cmd_start = .); + .u_boot_cmd : + { + *(.u_boot_cmd) + . = ALIGN(4); + } + PROVIDE (__u_boot_cmd_end = .); + + PROVIDE (reloc_dst_end = .); + /* _reloc_dst_end = .; */ + + PROVIDE (bss_start = .); + PROVIDE (__bss_start = .); + .bss : + { + *(.bss) + . = ALIGN(4); + } + PROVIDE (bss_end = .); + + PROVIDE (_end = .); +} -- 1.5.6.5

3 4

[U-Boot] [PATCH 1/7] sh: ap325rxa: Moved ap325rxa board to board/renesas
by Nobuhiro Iwamatsu 30 Oct '08

30 Oct '08

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> --- Makefile | 2 +- board/{ => renesas}/ap325rxa/Makefile | 0 board/{ => renesas}/ap325rxa/ap325rxa.c | 0 board/{ => renesas}/ap325rxa/config.mk | 0 board/{ => renesas}/ap325rxa/cpld-ap325rxa.c | 0 board/{ => renesas}/ap325rxa/lowlevel_init.S | 0 board/{ => renesas}/ap325rxa/u-boot.lds | 0 7 files changed, 1 insertions(+), 1 deletions(-) rename board/{ => renesas}/ap325rxa/Makefile (100%) rename board/{ => renesas}/ap325rxa/ap325rxa.c (100%) rename board/{ => renesas}/ap325rxa/config.mk (100%) rename board/{ => renesas}/ap325rxa/cpld-ap325rxa.c (100%) rename board/{ => renesas}/ap325rxa/lowlevel_init.S (100%) rename board/{ => renesas}/ap325rxa/u-boot.lds (100%) diff --git a/Makefile b/Makefile index d6abb4d..04012f8 100644 --- a/Makefile +++ b/Makefile @@ -3179,7 +3179,7 @@ sh7785lcr_config : unconfig ap325rxa_config : unconfig @mkdir -p $(obj)include @echo "#define CONFIG_AP325RXA 1" > $(obj)include/config.h - @$(MKCONFIG) -a $(@:_config=) sh sh4 ap325rxa + @$(MKCONFIG) -a $(@:_config=) sh sh4 ap325rxa renesas #======================================================================== # SPARC diff --git a/board/ap325rxa/Makefile b/board/renesas/ap325rxa/Makefile similarity index 100% rename from board/ap325rxa/Makefile rename to board/renesas/ap325rxa/Makefile diff --git a/board/ap325rxa/ap325rxa.c b/board/renesas/ap325rxa/ap325rxa.c similarity index 100% rename from board/ap325rxa/ap325rxa.c rename to board/renesas/ap325rxa/ap325rxa.c diff --git a/board/ap325rxa/config.mk b/board/renesas/ap325rxa/config.mk similarity index 100% rename from board/ap325rxa/config.mk rename to board/renesas/ap325rxa/config.mk diff --git a/board/ap325rxa/cpld-ap325rxa.c b/board/renesas/ap325rxa/cpld-ap325rxa.c similarity index 100% rename from board/ap325rxa/cpld-ap325rxa.c rename to board/renesas/ap325rxa/cpld-ap325rxa.c diff --git a/board/ap325rxa/lowlevel_init.S b/board/renesas/ap325rxa/lowlevel_init.S similarity index 100% rename from board/ap325rxa/lowlevel_init.S rename to board/renesas/ap325rxa/lowlevel_init.S diff --git a/board/ap325rxa/u-boot.lds b/board/renesas/ap325rxa/u-boot.lds similarity index 100% rename from board/ap325rxa/u-boot.lds rename to board/renesas/ap325rxa/u-boot.lds -- 1.5.6.5

1 6

[U-Boot] [PATCH] libfdt: Fix bug in fdt_subnode_offset_namelen()
by Kumar Gala 30 Oct '08

30 Oct '08

From: David Gibson <david(a)gibson.dropbear.id.au> There's currently an off-by-one bug in fdt_subnode_offset_namelen() which causes it to keep searching after it's finished the subnodes of the given parent, and into the subnodes of siblings of the original node which come after it in the tree. Signed-off-by: David Gibson <david(a)gibson.dropbear.id.au> Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- Jerry, please pick this fix up for u-boot v2008.12. - k libfdt/fdt_ro.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libfdt/fdt_ro.c b/libfdt/fdt_ro.c index b705f91..fdc9c29 100644 --- a/libfdt/fdt_ro.c +++ b/libfdt/fdt_ro.c @@ -112,12 +112,12 @@ int fdt_num_mem_rsv(const void *fdt) int fdt_subnode_offset_namelen(const void *fdt, int offset, const char *name, int namelen) { - int depth; + int depth = 0; FDT_CHECK_HEADER(fdt); - for (depth = 0; - offset >= 0; + for (depth = 0, offset = fdt_next_node(fdt, offset, &depth); + (offset >= 0) && (depth > 0); offset = fdt_next_node(fdt, offset, &depth)) { if (depth < 0) return -FDT_ERR_NOTFOUND; @@ -126,7 +126,10 @@ int fdt_subnode_offset_namelen(const void *fdt, int offset, return offset; } - return offset; /* error */ + if (offset < 0) + return offset; /* error */ + else + return -FDT_ERR_NOTFOUND; } int fdt_subnode_offset(const void *fdt, int parentoffset, -- 1.5.5.1

2 1

[U-Boot] [PATCH 2/2] Moved initialization of IXP4XX_NPE Ethernet controller to cpu_eth_init()
by Ben Warren 30 Oct '08

30 Oct '08

Also, removed the driver initialization from net/eth.c Signed-off-by: Ben Warren <biggerbadderben(a)gmail.com> --- cpu/ixp/cpu.c | 9 +++++++++ include/netdev.h | 1 + net/eth.c | 4 ---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/cpu/ixp/cpu.c b/cpu/ixp/cpu.c index 402188e..27872fb 100644 --- a/cpu/ixp/cpu.c +++ b/cpu/ixp/cpu.c @@ -32,6 +32,7 @@ #include <common.h> #include <command.h> +#include <netdev.h> #include <asm/arch/ixp425.h> ulong loops_per_jiffy; @@ -215,3 +216,11 @@ ulong bootcount_load (void) } #endif /* CONFIG_BOOTCOUNT_LIMIT */ + +int cpu_eth_init(bd_t *bis) +{ +#ifdef CONFIG_IXP4XX_NPE + npe_initialize(bis); +#endif + return 0; +} diff --git a/include/netdev.h b/include/netdev.h index 87d578c..3739980 100644 --- a/include/netdev.h +++ b/include/netdev.h @@ -55,6 +55,7 @@ int mcffec_initialize(bd_t *bis); int mpc512x_fec_initialize(bd_t *bis); int mpc5xxx_fec_initialize(bd_t *bis); int natsemi_initialize(bd_t *bis); +int npe_initialize(bd_t *bis); int ns8382x_initialize(bd_t *bis); int pcnet_initialize(bd_t *bis); int plb2800_eth_initialize(bd_t *bis); diff --git a/net/eth.c b/net/eth.c index ccd871a..cad8fe3 100644 --- a/net/eth.c +++ b/net/eth.c @@ -46,7 +46,6 @@ extern int mv6436x_eth_initialize(bd_t *); extern int mv6446x_eth_initialize(bd_t *); extern int ppc_4xx_eth_initialize(bd_t *); extern int scc_initialize(bd_t*); -extern int npe_initialize(bd_t *); extern int uec_initialize(int); #ifdef CONFIG_API @@ -193,9 +192,6 @@ int eth_initialize(bd_t *bis) #if defined(CONFIG_AU1X00) au1x00_enet_initialize(bis); #endif -#if defined(CONFIG_IXP4XX_NPE) - npe_initialize(bis); -#endif if (!eth_devices) { puts ("No ethernet found.\n"); show_boot_progress (-64); -- 1.5.4.3

1 0

[U-Boot] [PATCH 4/4] NAND: Properly create JFFS2 cleanmarkers.
by Scott Wood 29 Oct '08

29 Oct '08

As reported by Ilko Iliev <iliev(a)ronetix.at>, the "nand erase clean" command is currently broken, and among other things causes all blocks to be marked bad. This implements it properly using MTD_OOB_AUTO, along with some indentation fixes. Signed-off-by: Scott Wood <scottwood(a)freescale.com> --- drivers/mtd/nand/nand_util.c | 30 +++++++++++------------------- 1 files changed, 11 insertions(+), 19 deletions(-) diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c index 52b3d21..149af83 100644 --- a/drivers/mtd/nand/nand_util.c +++ b/drivers/mtd/nand/nand_util.c @@ -78,9 +78,7 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts) const char *mtd_device = meminfo->name; struct mtd_oob_ops oob_opts; struct nand_chip *chip = meminfo->priv; - uint8_t buf[64]; - memset(buf, 0, sizeof(buf)); memset(&erase, 0, sizeof(erase)); memset(&oob_opts, 0, sizeof(oob_opts)); @@ -89,13 +87,9 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts) erase.addr = opts->offset; erase_length = opts->length; - cleanmarker.magic = cpu_to_je16 (JFFS2_MAGIC_BITMASK); cleanmarker.nodetype = cpu_to_je16 (JFFS2_NODETYPE_CLEANMARKER); cleanmarker.totlen = cpu_to_je32(8); - cleanmarker.hdr_crc = cpu_to_je32( - crc32_no_comp(0, (unsigned char *) &cleanmarker, - sizeof(struct jffs2_unknown_node) - 4)); /* scrub option allows to erase badblock. To prevent internal * check from erase() method, set block check method to dummy @@ -154,23 +148,21 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts) } /* format for JFFS2 ? */ - if (opts->jffs2) { - - chip->ops.len = chip->ops.ooblen = 64; + if (opts->jffs2 && chip->ecc.layout->oobavail >= 8) { + chip->ops.ooblen = 8; chip->ops.datbuf = NULL; - chip->ops.oobbuf = buf; - chip->ops.ooboffs = chip->badblockpos & ~0x01; + chip->ops.oobbuf = (uint8_t *)&cleanmarker; + chip->ops.ooboffs = 0; + chip->ops.mode = MTD_OOB_AUTO; result = meminfo->write_oob(meminfo, - erase.addr + meminfo->oobsize, - &chip->ops); + erase.addr, + &chip->ops); if (result != 0) { printf("\n%s: MTD writeoob failure: %d\n", - mtd_device, result); + mtd_device, result); continue; } - else - printf("%s: MTD writeoob at 0x%08x\n",mtd_device, erase.addr + meminfo->oobsize ); } if (!opts->quiet) { @@ -190,11 +182,11 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts) percent_complete = percent; printf("\rErasing at 0x%x -- %3d%% complete.", - erase.addr, percent); + erase.addr, percent); if (opts->jffs2 && result == 0) - printf(" Cleanmarker written at 0x%x.", - erase.addr); + printf(" Cleanmarker written at 0x%x.", + erase.addr); } } } -- 1.5.6.rc1.6.gc53ad

1 0