Changeset 15233


Ignore:
Timestamp:
2009-04-17T11:54:19+02:00 (9 years ago)
Author:
florian
Message:

merge r15232 to 8.09

Location:
branches/8.09/target/linux/brcm47xx
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • branches/8.09/target/linux/brcm47xx/config-2.6.25

    r12690 r15233  
    6969# CONFIG_E100 is not set 
    7070# CONFIG_E1000E_ENABLED is not set 
    71 CONFIG_EARLY_PRINTK=y 
    7271CONFIG_FS_POSIX_ACL=y 
    7372CONFIG_GENERIC_CLOCKEVENTS=y 
     
    245244CONFIG_SYSVIPC_SYSCTL=y 
    246245CONFIG_SYS_HAS_CPU_MIPS32_R1=y 
    247 CONFIG_SYS_HAS_EARLY_PRINTK=y 
    248246CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 
    249247CONFIG_SYS_SUPPORTS_ARBIT_HZ=y 
  • branches/8.09/target/linux/brcm47xx/patches-2.6.25/800-fix_cfe_detection.patch

    r13014 r15233  
    9999-       prom_init_cmdline(); 
    100100+       if (prom_init_cfe() == 0) { 
    101 +               prom_init_console_cfe(); 
    102 +               prom_init_cmdline_cfe(); 
     101+               //prom_init_console_cfe(); 
     102+               //prom_init_cmdline_cfe(); 
    103103+               __prom_putchar = prom_putchar_cfe; 
    104104+       } 
Note: See TracChangeset for help on using the changeset viewer.