diff options
author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-01-14 16:34:25 +0000 |
---|---|---|
committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-01-14 16:34:25 +0000 |
commit | 3ac4802f48d6a61ddf364255a618f9b4cbd8a5a9 (patch) | |
tree | 1982a7691196cb35f9b74d28f27a6782307f50f9 | |
parent | dc131c0a6e13e2d670ed3c9112a88b0cf3f9b7d9 (diff) |
target: enable XZ BCJ decompressor code after r35097
Required to actually be able to mount squashfs xz compressed
filesystems.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35156 3c298f89-4303-0410-b956-a3cf2f4a3e73
24 files changed, 48 insertions, 0 deletions
diff --git a/target/linux/at91/config-default b/target/linux/at91/config-default index 97c98989a..5b1534d2d 100644 --- a/target/linux/at91/config-default +++ b/target/linux/at91/config-default @@ -193,6 +193,8 @@ CONFIG_VECTORS_BASE=0xffff0000 # CONFIG_VFP is not set # CONFIG_WLAN is not set CONFIG_XZ_DEC=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_BCJ=y CONFIG_ZBOOT_ROM_BSS=0 CONFIG_ZBOOT_ROM_TEXT=0 CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/brcm2708/config-3.3 b/target/linux/brcm2708/config-3.3 index 1902a7590..f75111936 100644 --- a/target/linux/brcm2708/config-3.3 +++ b/target/linux/brcm2708/config-3.3 @@ -241,6 +241,8 @@ CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_VT_CONSOLE_SLEEP=y CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_BCJ=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/cns3xxx/config-3.3 b/target/linux/cns3xxx/config-3.3 index 6db30d6c2..422d0ccc1 100644 --- a/target/linux/cns3xxx/config-3.3 +++ b/target/linux/cns3xxx/config-3.3 @@ -196,6 +196,8 @@ CONFIG_VECTORS_BASE=0xffff0000 CONFIG_VFP=y CONFIG_WATCHDOG_NOWAYOUT=y CONFIG_XPS=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_BCJ=y CONFIG_ZBOOT_ROM_BSS=0 CONFIG_ZBOOT_ROM_TEXT=0 CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/ep93xx/config-3.3 b/target/linux/ep93xx/config-3.3 index 35b067602..69c94d37d 100644 --- a/target/linux/ep93xx/config-3.3 +++ b/target/linux/ep93xx/config-3.3 @@ -189,6 +189,8 @@ CONFIG_VM_EVENT_COUNTERS=y CONFIG_VT=y CONFIG_VT_CONSOLE=y # CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_BCJ=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/ep93xx/config-3.6 b/target/linux/ep93xx/config-3.6 index 35b067602..69c94d37d 100644 --- a/target/linux/ep93xx/config-3.6 +++ b/target/linux/ep93xx/config-3.6 @@ -189,6 +189,8 @@ CONFIG_VM_EVENT_COUNTERS=y CONFIG_VT=y CONFIG_VT_CONSOLE=y # CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_BCJ=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/gemini/config-3.3 b/target/linux/gemini/config-3.3 index 477f857ec..b2a219124 100644 --- a/target/linux/gemini/config-3.3 +++ b/target/linux/gemini/config-3.3 @@ -131,6 +131,8 @@ CONFIG_USB_SUPPORT=y CONFIG_VECTORS_BASE=0xffff0000 CONFIG_VM_EVENT_COUNTERS=y CONFIG_WAN=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_BCJ=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/imx21/config-default b/target/linux/imx21/config-default index 8bda76c91..068f1552c 100644 --- a/target/linux/imx21/config-default +++ b/target/linux/imx21/config-default @@ -125,6 +125,8 @@ CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_VECTORS_BASE=0xffff0000 # CONFIG_VFP is not set # CONFIG_WATCHDOG is not set +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_BCJ=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/iop32x/config-3.3 b/target/linux/iop32x/config-3.3 index b5e9aaf2f..6ce112bf1 100644 --- a/target/linux/iop32x/config-3.3 +++ b/target/linux/iop32x/config-3.3 @@ -142,6 +142,8 @@ CONFIG_VECTORS_BASE=0xffff0000 CONFIG_VM_EVENT_COUNTERS=y CONFIG_WAN=y CONFIG_XSCALE_PMU=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_BCJ=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/ixp4xx/config-3.3 b/target/linux/ixp4xx/config-3.3 index 9a8dcb836..c56a188a0 100644 --- a/target/linux/ixp4xx/config-3.3 +++ b/target/linux/ixp4xx/config-3.3 @@ -183,5 +183,7 @@ CONFIG_VECTORS_BASE=0xffff0000 CONFIG_VM_EVENT_COUNTERS=y CONFIG_WATCHDOG_NOWAYOUT=y CONFIG_XSCALE_PMU=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_BCJ=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 diff --git a/target/linux/kirkwood/config-3.3 b/target/linux/kirkwood/config-3.3 index 5e1beb11a..c03a30c32 100644 --- a/target/linux/kirkwood/config-3.3 +++ b/target/linux/kirkwood/config-3.3 @@ -171,6 +171,8 @@ CONFIG_VECTORS_BASE=0xffff0000 # CONFIG_VFP is not set CONFIG_VM_EVENT_COUNTERS=y CONFIG_WAN=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_BCJ=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/mcs814x/config-default b/target/linux/mcs814x/config-default index 5011107fe..842eb0f0f 100644 --- a/target/linux/mcs814x/config-default +++ b/target/linux/mcs814x/config-default @@ -183,6 +183,8 @@ CONFIG_WATCHDOG_NOWAYOUT=y # CONFIG_WEXT_SPY is not set # CONFIG_WIRELESS_EXT is not set CONFIG_XZ_DEC=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_BCJ=y CONFIG_ZBOOT_ROM_BSS=0 CONFIG_ZBOOT_ROM_TEXT=0 CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/mpc52xx/config-3.3 b/target/linux/mpc52xx/config-3.3 index 6aa64705f..16d14a8b0 100644 --- a/target/linux/mpc52xx/config-3.3 +++ b/target/linux/mpc52xx/config-3.3 @@ -268,3 +268,5 @@ CONFIG_VM_EVENT_COUNTERS=y CONFIG_WATCHDOG_NOWAYOUT=y # CONFIG_WATCHDOG_RTAS is not set CONFIG_WORD_SIZE=32 +CONFIG_XZ_DEC_BCJ=y +CONFIG_XZ_DEC_POWERPC=y diff --git a/target/linux/mpc83xx/config-3.7 b/target/linux/mpc83xx/config-3.7 index a04cbfdde..45bf49531 100644 --- a/target/linux/mpc83xx/config-3.7 +++ b/target/linux/mpc83xx/config-3.7 @@ -406,3 +406,5 @@ CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y CONFIG_YAFFS_XATTR=y CONFIG_YAFFS_YAFFS1=y CONFIG_YAFFS_YAFFS2=y +CONFIG_XZ_DEC_BCJ=y +CONFIG_XZ_DEC_POWERPC=y diff --git a/target/linux/mvebu/config-default b/target/linux/mvebu/config-default index eddfff789..4255efa21 100644 --- a/target/linux/mvebu/config-default +++ b/target/linux/mvebu/config-default @@ -250,6 +250,8 @@ CONFIG_VFAT_FS=y CONFIG_VFP=y CONFIG_VFPv3=y # CONFIG_XEN is not set +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_BCJ=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/omap4/config-default b/target/linux/omap4/config-default index 88a4307d7..b125c27fb 100644 --- a/target/linux/omap4/config-default +++ b/target/linux/omap4/config-default @@ -367,6 +367,8 @@ CONFIG_WL12XX_SDIO=m # CONFIG_WL12XX_SPI is not set CONFIG_XPS=y CONFIG_XZ_DEC=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_BCJ=y CONFIG_ZBOOT_ROM_BSS=0 CONFIG_ZBOOT_ROM_TEXT=0 CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/orion/config-3.3 b/target/linux/orion/config-3.3 index d6cc421e0..1098c6a5b 100644 --- a/target/linux/orion/config-3.3 +++ b/target/linux/orion/config-3.3 @@ -145,6 +145,8 @@ CONFIG_USB_SUPPORT=y CONFIG_VECTORS_BASE=0xffff0000 # CONFIG_VFP is not set CONFIG_VM_EVENT_COUNTERS=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_BCJ=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/ppc40x/config-3.7 b/target/linux/ppc40x/config-3.7 index 0d784c67b..73be0446f 100644 --- a/target/linux/ppc40x/config-3.7 +++ b/target/linux/ppc40x/config-3.7 @@ -234,3 +234,5 @@ CONFIG_USB_SUPPORT=y CONFIG_WORD_SIZE=32 # CONFIG_XILINX_SYSACE is not set # CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set +CONFIG_XZ_DEC_BCJ=y +CONFIG_XZ_DEC_POWERPC=y diff --git a/target/linux/ppc44x/config-3.7 b/target/linux/ppc44x/config-3.7 index de300783e..4243b10f1 100644 --- a/target/linux/ppc44x/config-3.7 +++ b/target/linux/ppc44x/config-3.7 @@ -234,4 +234,6 @@ CONFIG_USB_SUPPORT=y CONFIG_WORD_SIZE=32 # CONFIG_XILINX_SYSACE is not set # CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set +CONFIG_XZ_DEC_BCJ=y +CONFIG_XZ_DEC_POWERPC=y # CONFIG_YOSEMITE is not set diff --git a/target/linux/pxa/config-3.3 b/target/linux/pxa/config-3.3 index 204305162..40857399c 100644 --- a/target/linux/pxa/config-3.3 +++ b/target/linux/pxa/config-3.3 @@ -193,6 +193,8 @@ CONFIG_UNIX=m CONFIG_VECTORS_BASE=0xffff0000 # CONFIG_VLAN_8021Q is not set CONFIG_XSCALE_PMU=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_BCJ=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/realview/config-3.3 b/target/linux/realview/config-3.3 index 7c4356505..ade5029a0 100644 --- a/target/linux/realview/config-3.3 +++ b/target/linux/realview/config-3.3 @@ -232,5 +232,7 @@ CONFIG_VECTORS_BASE=0xffff0000 CONFIG_VFP=y CONFIG_VFPv3=y CONFIG_XPS=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_BCJ=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 diff --git a/target/linux/realview/config-3.8 b/target/linux/realview/config-3.8 index 85f3f8952..6b1cf6217 100644 --- a/target/linux/realview/config-3.8 +++ b/target/linux/realview/config-3.8 @@ -259,5 +259,7 @@ CONFIG_VECTORS_BASE=0xffff0000 CONFIG_VFP=y CONFIG_VFPv3=y CONFIG_XPS=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_BCJ=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 diff --git a/target/linux/x86/config-3.3 b/target/linux/x86/config-3.3 index 8c69e274c..d0fc49e4f 100644 --- a/target/linux/x86/config-3.3 +++ b/target/linux/x86/config-3.3 @@ -377,4 +377,6 @@ CONFIG_X86_UP_IOAPIC=y CONFIG_X86_VERBOSE_BOOTUP=y CONFIG_X86_WP_WORKS_OK=y CONFIG_X86_XADD=y +CONFIG_XZ_DEC_BCJ=y +CONFIG_XZ_DEC_X86=y # CONFIG_ZONE_DMA32 is not set diff --git a/target/linux/x86/config-3.6 b/target/linux/x86/config-3.6 index 3833049be..5a07d0113 100644 --- a/target/linux/x86/config-3.6 +++ b/target/linux/x86/config-3.6 @@ -383,4 +383,6 @@ CONFIG_X86_VERBOSE_BOOTUP=y CONFIG_X86_WP_WORKS_OK=y CONFIG_X86_XADD=y CONFIG_XZ_DEC=y +CONFIG_XZ_DEC_BCJ=y +CONFIG_XZ_DEC_X86=y # CONFIG_ZONE_DMA32 is not set diff --git a/target/linux/x86/config-3.7 b/target/linux/x86/config-3.7 index 54e7e8ec4..4f4dba2d4 100644 --- a/target/linux/x86/config-3.7 +++ b/target/linux/x86/config-3.7 @@ -386,4 +386,6 @@ CONFIG_X86_VERBOSE_BOOTUP=y CONFIG_X86_WP_WORKS_OK=y CONFIG_X86_XADD=y CONFIG_XZ_DEC=y +CONFIG_XZ_DEC_BCJ=y +CONFIG_XZ_DEC_X86=y # CONFIG_ZONE_DMA32 is not set |