[OpenWrt-Devel] mxs: fix ext4 image
diff mbox

Message ID 1428235308-31968-2-git-send-email-harald@ccbib.org
State Accepted
Delegated to: Zoltan HERPAI
Headers show

Commit Message

Harald Geyer April 5, 2015, 12:01 p.m. UTC
commit 597a84e52d9eff8d4686c40cd8be4f7a9b47679d with
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45052 3c298f89-4303-0410-b956-a3cf2f4a3e73

made the ext4 rootfs image unavailable for download from snapshots.
Only a SD-card image with u-boot and everything is available. This is
annoying for people who either have their own custom partition layout
or want to upgrade the rootfs without losing the u-boot configuration.

The same commit also broke the inclusion of dtbs in the root filesystem.

Note: I don't know if this is the right way to implement this. I'm just
adding code back that was there before.

Signed-off-by: Harald Geyer <harald@ccbib.org>
---
 target/linux/mxs/image/Makefile |    4 ++++
 1 file changed, 4 insertions(+)

Comments

Michael Heimpold April 5, 2015, 3:52 p.m. UTC | #1
Am Sonntag, 5. April 2015, 12:01:48 schrieb Harald Geyer:
> commit 597a84e52d9eff8d4686c40cd8be4f7a9b47679d with
> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45052 3c298f89-4303-0410-b956-a3cf2f4a3e73
> 
> made the ext4 rootfs image unavailable for download from snapshots.
> Only a SD-card image with u-boot and everything is available. This is
> annoying for people who either have their own custom partition layout
> or want to upgrade the rootfs without losing the u-boot configuration.
> 
> The same commit also broke the inclusion of dtbs in the root filesystem.
> 
> Note: I don't know if this is the right way to implement this. I'm just
> adding code back that was there before.
> 
> Signed-off-by: Harald Geyer <harald@ccbib.org>
> ---
>  target/linux/mxs/image/Makefile |    4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/target/linux/mxs/image/Makefile b/target/linux/mxs/image/Makefile
> index 9830a7d..b5a092e 100644
> --- a/target/linux/mxs/image/Makefile
> +++ b/target/linux/mxs/image/Makefile
> @@ -9,6 +9,9 @@ include $(TOPDIR)/rules.mk
>  include $(INCLUDE_DIR)/image.mk
>  include $(INCLUDE_DIR)/host.mk
>  
> +BOARDS:= \
> +	imx23-olinuxino \
> +	imx28-duckbill
>  FAT32_BLOCK_SIZE=1024
>  FAT32_BLOCKS=$(shell echo $$(($(CONFIG_MXS_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE))))
>  
> @@ -72,6 +75,7 @@ endef
>  define Image/Build
>  	$(call Image/Build/$(1),$(1))
>  	$(call Image/Build/Profile/$(PROFILE),$(1))
> +	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync
>  endef
>  
>  $(eval $(call BuildImage))
> 
Acked-by: Michael Heimpold <mhei@heimpold.de>
Zoltan HERPAI April 9, 2015, 1:29 p.m. UTC | #2
Michael Heimpold wrote:
> Am Sonntag, 5. April 2015, 12:01:48 schrieb Harald Geyer:
>   
>> commit 597a84e52d9eff8d4686c40cd8be4f7a9b47679d with
>> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45052 3c298f89-4303-0410-b956-a3cf2f4a3e73
>>
>> made the ext4 rootfs image unavailable for download from snapshots.
>> Only a SD-card image with u-boot and everything is available. This is
>> annoying for people who either have their own custom partition layout
>> or want to upgrade the rootfs without losing the u-boot configuration.
>>
>> The same commit also broke the inclusion of dtbs in the root filesystem.
>>
>> Note: I don't know if this is the right way to implement this. I'm just
>> adding code back that was there before.
>>     
[snip]

> Acked-by: Michael Heimpold <mhei@heimpold.de>
>   
With Michael's acks, I'll add this code (and the other patch) back in.

One more thing which we discussed with Michael, that the SDcard image 
for Duckbill could use the following partitions:

u-boot (0x53), rootfs1 for kernel/dtb (0x83), rootfs2 (0x83), data(0x83)

F.e. the second partition would be ext2 instead of fat, which could be supported with updating the uboot config to use ext2load instead of fatload. While this would be for Duckbill mainly, if people won't get annoyed this would be the default for the Olinuxino too.

Regards,
Zoltan H
Harald Geyer April 9, 2015, 3:07 p.m. UTC | #3
Zoltan HERPAI writes:
> Michael Heimpold wrote:
> > Am Sonntag, 5. April 2015, 12:01:48 schrieb Harald Geyer:
> >   
> >> commit 597a84e52d9eff8d4686c40cd8be4f7a9b47679d with
> >> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45052 3c298f89-4303-0410-b956-a3cf2f4a3e73
> >>
> >> made the ext4 rootfs image unavailable for download from snapshots.
> >> Only a SD-card image with u-boot and everything is available. This is
> >> annoying for people who either have their own custom partition layout
> >> or want to upgrade the rootfs without losing the u-boot configuration.
> >>
> >> The same commit also broke the inclusion of dtbs in the root filesystem.
> >>
> >> Note: I don't know if this is the right way to implement this. I'm just
> >> adding code back that was there before.
> >>     
> [snip]
> 
> > Acked-by: Michael Heimpold <mhei@heimpold.de>
> >   
> With Michael's acks, I'll add this code (and the other patch) back in.

Thanks.

> One more thing which we discussed with Michael, that the SDcard image 
> for Duckbill could use the following partitions:
> 
> u-boot (0x53), rootfs1 for kernel/dtb (0x83), rootfs2 (0x83), data(0x83)
> 
> F.e. the second partition would be ext2 instead of fat, which could
> be supported with updating the uboot config to use ext2load instead
> of fatload. While this would be for Duckbill mainly, if people won't
> get annoyed this would be the default for the Olinuxino too.

I probably won't use the SDcard image, so I can't give you real input
on that.

I personally use 
1: u-boot (0x53)
2: rootfs + kernel/dtb in /boot (0x83)
3: data (0x0b) - FAT seems more tolerant to unclean shutdown (black out)
                 a flash friendly filesystem would be even better
4: unused / debian chroot on development boards

So I don't have any feelings to either of your proposals as long as
including the kernel/dtbs in the rootfs works.

best regards,
Harald
Zoltan HERPAI April 10, 2015, 9:46 p.m. UTC | #4
Harald Geyer wrote:
> Zoltan HERPAI writes:
>   
>> Michael Heimpold wrote:
>>     
>>> Am Sonntag, 5. April 2015, 12:01:48 schrieb Harald Geyer:
>>>   
>>>       
>>>> commit 597a84e52d9eff8d4686c40cd8be4f7a9b47679d with
>>>> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45052 3c298f89-4303-0410-b956-a3cf2f4a3e73
>>>>
>>>> made the ext4 rootfs image unavailable for download from snapshots.
>>>> Only a SD-card image with u-boot and everything is available. This is
>>>> annoying for people who either have their own custom partition layout
>>>> or want to upgrade the rootfs without losing the u-boot configuration.
>>>>
>>>> The same commit also broke the inclusion of dtbs in the root filesystem.
>>>>
>>>> Note: I don't know if this is the right way to implement this. I'm just
>>>> adding code back that was there before.
>>>>     
>>>>         
>> [snip]
>>
>>     
>>> Acked-by: Michael Heimpold <mhei@heimpold.de>
>>>   
>>>       
>> With Michael's acks, I'll add this code (and the other patch) back in.
>>     
>
> Thanks.
>
>   
[snip]

Added the two patches in r45368-45369.

Thanks,
Zoltan H

Patch
diff mbox

diff --git a/target/linux/mxs/image/Makefile b/target/linux/mxs/image/Makefile
index 9830a7d..b5a092e 100644
--- a/target/linux/mxs/image/Makefile
+++ b/target/linux/mxs/image/Makefile
@@ -9,6 +9,9 @@  include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 include $(INCLUDE_DIR)/host.mk
 
+BOARDS:= \
+	imx23-olinuxino \
+	imx28-duckbill
 FAT32_BLOCK_SIZE=1024
 FAT32_BLOCKS=$(shell echo $$(($(CONFIG_MXS_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE))))
 
@@ -72,6 +75,7 @@  endef
 define Image/Build
 	$(call Image/Build/$(1),$(1))
 	$(call Image/Build/Profile/$(PROFILE),$(1))
+	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync
 endef
 
 $(eval $(call BuildImage))