Changeset 9342


Ignore:
Timestamp:
2007-10-18T09:40:01+02:00 (10 years ago)
Author:
juhosg
Message:

[adm5120] add ids for Edimax BR-6104Wg boards

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/adm5120/files/arch/mips/adm5120/boards/edimax.c

    r9009 r9342  
    3131 
    3232#include <adm5120_board.h> 
     33#include <adm5120_irq.h> 
    3334#include <adm5120_platform.h> 
    3435 
    35 static struct mtd_partition br6104k_partitions[] = { 
     36static struct adm5120_pci_irq br61xx_pci_irqs[] __initdata = { 
     37        PCIIRQ(2, 0, 1, ADM5120_IRQ_PCI0), 
     38}; 
     39 
     40static struct mtd_partition br61xx_partitions[] = { 
    3641        { 
    3742                .name   = "admboot", 
     
    5560}; 
    5661 
    57 static void __init br6104k_setup(void) { 
     62static struct platform_device *br61x4wg_devices[] __initdata = { 
     63        &adm5120_flash0_device, 
     64}; 
     65 
     66static void __init br61xx_setup(void) { 
    5867        /* setup data for flash0 device */ 
    59         adm5120_flash0_data.nr_parts = ARRAY_SIZE(br6104k_partitions); 
    60         adm5120_flash0_data.parts = br6104k_partitions; 
     68        adm5120_flash0_data.nr_parts = ARRAY_SIZE(br61xx_partitions); 
     69        adm5120_flash0_data.parts = br61xx_partitions; 
    6170 
    6271        /* TODO: setup mac addresses, if possible */ 
    6372} 
    6473 
    65 unsigned char br6104k_vlans[6] = { 
     74unsigned char br61xx_vlans[6] = { 
    6675        0x41, 0x42, 0x44, 0x48, 0x50, 0x00 
    6776}; 
     
    6978static struct adm5120_board br6104k_board __initdata = { 
    7079        .mach_type      = MACH_ADM5120_BR6104K, 
    71         .name           = "Edimax BR-6104K", 
    72         .board_setup    = br6104k_setup, 
     80        .name           = "Edimax BR-6104K/6104KP", 
     81        .board_setup    = br61xx_setup, 
    7382        .eth_num_ports  = 5, 
    74         .eth_vlans      = br6104k_vlans, 
     83        .eth_vlans      = br61xx_vlans, 
    7584        .num_devices    = ARRAY_SIZE(br6104k_devices), 
    7685        .devices        = br6104k_devices, 
     86}; 
     87 
     88static struct adm5120_board br61x4wg_board __initdata = { 
     89        .mach_type      = MACH_ADM5120_BR61x4WG, 
     90        .name           = "Edimax BR-6104WG/6114WG", 
     91        .board_setup    = br61xx_setup, 
     92        .eth_num_ports  = 5, 
     93        .eth_vlans      = br61xx_vlans, 
     94        .num_devices    = ARRAY_SIZE(br61x4wg_devices), 
     95        .devices        = br61x4wg_devices, 
     96        .pci_nr_irqs    = ARRAY_SIZE(br61xx_pci_irqs), 
     97        .pci_irq_map    = br61xx_pci_irqs, 
    7798}; 
    7899 
     
    80101{ 
    81102        adm5120_board_register(&br6104k_board); 
     103        adm5120_board_register(&br61x4wg_board); 
    82104        return 0; 
    83105} 
  • trunk/target/linux/adm5120/files/arch/mips/adm5120/prom.c

    r9263 r9342  
    6363        DEFBOARD("BR-6104K",    MACH_ADM5120_BR6104K), 
    6464        DEFBOARD("BR-6104KP",   MACH_ADM5120_BR6104K), 
     65        DEFBOARD("BR-6104WG",   MACH_ADM5120_BR61x4WG), 
    6566        /* Infineon boards */ 
    6667        DEFBOARD("EASY 5120P-ATA",      MACH_ADM5120_EASY5120PATA), 
  • trunk/target/linux/adm5120/image/lzma-loader/src/config.h

    r8128 r9342  
    7070#endif 
    7171 
     72#if defined(CONFIG_BOARD_BR6104WG) 
     73#  define CONFIG_BOARD_NAME     "BR-6104WG" 
     74#  define CONFIG_FLASH_SIZE     FLASH_2M 
     75#endif 
     76 
    7277/* 
    7378 * Infineon boards 
  • trunk/target/linux/adm5120/image/router_le.mk

    r9141 r9342  
    205205 
    206206# 
     207# Edimax BR-6104WG 
     208# 
     209define Image/Build/Board/BR6104WG 
     210        $(call Image/Build/Edimax,$(1),br-6104wg) 
     211endef 
     212 
     213define Image/Build/Board/BR6104WG/squashfs 
     214        $(call Image/Build/Board/BR6104WG,squashfs) 
     215endef 
     216 
     217define Image/Build/Board/BR6104WG/Initramfs 
     218        $(call Image/Build/LZMAKernel/Admboot,br-6104wg,gz) 
     219endef 
     220 
     221# 
    207222# Infineon EASY 83000 
    208223# 
     
    255270define Image/Build/Group/Edimax 
    256271        $(call Image/Build/Board/BR6104K/$(1)) 
     272        $(call Image/Build/Board/BR6104WG/$(1)) 
    257273endef 
    258274 
  • trunk/target/linux/adm5120/patches-2.6.23/001-adm5120.patch

    r9258 r9342  
    5555--- linux-2.6.23.orig/include/asm-mips/bootinfo.h 
    5656+++ linux-2.6.23/include/asm-mips/bootinfo.h 
    57 @@ -208,6 +208,58 @@ 
     57@@ -208,6 +208,59 @@ 
    5858 #define MACH_GROUP_WINDRIVER   28      /* Windriver boards */ 
    5959 #define MACH_WRPPMC             1 
     
    108108+#define MACH_ADM5120_EASY5120WVOIP 44  /* Infineon EASY 5120-WVoIP */ 
    109109+#define MACH_ADM5120_EASY83000 45      /* Infineon EASY-83000 */ 
    110 +#define MACH_ADM5120_BR6104K   46      /* Edimax BR-6104K */ 
     110+#define MACH_ADM5120_BR6104K   46      /* Edimax BR-6104K/BR-6104KP */ 
    111111+#define MACH_ADM5120_RB_192    47      /* Mikrotik RouterBOARD 192 */ 
     112+#define MACH_ADM5120_BR61x4WG  48      /* Edimax BR-6104Wg/BR-6114WG */ 
    112113+ 
    113114 #define CL_SIZE                        COMMAND_LINE_SIZE 
  • trunk/tools/firmware-utils/src/csysimg.h

    r8702 r9342  
    44 *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org> 
    55 * 
    6  *  This program was based on the code found in various Linux  
     6 *  This program was based on the code found in various Linux 
    77 *  source tarballs released by Edimax for it's devices. 
    88 *  Original author: David Hsu <davidhsu@realtek.com.tw> 
     
    3434 
    3535 
    36 /*  
     36/* 
    3737 * Generic signatures 
    3838 */ 
     
    4141#define SIG_BOOT_RTL    "\x00\x00\x40\x21" 
    4242 
    43 /*  
     43/* 
    4444 * Web page signatures 
    4545 */ 
    4646#define SIG_BR6104K     "WB4K" 
    4747#define SIG_BR6104KP    "WBKP" 
     48#define SIG_BR6104Wg    "WBGW" 
    4849#define SIG_BR6104IPC   "WBIP" 
    4950#define SIG_BR6114WG    SIG_BR6104IPC 
     
    6768#define SIG_XRT402D     SIG_BR6524K 
    6869 
    69 /*  
    70  * CSYS image file header  
     70/* 
     71 * CSYS image file header 
    7172 */ 
    7273struct csys_header { 
  • trunk/tools/firmware-utils/src/mkcsysimg.c

    r8538 r9342  
    153153        BOARD_ADM("BR-6104K", "Edimax BR-6104K", 2, SIG_BR6104K), 
    154154        BOARD_ADM("BR-6104KP", "Edimax BR-6104KP", 2, SIG_BR6104KP), 
     155        BOARD_ADM("BR-6104Wg", "Edimax BR-6104Wg", 2, SIG_BR6104Wg), 
    155156        BOARD_ADM("BR-6114WG", "Edimax BR-6114WG", 2, SIG_BR6114WG), 
    156157        BOARD_ADM("BR-6524K", "Edimax BR-6524K", 2, SIG_BR6524K), 
Note: See TracChangeset for help on using the changeset viewer.