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

SVN-Revision: 7902
master
Gabor Juhos 18 years ago
parent 6fe5338591
commit 0e1921ab3c
  1. 14
      target/linux/adm5120-2.6/image/Makefile
  2. 4
      target/linux/adm5120-2.6/image/lzma-loader/src/board.c
  3. 3
      target/linux/adm5120eb-2.6/image/Makefile

@ -82,7 +82,7 @@ root=/dev/mtdblock1 rootfstype=yaffs2 init=/etc/preinit
endef endef
define Image/Build/RouterBoard define Image/Build/RouterBoard
$(CP) $(KDIR)/vmlinux.elf $(IMGNAME)-vmlinux $(CP) $(KDIR)/vmlinux.elf $(IMGNAME)-rb1xx-vmlinux
$(STAGING_DIR)/bin/patch-cmdline $(KDIR)/vmlinux.elf '$(strip $(call Image/cmdline/yaffs2)) ' $(STAGING_DIR)/bin/patch-cmdline $(KDIR)/vmlinux.elf '$(strip $(call Image/cmdline/yaffs2)) '
endef endef
@ -91,6 +91,7 @@ define Image/Build
ifneq ($(1),jffs2-256k) ifneq ($(1),jffs2-256k)
ifneq ($(1),jffs2-128k) ifneq ($(1),jffs2-128k)
$(call Image/Build/Compex,$(1),wp54g-wrt,$(patsubst jffs2-%,jffs2,$(1)),WP54G-WRT) $(call Image/Build/Compex,$(1),wp54g-wrt,$(patsubst jffs2-%,jffs2,$(1)),WP54G-WRT)
ifeq (CONFIG_DEVEL,y)
$(call Image/Build/Edimax,$(1),br-6104k,$(patsubst jffs2-%,jffs2,$(1)),BR-6104K) $(call Image/Build/Edimax,$(1),br-6104k,$(patsubst jffs2-%,jffs2,$(1)),BR-6104K)
$(call Image/Build/Edimax,$(1),br-6104kp,$(patsubst jffs2-%,jffs2,$(1)),BR-6104KP) $(call Image/Build/Edimax,$(1),br-6104kp,$(patsubst jffs2-%,jffs2,$(1)),BR-6104KP)
$(call Image/Build/Edimax,$(1),br-6114wg,$(patsubst jffs2-%,jffs2,$(1)),BR-6114WG) $(call Image/Build/Edimax,$(1),br-6114wg,$(patsubst jffs2-%,jffs2,$(1)),BR-6114WG)
@ -117,6 +118,7 @@ ifneq ($(1),jffs2-128k)
$(call Image/Build/MyLoader,$(1),wpp54ag,$(patsubst jffs2-%,jffs2,$(1)),WPP54AG) $(call Image/Build/MyLoader,$(1),wpp54ag,$(patsubst jffs2-%,jffs2,$(1)),WPP54AG)
endif endif
endif endif
endif
ifeq ($(1),tgz) ifeq ($(1),tgz)
$(call Image/Build/RouterBoard) $(call Image/Build/RouterBoard)
endif endif
@ -143,12 +145,17 @@ define Image/Build/LZMAKernel/Admboot
$(call Image/Build/LZMAKernel,$(1),$(2),0x80500000,0x6D8,y,$(1)) $(call Image/Build/LZMAKernel,$(1),$(2),0x80500000,0x6D8,y,$(1))
endef endef
define Image/Build/Initramfs/RouterBoard
$(CP) $(KDIR)/vmlinux.elf $(IMGNAME)-ramfs-rb1xx.elf
endef
define Image/Build/Initramfs define Image/Build/Initramfs
$(call Image/Build/Initramfs/RouterBoard)
$(call Image/Build/LZMAKernel/Compex,wp54g-wrt,bin)
ifeq (CONFIG_DEVEL,y)
$(call Image/Build/LZMAKernel/Generic,generic,bin) $(call Image/Build/LZMAKernel/Generic,generic,bin)
$(call Image/Build/LZMAKernel/Generic,rb-100,elf)
$(call Image/Build/LZMAKernel/Generic,np27g,bin) $(call Image/Build/LZMAKernel/Generic,np27g,bin)
$(call Image/Build/LZMAKernel/Generic,wp54g,bin) $(call Image/Build/LZMAKernel/Generic,wp54g,bin)
$(call Image/Build/LZMAKernel/Compex,wp54g-wrt,bin)
$(call Image/Build/LZMAKernel/Admboot,br-6104k,gz) $(call Image/Build/LZMAKernel/Admboot,br-6104k,gz)
$(call Image/Build/LZMAKernel/Admboot,easy-5120,gz) $(call Image/Build/LZMAKernel/Admboot,easy-5120,gz)
$(call Image/Build/LZMAKernel/Admboot,easy-83000,gz) $(call Image/Build/LZMAKernel/Admboot,easy-83000,gz)
@ -158,6 +165,7 @@ define Image/Build/Initramfs
$(call Image/Build/LZMAKernel/Admboot,cas-771,gz) $(call Image/Build/LZMAKernel/Admboot,cas-771,gz)
$(call Image/Build/LZMAKernel/Admboot,cas-790,gz) $(call Image/Build/LZMAKernel/Admboot,cas-790,gz)
$(call Image/Build/LZMAKernel/Admboot,cas-861,gz) $(call Image/Build/LZMAKernel/Admboot,cas-861,gz)
endif
endef endef
$(eval $(call BuildImage)) $(eval $(call BuildImage))

@ -96,6 +96,7 @@
static void uart_init(void) static void uart_init(void)
{ {
#if 0
unsigned int t; unsigned int t;
/* disable uart */ /* disable uart */
@ -117,6 +118,7 @@ static void uart_init(void)
/* enable uart, and disable interrupts */ /* enable uart, and disable interrupts */
UART_WRITE(UART_REG_CTRL, UART_CTRL_EN); UART_WRITE(UART_REG_CTRL, UART_CTRL_EN);
#endif
} }
static void uart_putc(int ch) static void uart_putc(int ch)
@ -125,7 +127,7 @@ static void uart_putc(int ch)
UART_WRITE(UART_REG_DATA, ch); UART_WRITE(UART_REG_DATA, ch);
while ((UART_READ(UART_REG_FLAG) & UART_FLAG_TXFF) != 0); while ((UART_READ(UART_REG_FLAG) & UART_FLAG_TXFE) == 0);
} }
/* /*

@ -69,8 +69,11 @@ define Image/Build/LZMAKernel/ZyXEL
endef endef
define Image/Build/Initramfs define Image/Build/Initramfs
# this line is here intentionally
ifeq (CONFIG_DEVEL,y)
$(call Image/Build/LZMAKernel/ZyXEL,p-334wt,bin) $(call Image/Build/LZMAKernel/ZyXEL,p-334wt,bin)
$(call Image/Build/LZMAKernel/ZyXEL,p-335,bin) $(call Image/Build/LZMAKernel/ZyXEL,p-335,bin)
endif
endef endef
$(eval $(call BuildImage)) $(eval $(call BuildImage))

Loading…
Cancel
Save