From 417185b33c0d07c6a8ef1818ececc1ff6bec7253 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Sun, 29 Apr 2012 07:36:46 +0000 Subject: [PATCH] adm5120: create a new subtarget for the RB1xx devices SVN-Revision: 31513 --- target/linux/adm5120/Makefile | 2 +- target/linux/adm5120/config-3.3 | 34 ++++---------- target/linux/adm5120/image/rb1xx.mk | 24 ++++++++++ target/linux/adm5120/image/router_le.mk | 20 -------- .../base-files/sbin/wget2nand | 4 +- target/linux/adm5120/rb1xx/config-3.3 | 46 +++++++++++++++++++ .../{router_le => rb1xx}/profiles/RB1xx.mk | 0 target/linux/adm5120/rb1xx/target.mk | 9 ++++ target/linux/adm5120/router_be/config-3.3 | 1 - 9 files changed, 90 insertions(+), 50 deletions(-) create mode 100644 target/linux/adm5120/image/rb1xx.mk rename target/linux/adm5120/{router_le => rb1xx}/base-files/sbin/wget2nand (92%) create mode 100644 target/linux/adm5120/rb1xx/config-3.3 rename target/linux/adm5120/{router_le => rb1xx}/profiles/RB1xx.mk (100%) create mode 100644 target/linux/adm5120/rb1xx/target.mk diff --git a/target/linux/adm5120/Makefile b/target/linux/adm5120/Makefile index eecf06c14b..067ada2378 100644 --- a/target/linux/adm5120/Makefile +++ b/target/linux/adm5120/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk BOARD:=adm5120 BOARDNAME:=Infineon/ADMtek ADM5120 LINUX_VERSION:=3.3.3 -SUBTARGETS:=router_le router_be +SUBTARGETS:=router_le router_be rb1xx INITRAMFS_EXTRA_FILES:= include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/adm5120/config-3.3 b/target/linux/adm5120/config-3.3 index 59696e868c..ee92cc1291 100644 --- a/target/linux/adm5120/config-3.3 +++ b/target/linux/adm5120/config-3.3 @@ -14,19 +14,19 @@ CONFIG_ADM5120_MACH_NFS_101=y CONFIG_ADM5120_MACH_NP27G=y CONFIG_ADM5120_MACH_NP28G=y CONFIG_ADM5120_MACH_PMUGW=y -CONFIG_ADM5120_MACH_RB_11X=y -CONFIG_ADM5120_MACH_RB_133=y -CONFIG_ADM5120_MACH_RB_133C=y -CONFIG_ADM5120_MACH_RB_150=y -CONFIG_ADM5120_MACH_RB_153=y -CONFIG_ADM5120_MACH_RB_192=y +# CONFIG_ADM5120_MACH_RB_11X is not set +# CONFIG_ADM5120_MACH_RB_133 is not set +# CONFIG_ADM5120_MACH_RB_133C is not set +# CONFIG_ADM5120_MACH_RB_150 is not set +# CONFIG_ADM5120_MACH_RB_153 is not set +# CONFIG_ADM5120_MACH_RB_192 is not set CONFIG_ADM5120_MACH_WP54=y CONFIG_ADM5120_OEM_CELLVISION=y CONFIG_ADM5120_OEM_COMPEX=y CONFIG_ADM5120_OEM_EDIMAX=y CONFIG_ADM5120_OEM_GENERIC=y CONFIG_ADM5120_OEM_INFINEON=y -CONFIG_ADM5120_OEM_MIKROTIK=y +# CONFIG_ADM5120_OEM_MIKROTIK is not set CONFIG_ADM5120_OEM_MOTOROLA=y CONFIG_ADM5120_OEM_OSBRIDGE=y # CONFIG_ADM5120_OEM_ZYXEL is not set @@ -49,7 +49,7 @@ CONFIG_BCMA_POSSIBLE=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_CEVT_R4K=y CONFIG_CEVT_R4K_LIB=y -CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,yaffs2,jffs2" +CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2" CONFIG_CMDLINE_BOOL=y # CONFIG_CMDLINE_OVERRIDE is not set # CONFIG_CPU_BIG_ENDIAN is not set @@ -157,10 +157,6 @@ CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC=y CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_JEDECPROBE=y CONFIG_MTD_MYLOADER_PARTS=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ECC=y -CONFIG_MTD_NAND_PLATFORM=y -# CONFIG_MTD_SM_COMMON is not set CONFIG_MTD_TRXSPLIT=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_KM=y @@ -170,7 +166,6 @@ CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y CONFIG_NO_HZ=y CONFIG_PAGEFLAGS_EXTENDED=y # CONFIG_PARTITION_ADVANCED is not set -# CONFIG_PATA_RB153_CF is not set CONFIG_PCI=y CONFIG_PCI_DISABLE_COMMON_QUIRKS=y CONFIG_PCI_DOMAINS=y @@ -211,17 +206,4 @@ CONFIG_USB_OHCI_HCD=m CONFIG_USB_SUPPORT=y # CONFIG_USB_UHCI_HCD is not set CONFIG_XZ_DEC=y -CONFIG_YAFFS_9BYTE_TAGS=y -# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set -CONFIG_YAFFS_AUTO_YAFFS2=y -# CONFIG_YAFFS_DISABLE_BACKGROUND is not set -# CONFIG_YAFFS_DISABLE_BLOCK_REFRESHING is not set -CONFIG_YAFFS_DISABLE_TAGS_ECC=y -# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set -# CONFIG_YAFFS_EMPTY_LOST_AND_FOUND is not set -CONFIG_YAFFS_FS=y -CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y -CONFIG_YAFFS_XATTR=y -CONFIG_YAFFS_YAFFS1=y -CONFIG_YAFFS_YAFFS2=y CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/adm5120/image/rb1xx.mk b/target/linux/adm5120/image/rb1xx.mk new file mode 100644 index 0000000000..333adce805 --- /dev/null +++ b/target/linux/adm5120/image/rb1xx.mk @@ -0,0 +1,24 @@ +# +# Copyright (C) 2007,2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + + +define Image/cmdline/yaffs2 + root=/dev/mtdblock3 rootfstype=yaffs2 +endef + +define Image/BuildKernel/RouterBoard + $(CP) $(KDIR)/vmlinux.elf $(call imgname,kernel,rb1xx) + $(STAGING_DIR_HOST)/bin/patch-cmdline $(call imgname,kernel,rb1xx) \ + '$(strip $(call Image/cmdline/yaffs2))' +endef + +ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) + define Image/BuildKernel + $(call Image/BuildKernel/RouterBoard) + endef +endif + diff --git a/target/linux/adm5120/image/router_le.mk b/target/linux/adm5120/image/router_le.mk index 7c4bf1d81b..6df6dcd8cc 100644 --- a/target/linux/adm5120/image/router_le.mk +++ b/target/linux/adm5120/image/router_le.mk @@ -399,23 +399,3 @@ define Image/Build/Profile/Generic $(call Image/Build/Experimental,$(1)) endef - -ifeq ($(PROFILE),RouterBoard) - define Image/cmdline/yaffs2 - root=/dev/mtdblock3 rootfstype=yaffs2 - endef - - define Image/BuildKernel/RouterBoard - $(CP) $(KDIR)/vmlinux.elf $(call imgname,kernel,rb1xx) - $(STAGING_DIR_HOST)/bin/patch-cmdline $(call imgname,kernel,rb1xx) \ - '$(strip $(call Image/cmdline/yaffs2))' - endef - - ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) - define Image/BuildKernel - $(call Image/BuildKernel/RouterBoard) - endef - endif - -endif - diff --git a/target/linux/adm5120/router_le/base-files/sbin/wget2nand b/target/linux/adm5120/rb1xx/base-files/sbin/wget2nand similarity index 92% rename from target/linux/adm5120/router_le/base-files/sbin/wget2nand rename to target/linux/adm5120/rb1xx/base-files/sbin/wget2nand index 5263bffba4..6cd8d6fbd9 100755 --- a/target/linux/adm5120/router_le/base-files/sbin/wget2nand +++ b/target/linux/adm5120/rb1xx/base-files/sbin/wget2nand @@ -52,9 +52,9 @@ echo "Erasing existing files..." rm -rf /tmp/wget2nand-rootfs/* echo "Copying filesystem..." -( wget -O - $url/openwrt-adm5120-router_le-rootfs.tar.gz) | ( cd /tmp/wget2nand-rootfs/; tar xvz ) +( wget -O - $url/openwrt-adm5120-rb1xx-rootfs.tar.gz) | ( cd /tmp/wget2nand-rootfs/; tar xvz ) # RouterBOOT is looking for a kernel named "kernel" -wget -O /tmp/wget2nand-kernel/kernel $url/openwrt-adm5120-router_le-vmlinux.elf +wget -O /tmp/wget2nand-kernel/kernel $url/openwrt-adm5120-rb1xx-vmlinux.elf chmod +x /tmp/wget2nand-kernel/kernel diff --git a/target/linux/adm5120/rb1xx/config-3.3 b/target/linux/adm5120/rb1xx/config-3.3 new file mode 100644 index 0000000000..1afeb79eb1 --- /dev/null +++ b/target/linux/adm5120/rb1xx/config-3.3 @@ -0,0 +1,46 @@ +# CONFIG_ADM5120_MACH_5GXI is not set +# CONFIG_ADM5120_MACH_BR_6104K is not set +# CONFIG_ADM5120_MACH_BR_6104KP is not set +# CONFIG_ADM5120_MACH_BR_61X4WG is not set +# CONFIG_ADM5120_MACH_CAS_771 is not set +# CONFIG_ADM5120_MACH_EASY5120P_ATA is not set +# CONFIG_ADM5120_MACH_EASY5120_RT is not set +# CONFIG_ADM5120_MACH_EASY5120_WVOIP is not set +# CONFIG_ADM5120_MACH_EASY83000 is not set +# CONFIG_ADM5120_MACH_EB_214A is not set +# CONFIG_ADM5120_MACH_NFS_101 is not set +# CONFIG_ADM5120_MACH_NP27G is not set +# CONFIG_ADM5120_MACH_NP28G is not set +# CONFIG_ADM5120_MACH_PMUGW is not set +# CONFIG_ADM5120_MACH_WP54 is not set +# CONFIG_ADM5120_OEM_CELLVISION is not set +# CONFIG_ADM5120_OEM_COMPEX is not set +# CONFIG_ADM5120_OEM_EDIMAX is not set +# CONFIG_ADM5120_OEM_GENERIC is not set +# CONFIG_ADM5120_OEM_INFINEON is not set +# CONFIG_ADM5120_OEM_MOTOROLA is not set +# CONFIG_ADM5120_OEM_OSBRIDGE is not set +CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=yaffs2" +# CONFIG_JFFS2_FS is not set +# CONFIG_MTD_MYLOADER_PARTS is not set +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_ECC=y +CONFIG_MTD_NAND_PLATFORM=y +# CONFIG_MTD_ROOTFS_SPLIT is not set +# CONFIG_MTD_SM_COMMON is not set +# CONFIG_MTD_TRXSPLIT is not set +# CONFIG_OVERLAYFS_FS is not set +# CONFIG_SQUASHFS is not set +CONFIG_YAFFS_9BYTE_TAGS=y +# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set +CONFIG_YAFFS_AUTO_YAFFS2=y +# CONFIG_YAFFS_DISABLE_BACKGROUND is not set +# CONFIG_YAFFS_DISABLE_BLOCK_REFRESHING is not set +CONFIG_YAFFS_DISABLE_TAGS_ECC=y +# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set +# CONFIG_YAFFS_EMPTY_LOST_AND_FOUND is not set +CONFIG_YAFFS_FS=y +CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y +CONFIG_YAFFS_XATTR=y +CONFIG_YAFFS_YAFFS1=y +CONFIG_YAFFS_YAFFS2=y diff --git a/target/linux/adm5120/router_le/profiles/RB1xx.mk b/target/linux/adm5120/rb1xx/profiles/RB1xx.mk similarity index 100% rename from target/linux/adm5120/router_le/profiles/RB1xx.mk rename to target/linux/adm5120/rb1xx/profiles/RB1xx.mk diff --git a/target/linux/adm5120/rb1xx/target.mk b/target/linux/adm5120/rb1xx/target.mk new file mode 100644 index 0000000000..2e9b08e511 --- /dev/null +++ b/target/linux/adm5120/rb1xx/target.mk @@ -0,0 +1,9 @@ +ARCH:=mipsel +ARCH_PACKAGES:=adm5120_mipsel +SUBTARGET:=rb1xx +BOARDNAME:=MikroTik RB-1xx boards +FEATURES:=tgz + +define Target/Description + Build firmware images for Mikrotik RB-1xx series. +endef diff --git a/target/linux/adm5120/router_be/config-3.3 b/target/linux/adm5120/router_be/config-3.3 index a31afda10a..97025375d5 100644 --- a/target/linux/adm5120/router_be/config-3.3 +++ b/target/linux/adm5120/router_be/config-3.3 @@ -10,7 +10,6 @@ CONFIG_ADM5120_MACH_P_335=y # CONFIG_ADM5120_OEM_MOTOROLA is not set # CONFIG_ADM5120_OEM_OSBRIDGE is not set CONFIG_ADM5120_OEM_ZYXEL=y -CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2" CONFIG_CPU_BIG_ENDIAN=y # CONFIG_CPU_LITTLE_ENDIAN is not set CONFIG_SWAP_IO_SPACE=y