diff options
author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-10-29 14:51:47 (GMT) |
---|---|---|
committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-10-30 03:43:28 (GMT) |
commit | 91d29ee1a82fedcd7d1bbf24007b31a49c47e90a (patch) | |
tree | 83fea421302411a92023b74545b454c4c24212ef /drivers/staging/bcm/nvm.c | |
parent | 2e44f765dfd3a8592c2d6b6005be061eccdee137 (diff) | |
download | linux-fsl-qoriq-91d29ee1a82fedcd7d1bbf24007b31a49c47e90a.tar.xz |
beceem: remove ifdef's
There were a lot of ifdef's for driver options which have no
configuration options. Choose the current value and remove the
ifdef.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Diffstat (limited to 'drivers/staging/bcm/nvm.c')
-rw-r--r-- | drivers/staging/bcm/nvm.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c index 41c9ab8..95716f5 100644 --- a/drivers/staging/bcm/nvm.c +++ b/drivers/staging/bcm/nvm.c @@ -2642,20 +2642,8 @@ static INT BcmInitEEPROMQueues(PMINI_ADAPTER Adapter) INT BcmInitNVM(PMINI_ADAPTER ps_adapter) { -#ifdef BCM_SHM_INTERFACE -#ifdef FLASH_DIRECT_ACCESS - unsigned int data,data1,data2 = 1; - wrm(ps_adapter, PAD_SELECT_REGISTER, &data2, 4); - data1 = rdm(ps_adapter,SYS_CFG,&data,4); - data1 = rdm(ps_adapter,SYS_CFG,&data,4); - data2 = (data | 0x80 | 0x8000); - wrm(ps_adapter,SYS_CFG, &data2,4); // over-write as Flash boot mode -#endif - ps_adapter->eNVMType = NVM_FLASH; -#else BcmValidateNvmType(ps_adapter); BcmInitEEPROMQueues(ps_adapter); -#endif if(ps_adapter->eNVMType == NVM_AUTODETECT) { @@ -3070,7 +3058,6 @@ INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter) memset(Adapter->psFlashCSInfo, 0 ,sizeof(FLASH_CS_INFO)); memset(Adapter->psFlash2xCSInfo, 0 ,sizeof(FLASH2X_CS_INFO)); -#ifndef BCM_SHM_INTERFACE if(!Adapter->bDDRInitDone) { { @@ -3079,7 +3066,6 @@ INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter) } } -#endif // Reading first 8 Bytes to get the Flash Layout // MagicNumber(4 bytes) +FlashLayoutMinorVersion(2 Bytes) +FlashLayoutMajorVersion(2 Bytes) @@ -3147,9 +3133,7 @@ INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter) return STATUS_FAILURE; } ConvertEndianOf2XCSStructure(Adapter->psFlash2xCSInfo); -#ifndef BCM_SHM_INTERFACE BcmDumpFlash2XCSStructure(Adapter->psFlash2xCSInfo,Adapter); -#endif if((FLASH_CONTROL_STRUCT_SIGNATURE == Adapter->psFlash2xCSInfo->MagicNumber) && (SCSI_FIRMWARE_MINOR_VERSION <= MINOR_VERSION(Adapter->psFlash2xCSInfo->SCSIFirmwareVersion)) && (FLASH_SECTOR_SIZE_SIG == Adapter->psFlash2xCSInfo->FlashSectorSizeSig) && @@ -3181,9 +3165,7 @@ INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter) Concerns: what if CS sector size does not match with this sector size ??? what is the indication of AccessBitMap in CS in flash 2.x ???? */ -#ifndef BCM_SHM_INTERFACE Adapter->ulFlashID = BcmReadFlashRDID(Adapter); -#endif Adapter->uiFlashLayoutMajorVersion = uiFlashLayoutMajorVersion; |