Changeset 7902


Ignore:
Timestamp:
2007-07-09T18:36:19+02:00 (11 years ago)
Author:
juhosg
Message:

disable image generation for boards which we still have problems with (at least if CONFIG_DEVEL is not selected)

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • tags/kamikaze_7.07/target/linux/adm5120-2.6/image/Makefile

    r7856 r7902  
    8383 
    8484define Image/Build/RouterBoard 
    85         $(CP) $(KDIR)/vmlinux.elf $(IMGNAME)-vmlinux 
     85        $(CP) $(KDIR)/vmlinux.elf $(IMGNAME)-rb1xx-vmlinux 
    8686        $(STAGING_DIR)/bin/patch-cmdline $(KDIR)/vmlinux.elf '$(strip $(call Image/cmdline/yaffs2)) ' 
    8787endef 
     
    9292ifneq ($(1),jffs2-128k) 
    9393        $(call Image/Build/Compex,$(1),wp54g-wrt,$(patsubst jffs2-%,jffs2,$(1)),WP54G-WRT) 
     94ifeq (CONFIG_DEVEL,y) 
    9495        $(call Image/Build/Edimax,$(1),br-6104k,$(patsubst jffs2-%,jffs2,$(1)),BR-6104K) 
    9596        $(call Image/Build/Edimax,$(1),br-6104kp,$(patsubst jffs2-%,jffs2,$(1)),BR-6104KP) 
     
    116117        $(call Image/Build/MyLoader,$(1),wpp54g,$(patsubst jffs2-%,jffs2,$(1)),WPP54G) 
    117118        $(call Image/Build/MyLoader,$(1),wpp54ag,$(patsubst jffs2-%,jffs2,$(1)),WPP54AG) 
     119endif 
    118120endif 
    119121endif 
     
    144146endef 
    145147 
     148define Image/Build/Initramfs/RouterBoard 
     149        $(CP) $(KDIR)/vmlinux.elf $(IMGNAME)-ramfs-rb1xx.elf 
     150endef 
     151 
    146152define Image/Build/Initramfs 
     153        $(call Image/Build/Initramfs/RouterBoard) 
     154        $(call Image/Build/LZMAKernel/Compex,wp54g-wrt,bin) 
     155ifeq (CONFIG_DEVEL,y) 
    147156        $(call Image/Build/LZMAKernel/Generic,generic,bin) 
    148         $(call Image/Build/LZMAKernel/Generic,rb-100,elf) 
    149157        $(call Image/Build/LZMAKernel/Generic,np27g,bin) 
    150158        $(call Image/Build/LZMAKernel/Generic,wp54g,bin) 
    151         $(call Image/Build/LZMAKernel/Compex,wp54g-wrt,bin) 
    152159        $(call Image/Build/LZMAKernel/Admboot,br-6104k,gz) 
    153160        $(call Image/Build/LZMAKernel/Admboot,easy-5120,gz) 
     
    159166        $(call Image/Build/LZMAKernel/Admboot,cas-790,gz) 
    160167        $(call Image/Build/LZMAKernel/Admboot,cas-861,gz) 
     168endif 
    161169endef 
    162170 
  • tags/kamikaze_7.07/target/linux/adm5120-2.6/image/lzma-loader/src/board.c

    r7673 r7902  
    11/* 
    2  * ADM5120 specific board support for LZMA decompressor  
     2 * ADM5120 specific board support for LZMA decompressor 
    33 * 
    44 * Copyright (C) 2007 OpenWrt.org 
     
    2525#define WRITEREG(r,v)   *(volatile unsigned int *)(r) = v 
    2626 
    27 /*  
     27/* 
    2828 * INTC definitions 
    2929 */ 
     
    3333#define INTC_REG_IRQ_DISABLE    0x0C 
    3434 
    35 /*  
     35/* 
    3636 * UART definitions 
    3737 */ 
     
    6262#define UART_FLAG_TXFE  ( 1 << 7 )      /* TX FIFO empty */ 
    6363 
    64 /*  
     64/* 
    6565 * SWITCH definitions 
    6666 */ 
     
    9797static void uart_init(void) 
    9898{ 
     99#if 0 
    99100        unsigned int t; 
    100          
     101 
    101102        /* disable uart */ 
    102103        UART_WRITE(UART_REG_CTRL, 0); 
     
    107108        t = UART_READ(UART_REG_LCRL); 
    108109        UART_WRITE(UART_REG_LCRL, t); 
    109          
     110 
    110111        /* keep data, stop, and parity bits, but disable FIFO */ 
    111112        t = UART_READ(UART_REG_LCRH); 
     
    118119        /* enable uart, and disable interrupts */ 
    119120        UART_WRITE(UART_REG_CTRL, UART_CTRL_EN); 
     121#endif 
    120122} 
    121123 
     
    126128        UART_WRITE(UART_REG_DATA, ch); 
    127129 
    128         while ((UART_READ(UART_REG_FLAG) & UART_FLAG_TXFF) != 0); 
     130        while ((UART_READ(UART_REG_FLAG) & UART_FLAG_TXFE) == 0); 
    129131} 
    130132 
     
    151153{ 
    152154        /* disable PHYS ports */ 
    153         SWITCH_WRITE(SWITCH_REG_PORT_CONF0,  
     155        SWITCH_WRITE(SWITCH_REG_PORT_CONF0, 
    154156            (SWITCH_PORTS_HW << PORT_CONF0_DP_SHIFT)); 
    155157 
     
    160162        SWITCH_WRITE(SWITCH_REG_GPIO_CONF0, 0); 
    161163        SWITCH_WRITE(SWITCH_REG_GPIO_CONF2, 0); 
    162          
     164 
    163165        /* disable LED lines */ 
    164166        SWITCH_WRITE(SWITCH_REG_PORT0_LED, 0); 
  • trunk/target/linux/adm5120-2.6/image/Makefile

    r7856 r7902  
    8383 
    8484define Image/Build/RouterBoard 
    85         $(CP) $(KDIR)/vmlinux.elf $(IMGNAME)-vmlinux 
     85        $(CP) $(KDIR)/vmlinux.elf $(IMGNAME)-rb1xx-vmlinux 
    8686        $(STAGING_DIR)/bin/patch-cmdline $(KDIR)/vmlinux.elf '$(strip $(call Image/cmdline/yaffs2)) ' 
    8787endef 
     
    9292ifneq ($(1),jffs2-128k) 
    9393        $(call Image/Build/Compex,$(1),wp54g-wrt,$(patsubst jffs2-%,jffs2,$(1)),WP54G-WRT) 
     94ifeq (CONFIG_DEVEL,y) 
    9495        $(call Image/Build/Edimax,$(1),br-6104k,$(patsubst jffs2-%,jffs2,$(1)),BR-6104K) 
    9596        $(call Image/Build/Edimax,$(1),br-6104kp,$(patsubst jffs2-%,jffs2,$(1)),BR-6104KP) 
     
    116117        $(call Image/Build/MyLoader,$(1),wpp54g,$(patsubst jffs2-%,jffs2,$(1)),WPP54G) 
    117118        $(call Image/Build/MyLoader,$(1),wpp54ag,$(patsubst jffs2-%,jffs2,$(1)),WPP54AG) 
     119endif 
    118120endif 
    119121endif 
     
    144146endef 
    145147 
     148define Image/Build/Initramfs/RouterBoard 
     149        $(CP) $(KDIR)/vmlinux.elf $(IMGNAME)-ramfs-rb1xx.elf 
     150endef 
     151 
    146152define Image/Build/Initramfs 
     153        $(call Image/Build/Initramfs/RouterBoard) 
     154        $(call Image/Build/LZMAKernel/Compex,wp54g-wrt,bin) 
     155ifeq (CONFIG_DEVEL,y) 
    147156        $(call Image/Build/LZMAKernel/Generic,generic,bin) 
    148         $(call Image/Build/LZMAKernel/Generic,rb-100,elf) 
    149157        $(call Image/Build/LZMAKernel/Generic,np27g,bin) 
    150158        $(call Image/Build/LZMAKernel/Generic,wp54g,bin) 
    151         $(call Image/Build/LZMAKernel/Compex,wp54g-wrt,bin) 
    152159        $(call Image/Build/LZMAKernel/Admboot,br-6104k,gz) 
    153160        $(call Image/Build/LZMAKernel/Admboot,easy-5120,gz) 
     
    159166        $(call Image/Build/LZMAKernel/Admboot,cas-790,gz) 
    160167        $(call Image/Build/LZMAKernel/Admboot,cas-861,gz) 
     168endif 
    161169endef 
    162170 
  • trunk/target/linux/adm5120-2.6/image/lzma-loader/src/board.c

    r7673 r7902  
    11/* 
    2  * ADM5120 specific board support for LZMA decompressor  
     2 * ADM5120 specific board support for LZMA decompressor 
    33 * 
    44 * Copyright (C) 2007 OpenWrt.org 
     
    2525#define WRITEREG(r,v)   *(volatile unsigned int *)(r) = v 
    2626 
    27 /*  
     27/* 
    2828 * INTC definitions 
    2929 */ 
     
    3333#define INTC_REG_IRQ_DISABLE    0x0C 
    3434 
    35 /*  
     35/* 
    3636 * UART definitions 
    3737 */ 
     
    6262#define UART_FLAG_TXFE  ( 1 << 7 )      /* TX FIFO empty */ 
    6363 
    64 /*  
     64/* 
    6565 * SWITCH definitions 
    6666 */ 
     
    9797static void uart_init(void) 
    9898{ 
     99#if 0 
    99100        unsigned int t; 
    100          
     101 
    101102        /* disable uart */ 
    102103        UART_WRITE(UART_REG_CTRL, 0); 
     
    107108        t = UART_READ(UART_REG_LCRL); 
    108109        UART_WRITE(UART_REG_LCRL, t); 
    109          
     110 
    110111        /* keep data, stop, and parity bits, but disable FIFO */ 
    111112        t = UART_READ(UART_REG_LCRH); 
     
    118119        /* enable uart, and disable interrupts */ 
    119120        UART_WRITE(UART_REG_CTRL, UART_CTRL_EN); 
     121#endif 
    120122} 
    121123 
     
    126128        UART_WRITE(UART_REG_DATA, ch); 
    127129 
    128         while ((UART_READ(UART_REG_FLAG) & UART_FLAG_TXFF) != 0); 
     130        while ((UART_READ(UART_REG_FLAG) & UART_FLAG_TXFE) == 0); 
    129131} 
    130132 
     
    151153{ 
    152154        /* disable PHYS ports */ 
    153         SWITCH_WRITE(SWITCH_REG_PORT_CONF0,  
     155        SWITCH_WRITE(SWITCH_REG_PORT_CONF0, 
    154156            (SWITCH_PORTS_HW << PORT_CONF0_DP_SHIFT)); 
    155157 
     
    160162        SWITCH_WRITE(SWITCH_REG_GPIO_CONF0, 0); 
    161163        SWITCH_WRITE(SWITCH_REG_GPIO_CONF2, 0); 
    162          
     164 
    163165        /* disable LED lines */ 
    164166        SWITCH_WRITE(SWITCH_REG_PORT0_LED, 0); 
  • trunk/target/linux/adm5120eb-2.6/image/Makefile

    r7856 r7902  
    7070 
    7171define Image/Build/Initramfs 
     72# this line is here intentionally 
     73ifeq (CONFIG_DEVEL,y) 
    7274        $(call Image/Build/LZMAKernel/ZyXEL,p-334wt,bin) 
    7375        $(call Image/Build/LZMAKernel/ZyXEL,p-335,bin) 
     76endif 
    7477endef 
    7578 
Note: See TracChangeset for help on using the changeset viewer.