diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2017-02-11 17:30:18 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2017-02-11 23:31:47 +0100 |
| commit | ca9b9969fb3f3853f7c6beb43bd496d90c7efe80 (patch) | |
| tree | 5c32a8613ed51d7cae6778181b9b1231576b4516 /package/kernel/lantiq/ltq-vmmc/patches/500-ar9_vr9.patch | |
| parent | c7ce9908bd58af60153716aa64a72510a3a26b35 (diff) | |
| download | upstream-ca9b9969fb3f3853f7c6beb43bd496d90c7efe80.tar.gz upstream-ca9b9969fb3f3853f7c6beb43bd496d90c7efe80.tar.bz2 upstream-ca9b9969fb3f3853f7c6beb43bd496d90c7efe80.zip | |
ltq-vmmc: fix build with kernel 4.9
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/kernel/lantiq/ltq-vmmc/patches/500-ar9_vr9.patch')
| -rw-r--r-- | package/kernel/lantiq/ltq-vmmc/patches/500-ar9_vr9.patch | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/package/kernel/lantiq/ltq-vmmc/patches/500-ar9_vr9.patch b/package/kernel/lantiq/ltq-vmmc/patches/500-ar9_vr9.patch index 953724e473..a54cb79179 100644 --- a/package/kernel/lantiq/ltq-vmmc/patches/500-ar9_vr9.patch +++ b/package/kernel/lantiq/ltq-vmmc/patches/500-ar9_vr9.patch @@ -1,5 +1,5 @@ ---- drv_vmmc-1.9.0_orig/src/mps/drv_mps_vmmc_ar9.c 2010-03-08 14:08:30.000000000 +0100 -+++ drv_vmmc-1.9.0/src/mps/drv_mps_vmmc_ar9.c 2014-10-14 21:49:20.000000000 +0200 +--- a/src/mps/drv_mps_vmmc_ar9.c ++++ b/src/mps/drv_mps_vmmc_ar9.c @@ -30,15 +30,24 @@ #include "ifxos_interrupt.h" @@ -17,7 +17,7 @@ #include "drv_mps_vmmc.h" #include "drv_mps_vmmc_dbg.h" #include "drv_mps_vmmc_device.h" - + +const void (*ifx_bsp_basic_mps_decrypt)(unsigned int addr, int n) = NULL; + +#define IFX_MPS_SRAM IFXMIPS_MPS_SRAM @@ -25,7 +25,7 @@ /* ============================= */ /* Local Macros & Definitions */ /* ============================= */ -@@ -108,6 +108,7 @@ +@@ -98,6 +107,7 @@ IFX_int32_t (*ifx_wdog_callback) (IFX_ui */ IFX_int32_t ifx_mps_fw_wdog_start_ar9() { @@ -33,7 +33,7 @@ /* vpe1_wdog_ctr should be set up in u-boot as "vpe1_wdog_ctr_addr=0xBF2001B0"; protection from incorrect or missing setting */ -@@ -292,7 +302,19 @@ +@@ -292,6 +302,18 @@ IFX_int32_t ifx_mps_download_firmware (m decryption. Subtract sizeof(u32) from length to avoid decryption of data beyond the FW image code */ pFWDwnld->length -= sizeof(IFX_uint32_t); @@ -52,8 +52,7 @@ ifx_bsp_basic_mps_decrypt((IFX_uint32_t)cpu1_base_addr, pFWDwnld->length); } - /* calculate CRC32 checksum over downloaded image */ -@@ -306,7 +320,7 @@ +@@ -306,7 +328,7 @@ IFX_int32_t ifx_mps_download_firmware (m TRACE (MPS, DBG_LEVEL_HIGH, ("MPS: FW checksum error: img=0x%08x calc=0x%08x\r\n", pFW_img_data->crc32, cksum)); @@ -62,7 +61,7 @@ } } else -@@ -454,62 +473,62 @@ +@@ -454,62 +476,62 @@ IFX_int32_t ifx_mps_wdog_callback (IFX_u #endif /* DEBUG */ /* reset SmartSLIC */ @@ -176,8 +175,8 @@ /* recalculate and compare the firmware checksum */ ifx_mps_fw_crc_compare(cpu1_base_addr, pFW_img_data); ---- drv_vmmc-1.9.0_orig/src/drv_vmmc_amazon_s.h 2009-12-03 17:20:34.000000000 +0100 -+++ drv_vmmc-1.9.0/src/drv_vmmc_amazon_s.h 2014-10-16 10:30:48.000000000 +0200 +--- a/src/drv_vmmc_amazon_s.h ++++ b/src/drv_vmmc_amazon_s.h @@ -16,7 +16,7 @@ @@ -233,7 +232,7 @@ } while(0); /** -@@ -73,11 +34,6 @@ +@@ -73,11 +34,6 @@ do { \ */ #define VMMC_DRIVER_UNLOAD_HOOK(ret) \ do { \ |