From: Florian Fainelli Date: Mon, 14 Jan 2013 16:34:25 +0000 (+0000) Subject: target: enable XZ BCJ decompressor code after r35097 X-Git-Tag: reboot~11593 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1e103b2eccfdc9ddd98db65380a3d9054301d980;p=openwrt%2Fstaging%2Fblogic.git target: enable XZ BCJ decompressor code after r35097 Required to actually be able to mount squashfs xz compressed filesystems. Signed-off-by: Florian Fainelli SVN-Revision: 35156 --- diff --git a/target/linux/at91/config-default b/target/linux/at91/config-default index 97c98989a763..5b1534d2d23c 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 1902a7590058..f751119369ca 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 6db30d6c2c47..422d0ccc1da1 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 35b06760274e..69c94d37dddd 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 35b06760274e..69c94d37dddd 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 477f857ec7fa..b2a219124505 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 8bda76c91432..068f1552c9c9 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 b5e9aaf2f1f1..6ce112bf101b 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 9a8dcb836df2..c56a188a0fb2 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 5e1beb11a97a..c03a30c32920 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 5011107fe4db..842eb0f0f8fe 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 6aa64705f0b2..16d14a8b0a4b 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 a04cbfddea61..45bf49531182 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 eddfff7896ee..4255efa210a7 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 88a4307d7bfb..b125c27fb3de 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 d6cc421e01e1..1098c6a5b11d 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 0d784c67b7b8..73be0446fe09 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 de300783ed89..4243b10f19df 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 2043051625e0..40857399c10a 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 7c4356505848..ade5029a0cc7 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 85f3f89523c1..6b1cf621764d 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 8c69e274cb85..d0fc49e4f8f8 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 3833049be12a..5a07d011344f 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 54e7e8ec48b0..4f4dba2d41b8 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