From 626d9efa74685720020e816f3a917b7591d3cf7a Mon Sep 17 00:00:00 2001 From: James <> Date: Sat, 26 Sep 2015 12:29:31 +0100 Subject: trunk-47048 --- target/linux/orion/Makefile | 24 ++ .../orion/base-files/etc/hotplug.d/usb/10-usb | 54 +++ .../orion/base-files/etc/uci-defaults/10-network | 53 +++ target/linux/orion/config-default | 187 +++++++++ .../orion/files/arch/arm/mach-orion5x/dt2-common.h | 82 ++++ .../orion/files/arch/arm/mach-orion5x/dt2-setup.c | 445 +++++++++++++++++++++ .../base-files/etc/uci-defaults/09_hardware | 54 +++ .../generic/base-files/lib/upgrade/platform.sh | 38 ++ target/linux/orion/generic/target.mk | 14 + target/linux/orion/harddisk/config-default | 38 ++ target/linux/orion/harddisk/target.mk | 14 + target/linux/orion/image/Makefile | 12 + target/linux/orion/image/generic.mk | 230 +++++++++++ target/linux/orion/image/harddisk.mk | 57 +++ .../100-wrt350nv2_openwrt_partition_map.patch | 32 ++ .../orion/patches/101-wnr854t_partition_map.patch | 25 ++ .../orion/patches/200-dt2_board_support.patch | 26 ++ .../linux/orion/patches/210-wn802t_support.patch | 78 ++++ 18 files changed, 1463 insertions(+) create mode 100644 target/linux/orion/Makefile create mode 100644 target/linux/orion/base-files/etc/hotplug.d/usb/10-usb create mode 100644 target/linux/orion/base-files/etc/uci-defaults/10-network create mode 100644 target/linux/orion/config-default create mode 100644 target/linux/orion/files/arch/arm/mach-orion5x/dt2-common.h create mode 100644 target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c create mode 100644 target/linux/orion/generic/base-files/etc/uci-defaults/09_hardware create mode 100644 target/linux/orion/generic/base-files/lib/upgrade/platform.sh create mode 100644 target/linux/orion/generic/target.mk create mode 100644 target/linux/orion/harddisk/config-default create mode 100644 target/linux/orion/harddisk/target.mk create mode 100644 target/linux/orion/image/Makefile create mode 100644 target/linux/orion/image/generic.mk create mode 100644 target/linux/orion/image/harddisk.mk create mode 100644 target/linux/orion/patches/100-wrt350nv2_openwrt_partition_map.patch create mode 100644 target/linux/orion/patches/101-wnr854t_partition_map.patch create mode 100644 target/linux/orion/patches/200-dt2_board_support.patch create mode 100644 target/linux/orion/patches/210-wn802t_support.patch (limited to 'target/linux/orion') diff --git a/target/linux/orion/Makefile b/target/linux/orion/Makefile new file mode 100644 index 0000000..58e74b8 --- /dev/null +++ b/target/linux/orion/Makefile @@ -0,0 +1,24 @@ +# +# Copyright (C) 2008-2015 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +include $(TOPDIR)/rules.mk + +ARCH:=arm +BOARD:=orion +BOARDNAME:=Marvell Orion +FEATURES:=broken +SUBTARGETS:=generic harddisk +MAINTAINER:=Imre Kaloz + +KERNEL_PATCHVER:=3.18 + +include $(INCLUDE_DIR)/target.mk + +KERNELNAME:=zImage + +DEFAULT_PACKAGES += kmod-ath9k kmod-crypto-mv-cesa wpad-mini kmod-i2c-core kmod-i2c-mv64xxx kmod-rtc-isl1208 + +$(eval $(call BuildTarget)) diff --git a/target/linux/orion/base-files/etc/hotplug.d/usb/10-usb b/target/linux/orion/base-files/etc/hotplug.d/usb/10-usb new file mode 100644 index 0000000..5572dae --- /dev/null +++ b/target/linux/orion/base-files/etc/hotplug.d/usb/10-usb @@ -0,0 +1,54 @@ +#!/bin/sh +# +# Copyright (C) 2009-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +usb_led='' +usb_device='' + +led_set_attr() { + [ -f "/sys/class/leds/$1/$2" ] && echo "$3" > "/sys/class/leds/$1/$2" +} + +usb_led_set_timer() { + led_set_attr "${usb_led}" 'trigger' 'timer' + led_set_attr "${usb_led}" 'delay_on' "$1" + led_set_attr "${usb_led}" 'delay_off' "$2" +} + +usb_led_on() { + led_set_attr "${usb_led}" 'trigger' 'none' + led_set_attr "${usb_led}" 'brightness' 255 +} + +usb_led_off() { + led_set_attr "${usb_led}" 'trigger' 'none' + led_set_attr "${usb_led}" 'brightness' 0 +} + +get_usb_led() { + local hardware=`sed -n /Hardware/s/.*:.//p /proc/cpuinfo` + + case "${hardware}" in + 'Linksys WRT350N v2') + usb_led='wrt350nv2:green:usb' + usb_device='1-1:1.0' + ;; + esac; +} + +get_usb_led + +case "${ACTION}" in + add) + # update LEDs + [ "${usb_device}" = "${DEVICENAME}" ] && usb_led_on + ;; + remove) + # update LEDs + [ "${usb_device}" = "${DEVICENAME}" ] && usb_led_off + ;; +esac diff --git a/target/linux/orion/base-files/etc/uci-defaults/10-network b/target/linux/orion/base-files/etc/uci-defaults/10-network new file mode 100644 index 0000000..5d5a585 --- /dev/null +++ b/target/linux/orion/base-files/etc/uci-defaults/10-network @@ -0,0 +1,53 @@ +config_simple() { +cat >> /etc/config/network <> /etc/config/network < /etc/config/network < + * + * This file is licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without any + * warranty of any kind, whether express or implied. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "common.h" +#include "mpp.h" + +/***************************************************************************** + * DT2 local + ****************************************************************************/ +#include +#include "dt2-common.h" + +u32 mvUbootVer = 0; +u32 mvTclk = 166666667; +u32 mvSysclk = 200000000; +u32 mvIsUsbHost = 1; +u32 overEthAddr = 0; +u32 gBoardId = -1; +struct DT2_EEPROM_STRUCT dt2_eeprom; + +/***************************************************************************** + * DT2 Info + ****************************************************************************/ +/* + * PCI + */ + +#define DT2_PCI_SLOT0_OFFS 7 +#define DT2_PCI_SLOT0_IRQ_A_PIN 3 +#define DT2_PCI_SLOT0_IRQ_B_PIN 2 + +#define DT2_PIN_GPIO_SYNC 25 +#define DT2_PIN_GPIO_POWER 24 +#define DT2_PIN_GPIO_UNPLUG1 23 +#define DT2_PIN_GPIO_UNPLUG2 22 +#define DT2_PIN_GPIO_RESET 4 + +#define DT2_NOR_BOOT_BASE 0xf4000000 +#define DT2_NOR_BOOT_SIZE SZ_512K + +#define DT2_LEDS_BASE 0xfa000000 +#define DT2_LEDS_SIZE SZ_1K + +/***************************************************************************** + * 512K NOR Flash on Device bus Boot CS + ****************************************************************************/ + +static struct mtd_partition dt2_partitions[] = { + { + .name = "u-boot", + .size = 0x00080000, + .offset = 0, + }, +}; + +static struct physmap_flash_data dt2_nor_flash_data = { + .width = 1, /* 8 bit bus width */ + .parts = dt2_partitions, + .nr_parts = ARRAY_SIZE(dt2_partitions) +}; + +static struct resource dt2_nor_flash_resource = { + .flags = IORESOURCE_MEM, + .start = DT2_NOR_BOOT_BASE, + .end = DT2_NOR_BOOT_BASE + DT2_NOR_BOOT_SIZE - 1, +}; + +static struct platform_device dt2_nor_flash = { + .name = "physmap-flash", + .id = 0, + .dev = { + .platform_data = &dt2_nor_flash_data, + }, + .resource = &dt2_nor_flash_resource, + .num_resources = 1, +}; + +/***************************************************************************** + * PCI + ****************************************************************************/ + +void __init dt2_pci_preinit(void) +{ + int pin, irq; + + /* + * Configure PCI GPIO IRQ pins + */ + pin = DT2_PCI_SLOT0_IRQ_A_PIN; + if (gpio_request(pin, "PCI IntA") == 0) { + if (gpio_direction_input(pin) == 0) { + irq = gpio_to_irq(pin); + irq_set_irq_type(irq, IRQ_TYPE_LEVEL_LOW); + printk (KERN_INFO "PCI IntA IRQ: %d\n", irq); + } else { + printk(KERN_ERR "dt2_pci_preinit failed to " + "irq_set_irq_type pin %d\n", pin); + gpio_free(pin); + } + } else { + printk(KERN_ERR "dt2_pci_preinit failed to request gpio %d\n", pin); + } + + pin = DT2_PCI_SLOT0_IRQ_B_PIN; + if (gpio_request(pin, "PCI IntB") == 0) { + if (gpio_direction_input(pin) == 0) { + irq = gpio_to_irq(pin); + irq_set_irq_type(irq, IRQ_TYPE_LEVEL_LOW); + printk (KERN_INFO "PCI IntB IRQ: %d\n", irq); + } else { + printk(KERN_ERR "dt2_pci_preinit failed to " + "irq_set_irq_type pin %d\n", pin); + gpio_free(pin); + } + } else { + printk(KERN_ERR "dt2_pci_preinit failed to gpio_request %d\n", pin); + } +} + +static int __init dt2_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) +{ + int irq; + + /* + * Check for devices with hard-wired IRQs. + */ + irq = orion5x_pci_map_irq(dev, slot, pin); + if (irq != -1){ + printk(KERN_INFO "orion5x_pci_map_irq: %d\n", irq); + return irq; + } + + /* + * PCI IRQs are connected via GPIOs + */ + switch (slot - DT2_PCI_SLOT0_OFFS) { + case 0: + if (pin == 1){ + irq = gpio_to_irq(DT2_PCI_SLOT0_IRQ_A_PIN); + printk(KERN_INFO "dt2_pci_map_irq DT2_PCI_SLOT0_IRQ_A_PIN: %d\n", irq); + } + else { + irq = gpio_to_irq(DT2_PCI_SLOT0_IRQ_B_PIN); + printk(KERN_INFO "dt2_pci_map_irq DT2_PCI_SLOT0_IRQ_B_PIN: %d\n", irq); + } + default: + irq = -1; + printk(KERN_INFO "dt2_pci_map_irq IRQ: %d\n", irq); + } + + return irq; +} + +static struct hw_pci dt2_pci __initdata = { + .nr_controllers = 2, + .preinit = dt2_pci_preinit, + .setup = orion5x_pci_sys_setup, + .scan = orion5x_pci_sys_scan_bus, + .map_irq = dt2_pci_map_irq, +}; + +static int __init dt2_pci_init(void) +{ + if (machine_is_dt2()) + pci_common_init(&dt2_pci); + + return 0; +} + +subsys_initcall(dt2_pci_init); + +/***************************************************************************** + * Ethernet + ****************************************************************************/ + +static struct mv643xx_eth_platform_data dt2_eth_data = { + .phy_addr = MV643XX_ETH_PHY_NONE, + .speed = SPEED_1000, + .duplex = DUPLEX_FULL, +}; + +static struct dsa_chip_data dt2_switch_chip_data = { + .port_names[0] = "wan", + .port_names[1] = "lan1", + .port_names[2] = "lan2", + .port_names[3] = "cpu", + .port_names[4] = "lan3", + .port_names[5] = "lan4", +}; + +static struct dsa_platform_data dt2_switch_plat_data = { + .nr_chips = 1, + .chip = &dt2_switch_chip_data, +}; + +/***************************************************************************** + * RTC ISL1208 on I2C bus + ****************************************************************************/ +static struct i2c_board_info __initdata dt2_i2c_rtc = { + I2C_BOARD_INFO("isl1208", 0x6F), +}; + +/***************************************************************************** + * Sata + ****************************************************************************/ +static struct mv_sata_platform_data dt2_sata_data = { + .n_ports = 2, +}; + +/***************************************************************************** + * General Setup + ****************************************************************************/ +static unsigned int dt2_mpp_modes[] __initdata = { + MPP0_GPIO, // RTC interrupt + MPP1_GPIO, // 88e6131 interrupt + MPP2_GPIO, // PCI_intB + MPP3_GPIO, // PCI_intA + MPP4_GPIO, // reset button switch + MPP5_GPIO, + MPP6_GPIO, + MPP7_GPIO, + MPP8_GPIO, + MPP9_GIGE, /* GE_RXERR */ + MPP10_GPIO, // usb + MPP11_GPIO, // usb + MPP12_GIGE, // GE_TXD[4] + MPP13_GIGE, // GE_TXD[5] + MPP14_GIGE, // GE_TXD[6] + MPP15_GIGE, // GE_TXD[7] + MPP16_GIGE, // GE_RXD[4] + MPP17_GIGE, // GE_RXD[5] + MPP18_GIGE, // GE_RXD[6] + MPP19_GIGE, // GE_RXD[7] + 0, +}; + +/***************************************************************************** + * LEDS + ****************************************************************************/ +static struct platform_device dt2_leds = { + .name = "dt2-led", + .id = -1, +}; + +/**************************************************************************** + * GPIO key + ****************************************************************************/ +static irqreturn_t dt2_reset_handler(int irq, void *dev_id) +{ + /* This is the paper-clip reset which does an emergency reboot. */ + printk(KERN_INFO "Restarting system.\n"); + machine_restart(NULL); + + /* This should never be reached. */ + return IRQ_HANDLED; +} + +static irqreturn_t dt2_power_handler(int irq, void *dev_id) +{ + printk(KERN_INFO "Shutting down system.\n"); + machine_power_off(); + return IRQ_HANDLED; +} + +static void __init dt2_init(void) +{ + /* + * Setup basic Orion functions. Need to be called early. + */ + orion5x_init(); + + orion5x_mpp_conf(dt2_mpp_modes); + + /* + * Configure peripherals. + */ + + orion5x_uart0_init(); + orion5x_ehci0_init(); + orion5x_ehci1_init(); + orion5x_i2c_init(); + orion5x_sata_init(&dt2_sata_data); + orion5x_xor_init(); + + printk(KERN_INFO "U-Boot parameters:\n"); + printk(KERN_INFO "Sys Clk = %d, Tclk = %d, BoardID = 0x%02x\n", mvSysclk, mvTclk, gBoardId); + + printk(KERN_INFO "Serial: %s\n", dt2_eeprom.fc.dt2_serial_number); + printk(KERN_INFO "Revision: %016x\n", dt2_eeprom.fc.dt2_revision); + printk(KERN_INFO "DT2: Using MAC address %pM for port 0\n", + dt2_eeprom.gw.mac_addr[0]); + printk(KERN_INFO "DT2: Using MAC address %pM for port 1\n", + dt2_eeprom.gw.mac_addr[1]); + + orion5x_eth_init(&dt2_eth_data); + memcpy(dt2_eth_data.mac_addr, dt2_eeprom.gw.mac_addr[0], 6); + orion5x_eth_switch_init(&dt2_switch_plat_data, NO_IRQ); + + i2c_register_board_info(0, &dt2_i2c_rtc, 1); + + mvebu_mbus_add_window("devbus-boot", DT2_NOR_BOOT_BASE, + DT2_NOR_BOOT_SIZE); + + platform_device_register(&dt2_nor_flash); + + mvebu_mbus_add_window("devbus-cs0", DT2_LEDS_BASE, DT2_LEDS_SIZE); + platform_device_register(&dt2_leds); + + if (request_irq(gpio_to_irq(DT2_PIN_GPIO_RESET), &dt2_reset_handler, + IRQF_TRIGGER_LOW, + "DT2: Reset button", NULL) < 0) { + + printk("DT2: Reset Button IRQ %d not available\n", + gpio_to_irq(DT2_PIN_GPIO_RESET)); + } + + if (request_irq(gpio_to_irq(DT2_PIN_GPIO_POWER), &dt2_power_handler, + IRQF_TRIGGER_LOW, + "DT2: Power button", NULL) < 0) { + + printk(KERN_DEBUG "DT2: Power Button IRQ %d not available\n", + gpio_to_irq(DT2_PIN_GPIO_POWER)); + } +} + +static int __init parse_tag_dt2_uboot(const struct tag *t) +{ + struct tag_mv_uboot *mv_uboot; + + // Get pointer to our block + mv_uboot = (struct tag_mv_uboot*)&t->u; + mvTclk = mv_uboot->tclk; + mvSysclk = mv_uboot->sysclk; + mvUbootVer = mv_uboot->uboot_version; + mvIsUsbHost = mv_uboot->isUsbHost; + + // Some clock fixups + if(mvTclk == 166000000) mvTclk = 166666667; + else if(mvTclk == 133000000) mvTclk = 133333333; + else if(mvSysclk == 166000000) mvSysclk = 166666667; + + gBoardId = (mvUbootVer & 0xff); + + //DT2 specific data + memcpy(&dt2_eeprom, mv_uboot->dt2_eeprom, sizeof(struct DT2_EEPROM_STRUCT)); + + return 0; +} +__tagtable(ATAG_MV_UBOOT, parse_tag_dt2_uboot); + +/* + * This is OpenWrt specific fixup. It includes code from original "tag_fixup_mem32" to + * fixup bogus memory tags and also fixes kernel cmdline by adding " init=/etc/preinit" + * at the end. It is important to flash OpenWrt image from original Freecom firmware. + * + * Vanilla kernel should use "tag_fixup_mem32" function. + */ +void __init openwrt_fixup(struct tag *t, char **from, struct meminfo *meminfo) +{ + char *p = NULL; + static char openwrt_init_tag[] __initdata = " init=/etc/preinit"; + + for (; t->hdr.size; t = tag_next(t)){ + /* Locate the Freecom cmdline */ + if (t->hdr.tag == ATAG_CMDLINE) { + p = t->u.cmdline.cmdline; + printk("%s(%d): Found cmdline '%s' at 0x%0lx\n", + __FUNCTION__, __LINE__, p, (unsigned long)p); + } + /* + * Many orion-based systems have buggy bootloader implementations. + * This is a common fixup for bogus memory tags. + */ + if (t->hdr.tag == ATAG_MEM && + (!t->u.mem.size || t->u.mem.size & ~PAGE_MASK || + t->u.mem.start & ~PAGE_MASK)) { + printk(KERN_WARNING + "Clearing invalid memory bank %dKB@0x%08x\n", + t->u.mem.size / 1024, t->u.mem.start); + t->hdr.tag = 0; + } + } + + printk("%s(%d): End of table at 0x%0lx\n", __FUNCTION__, __LINE__, (unsigned long)t); + + /* Overwrite the end of the table with a new cmdline tag. */ + t->hdr.tag = ATAG_CMDLINE; + t->hdr.size = + (sizeof (struct tag_header) + + strlen(p) + strlen(openwrt_init_tag) + 1 + 4) >> 2; + + strlcpy(t->u.cmdline.cmdline, p, COMMAND_LINE_SIZE); + strlcpy(t->u.cmdline.cmdline + strlen(p), openwrt_init_tag, + COMMAND_LINE_SIZE - strlen(p)); + + printk("%s(%d): New cmdline '%s' at 0x%0lx\n", + __FUNCTION__, __LINE__, + t->u.cmdline.cmdline, (unsigned long)t->u.cmdline.cmdline); + + t = tag_next(t); + + printk("%s(%d): New end of table at 0x%0lx\n", __FUNCTION__, __LINE__, (unsigned long)t); + + t->hdr.tag = ATAG_NONE; + t->hdr.size = 0; +} + +/* Warning: Freecom uses their own custom bootloader with mach-type (=1500) */ +MACHINE_START(DT2, "Freecom DataTank Gateway") + /* Maintainer: Zintis Petersons */ + .atag_offset = 0x100, + .init_machine = dt2_init, + .map_io = orion5x_map_io, + .init_irq = orion5x_init_irq, + .init_time = orion5x_timer_init, + .fixup = openwrt_fixup, //tag_fixup_mem32, +MACHINE_END diff --git a/target/linux/orion/generic/base-files/etc/uci-defaults/09_hardware b/target/linux/orion/generic/base-files/etc/uci-defaults/09_hardware new file mode 100644 index 0000000..7f727eb --- /dev/null +++ b/target/linux/orion/generic/base-files/etc/uci-defaults/09_hardware @@ -0,0 +1,54 @@ +#!/bin/sh +# +# Copyright (C) 2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +# +# This script sets system defaults for the hardware on firstboot +# + +local hardware=`sed -n /Hardware/s/.*:.//p /proc/cpuinfo` + +wrt350nv2_default() { +# leds + uci batch <<__EOF +set system.power_led=led +set system.power_led.name='Power LED (green)' +set system.power_led.sysfs='wrt350nv2:green:power' +set system.power_led.default='1' +set system.wifi_led=led +set system.wifi_led.name='Wireless LED (green)' +set system.wifi_led.sysfs='wrt350nv2:green:wireless' +set system.wifi_led.trigger='netdev' +set system.wifi_led.dev='wlan0' +set system.wifi_led.mode='link tx rx' +set system.wifi_led.default='0' +commit system +__EOF + +# add mac address from U-Boot partition to lan and wan devices + MTD=`grep -e 'u-boot' /proc/mtd` + MTD=`echo ${MTD} | sed 's/[a-z]*\([0-9]*\):.*/\1/'` + [ -n "${MTD}" ] && { + MACADDR=`dd if=/dev/mtdblock${MTD} bs=1 skip=262048 count=6 2>/dev/null | hexdump -e '1/1 "%02x"'` + MACADDR2=$(( 0x${MACADDR} + 1)) + MACADDR2=`printf "%012x" ${MACADDR2}` + + MACADDR=`echo ${MACADDR} | sed 's/\(..\)/\1:/g' | sed 's/:$//'` + MACADDR2=`echo ${MACADDR2} | sed 's/\(..\)/\1:/g' | sed 's/:$//'` + + uci set network.eth0.macaddr=${MACADDR} + uci set network.lan.macaddr=${MACADDR} + uci set network.wan.macaddr=${MACADDR2} + uci commit network + } +} + +case "${hardware}" in + 'Linksys WRT350N v2') + wrt350nv2_default + ;; +esac diff --git a/target/linux/orion/generic/base-files/lib/upgrade/platform.sh b/target/linux/orion/generic/base-files/lib/upgrade/platform.sh new file mode 100644 index 0000000..9c9967e --- /dev/null +++ b/target/linux/orion/generic/base-files/lib/upgrade/platform.sh @@ -0,0 +1,38 @@ +# +# Copyright (C) 2010-2011 OpenWrt.org +# + +# use default "image" for PART_NAME +# use default for platform_do_upgrade() + +platform_check_image() { + [ "${ARGC}" -gt 1 ] && { echo 'Too many arguments. Only flash file expected.'; return 1; } + + local hardware=`sed -n /Hardware/s/.*:.//p /proc/cpuinfo` + local magic="$(get_magic_word "$1")" + local magic_long="$(get_magic_long "$1")" + + case "${hardware}" in + # hardware with a direct uImage partition + # image header format as described in U-Boot's include/image.h + # see http://git.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=blob;f=include/image.h + 'Linksys WRT350N v2') + [ "${magic_long}" != '27051956' ] && { + echo "Invalid image type ${magic_long}." + return 1 + } + return 0 + ;; + # Netgear WNR854T (has uImage as file inside a JFFS2 partition) + 'Netgear WNR854T') + [ "${magic}" != '8519' ] && { + echo "Invalid image type ${magic}." + return 1 + } + return 0 + ;; + esac + + echo "Sysupgrade is not yet supported on ${hardware}." + return 1 +} diff --git a/target/linux/orion/generic/target.mk b/target/linux/orion/generic/target.mk new file mode 100644 index 0000000..451de4e --- /dev/null +++ b/target/linux/orion/generic/target.mk @@ -0,0 +1,14 @@ +# +# Copyright (C) 2008-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +BOARDNAME:=Generic +FEATURES:=squashfs + +define Target/Description + Build firmware images for Marvell Orion based boards that boot from internal flash. + (e.g.: Linksys WRT350N v2, Netgear WNR854T, ...) +endef diff --git a/target/linux/orion/harddisk/config-default b/target/linux/orion/harddisk/config-default new file mode 100644 index 0000000..bf6cee1 --- /dev/null +++ b/target/linux/orion/harddisk/config-default @@ -0,0 +1,38 @@ +CONFIG_ATA=y +CONFIG_BLK_DEV_DM=y +CONFIG_BLK_DEV_MD=y +CONFIG_BLK_DEV_SD=y +CONFIG_CRC16=y +# CONFIG_DM_CRYPT is not set +# CONFIG_DM_MIRROR is not set +# CONFIG_DM_SNAPSHOT is not set +CONFIG_EXT4_FS=y +CONFIG_FS_MBCACHE=y +CONFIG_HWMON=y +CONFIG_I2C_BOARDINFO=y +CONFIG_JBD2=y +CONFIG_MACH_DT2=y +CONFIG_MACH_NET2BIG=y +# CONFIG_MACH_WN802T is not set +# CONFIG_MACH_WNR854T is not set +# CONFIG_MACH_WRT350N_V2 is not set +CONFIG_MD=y +CONFIG_MD_AUTODETECT=y +CONFIG_MD_LINEAR=y +# CONFIG_MD_MULTIPATH is not set +CONFIG_MD_RAID0=y +CONFIG_MD_RAID1=y +# CONFIG_MD_RAID10 is not set +# CONFIG_MD_RAID456 is not set +CONFIG_NLS=y +CONFIG_RTC_CLASS=y +CONFIG_SATA_MV=y +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +CONFIG_USB=y +CONFIG_USB_COMMON=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_HCD_ORION=y +CONFIG_USB_EHCI_HCD_PLATFORM=y +CONFIG_USB_STORAGE=y +# CONFIG_USB_UHCI_HCD is not set diff --git a/target/linux/orion/harddisk/target.mk b/target/linux/orion/harddisk/target.mk new file mode 100644 index 0000000..a3a0e41 --- /dev/null +++ b/target/linux/orion/harddisk/target.mk @@ -0,0 +1,14 @@ +# +# Copyright (C) 2008-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +BOARDNAME:=Internal Hard-Disk +FEATURES:=targz + +define Target/Description + Build firmware images for Marvell Orion based boards that boot directly from internal disk storage. + (e.g.: Freecom DataTank 2, ...) +endef diff --git a/target/linux/orion/image/Makefile b/target/linux/orion/image/Makefile new file mode 100644 index 0000000..058519f --- /dev/null +++ b/target/linux/orion/image/Makefile @@ -0,0 +1,12 @@ +# +# Copyright (C) 2008-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/image.mk + +include $(SUBTARGET).mk + +$(eval $(call BuildImage)) diff --git a/target/linux/orion/image/generic.mk b/target/linux/orion/image/generic.mk new file mode 100644 index 0000000..905997d --- /dev/null +++ b/target/linux/orion/image/generic.mk @@ -0,0 +1,230 @@ +# +# Copyright (C) 2008-2015 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +### DO NOT INDENT LINES CONTAINING $(call xyz) AS THIS MAY CHANGE THE CONTEXT +### OF THE FIRST LINE IN THE CALLED VARIABLE (NOTE: variable!) +### see http://www.gnu.org/software/make/manual/html_node/Call-Function.html#Call-Function +### ACTUALLY IT IS A SIMPLE MACRO EXPANSION + +### use round brackets for make variables, and curly brackets for shell variables + + +## Kernel mtd partition size in KiB +KERNEL_MTD_SIZE:=1280 + +# Netgear WNR854T: erase size is 128KiB = 0x00020000 = 131072 +ERASE_SIZE_128K:=128 + +# Linksys WRT350N v2: erase size is 64KiB = 0x00010000 = 65536 +ERASE_SIZE_64K:=64 + +# define JFFS2 sizes for include/image.mk +JFFS2_BLOCKSIZE:=64k 128k + + +### +### Image/BuildKernel +### + +define Image/BuildKernel +### Dummy comment for indented calls of Image/BuildKernel + + ## Netgear WN802T: mach id 3306 (0x0cea) +$(call Image/BuildKernel/ARM/zImage,wn802t,"\x0c\x1c\xa0\xe3\xea\x10\x81\xe3") +$(call Image/BuildKernel/ARM/uImage,wn802t) +ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) +$(call Image/BuildKernel/ARM/zImage,wn802t,"\x0c\x1c\xa0\xe3\xea\x10\x81\xe3",-initramfs) +$(call Image/BuildKernel/ARM/uImage,wn802t,-initramfs) +endif + ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) # nothing more to do for a ramdisk build +$(call Image/BuildKernel/JFFS2uImage,wn802t,$(ERASE_SIZE_64K),uImage) +$(call Image/Default/FileSizeCheck,$(KDIR)/wn802t-uImage.jffs2,$(shell expr $(KERNEL_MTD_SIZE) \* 1024)) + endif + + ## Netgear WNR854T: mach id 1801 (0x0709) +$(call Image/BuildKernel/ARM/zImage,wnr854t,"\x07\x1c\xa0\xe3\x09\x10\x81\xe3") +$(call Image/BuildKernel/ARM/uImage,wnr854t) +ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) +$(call Image/BuildKernel/ARM/zImage,wnr854t,"\x07\x1c\xa0\xe3\x09\x10\x81\xe3",-initramfs) +$(call Image/BuildKernel/ARM/uImage,wnr854t,-initramfs) +endif + ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) # nothing more to do for a ramdisk build +$(call Image/BuildKernel/JFFS2uImage,wnr854t,$(ERASE_SIZE_128K),uImage) +$(call Image/Default/FileSizeCheck,$(KDIR)/wnr854t-uImage.jffs2,$(shell expr $(KERNEL_MTD_SIZE) \* 1024)) + endif + + ## Linksys WRT350N v2: mach id 1633 (0x0661) +$(call Image/BuildKernel/ARM/zImage,wrt350nv2,"\x06\x1c\xa0\xe3\x61\x10\x81\xe3") +$(call Image/BuildKernel/ARM/uImage,wrt350nv2) +ifeq ($($CONFIG_TARGET_ROOTFS_INITRAMFS),y) +$(call Image/BuildKernel/ARM/zImage,wrt350nv2,"\x06\x1c\xa0\xe3\x61\x10\x81\xe3",-initramfs) +$(call Image/BuildKernel/ARM/uImage,wrt350nv2-initramfs) +endif + ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) # nothing more to do for a ramdisk build +$(call Image/Default/FileSizeCheck,$(KDIR)/wrt350nv2-uImage,$(shell expr $(KERNEL_MTD_SIZE) \* 1024)) + endif +endef + +define Image/BuildKernel/ARM/zImage + # merge machine id and regular zImage into one file + # parameters: 1 = machine name, 2 = machine id as string in quotes + # $(BOARD) kernel zImage for $(1) + echo -en $(2) > '$(KDIR)/$(1)-zImage$(3)' + cat '$(KDIR)/zImage$(3)' >> '$(KDIR)/$(1)-zImage$(3)' +endef + +define Image/BuildKernel/ARM/uImage + # create uImage from zImage + # parameters: 1 = machine name + # $(BOARD) kernel uImage for $(1) + '$(STAGING_DIR_HOST)/bin/mkimage' -A arm -O linux -T kernel \ + -C none -a 0x00008000 -e 0x00008000 -n 'Linux-$(LINUX_VERSION)' \ + -d '$(KDIR)/$(1)-zImage$(2)' '$(KDIR)/$(1)-uImage$(2)' + ifeq ($(2),-initramfs) # only copy uImage for ramdisk build + cp '$(KDIR)/$(1)-uImage-initramfs' '$(BIN_DIR)/openwrt-$(1)-uImage-initramfs' + endif +endef + +define Image/BuildKernel/JFFS2uImage + # create JFFS2 partition with uImage file (result is already padded to erase size) + # parameters: 1 = machine name, 2 = erase size in KiB, 3 = uImage file name + # $(BOARD) kernel uImage for $(1) in JFFS2-$(2)k partition + rm -rf '$(TMP_DIR)/$(1)_jffs2_uimage' + mkdir '$(TMP_DIR)/$(1)_jffs2_uimage' + cp '$(KDIR)/$(1)-uImage' '$(TMP_DIR)/$(1)_jffs2_uimage/$(3)' + $(STAGING_DIR_HOST)/bin/mkfs.jffs2 --compression-mode=none --pad --little-endian --squash -e $(2)KiB -o '$(KDIR)/$(1)-uImage.jffs2' -d '$(TMP_DIR)/$(1)_jffs2_uimage' + rm -rf '$(TMP_DIR)/$(1)_jffs2_uimage' +endef + +define Image/Default/FileSizeCheck + # parameters: 1 = file path, 2 = maximum size in bytes + [ `stat -c %s '$(1)'` -le $(2) ] || { echo ' ERROR: $(1) too big (> $(2) bytes)'; exit 1; } +endef + + +### +### Image/Build +### + +define Image/Build +### Dummy comment for indented calls of Image/Build with $(1) + + ## Prepare rootfs +$(call Image/Build/$(1),$(1)) + + ## Netgear WN802T +$(call Image/Build/Default,$(1),wn802t,$(ERASE_SIZE_64K),$(KERNEL_MTD_SIZE),.jffs2,NG_WN802T) + + ## Netgear WNR854T +$(call Image/Build/Default,$(1),wnr854t,$(ERASE_SIZE_128K),$(KERNEL_MTD_SIZE),.jffs2,NG_WNR854T) + + ## Linksys WRT350N v2 +$(call Image/Build/Linksys/wrt350nv2,$(1),wrt350nv2,$(ERASE_SIZE_64K),$(KERNEL_MTD_SIZE),) +endef + +define Image/Build/squashfs +$(call prepare_generic_squashfs,$(KDIR)/root.squashfs) +endef + +## generate defines for all JFFS2 block sizes +define Image/Build/jffs2/sub + $(eval define Image/Build/jffs2-$(1) + cp '$$(KDIR)/root.jffs2-$(1)' '$$(BIN_DIR)/$$(IMG_PREFIX)-root.jffs2-$(1)' + endef) +endef + +$(foreach SZ,$(JFFS2_BLOCKSIZE),$(call Image/Build/jffs2/sub,$(SZ))) + +define Image/Build/Default + # parameters: 1 = rootfs type, 2 = machine name, 3 = erase size in KiB, 4 = kernel mtd size in KiB, 5 = kernel file suffix, 6 = header + ifeq ($(findstring jffs2-,$(1)),jffs2-) # JFFS2: build only image fitting to erase size + ifeq ($(1),jffs2-$(3)k) +$(call Image/Build/Default/sysupgrade,$(1),$(2),$(4),$(5)) +$(call Image/Build/Default/factory,$(1),$(2),$(6)) + endif + else + ifeq ($(1),ext4) # EXT4: ignore + # do nothing + else # do all other images +$(call Image/Build/Default/sysupgrade,$(1),$(2),$(4),$(5)) +$(call Image/Build/Default/factory,$(1),$(2),$(6)) + endif + endif +endef + +define Image/Build/Default/sysupgrade + # parameters: 1 = rootfs type, 2 = machine name, 3 = pad size in KiB (kernel mtd size or erase size), 4 = kernel file suffix + # $(BOARD) $(1) sysupgrade image for $(2) + ( \ + dd if='$(KDIR)/$(2)-uImage$(4)' bs=$(3)k conv=sync; \ + dd if='$(KDIR)/root.$(1)'; \ + ) > '$(BIN_DIR)/openwrt-$(2)-$(1)-sysupgrade.img' +endef + +define Image/Build/Default/factory + # parameters: 1 = rootfs type, 2 = machine name, 3 = header + # $(BOARD) $(1) factory upgrade image for $(2) + '$(STAGING_DIR_HOST)/bin/add_header' $(3) '$(BIN_DIR)/openwrt-$(2)-$(1)-sysupgrade.img' '$(BIN_DIR)/openwrt-$(2)-$(1)-factory.img' +endef + +## +## Image/Build/Linksys +## + +define Image/Build/Linksys/wrt350nv2 + # parameters: 1 = rootfs type, 2 = machine name, 3 = erase size in KiB, 4 = kernel mtd size in KiB, 5 = kernel file suffix + ifeq ($(findstring jffs2-,$(1)),jffs2-) # JFFS2: build only image fitting to erase size + ifeq ($(1),jffs2-$(3)k) +$(call Image/Build/Default/sysupgrade,$(1),$(2),$(4),$(5)) +$(call Image/Build/Linksys/wrt350nv2-builder,$(1),$(2)) + endif + else + ifeq ($(1),ext4) # EXT4: ignore + # do nothing + else # do all other images +$(call Image/Build/Default/sysupgrade,$(1),$(2),$(4),$(5)) +$(call Image/Build/Linksys/wrt350nv2-builder,$(1),$(2)) + endif + endif +endef + +define Image/Build/Linksys/wrt350nv2-builder + # parameters: 1 = rootfs type, 2 = machine name + # $(BOARD) $(1) factory and recovery image for $(2) via wrt350nv2-builder + rm -rf '$(TMP_DIR)/$(2)_factory' + mkdir '$(TMP_DIR)/$(2)_factory' + # create parameter file + echo ':image 0 $(BIN_DIR)/openwrt-$(2)-$(1)-sysupgrade.img' > '$(TMP_DIR)/$(2)_factory/$(2).par' + [ ! -f '$(STAGING_DIR_HOST)/share/wrt350nv2-builder/u-boot.bin' ] || ( \ + echo ':u-boot 0 $(STAGING_DIR_HOST)/share/wrt350nv2-builder/u-boot.bin' >> '$(TMP_DIR)/$(2)_factory/$(2).par'; \ + ) + echo '#version 0x2020' >> '$(TMP_DIR)/$(2)_factory/$(2).par' + # create bin file for recovery and factory image + ( \ + cd '$(TMP_DIR)/$(2)_factory'; \ + '$(STAGING_DIR_HOST)/bin/wrt350nv2-builder' -b '$(TMP_DIR)/$(2)_factory/$(2).par'; \ + ) + # copy bin file as recovery image + $(CP) '$(TMP_DIR)/$(2)_factory/wrt350n.bin' '$(BIN_DIR)/openwrt-$(2)-$(1)-recovery.bin' + # create factory image for stock firmware update mechanism + ( \ + cd '$(TMP_DIR)/$(2)_factory'; \ + zip 'wrt350n.zip' 'wrt350n.bin'; \ + ) + '$(STAGING_DIR_HOST)/bin/wrt350nv2-builder' -z '$(TMP_DIR)/$(2)_factory/wrt350n.zip' '$(BIN_DIR)/openwrt-$(2)-$(1)-factory.img' + rm -rf '$(TMP_DIR)/$(2)_factory' +endef + + +### +### Image/PreReq +### + +## Dependency for WRT350N v2 factory image +$(eval $(call RequireCommand,zip, \ + Please install zip. \ +)) diff --git a/target/linux/orion/image/harddisk.mk b/target/linux/orion/image/harddisk.mk new file mode 100644 index 0000000..fb2f351 --- /dev/null +++ b/target/linux/orion/image/harddisk.mk @@ -0,0 +1,57 @@ +# +# Copyright (C) 2008-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Image/BuildKernelMachId + echo -en "\x$(2)\x1c\xa0\xe3\x$(3)\x10\x81\xe3" > $(KDIR)/$(1)-zImage + cat $(LINUX_DIR)/arch/arm/boot/zImage >> $(KDIR)/$(1)-zImage + $(STAGING_DIR_HOST)/bin/mkimage -A arm -O linux -T kernel \ + -C none -a 0x00008000 -e 0x00008000 -n 'Linux-$(LINUX_VERSION)' \ + -d $(KDIR)/$(1)-zImage $(KDIR)/$(1)-uImage + cp $(KDIR)/$(1)-uImage $(BIN_DIR)/openwrt-$(1)-uImage +endef + +define Image/BuildKernel + # Orion Kernel uImages + # DT2: mach id 1514 (0x5EA) + $(call Image/BuildKernelMachId,dt2,05,ea) + # LaCie 2big Network: mach id 2342 (0x926) + $(call Image/BuildKernelMachId,net2big,09,26) +endef + +define Image/Build/Freecom + # Orion Freecom Images + # backup unwanted files + rm -rf ${TMP_DIR}/$2_backup + mkdir ${TMP_DIR}/$2_backup + -mv $(TARGET_DIR)/{var,jffs,rom} ${TMP_DIR}/$2_backup + # add extra files + $(INSTALL_DIR) $(TARGET_DIR)/boot + # TODO: Add special CMDLINE shim for webupgrade image here + $(CP) $(KDIR)/dt2-uImage $(TARGET_DIR)/boot/uImage + $(INSTALL_DIR) $(TARGET_DIR)/var + # create image + $(TAR) cfj $(BIN_DIR)/openwrt-$(2)-$(1).img --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ . + $(STAGING_DIR_HOST)/bin/encode_crc $(BIN_DIR)/openwrt-$(2)-$(1).img $(BIN_DIR)/openwrt-$(2)-$(1)-webupgrade.img $(3) + # remove extra files + rm -rf $(TARGET_DIR)/{boot,var} + # recover unwanted files + -mv ${TMP_DIR}/$2_backup/* $(TARGET_DIR)/ + rm -rf ${TMP_DIR}/$2_backup +endef + +define Image/Build +$(call Image/Build/$(1),$(1)) +$(call Image/Build/Freecom,$(1),dt2,DT,$(1)) +endef + +define Image/Build/squashfs +$(call prepare_generic_squashfs,$(KDIR)/root.squashfs) + ( \ + dd if=$(KDIR)/uImage bs=1024k conv=sync; \ + dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \ + ) > $(BIN_DIR)/$(IMG_PREFIX)-$(1).img +endef diff --git a/target/linux/orion/patches/100-wrt350nv2_openwrt_partition_map.patch b/target/linux/orion/patches/100-wrt350nv2_openwrt_partition_map.patch new file mode 100644 index 0000000..89c2c94 --- /dev/null +++ b/target/linux/orion/patches/100-wrt350nv2_openwrt_partition_map.patch @@ -0,0 +1,32 @@ +--- a/arch/arm/mach-orion5x/wrt350n-v2-setup.c ++++ b/arch/arm/mach-orion5x/wrt350n-v2-setup.c +@@ -134,11 +134,11 @@ static struct mtd_partition wrt350n_v2_n + { + .name = "kernel", + .offset = 0x00000000, +- .size = 0x00760000, ++ .size = 0x00140000, // change to kernel mtd size here (1/3) + }, { + .name = "rootfs", +- .offset = 0x001a0000, +- .size = 0x005c0000, ++ .offset = 0x00140000, // change to kernel mtd size here (2/3) ++ .size = 0x00610000, // adopt to kernel mtd size here (3/3) = 0x00750000 - + }, { + .name = "lang", + .offset = 0x00760000, +@@ -151,6 +151,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 new file mode 100644 index 0000000..881cfb7 --- /dev/null +++ b/target/linux/orion/patches/101-wnr854t_partition_map.patch @@ -0,0 +1,25 @@ +--- a/arch/arm/mach-orion5x/wnr854t-setup.c ++++ b/arch/arm/mach-orion5x/wnr854t-setup.c +@@ -57,15 +57,19 @@ static struct mtd_partition wnr854t_nor_ + { + .name = "kernel", + .offset = 0x00000000, +- .size = 0x00100000, ++ .size = 0x00140000, + }, { + .name = "rootfs", +- .offset = 0x00100000, +- .size = 0x00660000, ++ .offset = 0x00140000, ++ .size = 0x00620000, + }, { + .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 new file mode 100644 index 0000000..6d3f559 --- /dev/null +++ b/target/linux/orion/patches/200-dt2_board_support.patch @@ -0,0 +1,26 @@ +--- a/arch/arm/mach-orion5x/Kconfig ++++ b/arch/arm/mach-orion5x/Kconfig +@@ -36,6 +36,13 @@ config MACH_RD88F5182_DT + Say 'Y' here if you want your kernel to support the Marvell + Orion-NAS (88F5182) RD2, Flattened Device Tree. + ++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 +@@ -14,6 +14,7 @@ obj-$(CONFIG_MACH_TS78XX) += ts78xx-setu + obj-$(CONFIG_MACH_MV2120) += mv2120-setup.o + obj-$(CONFIG_MACH_NET2BIG) += net2big-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/210-wn802t_support.patch b/target/linux/orion/patches/210-wn802t_support.patch new file mode 100644 index 0000000..479498e --- /dev/null +++ b/target/linux/orion/patches/210-wn802t_support.patch @@ -0,0 +1,78 @@ +--- a/arch/arm/mach-orion5x/Kconfig ++++ b/arch/arm/mach-orion5x/Kconfig +@@ -144,10 +144,13 @@ config MACH_MSS2_DT + Maxtor Shared Storage II platform. + + config MACH_WNR854T +- bool "Netgear WNR854T" ++ bool "Netgear WNR854T / WN802T" + help + Say 'Y' here if you want your kernel to support the +- Netgear WNR854T platform. ++ Netgear WNR854T or WN802T platform. ++ ++config MACH_WN802T ++ def_bool MACH_WNR854T + + config MACH_RD88F5181L_GE + bool "Marvell Orion-VoIP GE Reference Design" +--- a/arch/arm/mach-orion5x/wnr854t-setup.c ++++ b/arch/arm/mach-orion5x/wnr854t-setup.c +@@ -115,6 +115,15 @@ static struct dsa_platform_data wnr854t_ + .chip = &wnr854t_switch_chip_data, + }; + ++static struct dsa_chip_data wn802t_switch_chip_data = { ++ .port_names[2] = "wan", ++ .port_names[3] = "cpu", ++}; ++ ++static struct dsa_platform_data wn802t_switch_plat_data = { ++ .nr_chips = 1, ++ .chip = &wn802t_switch_chip_data, ++}; + static void __init wnr854t_init(void) + { + /* +@@ -128,7 +137,12 @@ static void __init wnr854t_init(void) + * Configure peripherals. + */ + orion5x_eth_init(&wnr854t_eth_data); +- orion5x_eth_switch_init(&wnr854t_switch_plat_data, NO_IRQ); ++ ++ if (machine_is_wn802t()) ++ orion5x_eth_switch_init(&wn802t_switch_plat_data, NO_IRQ); ++ else ++ orion5x_eth_switch_init(&wnr854t_switch_plat_data, NO_IRQ); ++ + orion5x_uart0_init(); + + mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET, +@@ -168,7 +182,7 @@ static struct hw_pci wnr854t_pci __initd + + static int __init wnr854t_pci_init(void) + { +- if (machine_is_wnr854t()) ++ if (machine_is_wnr854t() || machine_is_wn802t()) + pci_common_init(&wnr854t_pci); + + return 0; +@@ -179,6 +193,18 @@ MACHINE_START(WNR854T, "Netgear WNR854T" + /* Maintainer: Imre Kaloz */ + .atag_offset = 0x100, + .init_machine = wnr854t_init, ++ .map_io = orion5x_map_io, ++ .init_early = orion5x_init_early, ++ .init_irq = orion5x_init_irq, ++ .init_time = orion5x_timer_init, ++ .fixup = tag_fixup_mem32, ++ .restart = orion5x_restart, ++MACHINE_END ++ ++MACHINE_START(WN802T, "Netgear WN802T") ++ /* Maintainer: Imre Kaloz */ ++ .atag_offset = 0x100, ++ .init_machine = wnr854t_init, + .map_io = orion5x_map_io, + .init_early = orion5x_init_early, + .init_irq = orion5x_init_irq, -- cgit v1.2.3