2012.01.05. 9:34 keltezéssel, Cezary Jackiewicz írta:
> Update patches https://dev.openwrt.org/ticket/9568
>
> Tested on r29664
>
> Signed-off-by: Cezary Jackiewicz <cezary.jackiew...@gmail.com>
>
> ---
> --- target/linux/ar71xx/config-2.6.37 (wersja 27297)
> +++ target/linux/ar71xx/config-2.6.37 (kopia robocza)
> @@ -33,6 +32,7 @@
> CONFIG_AR71XX_MACH_PB92=y
> CONFIG_AR71XX_MACH_RB4XX=y
> CONFIG_AR71XX_MACH_RB750=y
> +CONFIG_AR71XX_MACH_RW2458N=y
> CONFIG_AR71XX_MACH_TEW_632BRP=y
> CONFIG_AR71XX_MACH_TL_MR3X20=y
> CONFIG_AR71XX_MACH_TL_WA901ND=y
> --- target/linux/ar71xx/image/Makefile (wersja 29665)
> +++ target/linux/ar71xx/image/Makefile (kopia robocza)
> @@ -687,6 +687,11 @@
> $(call
> Image/Build/Template/$(fs_squash)/$(1),Cameo913x,dir-615-c1,$(dir615c1_cmdline),"AP81-AR9130-RT-070614-02")
> endef
>
> +rw2458n_cmdline=board=RW2458N console=ttyS0,115200
> +define Image/Build/Profile/RW2458N
> + $(call
> Image/Build/Template/$(fs_64k)/$(1),UBNTXM,rw2458n,$(rw2458n_cmdline),XM,UBNTXM,ar7240)
> +endef
> +
> tew632brp_cmdline=board=TEW-632BRP console=ttyS0,115200
> define Image/Build/Profile/TEW632BRP
> $(call
> Image/Build/Template/$(fs_squash)/$(1),Cameo913x,tew-632brp,$(tew632brp_cmdline),"AP81-AR9130-RT-070614-00")
> @@ -950,6 +955,7 @@
> $(call Image/Build/Profile/PB42,$(1))
> $(call Image/Build/Profile/PB44,$(1))
> $(call Image/Build/Profile/PB92,$(1))
> + $(call Image/Build/Profile/RW2458N,$(1))
> $(call Image/Build/Profile/TEW632BRP,$(1))
> $(call Image/Build/Profile/TEW652BRP,$(1))
> $(call Image/Build/Profile/TLMR3020,$(1))
> --- target/linux/ar71xx/files/arch/mips/ar71xx/Makefile (wersja 29665)
> +++ target/linux/ar71xx/files/arch/mips/ar71xx/Makefile (kopia robocza)
> @@ -53,6 +53,7 @@
> obj-$(CONFIG_AR71XX_MACH_PB92) += mach-pb92.o
> obj-$(CONFIG_AR71XX_MACH_RB4XX) += mach-rb4xx.o
> obj-$(CONFIG_AR71XX_MACH_RB750) += mach-rb750.o
> +obj-$(CONFIG_AR71XX_MACH_RW2458N) += mach-rw2458n.o
> obj-$(CONFIG_AR71XX_MACH_TEW_632BRP) += mach-tew-632brp.o
> obj-$(CONFIG_AR71XX_MACH_TL_MR3020) += mach-tl-mr3020.o
> obj-$(CONFIG_AR71XX_MACH_TL_MR3X20) += mach-tl-mr3x20.o
> --- target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h (wersja 29665)
> +++ target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h (kopia robocza)
> @@ -49,6 +49,7 @@
> AR71XX_MACH_RB_493, /* Mikrotik RouterBOARD 493/493AH */
> AR71XX_MACH_RB_493G, /* Mikrotik RouterBOARD 493G */
> AR71XX_MACH_RB_750, /* MikroTik RouterBOARD 750 */
> + AR71XX_MACH_RW2458N, /* Redwave RW2458N */
> AR71XX_MACH_TEW_632BRP, /* TRENDnet TEW-632BRP */
> AR71XX_MACH_TL_MR3020, /* TP-LINK TL-MR3020 */
> AR71XX_MACH_TL_MR3220, /* TP-LINK TL-MR3220 */
> --- target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig (wersja 29665)
> +++ target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig (kopia robocza)
> @@ -144,6 +144,17 @@
> select AR71XX_DEV_LEDS_GPIO
> select AR71XX_DEV_USB
>
> +config AR71XX_MACH_RW2458N
> + bool "Redwave RW2458N board support"
> + select SOC_AR724X
> + select AR71XX_DEV_M25P80
> + select AR71XX_DEV_AP91_PCI if PCI
> + select AR71XX_DEV_GPIO_BUTTONS
> + select AR71XX_DEV_LEDS_GPIO
> + select AR71XX_DEV_PB42_PCI if PCI
AR71XX_PB42_PCI should be used for AR71xx based boards only.
> + select AR71XX_DEV_USB
> + default n
The 'default n' is not needed.
> +
> config AR71XX_MACH_AW_NR580
> bool "AzureWave AW-NR580 board support"
> select SOC_AR71XX
> --- target/linux/ar71xx/files/arch/mips/ar71xx/mach-rw2458n.c (wersja 0)
> +++ target/linux/ar71xx/files/arch/mips/ar71xx/mach-rw2458n.c (wersja 0)
> @@ -0,0 +1,111 @@
> +/*
> + * Redwave RW2458N support
> + *
<...>
> +static void __init rw2458n_setup(void)
> +{
> + u8 *mac1 = (u8 *) KSEG1ADDR(0x1fff0000);
> + u8 *mac2 = (u8 *) KSEG1ADDR(0x1fff0000 + ETH_ALEN);
> + u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
> +
> + ar71xx_add_device_m25p80(&rw2458n_flash_data);
> +
> + ar71xx_add_device_mdio(0, ~RW2458N_WAN_PHYMASK);
> +
> + ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac1, 0);
> + ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac2, 0);
> + ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
> + ar71xx_eth0_data.speed = SPEED_100;
> + ar71xx_eth0_data.duplex = DUPLEX_FULL;
> + ar71xx_eth0_data.phy_mask = RW2458N_WAN_PHYMASK;
> +
> + ar71xx_add_device_eth(0);
> +
> + ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
> + ar71xx_eth1_data.speed = SPEED_100;
> + ar71xx_eth1_data.duplex = DUPLEX_FULL;
Please remove the ar71xx_eth{0,1}_data.* initialization. Those values are
configured automatically for AR7240 since r29103.
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
