> -----Original Message----- > From: Tomasz Maciej Nowak [mailto:tome...@o2.pl] > Sent: Freitag, 10. Juli 2020 19:30 > To: m...@adrianschmutzler.de; openwrt-devel@lists.openwrt.org > Cc: 'Alexandra Alth' <alexan...@alth.de> > Subject: Re: [PATCH] mvebu: add support for MACCHIATObin Single Shot > > Hi. > > W dniu 10.07.2020 o 10:33, m...@adrianschmutzler.de pisze: > >>> -----Original Message----- > >>> From: openwrt-devel [mailto:openwrt-devel- > boun...@lists.openwrt.org] > >>> On Behalf Of Tomasz Maciej Nowak > >>> Sent: Donnerstag, 9. Juli 2020 21:16 > >>> To: openwrt-devel@lists.openwrt.org > >>> Cc: Alexandra Alth <alexan...@alth.de> > >>> Subject: [PATCH] mvebu: add support for MACCHIATObin Single Shot > >>> > >>> The currently supported Double Shot variant provides dts which is > >>> not entirely compatible with Single Shot variant. The symptoms are > >>> that SFP ports are not working. To remedy this, add two images to > >>> distinguish both boards, wich have proper dtb assigned. > >>> > >>> Reported-by: Alexandra Alth <alexan...@alth.de> > >>> Signed-off-by: Tomasz Maciej Nowak <tome...@o2.pl> > >>> --- > >>> target/linux/mvebu/image/cortexa72.mk | 20 ++++++++++++++++++-- > >>> 1 file changed, 18 insertions(+), 2 deletions(-) > >>> > >>> diff --git a/target/linux/mvebu/image/cortexa72.mk > >>> b/target/linux/mvebu/image/cortexa72.mk > >>> index 50233540ed2e..cab2ffcaa251 100644 > >>> --- a/target/linux/mvebu/image/cortexa72.mk > >>> +++ b/target/linux/mvebu/image/cortexa72.mk > >>> @@ -16,14 +16,30 @@ define Device/marvell_armada8040-db endef > >>> TARGET_DEVICES += marvell_armada8040-db > >>> > >>> -define Device/marvell_macchiatobin > >>> +define Device/marvell_macchiatobin-doubleshot > >>> $(call Device/Default-arm64) > >>> DEVICE_VENDOR := SolidRun > >>> DEVICE_MODEL := MACCHIATObin > >>> + DEVICE_VARIANT := Double Shot > >>> DEVICE_ALT0_VENDOR := SolidRun > >>> DEVICE_ALT0_MODEL := Armada 8040 Community Board > >>> + DEVICE_ALT0_VARIANT := Double Shot > >>> DEVICE_PACKAGES += kmod-i2c-mux-pca954x > >>> DEVICE_DTS := armada-8040-mcbin > >>> SUPPORTED_DEVICES := marvell,armada8040-mcbin endef - > >>> TARGET_DEVICES += marvell_macchiatobin > >>> +TARGET_DEVICES += marvell_macchiatobin-doubleshot > >>> + > >>> +define Device/marvell_macchiatobin-singleshot > >>> + $(call Device/Default-arm64) > >>> + DEVICE_VENDOR := SolidRun > >>> + DEVICE_MODEL := MACCHIATObin > >>> + DEVICE_VARIANT := Single Shot > >>> + DEVICE_ALT0_VENDOR := SolidRun > >>> + DEVICE_ALT0_MODEL := Armada 8040 Community Board > >>> + DEVICE_ALT0_VARIANT := Single Shot > >>> + DEVICE_PACKAGES += kmod-i2c-mux-pca954x > >>> + DEVICE_DTS := armada-8040-mcbin-singleshot > >>> + SUPPORTED_DEVICES := marvell,armada8040-mcbin-singleshot > >>> +endef > >>> +TARGET_DEVICES += marvell_macchiatobin-singleshot > >> Kernel tells me that the compatible for these devices is > >> marvell,armada8040-mcbin-doubleshot > >> and > >> marvell,armada8040-mcbin-singleshot > >> However, we seem to implement something different: > >> adsc@buildfff:/data/openwrt$ grep -rn "mcbin" target/linux/mvebu/ | > >> sort > >> target/linux/mvebu/cortexa72/base- > files/etc/board.d/02_network:14:mar > >> vell,armada8040-mcbin) > >> target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh:12: > >> marvell,armada8040-mcbin) > >> target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh:23: > >> marvell,armada8040-mcbin) > >> target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh:33: > >> marvell,armada8040-mcbin) > >> target/linux/mvebu/image/cortexa72.mk:26: DEVICE_DTS := > >> armada-8040-mcbin > >> target/linux/mvebu/image/cortexa72.mk:27: SUPPORTED_DEVICES := > >> marvell,armada8040-mcbin So, ... > >> 1. is the current setup broken for the doubleshot already? > >> 2. If yes, the relevant sections seem to be updated for the singleshot as > well ... > >> Best > >> Adrian > > > > Had a look at the kernel and actually option 1 is true, they added a new > primary compatible for the doubleshot when introducing the singleshot. > > Indeed, I have overlooked that change. > > > > > I sent a patch for that already a minute ago, just fixing doubleshot with > > the > current implementation. > > I'll base v2 on Your patch.
Thanks for your feedback. You might speed things up by providing Reviewed-by and/or Tested-by for my other patch. :-) Best Adrian > > > > > Consequently, your patch should be updated to also provide the correct > board name for singleshot in 02_network and platform.sh. > > Yeah, I was really narrow sighted to provide the image, that forgot to add > those. > > > > > Despite, I cannot judge how the SFP port will affect network config with > respect to 02_network. > > It seems that the setup is correct for both boards and in Double Shot variant > one uses SFP cages or 10 Gb copper ports. > > > > > Best > > > > Adrian > > > > Regards > > -- > TMN
openpgp-digital-signature.asc
Description: PGP signature
_______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
