From 08abf72f92b0fd48b6ad95269cb7e1b79faf4fc5 Mon Sep 17 00:00:00 2001 From: blogic Date: Sat, 15 Dec 2012 02:00:45 +0000 Subject: [PATCH] [lantiq] move voice packages git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34695 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../lantiq}/ltq-tapi/Config.in | 0 .../lantiq}/ltq-tapi/Makefile | 0 .../ltq-tapi/patches/000-portability.patch | 0 .../lantiq}/ltq-tapi/patches/100-ifxmips.patch | 0 .../lantiq}/ltq-tapi/patches/200-linux-37.patch | 0 .../lantiq}/ltq-vmmc/Config.in | 16 ++++++++-------- .../lantiq}/ltq-vmmc/Makefile | 0 .../lantiq}/ltq-vmmc/files/vmmc.init | 0 .../ltq-vmmc/patches/000-portability.patch | 0 .../lantiq}/ltq-vmmc/patches/100-target.patch | 15 ++++++++++++++- .../lantiq}/ltq-vmmc/patches/400-falcon.patch | 0 11 files changed, 22 insertions(+), 9 deletions(-) rename package/{system => platform/lantiq}/ltq-tapi/Config.in (100%) rename package/{system => platform/lantiq}/ltq-tapi/Makefile (100%) rename package/{system => platform/lantiq}/ltq-tapi/patches/000-portability.patch (100%) rename package/{system => platform/lantiq}/ltq-tapi/patches/100-ifxmips.patch (100%) rename package/{system => platform/lantiq}/ltq-tapi/patches/200-linux-37.patch (100%) rename package/{system => platform/lantiq}/ltq-vmmc/Config.in (92%) rename package/{system => platform/lantiq}/ltq-vmmc/Makefile (100%) rename package/{system => platform/lantiq}/ltq-vmmc/files/vmmc.init (100%) rename package/{system => platform/lantiq}/ltq-vmmc/patches/000-portability.patch (100%) rename package/{system => platform/lantiq}/ltq-vmmc/patches/100-target.patch (97%) rename package/{system => platform/lantiq}/ltq-vmmc/patches/400-falcon.patch (100%) diff --git a/package/system/ltq-tapi/Config.in b/package/platform/lantiq/ltq-tapi/Config.in similarity index 100% rename from package/system/ltq-tapi/Config.in rename to package/platform/lantiq/ltq-tapi/Config.in diff --git a/package/system/ltq-tapi/Makefile b/package/platform/lantiq/ltq-tapi/Makefile similarity index 100% rename from package/system/ltq-tapi/Makefile rename to package/platform/lantiq/ltq-tapi/Makefile diff --git a/package/system/ltq-tapi/patches/000-portability.patch b/package/platform/lantiq/ltq-tapi/patches/000-portability.patch similarity index 100% rename from package/system/ltq-tapi/patches/000-portability.patch rename to package/platform/lantiq/ltq-tapi/patches/000-portability.patch diff --git a/package/system/ltq-tapi/patches/100-ifxmips.patch b/package/platform/lantiq/ltq-tapi/patches/100-ifxmips.patch similarity index 100% rename from package/system/ltq-tapi/patches/100-ifxmips.patch rename to package/platform/lantiq/ltq-tapi/patches/100-ifxmips.patch diff --git a/package/system/ltq-tapi/patches/200-linux-37.patch b/package/platform/lantiq/ltq-tapi/patches/200-linux-37.patch similarity index 100% rename from package/system/ltq-tapi/patches/200-linux-37.patch rename to package/platform/lantiq/ltq-tapi/patches/200-linux-37.patch diff --git a/package/system/ltq-vmmc/Config.in b/package/platform/lantiq/ltq-vmmc/Config.in similarity index 92% rename from package/system/ltq-vmmc/Config.in rename to package/platform/lantiq/ltq-vmmc/Config.in index 3a5e0145c..89e1bc5cb 100644 --- a/package/system/ltq-vmmc/Config.in +++ b/package/platform/lantiq/ltq-vmmc/Config.in @@ -7,16 +7,16 @@ choice config VOICE_CPE_VMMC_WITH_DEVICE_DANUBE bool "Danube, Twinpass, Vinax" - depends on TARGET_lantiq_danube + depends on TARGET_lantiq_xway - config VOICE_CPE_VMMC_WITH_DEVICE_AR9 - bool "AR9 family" - depends on TARGET_lantiq_ar9 +# config VOICE_CPE_VMMC_WITH_DEVICE_AR9 +# bool "AR9 family" +# depends on TARGET_lantiq_ar9 - config VOICE_CPE_VMMC_WITH_DEVICE_VR9 - bool "VR9 family" - depends on TARGET_lantiq_vr9 - +# config VOICE_CPE_VMMC_WITH_DEVICE_VR9 +# bool "VR9 family" +# depends on TARGET_lantiq_vr9 +# config VOICE_VMMC_WITH_DEVICE_FALCON bool "FALC-ON" depends on (TARGET_lantiq_falcon||TARGET_lantiq_falcon_stable) diff --git a/package/system/ltq-vmmc/Makefile b/package/platform/lantiq/ltq-vmmc/Makefile similarity index 100% rename from package/system/ltq-vmmc/Makefile rename to package/platform/lantiq/ltq-vmmc/Makefile diff --git a/package/system/ltq-vmmc/files/vmmc.init b/package/platform/lantiq/ltq-vmmc/files/vmmc.init similarity index 100% rename from package/system/ltq-vmmc/files/vmmc.init rename to package/platform/lantiq/ltq-vmmc/files/vmmc.init diff --git a/package/system/ltq-vmmc/patches/000-portability.patch b/package/platform/lantiq/ltq-vmmc/patches/000-portability.patch similarity index 100% rename from package/system/ltq-vmmc/patches/000-portability.patch rename to package/platform/lantiq/ltq-vmmc/patches/000-portability.patch diff --git a/package/system/ltq-vmmc/patches/100-target.patch b/package/platform/lantiq/ltq-vmmc/patches/100-target.patch similarity index 97% rename from package/system/ltq-vmmc/patches/100-target.patch rename to package/platform/lantiq/ltq-vmmc/patches/100-target.patch index eae621eaf..cabd2d199 100644 --- a/package/system/ltq-vmmc/patches/100-target.patch +++ b/package/platform/lantiq/ltq-vmmc/patches/100-target.patch @@ -159,7 +159,7 @@ +static void inline bsp_mask_and_ack_irq(int x) +{ + struct irq_data d; -+ d.irq = x; ++ d.hwirq = x; + ltq_mask_and_ack_irq(&d); +} +#endif @@ -735,4 +735,17 @@ +#include "drv_vmmc_init.h" #include "drv_vmmc_api.h" #include "drv_vmmc_bbd.h" + +Index: drv_vmmc-1.9.0/src/mps/drv_mps_vmmc_danube.c +=================================================================== +--- drv_vmmc-1.9.0.orig/src/mps/drv_mps_vmmc_danube.c 2012-12-13 08:43:16.080109377 +0100 ++++ drv_vmmc-1.9.0/src/mps/drv_mps_vmmc_danube.c 2012-12-13 08:43:48.584110192 +0100 +@@ -44,7 +44,7 @@ + # include + +-#define LQ_RCU_BASE_ADDR (KSEG1 + LTQ_RCU_BASE_ADDR) ++#define LQ_RCU_BASE_ADDR (KSEG1 + 0x1F203000) + # define LQ_RCU_RST ((u32 *)(LQ_RCU_BASE_ADDR + 0x0010)) + #define IFX_RCU_RST_REQ_CPU1 (1 << 3) + # define IFX_RCU_RST_REQ LQ_RCU_RST diff --git a/package/system/ltq-vmmc/patches/400-falcon.patch b/package/platform/lantiq/ltq-vmmc/patches/400-falcon.patch similarity index 100% rename from package/system/ltq-vmmc/patches/400-falcon.patch rename to package/platform/lantiq/ltq-vmmc/patches/400-falcon.patch