Author: luka Date: 2016-03-24 22:09:34 +0100 (Thu, 24 Mar 2016) New Revision: 49086
Modified: trunk/target/linux/ar71xx/base-files/lib/ar71xx.sh trunk/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt trunk/target/linux/ar71xx/files/arch/mips/ath79/Makefile trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-ap120c.c trunk/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h trunk/target/linux/ar71xx/image/Makefile Log: ar71xx: cosmetic fix of alfa ap120c/ap96 ordering Signed-off-by: Luka Perkov <[email protected]> Modified: trunk/target/linux/ar71xx/base-files/lib/ar71xx.sh =================================================================== --- trunk/target/linux/ar71xx/base-files/lib/ar71xx.sh 2016-03-23 22:37:05 UTC (rev 49085) +++ trunk/target/linux/ar71xx/base-files/lib/ar71xx.sh 2016-03-24 21:09:34 UTC (rev 49086) @@ -348,12 +348,12 @@ *"AirRouter") name="airrouter" ;; + *"ALFA Network AP120C") + name="alfa-ap120c" + ;; *"ALFA Network AP96") name="alfa-ap96" ;; - *"ALFA Network AP120C") - name="alfa-ap120c" - ;; *"ALFA Network N2/N5") name="alfa-nx" ;; Modified: trunk/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt =================================================================== --- trunk/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt 2016-03-23 22:37:05 UTC (rev 49085) +++ trunk/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt 2016-03-24 21:09:34 UTC (rev 49086) @@ -1,3 +1,11 @@ +config ATH79_MACH_ALFA_AP120C + bool "ALFA Network AP120C board support" + select ATH79_DEV_AP9X_PCI if PCI + select ATH79_DEV_ETH + select ATH79_DEV_GPIO_BUTTONS + select ATH79_DEV_M25P80 + select ATH79_DEV_WMAC + config ATH79_MACH_ALFA_AP96 bool "ALFA Network AP96 board support" select SOC_AR71XX @@ -6,14 +14,6 @@ select ATH79_DEV_M25P80 select ATH79_DEV_USB -config ATH79_MACH_ALFA_AP120C - bool "ALFA Network AP120C board support" - select ATH79_DEV_AP9X_PCI if PCI - select ATH79_DEV_ETH - select ATH79_DEV_GPIO_BUTTONS - select ATH79_DEV_M25P80 - select ATH79_DEV_WMAC - config ATH79_MACH_HORNET_UB bool "ALFA Network Hornet-UB board support" select SOC_AR933X Modified: trunk/target/linux/ar71xx/files/arch/mips/ath79/Makefile =================================================================== --- trunk/target/linux/ar71xx/files/arch/mips/ath79/Makefile 2016-03-23 22:37:05 UTC (rev 49085) +++ trunk/target/linux/ar71xx/files/arch/mips/ath79/Makefile 2016-03-24 21:09:34 UTC (rev 49086) @@ -38,8 +38,8 @@ # # Machines # +obj-$(CONFIG_ATH79_MACH_ALFA_AP120C) += mach-alfa-ap120c.o obj-$(CONFIG_ATH79_MACH_ALFA_AP96) += mach-alfa-ap96.o -obj-$(CONFIG_ATH79_MACH_ALFA_AP120C) += mach-alfa-ap120c.o obj-$(CONFIG_ATH79_MACH_ALFA_NX) += mach-alfa-nx.o obj-$(CONFIG_ATH79_MACH_ALL0258N) += mach-all0258n.o obj-$(CONFIG_ATH79_MACH_ALL0315N) += mach-all0315n.o Modified: trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-ap120c.c =================================================================== --- trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-ap120c.c 2016-03-23 22:37:05 UTC (rev 49085) +++ trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-ap120c.c 2016-03-24 21:09:34 UTC (rev 49086) @@ -101,13 +101,13 @@ struct ath9k_platform_data *pdata; ath79_register_leds_gpio(-1, ARRAY_SIZE(alfa_ap120c_leds_gpio), - alfa_ap120c_leds_gpio); + alfa_ap120c_leds_gpio); ath79_register_gpio_keys_polled(-1, ALFA_AP120C_KEYS_POLL_INTERVAL, ARRAY_SIZE(alfa_ap120c_gpio_keys), alfa_ap120c_gpio_keys); ath79_gpio_function_enable(AR71XX_GPIO_FUNC_SPI_CS1_EN | - AR71XX_GPIO_FUNC_SPI_CS2_EN); + AR71XX_GPIO_FUNC_SPI_CS2_EN); ath79_register_m25p80_multi(&flash); @@ -124,7 +124,7 @@ pdata->use_eeprom = true; ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_RGMII_GMAC0 | - BIT(15) | BIT(17) | BIT(19) | BIT(21)); + BIT(15) | BIT(17) | BIT(19) | BIT(21)); ath79_register_mdio(0, 0x0); @@ -144,4 +144,4 @@ } MIPS_MACHINE(ATH79_MACH_ALFA_AP120C, "ALFA-AP120C", "ALFA Network AP120C", - alfa_ap120c_init); + alfa_ap120c_init); Modified: trunk/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h =================================================================== --- trunk/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h 2016-03-23 22:37:05 UTC (rev 49085) +++ trunk/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h 2016-03-24 21:09:34 UTC (rev 49086) @@ -17,8 +17,8 @@ enum ath79_mach_type { ATH79_MACH_GENERIC_OF = -1, /* Device tree board */ ATH79_MACH_GENERIC = 0, + ATH79_MACH_ALFA_AP120C, /* ALFA Network AP120C board */ ATH79_MACH_ALFA_AP96, /* ALFA Network AP96 board */ - ATH79_MACH_ALFA_AP120C, /* ALFA Network AP120 board */ ATH79_MACH_ALFA_NX, /* ALFA Network N2/N5 board */ ATH79_MACH_ALL0258N, /* Allnet ALL0258N */ ATH79_MACH_ALL0305, /* Allnet ALL0305 */ Modified: trunk/target/linux/ar71xx/image/Makefile =================================================================== --- trunk/target/linux/ar71xx/image/Makefile 2016-03-23 22:37:05 UTC (rev 49085) +++ trunk/target/linux/ar71xx/image/Makefile 2016-03-24 21:09:34 UTC (rev 49086) @@ -1556,8 +1556,8 @@ $(LOADER_MAKE) clean endef +alfa_ap120c_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,13312k(rootfs),1536k(kernel),1152k(unknown)ro,64k(art)ro;spi0.1:-(unknown) alfa_ap96_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,256k(u-boot-env)ro,13312k(rootfs),2048k(kernel),512k(caldata)ro,15360k@0x80000(firmware) -alfa_ap120c_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,13312k(rootfs),1536k(kernel),1152k(unknown)ro,64k(art)ro;spi0.1:-(unknown) alfa_mtdlayout_8M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,6144k(rootfs),1600k(kernel),64k(nvram),64k(art)ro,7744k@0x50000(firmware) alfa_mtdlayout_16M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,15936k(firmware),64k(nvram),64k(art)ro all0258n_mtdlayout=mtdparts=spi0.0:256k(u-boot),64k(u-boot-env),6272k(firmware),1536k(failsafe),64k(art) @@ -2357,8 +2357,8 @@ $(eval $(call SingleProfile,AthGzip,64k,AP96,ap96,AP96,ttyS0,115200,$$(ap96_mtdlayout),RKuImage)) $(eval $(call SingleProfile,AthGzip,64k,WNDAP360,wndap360,WNDAP360,ttyS0,9600,$$(wndap360_mtdlayout),KRuImage)) +$(eval $(call SingleProfile,AthLzma,64k,ALFAAP120C,alfa-ap120c,ALFA-AP120C,ttyS0,115200,$$(alfa_ap120c_mtdlayout),RKuImage)) $(eval $(call SingleProfile,AthLzma,64k,ALFAAP96,alfa-ap96,ALFA-AP96,ttyS0,115200,$$(alfa_ap96_mtdlayout),RKuImage)) -$(eval $(call SingleProfile,AthLzma,64k,ALFAAP120C,alfa-ap120c,ALFA-AP120C,ttyS0,115200,$$(alfa_ap120c_mtdlayout),RKuImage)) $(eval $(call SingleProfile,AthLzma,64k,ALL0258N,all0258n,ALL0258N,ttyS0,115200,$$(all0258n_mtdlayout),KRuImage,65536)) $(eval $(call SingleProfile,AthLzma,256k,ALL0315N,all0315n,ALL0315N,ttyS0,115200,$$(all0315n_mtdlayout),KRuImage,262144)) $(eval $(call SingleProfile,AthLzma,64k,AP113,ap113,AP113,ttyS0,115200,$$(ap113_mtd_layout),RK)) _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
