Changeset 2710

Show
Ignore:
Timestamp:
06/05/07 14:40:57 (2 years ago)
Author:
tg
Message:

• $ svn merge -c -2707 .

requested by wbx@ because
– the change breaks things
– n0-1@ wants to maintain it

• comment out brcm-2.6 selection for now tho

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/target/Config.in

    r2707 r2710  
    1111depends on ! FWRT_LINUX_SNAPSHOT_META_TARGET 
    1212source "target/linux/brcm-2.4/Config.in" 
     13#source "target/linux/brcm-2.6/Config.in" 
    1314source "target/linux/rb-2.4/Config.in" 
    1415source "target/linux/rb-2.6/Config.in" 
    …… 
    2728        select FWRT_PACKAGE_MTD 
    2829        select FWRT_PACKAGE_FWCF 
     30        select FWRT_PACKAGE_JFFS2ROOT 
    2931        select FWRT_KERNEL_JFFS2_FS  
    3032        select FWRT_KERNEL_JFFS2_BBC_LZARI 
    31         depends on FWRT_LINUX_2_4_BRCM 
     33        depends on FWRT_LINUX_2_4_BRCM || FWRT_LINUX_2_6_BRCM 
    3234        help 
    3335          Build firmware images with a writable jffs2 root filesystem. 
    …… 
    4143        select FWRT_KERNEL_SQUASHFS  
    4244        select FWRT_KERNEL_MINI_FO 
    43         depends on FWRT_LINUX_2_4_BRCM 
     45        depends on FWRT_LINUX_2_4_BRCM || FWRT_LINUX_2_6_BRCM 
    4446        help 
    4547          Build firmware images with a read-only and highly compressed