diff --git a/u-boot/board/rockchip/common/storage/storage.c b/u-boot/board/rockchip/common/storage/storage.c index c1d978c26c..b2cc44483c 100755 --- a/u-boot/board/rockchip/common/storage/storage.c +++ b/u-boot/board/rockchip/common/storage/storage.c @@ -344,7 +344,7 @@ uint32 StorageUbootDataStore(uint32 Index, void *Buf) return StorageSysDataStore(Index + UBOOT_SYS_DATA_OFFSET, Buf); } -uint32 UsbStorageSysDataLoad(uint32 offset, uint32 len, uint32 *Buf) +uint32 StorageVendorSysDataLoad(uint32 offset, uint32 len, uint32 *Buf) { uint32 ret = FTL_ERROR; uint32 i; @@ -363,7 +363,7 @@ uint32 UsbStorageSysDataLoad(uint32 offset, uint32 len, uint32 *Buf) return ret; } -uint32 UsbStorageSysDataStore(uint32 offset, uint32 len, uint32 *Buf) +uint32 StorageVendorSysDataStore(uint32 offset, uint32 len, uint32 *Buf) { uint32 ret = FTL_ERROR; uint32 i; diff --git a/u-boot/board/rockchip/common/storage/storage.h b/u-boot/board/rockchip/common/storage/storage.h index 80bc93d8ca..6c4f6f4fbb 100755 --- a/u-boot/board/rockchip/common/storage/storage.h +++ b/u-boot/board/rockchip/common/storage/storage.h @@ -58,8 +58,8 @@ extern uint32 StorageGetSDFwOffset(void); extern uint32 StorageGetSDSysOffset(void); extern int StorageReadId(void *pbuf); extern int32 StorageInit(void); -extern uint32 UsbStorageSysDataLoad(uint32 offset, uint32 len, uint32 *Buf); -extern uint32 UsbStorageSysDataStore(uint32 offset, uint32 len, uint32 *Buf); +extern uint32 StorageVendorSysDataLoad(uint32 offset, uint32 len, uint32 *Buf); +extern uint32 StorageVendorSysDataStore(uint32 offset, uint32 len, uint32 *Buf); #ifdef RK_SDCARD_BOOT_EN extern uint32 StorageSDCardUpdateMode(void); #endif diff --git a/u-boot/common/cmd_rockusb.c b/u-boot/common/cmd_rockusb.c index 0da19ee856..86b9b85a7d 100755 --- a/u-boot/common/cmd_rockusb.c +++ b/u-boot/common/cmd_rockusb.c @@ -780,7 +780,7 @@ void rkusb_handle_datarx(void) } else if(usbcmd.cmnd == K_FW_LBA_WRITE_10) { if(usbcmd.lba >= 0xFFFFFF00) { - UsbStorageSysDataStore(usbcmd.lba - 0xFFFFFF00, rxdata_blocks, (uint32 *)rxdata_buf); + StorageVendorSysDataStore(usbcmd.lba - 0xFFFFFF00, rxdata_blocks, (uint32 *)rxdata_buf); usbcmd.lba += rxdata_blocks; } else if(usbcmd.lba == 0xFFFFF000) { @@ -848,7 +848,7 @@ start: } else if(usbcmd.cmnd == K_FW_LBA_READ_10) { if(usbcmd.lba >= 0xFFFFFF00) - UsbStorageSysDataLoad(usbcmd.pre_read.pre_lba - 0xFFFFFF00, pre_blocks, (uint32 *)usbcmd.pre_read.pre_buffer); + StorageVendorSysDataLoad(usbcmd.pre_read.pre_lba - 0xFFFFFF00, pre_blocks, (uint32 *)usbcmd.pre_read.pre_buffer); else if(usbcmd.lba == 0xFFFFF000) SecureBootUnlockCheck(usbcmd.pre_read.pre_buffer); else