From b7bb9d33b6bd98d85592cdaf38f28925fb78908b Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Wed, 9 May 2012 10:48:38 +0000 Subject: orion: nuke 3.0 support git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31659 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/orion/config-default | 238 --------------------- target/linux/orion/dns323/config-default | 54 ----- target/linux/orion/harddisk/config-default | 34 --- .../100-wrt350nv2_openwrt_partition_map.patch | 32 --- .../orion/patches/101-wnr854t_partition_map.patch | 13 -- .../orion/patches/200-dt2_board_support.patch | 26 --- .../orion/patches/300-dns323_partition_map.patch | 30 --- 7 files changed, 427 deletions(-) delete mode 100644 target/linux/orion/config-default delete mode 100644 target/linux/orion/dns323/config-default delete mode 100644 target/linux/orion/harddisk/config-default delete mode 100644 target/linux/orion/patches/100-wrt350nv2_openwrt_partition_map.patch delete mode 100644 target/linux/orion/patches/101-wnr854t_partition_map.patch delete mode 100644 target/linux/orion/patches/200-dt2_board_support.patch delete mode 100644 target/linux/orion/patches/300-dns323_partition_map.patch diff --git a/target/linux/orion/config-default b/target/linux/orion/config-default deleted file mode 100644 index 7e3193e2bb..0000000000 --- a/target/linux/orion/config-default +++ /dev/null @@ -1,238 +0,0 @@ -CONFIG_ALIGNMENT_TRAP=y -# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set -# CONFIG_ARCH_HAS_ILOG2_U32 is not set -# CONFIG_ARCH_HAS_ILOG2_U64 is not set -CONFIG_ARCH_ORION5X=y -CONFIG_ARCH_SUPPORTS_AOUT=y -# CONFIG_ARCH_SUPPORTS_MSI is not set -CONFIG_ARCH_SUSPEND_POSSIBLE=y -# CONFIG_ARM_THUMB is not set -CONFIG_ARM=y -# CONFIG_ARPD is not set -# CONFIG_ARTHUR is not set -CONFIG_ATA=m -# CONFIG_ATMEL is not set -# CONFIG_ATM is not set -# CONFIG_BINFMT_AOUT is not set -CONFIG_BITREVERSE=y -# CONFIG_BLK_DEV_CRYPTOLOOP is not set -# CONFIG_BLK_DEV_NBD is not set -# CONFIG_BONDING is not set -CONFIG_BOUNCE=y -# CONFIG_BSD_DISKLABEL is not set -# CONFIG_CIFS_STATS is not set -CONFIG_CLASSIC_RCU=y -CONFIG_CMDLINE="root=/dev/mtdblock1 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200" -CONFIG_CMDLINE_FORCE=y -CONFIG_CPU_32v5=y -CONFIG_CPU_32=y -CONFIG_CPU_ABRT_EV5T=y -CONFIG_CPU_CACHE_VIVT=y -CONFIG_CPU_COPY_FEROCEON=y -CONFIG_CPU_CP15_MMU=y -CONFIG_CPU_CP15=y -# CONFIG_CPU_DCACHE_DISABLE is not set -CONFIG_CPU_FEROCEON_OLD_ID=y -CONFIG_CPU_FEROCEON=y -# CONFIG_CPU_ICACHE_DISABLE is not set -CONFIG_CPU_PABRT_NOIFAR=y -CONFIG_CPU_TLB_V4WBI=y -# CONFIG_CRC_CCITT is not set -CONFIG_CRYPTO_DEV_MV_CESA=y -CONFIG_CRYPTO_HW=y -# CONFIG_DEBUG_USER is not set -CONFIG_DEVPORT=y -CONFIG_DLCI=m -CONFIG_DLCI_MAX=8 -# CONFIG_DM9000 is not set -CONFIG_DNOTIFY=y -# CONFIG_DSCC4 is not set -# CONFIG_E1000E_ENABLED is not set -# CONFIG_E100 is not set -# CONFIG_FARSYNC is not set -# CONFIG_FPE_FASTFPE is not set -# CONFIG_FPE_NWFPE is not set -CONFIG_FRAME_POINTER=y -CONFIG_FS_POSIX_ACL=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -CONFIG_GENERIC_CLOCKEVENTS=y -# CONFIG_GENERIC_FIND_FIRST_BIT is not set -# CONFIG_GENERIC_FIND_NEXT_BIT is not set -CONFIG_GENERIC_GPIO=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y -# CONFIG_HAMRADIO is not set -CONFIG_HARDIRQS_SW_RESEND=y -CONFIG_HAS_DMA=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y -# CONFIG_HAVE_DMA_ATTRS is not set -CONFIG_HAVE_IDE=y -CONFIG_HAVE_KPROBES=y -CONFIG_HAVE_KRETPROBES=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_HAVE_OPROFILE=y -CONFIG_HDLC_CISCO=m -CONFIG_HDLC_FR=m -CONFIG_HDLC=m -CONFIG_HDLC_PPP=m -# CONFIG_HDLC_RAW_ETH is not set -CONFIG_HDLC_RAW=m -# CONFIG_HERMES is not set -# CONFIG_HWMON_DEBUG_CHIP is not set -CONFIG_HWMON=y -CONFIG_HW_RANDOM=y -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MV64XXX=y -CONFIG_I2C=y -# CONFIG_IDE is not set -CONFIG_INITRAMFS_SOURCE="" -# CONFIG_IP6_NF_MANGLE is not set -# CONFIG_IP6_NF_MATCH_EUI64 is not set -# CONFIG_IP6_NF_MATCH_FRAG is not set -# CONFIG_IP6_NF_MATCH_HL is not set -# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -# CONFIG_IP6_NF_MATCH_OPTS is not set -# CONFIG_IP6_NF_MATCH_RT is not set -# CONFIG_IP6_NF_TARGET_LOG is not set -CONFIG_IP_MROUTE=y -# CONFIG_IP_NF_ARPTABLES is not set -# CONFIG_IP_NF_MATCH_ADDRTYPE is not set -# CONFIG_IP_NF_MATCH_ECN is not set -# CONFIG_IP_NF_MATCH_RECENT is not set -# CONFIG_IP_NF_MATCH_TIME is not set -# CONFIG_IP_NF_SET is not set -# CONFIG_IP_NF_TARGET_ECN is not set -# CONFIG_IP_NF_TARGET_LOG is not set -# CONFIG_IP_NF_TARGET_NETMAP is not set -# CONFIG_IP_NF_TARGET_TTL is not set -# CONFIG_IP_NF_TARGET_ULOG is not set -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -# CONFIG_IPV6_MROUTE is not set -CONFIG_IPV6_NDISC_NODETYPE=y -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_IWLWIFI_LEDS is not set -# CONFIG_LANMEDIA is not set -# CONFIG_LATENCYTOP is not set -CONFIG_LEDS_GPIO=y -CONFIG_LEGACY_PTY_COUNT=256 -CONFIG_LEGACY_PTYS=y -# CONFIG_LLC2 is not set -CONFIG_LZO_COMPRESS=m -CONFIG_LZO_DECOMPRESS=m -# CONFIG_MACH_BIGDISK is not set -# CONFIG_MACH_D2NET is not set -# CONFIG_MACH_DB88F5281 is not set -CONFIG_MACH_DNS323=y -CONFIG_MACH_DT2=y -# CONFIG_MACH_EDMINI_V2 is not set -# CONFIG_MACH_KUROBOX_PRO is not set -# CONFIG_MACH_LINKSTATION_LS_HGL is not set -# CONFIG_MACH_LINKSTATION_LSCHL is not set -# CONFIG_MACH_LINKSTATION_MINI is not set -# CONFIG_MACH_LINKSTATION_PRO is not set -# CONFIG_MACH_MSS2 is not set -# CONFIG_MACH_MV2120 is not set -# CONFIG_MACH_NET2BIG is not set -# CONFIG_MACH_RD88F5181L_FXO is not set -# CONFIG_MACH_RD88F5181L_GE is not set -# CONFIG_MACH_RD88F5182 is not set -# CONFIG_MACH_RD88F6183AP_GE is not set -# CONFIG_MACH_TERASTATION_PRO2 is not set -# CONFIG_MACH_TS209 is not set -# CONFIG_MACH_TS409 is not set -# CONFIG_MACH_TS78XX is not set -CONFIG_MACH_WNR854T=y -CONFIG_MACH_WRT350N_V2=y -# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set -CONFIG_MEDIA_TUNER=m -CONFIG_MEDIA_TUNER_MT20XX=m -CONFIG_MEDIA_TUNER_SIMPLE=m -CONFIG_MEDIA_TUNER_TDA8290=m -CONFIG_MEDIA_TUNER_TDA9887=m -CONFIG_MEDIA_TUNER_TEA5761=m -CONFIG_MEDIA_TUNER_TEA5767=m -CONFIG_MEDIA_TUNER_XC2028=m -CONFIG_MEDIA_TUNER_XC5000=m -# CONFIG_MINIX_FS is not set -CONFIG_MTD_PHYSMAP_BANKWIDTH=1 -CONFIG_MTD_PHYSMAP_LEN=0 -CONFIG_MTD_PHYSMAP_START=0xf0000000 -CONFIG_MTD_PHYSMAP=y -# CONFIG_MTD_REDBOOT_PARTS is not set -CONFIG_MV643XX_ETH=y -# CONFIG_NE2K_PCI is not set -# CONFIG_NET_DSA_MV88E6060 is not set -# CONFIG_NET_DSA_MV88E6123_61_65 is not set -CONFIG_NET_DSA_MV88E6131=y -CONFIG_NET_DSA=y -# CONFIG_NET_EMATCH is not set -# CONFIG_NET_IPIP is not set -# CONFIG_NET_SCH_NETEM is not set -# CONFIG_NET_VENDOR_3COM is not set -# CONFIG_NLS_CODEPAGE_437 is not set -# CONFIG_NLS_CODEPAGE_850 is not set -# CONFIG_NLS_ISO8859_15 is not set -# CONFIG_NLS_ISO8859_1 is not set -# CONFIG_NLS_KOI8_R is not set -# CONFIG_NO_IOPORT is not set -# CONFIG_ORION5X_WATCHDOG is not set -# CONFIG_OUTER_CACHE is not set -CONFIG_PAGEFLAGS_EXTENDED=y -CONFIG_PATA_ARTOP=m -# CONFIG_PC300 is not set -CONFIG_PCI=y -# CONFIG_PCI200SYN is not set -# CONFIG_PCIPCWATCHDOG is not set -CONFIG_PLAT_ORION=y -# CONFIG_PPP is not set -# CONFIG_PRISM54 is not set -# CONFIG_R6040 is not set -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_ISL1208=y -CONFIG_SATA_PMP=y -# CONFIG_SCSI_MULTI_LUN is not set -# CONFIG_SENSORS_PC87360 is not set -# CONFIG_SERIAL_8250_EXTENDED is not set -CONFIG_SLABINFO=y -# CONFIG_SMC91X is not set -# CONFIG_SOC_CAMERA is not set -CONFIG_SPLIT_PTLOCK_CPUS=4096 -CONFIG_SYS_SUPPORTS_APM_EMULATION=y -CONFIG_UID16=y -# CONFIG_USB_ACM is not set -# CONFIG_USB_C67X00_HCD is not set -# CONFIG_USB_CATC is not set -CONFIG_USB_EHCI_HCD=m -# CONFIG_USB_ISIGHTFW is not set -# CONFIG_USB_ISP1760_HCD is not set -# CONFIG_USB_KAWETH is not set -CONFIG_USB=m -# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set -# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set -CONFIG_USB_OHCI_HCD=m -# CONFIG_USBPCWATCHDOG is not set -# CONFIG_USB_PEGASUS is not set -# CONFIG_USB_PRINTER is not set -# CONFIG_USB_R8A66597_HCD is not set -# CONFIG_USB_SERIAL is not set -CONFIG_USB_SUPPORT=y -CONFIG_USB_UHCI_HCD=m -# CONFIG_USB_USBNET is not set -# CONFIG_USB_VIDEO_CLASS is not set -# CONFIG_USB_WDM is not set -CONFIG_VECTORS_BASE=0xffff0000 -# CONFIG_VFP is not set -# CONFIG_VGASTATE is not set -# CONFIG_VIA_RHINE is not set -CONFIG_VIDEO_MEDIA=m -# CONFIG_VIDEO_SAA717X is not set -CONFIG_VM_EVENT_COUNTERS=y -# CONFIG_WANXL is not set -CONFIG_WAN=y -# CONFIG_XFS_FS is not set -# CONFIG_XIP_KERNEL is not set -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_ZBOOT_ROM_TEXT=0x0 diff --git a/target/linux/orion/dns323/config-default b/target/linux/orion/dns323/config-default deleted file mode 100644 index c5ec9592bb..0000000000 --- a/target/linux/orion/dns323/config-default +++ /dev/null @@ -1,54 +0,0 @@ -CONFIG_ARCH_REQUIRE_GPIOLIB=y -CONFIG_ATA=y -CONFIG_ATAGS_PROC=y -CONFIG_BLK_DEV_DM=y -CONFIG_BLK_DEV_MD=y -CONFIG_BLK_DEV_SD=y -CONFIG_CMDLINE="root=/dev/mtdblock3 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200" -CONFIG_CPU_PABRT_LEGACY=y -CONFIG_CPU_TLB_FEROCEON=y -CONFIG_CRC16=y -CONFIG_CRYPTO_AEAD2=y -CONFIG_CRYPTO_AES=y -CONFIG_CRYPTO_BLKCIPHER=y -CONFIG_CRYPTO_BLKCIPHER2=y -CONFIG_CRYPTO_CBC=y -CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_MANAGER2=y -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_WORKQUEUE=y -CONFIG_DM_CRYPT=y -CONFIG_DM_MIRROR=y -CONFIG_DM_SNAPSHOT=y -CONFIG_EXPORTFS=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -CONFIG_EXT4_FS=y -CONFIG_GPIO_DEVICE=y -CONFIG_HAVE_PERF_EVENTS=y -CONFIG_HAVE_PROC_CPU=y -CONFIG_INET_LRO=y -CONFIG_INPUT=y -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_GPIO_BUTTONS=y -CONFIG_INPUT_KEYBOARD=y -CONFIG_JBD=y -CONFIG_JBD2=y -CONFIG_KEXEC=y -CONFIG_KEYBOARD_GPIO=y -CONFIG_MD=y -CONFIG_MD_AUTODETECT=y -CONFIG_MD_LINEAR=y -CONFIG_MD_RAID0=y -CONFIG_MD_RAID1=y -CONFIG_NLS=y -CONFIG_RTC_DRV_M41T80=y -CONFIG_RTC_DRV_M41T80_WDT=y -CONFIG_SATA_MV=y -CONFIG_SCSI=y -CONFIG_SCSI_MOD=y -CONFIG_SENSORS_G760A=y -CONFIG_SENSORS_LM75=y -# CONFIG_USB_SUPPORT is not set -CONFIG_XFS_FS=y diff --git a/target/linux/orion/harddisk/config-default b/target/linux/orion/harddisk/config-default deleted file mode 100644 index ec77f5ef36..0000000000 --- a/target/linux/orion/harddisk/config-default +++ /dev/null @@ -1,34 +0,0 @@ -CONFIG_ATA=y -CONFIG_BLK_DEV_DM=y -CONFIG_BLK_DEV_MD=y -CONFIG_BLK_DEV_SD=y -# CONFIG_DM_CRYPT is not set -# CONFIG_DM_DEBUG is not set -# CONFIG_DM_DELAY is not set -# CONFIG_DM_MIRROR is not set -# CONFIG_DM_MULTIPATH is not set -# CONFIG_DM_SNAPSHOT is not set -# CONFIG_DM_UEVENT is not set -# CONFIG_DM_ZERO is not set -CONFIG_EXT4_FS=y -CONFIG_JBD=y -CONFIG_LBD=y -CONFIG_MD_AUTODETECT=y -# CONFIG_MD_FAULTY is not set -CONFIG_MD_LINEAR=y -# CONFIG_MD_MULTIPATH is not set -CONFIG_MD_RAID0=y -# CONFIG_MD_RAID10 is not set -CONFIG_MD_RAID1=y -# CONFIG_MD_RAID456 is not set -CONFIG_MD=y -CONFIG_SATA_MV=y -CONFIG_SWAP=y -CONFIG_USB_ARCH_HAS_EHCI=y -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB_ARCH_HAS_OHCI=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_ROOT_HUB_TT=y -CONFIG_USB_EHCI_TT_NEWSCHED=y -CONFIG_USB_STORAGE=y -CONFIG_USB=y diff --git a/target/linux/orion/patches/100-wrt350nv2_openwrt_partition_map.patch b/target/linux/orion/patches/100-wrt350nv2_openwrt_partition_map.patch deleted file mode 100644 index f179a053d6..0000000000 --- a/target/linux/orion/patches/100-wrt350nv2_openwrt_partition_map.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/arch/arm/mach-orion5x/wrt350n-v2-setup.c -+++ b/arch/arm/mach-orion5x/wrt350n-v2-setup.c -@@ -135,11 +135,11 @@ static struct mtd_partition wrt350n_v2_n - { - .name = "kernel", - .offset = 0x00000000, -- .size = 0x00760000, -+ .size = 0x00100000, // change to kernel mtd size here (1/3) - }, { - .name = "rootfs", -- .offset = 0x001a0000, -- .size = 0x005c0000, -+ .offset = 0x00100000, // change to kernel mtd size here (2/3) -+ .size = 0x00650000, // adopt to kernel mtd size here (3/3) = 0x00750000 - - }, { - .name = "lang", - .offset = 0x00760000, -@@ -152,6 +152,14 @@ static struct mtd_partition wrt350n_v2_n - .name = "u-boot", - .offset = 0x007c0000, - .size = 0x00040000, -+ }, { -+ .name = "eRcOmM_do_not_touch", -+ .offset = 0x00750000, -+ .size = 0x00010000, // erasesize -+ }, { -+ .name = "image", // for sysupgrade -+ .offset = 0x00000000, -+ .size = 0x00750000, - }, - }; - diff --git a/target/linux/orion/patches/101-wnr854t_partition_map.patch b/target/linux/orion/patches/101-wnr854t_partition_map.patch deleted file mode 100644 index c754106d28..0000000000 --- a/target/linux/orion/patches/101-wnr854t_partition_map.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/arch/arm/mach-orion5x/wnr854t-setup.c -+++ b/arch/arm/mach-orion5x/wnr854t-setup.c -@@ -67,6 +67,10 @@ static struct mtd_partition wnr854t_nor_ - .name = "uboot", - .offset = 0x00760000, - .size = 0x00040000, -+ }, { -+ .name = "image", // for sysupgrade -+ .offset = 0x00000000, -+ .size = 0x00760000, - }, - }; - diff --git a/target/linux/orion/patches/200-dt2_board_support.patch b/target/linux/orion/patches/200-dt2_board_support.patch deleted file mode 100644 index 91909abac0..0000000000 --- a/target/linux/orion/patches/200-dt2_board_support.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/arch/arm/mach-orion5x/Kconfig -+++ b/arch/arm/mach-orion5x/Kconfig -@@ -16,6 +16,13 @@ config MACH_RD88F5182 - Say 'Y' here if you want your kernel to support the - Marvell Orion-NAS (88F5182) RD2 - -+config MACH_DT2 -+ bool "Freecom DataTank Gateway" -+ select I2C_BOARDINFO -+ help -+ Say 'Y' here if you want your kernel to support the -+ Freecom DataTank Gateway -+ - config MACH_KUROBOX_PRO - bool "KuroBox Pro" - select I2C_BOARDINFO ---- a/arch/arm/mach-orion5x/Makefile -+++ b/arch/arm/mach-orion5x/Makefile -@@ -18,6 +18,7 @@ obj-$(CONFIG_MACH_BIGDISK) += d2net-setu - obj-$(CONFIG_MACH_NET2BIG) += net2big-setup.o - obj-$(CONFIG_MACH_MSS2) += mss2-setup.o - obj-$(CONFIG_MACH_WNR854T) += wnr854t-setup.o -+obj-$(CONFIG_MACH_DT2) += dt2-setup.o - obj-$(CONFIG_MACH_RD88F5181L_GE) += rd88f5181l-ge-setup.o - obj-$(CONFIG_MACH_RD88F5181L_FXO) += rd88f5181l-fxo-setup.o - obj-$(CONFIG_MACH_RD88F6183AP_GE) += rd88f6183ap-ge-setup.o diff --git a/target/linux/orion/patches/300-dns323_partition_map.patch b/target/linux/orion/patches/300-dns323_partition_map.patch deleted file mode 100644 index 87e357b0c0..0000000000 --- a/target/linux/orion/patches/300-dns323_partition_map.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/arch/arm/mach-orion5x/dns323-setup.c -+++ b/arch/arm/mach-orion5x/dns323-setup.c -@@ -99,6 +99,13 @@ - * 0x00020000-0x001a0000 : "Linux Kernel" - * 0x001a0000-0x007d0000 : "File System" - * 0x007d0000-0x00800000 : "u-boot" -+ * -+ * Layout as used by OpenWrt -+ * 0x00000000-0x00010000 : "MTD1" -+ * 0x00010000-0x00020000 : "MTD2" -+ * 0x00020000-0x001a0000 : "kernel" -+ * 0x001a0000-0x007d0000 : "rootfs" -+ * 0x007d0000-0x00800000 : "u-boot" - */ - - #define DNS323_NOR_BOOT_BASE 0xf4000000 -@@ -114,11 +121,11 @@ - .size = 0x00010000, - .offset = 0x00010000, - }, { -- .name = "Linux Kernel", -+ .name = "kernel", - .size = 0x00180000, - .offset = 0x00020000, - }, { -- .name = "File System", -+ .name = "rootfs", - .size = 0x00630000, - .offset = 0x001A0000, - }, { -- cgit v1.2.3