| Message ID | 20190501174224.19089-7-tomek_n@o2.pl |
|---|---|
| State | Superseded |
| Headers | show |
| Series | mvebu: cleanups, improvments and new ESPRESSObin variants | expand |
On 5/1/19 7:42 PM, Tomasz Maciej Nowak wrote: > Replace SoC names with vendors in device names, in few cases, and add > vendor to developemnt boards for easier identyfying potential firmware to > flash. Will sysupgrade still work after this rename? Isn't there some script which checks if the image is compatible with the currently installed image? > Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl> > --- > package/boot/uboot-mvebu/Makefile | 2 +- > target/linux/mvebu/image/Makefile | 1 - > target/linux/mvebu/image/cortex-a53.mk | 4 +-- > target/linux/mvebu/image/cortex-a72.mk | 12 +++---- > target/linux/mvebu/image/cortex-a9.mk | 44 +++++++++++++++----------- > 5 files changed, 34 insertions(+), 29 deletions(-) > > diff --git a/package/boot/uboot-mvebu/Makefile b/package/boot/uboot-mvebu/Makefile > index 61547acb27..06c574594b 100644 > --- a/package/boot/uboot-mvebu/Makefile > +++ b/package/boot/uboot-mvebu/Makefile > @@ -24,7 +24,7 @@ endef > > define U-Boot/clearfog > NAME:=SolidRun ClearFog A1 > - BUILD_DEVICES:=armada-388-clearfog-base armada-388-clearfog-pro > + BUILD_DEVICES:=solidrun-clearfog-base solidrun-clearfog-pro > BUILD_SUBTARGET:=cortexa9 > UBOOT_IMAGE:=u-boot-spl.kwb > endef > diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile > index 240cc88642..fe74a12c65 100644 > --- a/target/linux/mvebu/image/Makefile > +++ b/target/linux/mvebu/image/Makefile > @@ -70,7 +70,6 @@ endef > > define Device/Default > PROFILES := Default > - DEVICE_DTS := $(1) > BOARD_NAME = $$(DEVICE_DTS) > KERNEL_NAME := zImage > KERNEL := kernel-bin | append-dtb | uImage none > diff --git a/target/linux/mvebu/image/cortex-a53.mk b/target/linux/mvebu/image/cortex-a53.mk > index a102f52481..4dd1e44665 100644 > --- a/target/linux/mvebu/image/cortex-a53.mk > +++ b/target/linux/mvebu/image/cortex-a53.mk > @@ -8,12 +8,12 @@ define Device/globalscale-espressobin > endef > TARGET_DEVICES += globalscale-espressobin > > -define Device/armada-3720-db > +define Device/marvell-armada-3720-db > $(call Device/Default-arm64) > DEVICE_TITLE := Marvell Armada 3720 Development Board DB-88F3720-DDR3 > DEVICE_DTS := armada-3720-db > SUPPORTED_DEVICES := marvell,armada-3720-db > endef > -TARGET_DEVICES += armada-3720-db > +TARGET_DEVICES += marvell-armada-3720-db > > endif > diff --git a/target/linux/mvebu/image/cortex-a72.mk b/target/linux/mvebu/image/cortex-a72.mk > index 824f6b5d0f..3043f087cc 100644 > --- a/target/linux/mvebu/image/cortex-a72.mk > +++ b/target/linux/mvebu/image/cortex-a72.mk > @@ -1,30 +1,30 @@ > ifeq ($(SUBTARGET),cortexa72) > > -define Device/armada-macchiatobin > +define Device/marvell-macchiatobin > $(call Device/Default-arm64) > DEVICE_TITLE := MACCHIATObin (SolidRun Armada 8040 Community Board) > DEVICE_PACKAGES += kmod-i2c-core kmod-i2c-mux kmod-i2c-mux-pca954x > DEVICE_DTS := armada-8040-mcbin > SUPPORTED_DEVICES := marvell,armada8040-mcbin > endef > -TARGET_DEVICES += armada-macchiatobin > +TARGET_DEVICES += marvell-macchiatobin > > -define Device/armada-8040-db > +define Device/marvell-armada-8040-db > $(call Device/Default-arm64) > DEVICE_TITLE := Marvell Armada 8040 DB board > DEVICE_DTS := armada-8040-db > IMAGE/sdcard.img.gz := boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata > SUPPORTED_DEVICES := marvell,armada8040-db > endef > -TARGET_DEVICES += armada-8040-db > +TARGET_DEVICES += marvell-armada-8040-db > > -define Device/armada-7040-db > +define Device/marvell-armada-7040-db > $(call Device/Default-arm64) > DEVICE_TITLE := Marvell Armada 7040 DB board > DEVICE_DTS := armada-7040-db > IMAGE/sdcard.img.gz := boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata > SUPPORTED_DEVICES := marvell,armada7040-db > endef > -TARGET_DEVICES += armada-7040-db > +TARGET_DEVICES += marvell-armada-7040-db > > endif > diff --git a/target/linux/mvebu/image/cortex-a9.mk b/target/linux/mvebu/image/cortex-a9.mk > index 252300b942..e5459dad1a 100644 > --- a/target/linux/mvebu/image/cortex-a9.mk > +++ b/target/linux/mvebu/image/cortex-a9.mk > @@ -61,57 +61,63 @@ define Device/linksys-wrt1900ac > endef > TARGET_DEVICES += linksys-wrt1900ac > > -define Device/openblocks-ax3-4 > +define Device/plathome-openblocks-ax3-4 > DEVICE_DTS := armada-xp-openblocks-ax3-4 > - SUPPORTED_DEVICES := $(1) > + SUPPORTED_DEVICES := openblocks-ax3-4 > BLOCKSIZE := 128k > PAGESIZE := 1 > IMAGES += factory.img > IMAGE/factory.img := append-kernel | pad-to $$(BLOCKSIZE) | append-ubi > DEVICE_TITLE := Plat'Home OpenBlocks AX3 > endef > -TARGET_DEVICES += openblocks-ax3-4 > +TARGET_DEVICES += plathome-openblocks-ax3-4 > > -define Device/armada-385-db-ap > +define Device/marvell-armada-385-db-ap > $(Device/NAND-256K) > + DEVICE_DTS := armada-385-db-ap > IMAGES += factory.img > KERNEL_SIZE := 8192k > DEVICE_TITLE := Marvell Armada 385 DB AP (DB-88F6820-AP) > endef > -TARGET_DEVICES += armada-385-db-ap > +TARGET_DEVICES += marvell-armada-385-db-ap > > -define Device/armada-370-db > +define Device/marvell-armada-370-db > $(Device/NAND-512K) > DEVICE_TITLE := Marvell Armada 370 DB (DB-88F6710-BP-DDR3) > + DEVICE_DTS := armada-370-db > endef > -TARGET_DEVICES += armada-370-db > +TARGET_DEVICES += marvell-armada-370-db > > -define Device/armada-370-rd > +define Device/marvell-armada-370-rd > $(Device/NAND-512K) > DEVICE_TITLE := Marvell Armada 370 RD (RD-88F6710-A1) > + DEVICE_DTS := armada-370-rd > endef > -TARGET_DEVICES += armada-370-rd > +TARGET_DEVICES += marvell-armada-370-rd > > -define Device/armada-xp-db > +define Device/marvell-armada-xp-db > $(Device/NAND-512K) > DEVICE_TITLE := Marvell Armada XP DB (DB-78460-BP) > + DEVICE_DTS := armada-xp-db > endef > -TARGET_DEVICES += armada-xp-db > +TARGET_DEVICES += marvell-armada-xp-db > > -define Device/armada-xp-gp > +define Device/marvell-armada-xp-gp > $(Device/NAND-512K) > DEVICE_TITLE := Marvell Armada XP GP (DB-MV784MP-GP) > + DEVICE_DTS := armada-xp-gp > endef > -TARGET_DEVICES += armada-xp-gp > +TARGET_DEVICES += marvell-armada-xp-gp > > -define Device/armada-388-rd > +define Device/marvell-armada-388-rd > DEVICE_TITLE := Marvell Armada 388 RD (RD-88F6820-AP) > + DEVICE_DTS := armada-388-rd > IMAGES := firmware.bin > IMAGE/firmware.bin := append-kernel | pad-to 256k | append-rootfs | pad-rootfs > endef > -TARGET_DEVICES += armada-388-rd > +TARGET_DEVICES += marvell-armada-388-rd > > -define Device/armada-388-clearfog-pro > +define Device/solidrun-clearfog-pro > KERNEL_INSTALL := 1 > KERNEL := kernel-bin > DEVICE_TITLE := SolidRun ClearFog Pro > @@ -123,9 +129,9 @@ define Device/armada-388-clearfog-pro > UBOOT := clearfog-u-boot-spl.kwb > BOOT_SCRIPT := clearfog > endef > -TARGET_DEVICES += armada-388-clearfog-pro > +TARGET_DEVICES += solidrun-clearfog-pro > > -define Device/armada-388-clearfog-base > +define Device/solidrun-clearfog-base > KERNEL_INSTALL := 1 > KERNEL := kernel-bin > DEVICE_TITLE := SolidRun ClearFog Base > @@ -136,7 +142,7 @@ define Device/armada-388-clearfog-base > UBOOT := clearfog-u-boot-spl.kwb > BOOT_SCRIPT := clearfog > endef > -TARGET_DEVICES += armada-388-clearfog-base > +TARGET_DEVICES += solidrun-clearfog-base > > define Device/globalscale-mirabox > $(Device/NAND-512K) >
On 5/1/19 7:42 PM, Tomasz Maciej Nowak wrote: > Replace SoC names with vendors in device names, in few cases, and add > vendor to developemnt boards for easier identyfying potential firmware to > flash. > > Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl> > diff --git a/target/linux/mvebu/image/cortex-a72.mk b/target/linux/mvebu/image/cortex-a72.mk > index 824f6b5d0f..3043f087cc 100644 > --- a/target/linux/mvebu/image/cortex-a72.mk > +++ b/target/linux/mvebu/image/cortex-a72.mk > @@ -1,30 +1,30 @@ > ifeq ($(SUBTARGET),cortexa72) > > -define Device/armada-macchiatobin > +define Device/marvell-macchiatobin > $(call Device/Default-arm64) > DEVICE_TITLE := MACCHIATObin (SolidRun Armada 8040 Community Board) > DEVICE_PACKAGES += kmod-i2c-core kmod-i2c-mux kmod-i2c-mux-pca954x > DEVICE_DTS := armada-8040-mcbin > SUPPORTED_DEVICES := marvell,armada8040-mcbin > endef > -TARGET_DEVICES += armada-macchiatobin > +TARGET_DEVICES += marvell-macchiatobin This board is from solidrun
Hauke Mehrtens <hauke@hauke-m.de> [2019-05-04 00:00:25]: Hi, > On 5/1/19 7:42 PM, Tomasz Maciej Nowak wrote: > > Replace SoC names with vendors in device names, in few cases, and add > > vendor to developemnt boards for easier identyfying potential firmware to > > flash. > > Will sysupgrade still work after this rename? Isn't there some script > which checks if the image is compatible with the currently installed image? SUPPORTED_DEVICES variable is used for this, so it's probably going to work, but if we're willing to rename it, it might be a good idea to follow the DT compatible naming scheme as used in other targets. So instead of this in patch 4/8: - SUPPORTED_DEVICES = $$(DEVICE_DTS) + SUPPORTED_DEVICES = $$(firstword $$(DEVICE_DTS)) Tomasz should be doing following: - SUPPORTED_DEVICES = $$(DEVICE_DTS) + SUPPORTED_DEVICES = $(subst _,$(comma),$(1)) as currently being used in apm821xx, ath79, ipq40xx, ipq806x, kirkwood, lantiq, omap, oxnas and ramips. So this > > -define Device/armada-3720-db > > +define Device/marvell-armada-3720-db would become > > -define Device/armada-3720-db > > +define Device/marvell_armada-3720-db and this > > -TARGET_DEVICES += armada-3720-db > > +TARGET_DEVICES += marvell-armada-3720-db would become > > -TARGET_DEVICES += armada-3720-db > > +TARGET_DEVICES += marvell_armada-3720-db > > -SUPPORTED_DEVICES := marvell,armada-3720-db as the SUPPORTED_DEVICES variable would be automagically set to the same value by the code above, following the DRY principle. If the SUPPORTED_DEVICES variable is going to change as for example here: > > -define Device/openblocks-ax3-4 > > +define Device/plathome_openblocks-ax3-4 > > DEVICE_DTS := armada-xp-openblocks-ax3-4 > > - SUPPORTED_DEVICES := $(1) > > + SUPPORTED_DEVICES := openblocks-ax3-4 > > BLOCKSIZE := 128k > > PAGESIZE := 1 > > IMAGES += factory.img > > IMAGE/factory.img := append-kernel | pad-to $$(BLOCKSIZE) | append-ubi > > DEVICE_TITLE := Plat'Home OpenBlocks AX3 > > endef > > -TARGET_DEVICES += openblocks-ax3-4 > > +TARGET_DEVICES += plathome_openblocks-ax3-4 The old `openblocks-ax3-4` name has to be added by following construct: SUPPORTED_DEVICES += openblocks-ax3-4 in order to support the old and new naming schemes, so the SUPPORTED_DEVICES would actually contain `plathome,openblocks-ax3-4 openblocks-ax3-4` and allow seamless sysupgrade experience. -- ynezz
Hi, W dniu 04.05.2019 o 00:04, Hauke Mehrtens pisze: > On 5/1/19 7:42 PM, Tomasz Maciej Nowak wrote: >> Replace SoC names with vendors in device names, in few cases, and add >> vendor to developemnt boards for easier identyfying potential firmware to >> flash. >> >> Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl> > > >> diff --git a/target/linux/mvebu/image/cortex-a72.mk b/target/linux/mvebu/image/cortex-a72.mk >> index 824f6b5d0f..3043f087cc 100644 >> --- a/target/linux/mvebu/image/cortex-a72.mk >> +++ b/target/linux/mvebu/image/cortex-a72.mk >> @@ -1,30 +1,30 @@ >> ifeq ($(SUBTARGET),cortexa72) >> >> -define Device/armada-macchiatobin >> +define Device/marvell-macchiatobin >> $(call Device/Default-arm64) >> DEVICE_TITLE := MACCHIATObin (SolidRun Armada 8040 Community Board) >> DEVICE_PACKAGES += kmod-i2c-core kmod-i2c-mux kmod-i2c-mux-pca954x >> DEVICE_DTS := armada-8040-mcbin >> SUPPORTED_DEVICES := marvell,armada8040-mcbin >> endef >> -TARGET_DEVICES += armada-macchiatobin >> +TARGET_DEVICES += marvell-macchiatobin > > This board is from solidrun Yes, this case did make me confused. I went with what's in model and compatible string in dts. SolidRun also calls it that way: https://www.solid-run.com/marvell-armada-family/macchiatobin But I'll change that in next version. Regards
Hi Hauke, Petr, W dniu 04.05.2019 o 00:38, Petr Štetiar pisze: > Hauke Mehrtens <hauke@hauke-m.de> [2019-05-04 00:00:25]: > > Hi, > >> On 5/1/19 7:42 PM, Tomasz Maciej Nowak wrote: >>> Replace SoC names with vendors in device names, in few cases, and add >>> vendor to developemnt boards for easier identyfying potential firmware to >>> flash. >> >> Will sysupgrade still work after this rename? Isn't there some script >> which checks if the image is compatible with the currently installed image? > > SUPPORTED_DEVICES variable is used for this, so it's probably going to work, > but if we're willing to rename it, it might be a good idea to follow the DT > compatible naming scheme as used in other targets. > > So instead of this in patch 4/8: > > - SUPPORTED_DEVICES = $$(DEVICE_DTS) > + SUPPORTED_DEVICES = $$(firstword $$(DEVICE_DTS)) > > Tomasz should be doing following: > > - SUPPORTED_DEVICES = $$(DEVICE_DTS) > + SUPPORTED_DEVICES = $(subst _,$(comma),$(1)) Ideally that would be the case, unfortunately there is inconsistency in the upstream dtses, for example (stand after my patch renaming device names): linksys-wrt1200ac has compatible linksys,caiman, marvell-armada-385-db-ap -> marvell,a385-db-ap marvell-armada-3720-db -> marvell,armada-3720-db marvell-macchiatobin -> marvell,armada8040-mcbin marvell-armada-8040-db -> marvell,armada8040-db As You can see this differs a lot. So what would be best approach, following upstream naming or keep it as is or following upstream where possible? > > as currently being used in apm821xx, ath79, ipq40xx, ipq806x, kirkwood, lantiq, > omap, oxnas and ramips. > > So this > >>> -define Device/armada-3720-db >>> +define Device/marvell-armada-3720-db > > would become > >>> -define Device/armada-3720-db >>> +define Device/marvell_armada-3720-db > > and this > >>> -TARGET_DEVICES += armada-3720-db >>> +TARGET_DEVICES += marvell-armada-3720-db > > would become > >>> -TARGET_DEVICES += armada-3720-db >>> +TARGET_DEVICES += marvell_armada-3720-db >>> -SUPPORTED_DEVICES := marvell,armada-3720-db > > as the SUPPORTED_DEVICES variable would be automagically set to the same value > by the code above, following the DRY principle. > > If the SUPPORTED_DEVICES variable is going to change as for example here: > >>> -define Device/openblocks-ax3-4 >>> +define Device/plathome_openblocks-ax3-4 >>> DEVICE_DTS := armada-xp-openblocks-ax3-4 >>> - SUPPORTED_DEVICES := $(1) >>> + SUPPORTED_DEVICES := openblocks-ax3-4 >>> BLOCKSIZE := 128k >>> PAGESIZE := 1 >>> IMAGES += factory.img >>> IMAGE/factory.img := append-kernel | pad-to $$(BLOCKSIZE) | append-ubi >>> DEVICE_TITLE := Plat'Home OpenBlocks AX3 >>> endef >>> -TARGET_DEVICES += openblocks-ax3-4 >>> +TARGET_DEVICES += plathome_openblocks-ax3-4 > > The old `openblocks-ax3-4` name has to be added by following construct: > > SUPPORTED_DEVICES += openblocks-ax3-4 > > in order to support the old and new naming schemes, so the SUPPORTED_DEVICES > would actually contain `plathome,openblocks-ax3-4 openblocks-ax3-4` and allow > seamless sysupgrade experience. > > -- ynezz > Regards
Tomasz Maciej Nowak <tomek_n@o2.pl> [2019-05-04 16:01:11]: > W dniu 04.05.2019 o 00:38, Petr Štetiar pisze: > > > > SUPPORTED_DEVICES variable is used for this, so it's probably going to work, > > but if we're willing to rename it, it might be a good idea to follow the DT > > compatible naming scheme as used in other targets. > > > > So instead of this in patch 4/8: > > > > - SUPPORTED_DEVICES = $$(DEVICE_DTS) > > + SUPPORTED_DEVICES = $$(firstword $$(DEVICE_DTS)) > > > > Tomasz should be doing following: > > > > - SUPPORTED_DEVICES = $$(DEVICE_DTS) > > + SUPPORTED_DEVICES = $(subst _,$(comma),$(1)) > > Ideally that would be the case, unfortunately there is inconsistency in the upstream > dtses, for example (stand after my patch renaming device names): from my POV, it seems more convenient to stick to DT compatible, as it's then going to be referenced in the other places as well, so it's probably going to mean less confusion. > linksys-wrt1200ac has compatible linksys,caiman, I could still grep for wrt1200ac with the following code and find out the proper device/image: Device/linksys_caiman $(call Device/linksys,WRT1200AC (Caiman)) SUPPORTED_DEVICES += linksys-wrt1200ac ... endef TARGET_DEVICES += linksys_caiman and if we're going to rename it, we should fix all the references in the wiki as well. > marvell-armada-385-db-ap -> marvell,a385-db-ap > marvell-armada-3720-db -> marvell,armada-3720-db > marvell-armada-8040-db -> marvell,armada8040-db seems ok to me. > marvell-macchiatobin -> marvell,armada8040-mcbin quite weird, but that's a life, still DEVICE_TITLE is going to make it clear. -- ynezz
On 5/4/19 2:57 PM, Tomasz Maciej Nowak wrote: > Hi, > > W dniu 04.05.2019 o 00:04, Hauke Mehrtens pisze: >> On 5/1/19 7:42 PM, Tomasz Maciej Nowak wrote: >>> Replace SoC names with vendors in device names, in few cases, and add >>> vendor to developemnt boards for easier identyfying potential firmware to >>> flash. >>> >>> Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl> >> >> >>> diff --git a/target/linux/mvebu/image/cortex-a72.mk b/target/linux/mvebu/image/cortex-a72.mk >>> index 824f6b5d0f..3043f087cc 100644 >>> --- a/target/linux/mvebu/image/cortex-a72.mk >>> +++ b/target/linux/mvebu/image/cortex-a72.mk >>> @@ -1,30 +1,30 @@ >>> ifeq ($(SUBTARGET),cortexa72) >>> >>> -define Device/armada-macchiatobin >>> +define Device/marvell-macchiatobin >>> $(call Device/Default-arm64) >>> DEVICE_TITLE := MACCHIATObin (SolidRun Armada 8040 Community Board) >>> DEVICE_PACKAGES += kmod-i2c-core kmod-i2c-mux kmod-i2c-mux-pca954x >>> DEVICE_DTS := armada-8040-mcbin >>> SUPPORTED_DEVICES := marvell,armada8040-mcbin >>> endef >>> -TARGET_DEVICES += armada-macchiatobin >>> +TARGET_DEVICES += marvell-macchiatobin >> >> This board is from solidrun > > Yes, this case did make me confused. I went with what's in model and compatible > string in dts. SolidRun also calls it that way: > https://www.solid-run.com/marvell-armada-family/macchiatobin > But I'll change that in next version. > > Regards > Ok, as it is called Marvell 8040 MACCHIATOBin in the device tree, we should probably name it also marvell. Hauke
W dniu 05.05.2019 o 22:42, Petr Štetiar pisze: > Tomasz Maciej Nowak <tomek_n@o2.pl> [2019-05-04 16:01:11]: > >> W dniu 04.05.2019 o 00:38, Petr Štetiar pisze: >>> >>> SUPPORTED_DEVICES variable is used for this, so it's probably going to work, >>> but if we're willing to rename it, it might be a good idea to follow the DT >>> compatible naming scheme as used in other targets. >>> >>> So instead of this in patch 4/8: >>> >>> - SUPPORTED_DEVICES = $$(DEVICE_DTS) >>> + SUPPORTED_DEVICES = $$(firstword $$(DEVICE_DTS)) >>> >>> Tomasz should be doing following: >>> >>> - SUPPORTED_DEVICES = $$(DEVICE_DTS) >>> + SUPPORTED_DEVICES = $(subst _,$(comma),$(1)) >> >> Ideally that would be the case, unfortunately there is inconsistency in the upstream >> dtses, for example (stand after my patch renaming device names): > > from my POV, it seems more convenient to stick to DT compatible, as it's then > going to be referenced in the other places as well, so it's probably going to > mean less confusion. > >> linksys-wrt1200ac has compatible linksys,caiman, > > I could still grep for wrt1200ac with the following code and find out the > proper device/image: > > Device/linksys_caiman > $(call Device/linksys,WRT1200AC (Caiman)) > SUPPORTED_DEVICES += linksys-wrt1200ac > ... > endef > TARGET_DEVICES += linksys_caiman That would be convenient for us but not for the person searching for firmware in download directory. Please read the commit message what was the intention of this patch. > > and if we're going to rename it, we should fix all the references in the wiki as well. > >> marvell-armada-385-db-ap -> marvell,a385-db-ap >> marvell-armada-3720-db -> marvell,armada-3720-db >> marvell-armada-8040-db -> marvell,armada8040-db > > seems ok to me. That's also ok with me. These are dev boards so someone possessing it, would identify them without problem. > >> marvell-macchiatobin -> marvell,armada8040-mcbin > > quite weird, but that's a life, still DEVICE_TITLE is going to make it clear. DEVICE_TITLE is not visible in download directory, with this we'll add to the confusion instead of reducing it. I'll prepare v2 with something in the middle of what was discussed.
diff --git a/package/boot/uboot-mvebu/Makefile b/package/boot/uboot-mvebu/Makefile index 61547acb27..06c574594b 100644 --- a/package/boot/uboot-mvebu/Makefile +++ b/package/boot/uboot-mvebu/Makefile @@ -24,7 +24,7 @@ endef define U-Boot/clearfog NAME:=SolidRun ClearFog A1 - BUILD_DEVICES:=armada-388-clearfog-base armada-388-clearfog-pro + BUILD_DEVICES:=solidrun-clearfog-base solidrun-clearfog-pro BUILD_SUBTARGET:=cortexa9 UBOOT_IMAGE:=u-boot-spl.kwb endef diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile index 240cc88642..fe74a12c65 100644 --- a/target/linux/mvebu/image/Makefile +++ b/target/linux/mvebu/image/Makefile @@ -70,7 +70,6 @@ endef define Device/Default PROFILES := Default - DEVICE_DTS := $(1) BOARD_NAME = $$(DEVICE_DTS) KERNEL_NAME := zImage KERNEL := kernel-bin | append-dtb | uImage none diff --git a/target/linux/mvebu/image/cortex-a53.mk b/target/linux/mvebu/image/cortex-a53.mk index a102f52481..4dd1e44665 100644 --- a/target/linux/mvebu/image/cortex-a53.mk +++ b/target/linux/mvebu/image/cortex-a53.mk @@ -8,12 +8,12 @@ define Device/globalscale-espressobin endef TARGET_DEVICES += globalscale-espressobin -define Device/armada-3720-db +define Device/marvell-armada-3720-db $(call Device/Default-arm64) DEVICE_TITLE := Marvell Armada 3720 Development Board DB-88F3720-DDR3 DEVICE_DTS := armada-3720-db SUPPORTED_DEVICES := marvell,armada-3720-db endef -TARGET_DEVICES += armada-3720-db +TARGET_DEVICES += marvell-armada-3720-db endif diff --git a/target/linux/mvebu/image/cortex-a72.mk b/target/linux/mvebu/image/cortex-a72.mk index 824f6b5d0f..3043f087cc 100644 --- a/target/linux/mvebu/image/cortex-a72.mk +++ b/target/linux/mvebu/image/cortex-a72.mk @@ -1,30 +1,30 @@ ifeq ($(SUBTARGET),cortexa72) -define Device/armada-macchiatobin +define Device/marvell-macchiatobin $(call Device/Default-arm64) DEVICE_TITLE := MACCHIATObin (SolidRun Armada 8040 Community Board) DEVICE_PACKAGES += kmod-i2c-core kmod-i2c-mux kmod-i2c-mux-pca954x DEVICE_DTS := armada-8040-mcbin SUPPORTED_DEVICES := marvell,armada8040-mcbin endef -TARGET_DEVICES += armada-macchiatobin +TARGET_DEVICES += marvell-macchiatobin -define Device/armada-8040-db +define Device/marvell-armada-8040-db $(call Device/Default-arm64) DEVICE_TITLE := Marvell Armada 8040 DB board DEVICE_DTS := armada-8040-db IMAGE/sdcard.img.gz := boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata SUPPORTED_DEVICES := marvell,armada8040-db endef -TARGET_DEVICES += armada-8040-db +TARGET_DEVICES += marvell-armada-8040-db -define Device/armada-7040-db +define Device/marvell-armada-7040-db $(call Device/Default-arm64) DEVICE_TITLE := Marvell Armada 7040 DB board DEVICE_DTS := armada-7040-db IMAGE/sdcard.img.gz := boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata SUPPORTED_DEVICES := marvell,armada7040-db endef -TARGET_DEVICES += armada-7040-db +TARGET_DEVICES += marvell-armada-7040-db endif diff --git a/target/linux/mvebu/image/cortex-a9.mk b/target/linux/mvebu/image/cortex-a9.mk index 252300b942..e5459dad1a 100644 --- a/target/linux/mvebu/image/cortex-a9.mk +++ b/target/linux/mvebu/image/cortex-a9.mk @@ -61,57 +61,63 @@ define Device/linksys-wrt1900ac endef TARGET_DEVICES += linksys-wrt1900ac -define Device/openblocks-ax3-4 +define Device/plathome-openblocks-ax3-4 DEVICE_DTS := armada-xp-openblocks-ax3-4 - SUPPORTED_DEVICES := $(1) + SUPPORTED_DEVICES := openblocks-ax3-4 BLOCKSIZE := 128k PAGESIZE := 1 IMAGES += factory.img IMAGE/factory.img := append-kernel | pad-to $$(BLOCKSIZE) | append-ubi DEVICE_TITLE := Plat'Home OpenBlocks AX3 endef -TARGET_DEVICES += openblocks-ax3-4 +TARGET_DEVICES += plathome-openblocks-ax3-4 -define Device/armada-385-db-ap +define Device/marvell-armada-385-db-ap $(Device/NAND-256K) + DEVICE_DTS := armada-385-db-ap IMAGES += factory.img KERNEL_SIZE := 8192k DEVICE_TITLE := Marvell Armada 385 DB AP (DB-88F6820-AP) endef -TARGET_DEVICES += armada-385-db-ap +TARGET_DEVICES += marvell-armada-385-db-ap -define Device/armada-370-db +define Device/marvell-armada-370-db $(Device/NAND-512K) DEVICE_TITLE := Marvell Armada 370 DB (DB-88F6710-BP-DDR3) + DEVICE_DTS := armada-370-db endef -TARGET_DEVICES += armada-370-db +TARGET_DEVICES += marvell-armada-370-db -define Device/armada-370-rd +define Device/marvell-armada-370-rd $(Device/NAND-512K) DEVICE_TITLE := Marvell Armada 370 RD (RD-88F6710-A1) + DEVICE_DTS := armada-370-rd endef -TARGET_DEVICES += armada-370-rd +TARGET_DEVICES += marvell-armada-370-rd -define Device/armada-xp-db +define Device/marvell-armada-xp-db $(Device/NAND-512K) DEVICE_TITLE := Marvell Armada XP DB (DB-78460-BP) + DEVICE_DTS := armada-xp-db endef -TARGET_DEVICES += armada-xp-db +TARGET_DEVICES += marvell-armada-xp-db -define Device/armada-xp-gp +define Device/marvell-armada-xp-gp $(Device/NAND-512K) DEVICE_TITLE := Marvell Armada XP GP (DB-MV784MP-GP) + DEVICE_DTS := armada-xp-gp endef -TARGET_DEVICES += armada-xp-gp +TARGET_DEVICES += marvell-armada-xp-gp -define Device/armada-388-rd +define Device/marvell-armada-388-rd DEVICE_TITLE := Marvell Armada 388 RD (RD-88F6820-AP) + DEVICE_DTS := armada-388-rd IMAGES := firmware.bin IMAGE/firmware.bin := append-kernel | pad-to 256k | append-rootfs | pad-rootfs endef -TARGET_DEVICES += armada-388-rd +TARGET_DEVICES += marvell-armada-388-rd -define Device/armada-388-clearfog-pro +define Device/solidrun-clearfog-pro KERNEL_INSTALL := 1 KERNEL := kernel-bin DEVICE_TITLE := SolidRun ClearFog Pro @@ -123,9 +129,9 @@ define Device/armada-388-clearfog-pro UBOOT := clearfog-u-boot-spl.kwb BOOT_SCRIPT := clearfog endef -TARGET_DEVICES += armada-388-clearfog-pro +TARGET_DEVICES += solidrun-clearfog-pro -define Device/armada-388-clearfog-base +define Device/solidrun-clearfog-base KERNEL_INSTALL := 1 KERNEL := kernel-bin DEVICE_TITLE := SolidRun ClearFog Base @@ -136,7 +142,7 @@ define Device/armada-388-clearfog-base UBOOT := clearfog-u-boot-spl.kwb BOOT_SCRIPT := clearfog endef -TARGET_DEVICES += armada-388-clearfog-base +TARGET_DEVICES += solidrun-clearfog-base define Device/globalscale-mirabox $(Device/NAND-512K)
Replace SoC names with vendors in device names, in few cases, and add vendor to developemnt boards for easier identyfying potential firmware to flash. Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl> --- package/boot/uboot-mvebu/Makefile | 2 +- target/linux/mvebu/image/Makefile | 1 - target/linux/mvebu/image/cortex-a53.mk | 4 +-- target/linux/mvebu/image/cortex-a72.mk | 12 +++---- target/linux/mvebu/image/cortex-a9.mk | 44 +++++++++++++++----------- 5 files changed, 34 insertions(+), 29 deletions(-)