i renamed the api after r41131, so make sure to use the correct one. https://dev.openwrt.org/browser/trunk/target/linux/ar71xx/base-files/lib/upgrade/platform.sh?rev=41222#L308
On 30/06/2014 20:40, John Crispin wrote: > > > On 30/06/2014 20:32, Ben Mulvihill wrote: >> Great. Unless Daniel has any objections, I'll re-submit it >> properly ( - Patchwork didn't pick this one up). It didn't break >> the BTHOMEHUBV2B, but it would be good if someone could test it >> on the other boards too. >> >> The one thing that is still missing is sysupgrade support. >> >> Ben > > i have not spoken with daniel but i am sure he is fine with this > patch > > is the kernel located on the same nand .. i recall that the unit > had a nor flash aswell. > > look at the patch i added for the wndr4300 to make sysupgrade > work. the homehub should work the same way i believe > > https://dev.openwrt.org/changeset/41131/ > > > >> >> On Mon, 2014-06-30 at 14:43 +0200, John Crispin wrote: >>> >>> On 30/06/2014 13:40, Ben Mulvihill wrote: >>>> Hello Daniel and John, >>>> >>>> Could you have a look at this patch, and let me know if this >>>> is the best approach? I have defined new make targets for >>>> lantiq called Image/BuildNAND/squashfs and >>>> Image/BuildNAND/ubifs, making use of the UbinizeImage >>>> machanism. For the moment, I only enable them for the >>>> BTHOMEHUBV2B, because that is the only lantiq board I have to >>>> test, but I don't see any reason why they couldn't be used >>>> for the EASY80920NAND and the P2812HNUFX too. As far as I can >>>> see, that only leaves one more lantiq nand board, the >>>> FRITZ3370, which has a dedicated make target. Once that has >>>> been modified as well the make targets Image/Build/ubifs and >>>> Image/Build/ubi can be removed from >>>> target/linux/lantiq/image/Makefile. >>>> >>>> Thanks, >>>> >>>> Ben >>> >>> in general there are no guidelines to this stuff. every target >>> maintainer sort of has his own pattern for the >>> image/Makefile. some patterns have proven to be good and get >>> reused etc etc. >>> >>> that being said, i know felix is planning to globally rework >>> the image generation in owrt and unify it between all targets. >>> so, if your patch works and causes no regression i am happy to >>> take it. it looks good and i think i would have come up with a >>> similar patch >>> >>> John >>> >>> >>>> >>>> Signed-off-by: Ben Mulvihill <ben.mulvih...@gmail.com> --- >>>> --- a/target/linux/lantiq/image/Makefile 2014-06-30 >>>> 11:49:59.562213352 +0200 +++ >>>> b/target/linux/lantiq/image/Makefile 2014-06-30 >>>> 11:54:07.211979129 +0200 @@ -82,6 +82,14 @@ define >>>> Image/Build/squashfs $(if $(3),$(call MkBrnImage,$(3),$(4), >>>> $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(3)-brnImage,$(2),$(1),$(5))) >>>> endef >>>> >>>> +define Image/BuildNAND/squashfs + +ifneq >>>> ($($(PROFILE)_UBI_OPTS),) + $(call >>>> prepare_generic_squashfs,$(KDIR)/root.$(1)) + $(call >>>> Image/Build/UbinizeImage,$(PROFILE),,squashfs, >>>> $($(PROFILE)_UBI_OPTS)) +endif +endef + >>>> DGN3500_SKERNEL=0x50000 DGN3500_SKERNEL_DECIMAL=327680 >>>> define Image/BuildDGN3500/squashfs @@ -185,6 +193,17 @@ >>>> ifneq ($($(PROFILE)_UBI_OPTS),) endif endef >>>> >>>> + +define Image/BuildNAND/ubifs + +ifneq >>>> ($($(PROFILE)_UBIFS_OPTS),) +ifneq ($($(PROFILE)_UBI_OPTS),) >>>> + $(call Image/Build/UbinizeImage,$(PROFILE),,ubifs, >>>> $($(PROFILE)_UBI_OPTS)) +endif +endif +endef + + define >>>> Image/InstallKernel/Template >>>> >>>> ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_KERNEL),) @@ -293,7 >>>> +312,7 @@ ifeq ($(CONFIG_TARGET_lantiq_xway),y) >>>> >>>> # Danube Image/BuildKernel/Profile/BTHOMEHUBV2B=$(call >>>> Image/BuildKernel/Template,BTHOMEHUBV2B) >>>> -Image/Build/Profile/BTHOMEHUBV2B=$(call Image/Build/$(1), >>>> $(1),BTHOMEHUBV2B) +Image/Build/Profile/BTHOMEHUBV2B=$(call >>>> Image/BuildNAND/$(1), $(1),BTHOMEHUBV2B) >>>> >>>> Image/BuildKernel/Profile/EASY50712=$(call >>>> Image/BuildKernel/Template,EASY50712) >>>> Image/Build/Profile/EASY50712=$(call >>>> Image/Build/$(1),$(1),EASY50712) >>>> >>>> >> _______________________________________________ openwrt-devel >> mailing list openwrt-devel@lists.openwrt.org >> https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel >> > _______________________________________________ openwrt-devel > mailing list openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel > _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
