[LEDE-DEV] [PATCH v2] ar71xx:ew-dorin target moved from legacy to generic
Mathias Kresin
dev at kresin.me
Wed Jul 19 05:58:59 PDT 2017
2017-07-19 11:44 GMT+02:00 Catrinel Catrinescu <cc at 80211.de>:
> Embedded Wireless Dorin platform moved from legacy to generic and
> changed the STATUS-LED from GPIO23 to GPIO21 for Dorin-Eval 2.2 boards
>
> Signed-off-by: Catrinel Catrinescu <cc at 80211.de>
Please split the patch into two. One for switching the board to the
new image build code and one for fixing the Dorin-Eval 2.2 boards
GPIOs.
Btw., your commit message only mentions the GPIO change of the status
led but you're removing led21 and led22 as well. Please explain in the
commit message why you are doing so.
> ---
> .../ar71xx/files/arch/mips/ath79/mach-ew-dorin.c | 16 ++--------------
> target/linux/ar71xx/image/generic.mk | 20 ++++++++++++++++++++
> target/linux/ar71xx/image/legacy-devices.mk | 18 ------------------
> target/linux/ar71xx/image/legacy.mk | 5 -----
> 4 files changed, 22 insertions(+), 37 deletions(-)
>
> diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-ew-dorin.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-ew-dorin.c
> index e686b5fa6f..575a976aec 100644
> --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-ew-dorin.c
> +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-ew-dorin.c
> @@ -2,7 +2,7 @@
> * EW Dorin board support
> * (based on Atheros Ref. Design AP121)
> * Copyright (C) 2011-2012 Gabor Juhos <juhosg at openwrt.org>
> - * Copyright (C) 2012-2015 Embedded Wireless GmbH www.80211.de
> + * Copyright (C) 2012-2017 Embedded Wireless GmbH www.80211.de
> *
> * This program is free software; you can redistribute it and/or modify it
> * under the terms of the GNU General Public License version 2 as published
> @@ -27,25 +27,13 @@
> #define DORIN_CALDATA_OFFSET 0x1000
> #define DORIN_WMAC_MAC_OFFSET 0x1002
>
> -#define DORIN_GPIO_LED_21 21
> -#define DORIN_GPIO_LED_22 22
> -#define DORIN_GPIO_LED_STATUS 23
> +#define DORIN_GPIO_LED_STATUS 21
>
> #define DORIN_GPIO_BTN_JUMPSTART 11
> #define DORIN_GPIO_BTN_RESET 6
>
> static struct gpio_led dorin_leds_gpio[] __initdata = {
> {
> - .name = "dorin:green:led21",
> - .gpio = DORIN_GPIO_LED_21,
> - .active_low = 1,
> - },
> - {
> - .name = "dorin:green:led22",
> - .gpio = DORIN_GPIO_LED_22,
> - .active_low = 1,
> - },
> - {
> .name = "dorin:green:status",
> .gpio = DORIN_GPIO_LED_STATUS,
> .active_low = 1,
> diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk
> index 3f1486ed63..66cbfc6b3f 100644
> --- a/target/linux/ar71xx/image/generic.mk
> +++ b/target/linux/ar71xx/image/generic.mk
> @@ -207,6 +207,26 @@ define Device/dragino2
> endef
> TARGET_DEVICES += dragino2
>
> +define Device/ew-dorin
> + DEVICE_TITLE := Embedded Wireless Dorin Platform
> + DEVICE_PACKAGES := kmod-usb-core kmod-usb-chipidea
> + BOARDNAME = EW-DORIN
> + CONSOLE := ttyATH0,115200
> + IMAGE_SIZE = 16000k
> + MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env),16000k(firmware),64k(art)ro
> +endef
> +TARGET_DEVICES += ew-dorin
> +
> +define Device/ew-dorin-router
> + DEVICE_TITLE := Embedded Wireless Dorin Router Platform
> + DEVICE_PACKAGES := kmod-usb-core kmod-usb-chipidea
> + BOARDNAME = EW-DORIN-ROUTER
> + CONSOLE := ttyATH0,115200
> + IMAGE_SIZE = 16000k
> + MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env),16000k(firmware),64k(art)ro
> +endef
> +TARGET_DEVICES += ew-dorin-router
> +
> define Device/weio
> DEVICE_TITLE := WeIO
> DEVICE_PACKAGES := kmod-usb-core kmod-usb2
> diff --git a/target/linux/ar71xx/image/legacy-devices.mk b/target/linux/ar71xx/image/legacy-devices.mk
> index 77230249af..e418282dd0 100644
> --- a/target/linux/ar71xx/image/legacy-devices.mk
> +++ b/target/linux/ar71xx/image/legacy-devices.mk
> @@ -132,24 +132,6 @@ define LegacyDevice/DB120
> endef
> LEGACY_DEVICES += DB120
>
> -define LegacyDevice/EWDORINAP
> - DEVICE_TITLE := Embedded Wireless Dorin Platform (4MB flash)
> - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-usb-storage
> -endef
> -LEGACY_DEVICES += EWDORINAP
> -
> -define LegacyDevice/EWDORINRT
> - DEVICE_TITLE := Embedded Wireless Dorin Router
> - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-usb-storage
> -endef
> -LEGACY_DEVICES += EWDORINRT
> -
> -define LegacyDevice/EWDORIN16M
> - DEVICE_TITLE := Embedded Wireless Dorin Platform (16MB flash)
> - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-usb-storage
> -endef
> -LEGACY_DEVICES += EWDORIN16M
> -
> define LegacyDevice/HORNETUBx2
> DEVICE_TITLE := ALFA Network Hornet-UB-x2 board (16MB flash, 64MB ram)
> DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
> diff --git a/target/linux/ar71xx/image/legacy.mk b/target/linux/ar71xx/image/legacy.mk
> index b400e5ddbb..701116be43 100644
> --- a/target/linux/ar71xx/image/legacy.mk
> +++ b/target/linux/ar71xx/image/legacy.mk
> @@ -258,8 +258,6 @@ cameo_ap94_mtdlayout_fat=mtdparts=spi0.0:256k(uboot)ro,64k(config)ro,7808k(firmw
> esr900_mtdlayout=mtdparts=spi0.0:192k(u-boot)ro,64k(u-boot-env)ro,1408k(kernel),13248k(rootfs),1024k(manufacture)ro,64k(backup)ro,320k(storage)ro,64k(caldata)ro,14656k at 0x40000(firmware)
> esr1750_mtdlayout=mtdparts=spi0.0:192k(u-boot)ro,64k(u-boot-env)ro,1408k(kernel),13248k(rootfs),1024k(manufacture)ro,64k(backup)ro,320k(storage)ro,64k(caldata)ro,14656k at 0x40000(firmware)
> epg5000_mtdlayout=mtdparts=spi0.0:192k(u-boot)ro,64k(u-boot-env)ro,1408k(kernel),13248k(rootfs),1024k(manufacture)ro,64k(backup)ro,320k(storage)ro,64k(caldata)ro,14656k at 0x40000(firmware)
> -ew-dorin_mtdlayout_4M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env),3712k(firmware),64k(art)ro
> -ew-dorin_mtdlayout_16M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env),16000k(firmware),64k(art)ro
> f9k1115v2_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env),14464k(rootfs),1408k(kernel),64k(nvram)ro,64k(envram)ro,64k(art)ro,15872k at 0x50000(firmware)
> dlrtdev_mtdlayout=mtdparts=spi0.0:256k(uboot)ro,64k(config)ro,6208k(firmware),64k(caldata)ro,640k(certs),960k(unknown)ro,64k at 0x7f0000(caldata_copy)
> dlrtdev_mtdlayout_fat=mtdparts=spi0.0:256k(uboot)ro,64k(config)ro,7168k(firmware),640k(certs),64k(caldata)ro,64k at 0x660000(caldata_orig),6208k at 0x50000(firmware_orig)
> @@ -897,9 +895,6 @@ $(eval $(call SingleProfile,AthLzma,64k,AP152_16M,ap152-16M,AP152,ttyS0,115200,$
> $(eval $(call SingleProfile,AthLzma,64k,BXU2000N2,bxu2000n-2-a1,BXU2000n-2-A1,ttyS0,115200,$$(bxu2000n2_mtdlayout),RKuImage))
> $(eval $(call SingleProfile,AthLzma,64k,CAP4200AG,cap4200ag,CAP4200AG,ttyS0,115200,$$(cap4200ag_mtdlayout),KRuImage))
> $(eval $(call SingleProfile,AthLzma,64k,DB120,db120,DB120,ttyS0,115200,$$(db120_mtdlayout),RKuImage))
> -$(eval $(call SingleProfile,AthLzma,64k,EWDORINAP,ew-dorin,EW-DORIN,ttyATH0,115200,$$(ew-dorin_mtdlayout_4M),KRuImage,65536))
> -$(eval $(call SingleProfile,AthLzma,64k,EWDORINRT,ew-dorin-router,EW-DORIN-ROUTER,ttyATH0,115200,$$(ew-dorin_mtdlayout_4M),KRuImage,65536))
> -$(eval $(call SingleProfile,AthLzma,64k,EWDORIN16M,ew-dorin-16M,EW-DORIN,ttyATH0,115200,$$(ew-dorin_mtdlayout_16M),KRuImage,65536))
> $(eval $(call SingleProfile,AthLzma,64k,HORNETUBx2,hornet-ub-x2,HORNET-UB,ttyATH0,115200,$$(alfa_mtdlayout_16M),KRuImage,65536))
> $(eval $(call SingleProfile,AthLzma,64k,TUBE2H16M,tube2h-16M,TUBE2H,ttyATH0,115200,$$(alfa_mtdlayout_16M),KRuImage,65536))
> $(eval $(call SingleProfile,AthLzma,64k,WLR8100,wlr8100,WLR8100,ttyS0,115200,$$(wlr8100_mtdlayout),KRuImage))
> --
> 2.11.0 (Apple Git-81)
>
>
> _______________________________________________
> Lede-dev mailing list
> Lede-dev at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/lede-dev
More information about the Lede-dev
mailing list