[LEDE-DEV,3/3] at91: creating sdcard image for sama5

Message ID a12ab137dd6e1f455c589f95645cb65cc2465399.1507049401.git.sandeepsheriker.mallikarjun@microchip.com
State Superseded
Delegated to: Hauke Mehrtens
Headers show
Series
  • at91: sdcard image patch Summary
Related show

Commit Message

Sandeep Sheriker Mallikarjun Oct. 4, 2017, 11:14 p.m.
creating sdcard image using gen_at91_sdcard_img.sh for sama5 platform
and sdcard image partition layout is:

   P0: Boot (fat32) - Contains(at91bootstrap,u-boot,zImage & dtb)
   p1: Rootfs (ext4)

Signed-off-by: Sandeep Sheriker Mallikarjun <sandeepsheriker.mallikarjun@microchip.com>
---
 target/linux/at91/image/Makefile                   | 45 ++++++++++++++++++++++
 .../image/gen_at91_sdcard_img.sh}                  |  9 +++--
 target/linux/at91/image/sama5.mk                   |  3 ++
 3 files changed, 54 insertions(+), 3 deletions(-)
 copy target/linux/{omap/image/gen_omap_sdcard_img.sh => at91/image/gen_at91_sdcard_img.sh} (68%)

Comments

Hauke Mehrtens Oct. 12, 2017, 7:46 p.m. | #1
On 10/05/2017 01:14 AM, Sandeep Sheriker Mallikarjun wrote:
> creating sdcard image using gen_at91_sdcard_img.sh for sama5 platform
> and sdcard image partition layout is:
> 
>    P0: Boot (fat32) - Contains(at91bootstrap,u-boot,zImage & dtb)
>    p1: Rootfs (ext4)
> 
> Signed-off-by: Sandeep Sheriker Mallikarjun <sandeepsheriker.mallikarjun@microchip.com>
> ---
>  target/linux/at91/image/Makefile                   | 45 ++++++++++++++++++++++
>  .../image/gen_at91_sdcard_img.sh}                  |  9 +++--
>  target/linux/at91/image/sama5.mk                   |  3 ++
>  3 files changed, 54 insertions(+), 3 deletions(-)
>  copy target/linux/{omap/image/gen_omap_sdcard_img.sh => at91/image/gen_at91_sdcard_img.sh} (68%)
> 
> diff --git a/target/linux/at91/image/Makefile b/target/linux/at91/image/Makefile
> index 9333709..628d3d8 100644
> --- a/target/linux/at91/image/Makefile
> +++ b/target/linux/at91/image/Makefile
> @@ -9,6 +9,11 @@ include $(INCLUDE_DIR)/image.mk
>  
>  KERNEL_LOADADDR := 0x20008000
>  
> +AT91_SD_BOOT_PARTSIZE:= 64
> +FAT32_BLOCK_SIZE:=1024
> +FAT32_BLOCKS:=$(shell echo \
> +      $$(($(AT91_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE))))
> +
>  ifeq ($(SUBTARGET),legacy)
>  include ./legacy.mk
>  UBIFS_OPTS := -m 2048 -e 126KiB -c 2048
> @@ -48,6 +53,46 @@ define Device/evaluation
>    IMAGE/root.ubi := append-ubi
>  endef
>  
> +#  $(CP) $(KDIR)/zImage \
> +#  $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE_SANITIZED)-zImage
> +define Build/at91-sdcard
> +  rm -f $@.boot
> +  mkfs.fat -C $@.boot $(FAT32_BLOCKS)
> +
> +  mcopy -i $@.boot $(KDIR)/zImage ::zImage
> +
> +  $(foreach dts,$(DEVICE_DTS), \
> +     mcopy -i $@.boot $(DTS_DIR)/$(dts).dtb \
> +        ::$(dts).dtb; \
> +     mcopy -i $@.boot \
> +        $(BIN_DIR)/u-boot-$(dts:at91-%=%)_mmc/u-boot.bin \
> +            ::u-boot.bin; \
> +     $(CP) $(BIN_DIR)/at91bootstrap-$(dts:at91-%=%)sd_uboot*/*.bin \
> +         $(BIN_DIR)/BOOT.bin; \
> +     mcopy -i $@.boot $(BIN_DIR)/BOOT.bin ::BOOT.bin;)
> +
> +  ./gen_at91_sdcard_img.sh \
> +      $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img \
> +      $@.boot \
> +      $(KDIR)/root.ext4 \
> +      $(AT91_SD_BOOT_PARTSIZE) \
> +      $(CONFIG_TARGET_ROOTFS_PARTSIZE)
> +
> +  gzip -nc9 $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img \
> +         > $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img.gz
> +
> +  $(CP) $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img.gz \
> +        $(BIN_DIR)/
> +
> +  rm -f $(BIN_DIR)/BOOT.bin
> +  rm -f $@.boot
> +endef
> +
> +define Device/evaluation-sdimage
> +  IMAGES += sdcard.img.gz
> +  IMAGE/sdcard.img.gz := at91-sdcard
> +endef
> +
>  define Device/evaluation-zImage
>    IMAGES += zImage
>    IMAGE/zImage := install-zImage
> diff --git a/target/linux/omap/image/gen_omap_sdcard_img.sh b/target/linux/at91/image/gen_at91_sdcard_img.sh
> similarity index 68%
> copy from target/linux/omap/image/gen_omap_sdcard_img.sh
> copy to target/linux/at91/image/gen_at91_sdcard_img.sh
> index c2f2aad..16c76f0 100755
> --- a/target/linux/omap/image/gen_omap_sdcard_img.sh
> +++ b/target/linux/at91/image/gen_at91_sdcard_img.sh
> @@ -9,7 +9,9 @@
>  
>  set -x
>  [ $# -eq 5 ] || {
> -    echo "SYNTAX: $0 <file> <bootfs image> <rootfs image> <bootfs size> <rootfs size>"
> +    echo "SYNTAX: $0 <filename> \
> +                  <bootfs image> <rootfs image> \
> +                  <bootfs size> <rootfs size>"
>      exit 1
>  }
>  
> @@ -20,9 +22,10 @@ BOOTFSSIZE="$4"
>  ROOTFSSIZE="$5"
>  
>  head=4
> -sect=63
> +sect=2048
>  
> -set `ptgen -o $OUTPUT -h $head -s $sect -l 1024 -t c -p ${BOOTFSSIZE}M -t 83 -p ${ROOTFSSIZE}M`
> +set `ptgen -o $OUTPUT -h $head -s $sect -l 1024 -t c -p \
> +           ${BOOTFSSIZE}M -t 83 -p ${ROOTFSSIZE}M`
>  
>  BOOTOFFSET="$(($1 / 512))"
>  BOOTSIZE="$(($2 / 512))"
> diff --git a/target/linux/at91/image/sama5.mk b/target/linux/at91/image/sama5.mk
> index 1610815..7d32875 100644
> --- a/target/linux/at91/image/sama5.mk
> +++ b/target/linux/at91/image/sama5.mk
> @@ -8,6 +8,7 @@ define Device/at91-sama5d3_xplained
>          at91bootstrap-sama5d3_xplainedsd_uboot \
>          u-boot-sama5d3_xplained_mmc \
>          u-boot-sama5d3_xplained_nandflash
> +  $(Device/evaluation-sdimage)
>  endef
>  TARGET_DEVICES += at91-sama5d3_xplained
>  
> @@ -22,6 +23,7 @@ define Device/at91-sama5d2_xplained
>          at91bootstrap-sama5d2_xplainedsd_uboot \
>          u-boot-sama5d2_xplained_mmc \
>          u-boot-sama5d2_xplained_spiflash
> +  $(Device/evaluation-sdimage)
>  endef
>  TARGET_DEVICES += at91-sama5d2_xplained
>  
> @@ -37,5 +39,6 @@ define Device/at91-sama5d4_xplained
>          u-boot-sama5d4_xplained_mmc \
>          u-boot-sama5d4_xplained_nandflash \
>          u-boot-sama5d4_xplained_spiflash
> +  $(Device/evaluation-sdimage)
>  endef
>  TARGET_DEVICES += at91-sama5d4_xplained
> 
This patch does not apply to on target/linux/at91/image/sama5.mk

These uboot image names are not included in lede master.

Hauke
Sandeep Sheriker Mallikarjun Oct. 12, 2017, 8:10 p.m. | #2
-----Original Message-----
From: Hauke Mehrtens [mailto:hauke@hauke-m.de] 
Sent: Thursday, October 12, 2017 12:47 PM
To: Sandeep Sheriker Mallikarjun - C17018; lede-dev@lists.infradead.org
Subject: Re: [LEDE-DEV] [PATCH 3/3] at91: creating sdcard image for sama5

On 10/05/2017 01:14 AM, Sandeep Sheriker Mallikarjun wrote:
> creating sdcard image using gen_at91_sdcard_img.sh for sama5 platform 
> and sdcard image partition layout is:
> 
>    P0: Boot (fat32) - Contains(at91bootstrap,u-boot,zImage & dtb)
>    p1: Rootfs (ext4)
> 
> Signed-off-by: Sandeep Sheriker Mallikarjun 
> <sandeepsheriker.mallikarjun@microchip.com>
> ---
>  target/linux/at91/image/Makefile                   | 45 ++++++++++++++++++++++
>  .../image/gen_at91_sdcard_img.sh}                  |  9 +++--
>  target/linux/at91/image/sama5.mk                   |  3 ++
>  3 files changed, 54 insertions(+), 3 deletions(-)  copy 
> target/linux/{omap/image/gen_omap_sdcard_img.sh => 
> at91/image/gen_at91_sdcard_img.sh} (68%)
> 
> diff --git a/target/linux/at91/image/Makefile 
> b/target/linux/at91/image/Makefile
> index 9333709..628d3d8 100644
> --- a/target/linux/at91/image/Makefile
> +++ b/target/linux/at91/image/Makefile
> @@ -9,6 +9,11 @@ include $(INCLUDE_DIR)/image.mk
>  
>  KERNEL_LOADADDR := 0x20008000
>  
> +AT91_SD_BOOT_PARTSIZE:= 64
> +FAT32_BLOCK_SIZE:=1024
> +FAT32_BLOCKS:=$(shell echo \
> +      $$(($(AT91_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE))))
> +
>  ifeq ($(SUBTARGET),legacy)
>  include ./legacy.mk
>  UBIFS_OPTS := -m 2048 -e 126KiB -c 2048 @@ -48,6 +53,46 @@ define 
> Device/evaluation
>    IMAGE/root.ubi := append-ubi
>  endef
>  
> +#  $(CP) $(KDIR)/zImage \
> +#  $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE_SANITIZED)-zImage
> +define Build/at91-sdcard
> +  rm -f $@.boot
> +  mkfs.fat -C $@.boot $(FAT32_BLOCKS)
> +
> +  mcopy -i $@.boot $(KDIR)/zImage ::zImage
> +
> +  $(foreach dts,$(DEVICE_DTS), \
> +     mcopy -i $@.boot $(DTS_DIR)/$(dts).dtb \
> +        ::$(dts).dtb; \
> +     mcopy -i $@.boot \
> +        $(BIN_DIR)/u-boot-$(dts:at91-%=%)_mmc/u-boot.bin \
> +            ::u-boot.bin; \
> +     $(CP) $(BIN_DIR)/at91bootstrap-$(dts:at91-%=%)sd_uboot*/*.bin \
> +         $(BIN_DIR)/BOOT.bin; \
> +     mcopy -i $@.boot $(BIN_DIR)/BOOT.bin ::BOOT.bin;)
> +
> +  ./gen_at91_sdcard_img.sh \
> +      $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img \
> +      $@.boot \
> +      $(KDIR)/root.ext4 \
> +      $(AT91_SD_BOOT_PARTSIZE) \
> +      $(CONFIG_TARGET_ROOTFS_PARTSIZE)
> +
> +  gzip -nc9 $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img \
> +         > $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img.gz
> +
> +  $(CP) $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img.gz \
> +        $(BIN_DIR)/
> +
> +  rm -f $(BIN_DIR)/BOOT.bin
> +  rm -f $@.boot
> +endef
> +
> +define Device/evaluation-sdimage
> +  IMAGES += sdcard.img.gz
> +  IMAGE/sdcard.img.gz := at91-sdcard
> +endef
> +
>  define Device/evaluation-zImage
>    IMAGES += zImage
>    IMAGE/zImage := install-zImage
> diff --git a/target/linux/omap/image/gen_omap_sdcard_img.sh 
> b/target/linux/at91/image/gen_at91_sdcard_img.sh
> similarity index 68%
> copy from target/linux/omap/image/gen_omap_sdcard_img.sh
> copy to target/linux/at91/image/gen_at91_sdcard_img.sh
> index c2f2aad..16c76f0 100755
> --- a/target/linux/omap/image/gen_omap_sdcard_img.sh
> +++ b/target/linux/at91/image/gen_at91_sdcard_img.sh
> @@ -9,7 +9,9 @@
>  
>  set -x
>  [ $# -eq 5 ] || {
> -    echo "SYNTAX: $0 <file> <bootfs image> <rootfs image> <bootfs size> <rootfs size>"
> +    echo "SYNTAX: $0 <filename> \
> +                  <bootfs image> <rootfs image> \
> +                  <bootfs size> <rootfs size>"
>      exit 1
>  }
>  
> @@ -20,9 +22,10 @@ BOOTFSSIZE="$4"
>  ROOTFSSIZE="$5"
>  
>  head=4
> -sect=63
> +sect=2048
>  
> -set `ptgen -o $OUTPUT -h $head -s $sect -l 1024 -t c -p 
> ${BOOTFSSIZE}M -t 83 -p ${ROOTFSSIZE}M`
> +set `ptgen -o $OUTPUT -h $head -s $sect -l 1024 -t c -p \
> +           ${BOOTFSSIZE}M -t 83 -p ${ROOTFSSIZE}M`
>  
>  BOOTOFFSET="$(($1 / 512))"
>  BOOTSIZE="$(($2 / 512))"
> diff --git a/target/linux/at91/image/sama5.mk 
> b/target/linux/at91/image/sama5.mk
> index 1610815..7d32875 100644
> --- a/target/linux/at91/image/sama5.mk
> +++ b/target/linux/at91/image/sama5.mk
> @@ -8,6 +8,7 @@ define Device/at91-sama5d3_xplained
>          at91bootstrap-sama5d3_xplainedsd_uboot \
>          u-boot-sama5d3_xplained_mmc \
>          u-boot-sama5d3_xplained_nandflash
> +  $(Device/evaluation-sdimage)
>  endef
>  TARGET_DEVICES += at91-sama5d3_xplained
>  
> @@ -22,6 +23,7 @@ define Device/at91-sama5d2_xplained
>          at91bootstrap-sama5d2_xplainedsd_uboot \
>          u-boot-sama5d2_xplained_mmc \
>          u-boot-sama5d2_xplained_spiflash
> +  $(Device/evaluation-sdimage)
>  endef
>  TARGET_DEVICES += at91-sama5d2_xplained
>  
> @@ -37,5 +39,6 @@ define Device/at91-sama5d4_xplained
>          u-boot-sama5d4_xplained_mmc \
>          u-boot-sama5d4_xplained_nandflash \
>          u-boot-sama5d4_xplained_spiflash
> +  $(Device/evaluation-sdimage)
>  endef
>  TARGET_DEVICES += at91-sama5d4_xplained
> 
>This patch does not apply to on target/linux/at91/image/sama5.mk
>
>These uboot image names are not included in lede master.
>
>Hauke

Hi,
 These uboot images names are included in below patch.
https://patchwork.ozlabs.org/patch/821496/

Regards,
Sandeep Sheriker M
Hauke Mehrtens Oct. 12, 2017, 8:43 p.m. | #3
On 10/12/2017 10:10 PM, SandeepSheriker.Mallikarjun@microchip.com wrote:
> -----Original Message-----
> From: Hauke Mehrtens [mailto:hauke@hauke-m.de] 
> Sent: Thursday, October 12, 2017 12:47 PM
> To: Sandeep Sheriker Mallikarjun - C17018; lede-dev@lists.infradead.org
> Subject: Re: [LEDE-DEV] [PATCH 3/3] at91: creating sdcard image for sama5
> 
> On 10/05/2017 01:14 AM, Sandeep Sheriker Mallikarjun wrote:
>> creating sdcard image using gen_at91_sdcard_img.sh for sama5 platform 
>> and sdcard image partition layout is:
>>
>>    P0: Boot (fat32) - Contains(at91bootstrap,u-boot,zImage & dtb)
>>    p1: Rootfs (ext4)
>>
>> Signed-off-by: Sandeep Sheriker Mallikarjun 
>> <sandeepsheriker.mallikarjun@microchip.com>
>> ---
>>  target/linux/at91/image/Makefile                   | 45 ++++++++++++++++++++++
>>  .../image/gen_at91_sdcard_img.sh}                  |  9 +++--
>>  target/linux/at91/image/sama5.mk                   |  3 ++
>>  3 files changed, 54 insertions(+), 3 deletions(-)  copy 
>> target/linux/{omap/image/gen_omap_sdcard_img.sh => 
>> at91/image/gen_at91_sdcard_img.sh} (68%)
>>
>> diff --git a/target/linux/at91/image/Makefile 
>> b/target/linux/at91/image/Makefile
>> index 9333709..628d3d8 100644
>> --- a/target/linux/at91/image/Makefile
>> +++ b/target/linux/at91/image/Makefile
>> @@ -9,6 +9,11 @@ include $(INCLUDE_DIR)/image.mk
>>  
>>  KERNEL_LOADADDR := 0x20008000
>>  
>> +AT91_SD_BOOT_PARTSIZE:= 64
>> +FAT32_BLOCK_SIZE:=1024
>> +FAT32_BLOCKS:=$(shell echo \
>> +      $$(($(AT91_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE))))
>> +
>>  ifeq ($(SUBTARGET),legacy)
>>  include ./legacy.mk
>>  UBIFS_OPTS := -m 2048 -e 126KiB -c 2048 @@ -48,6 +53,46 @@ define 
>> Device/evaluation
>>    IMAGE/root.ubi := append-ubi
>>  endef
>>  
>> +#  $(CP) $(KDIR)/zImage \
>> +#  $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE_SANITIZED)-zImage
>> +define Build/at91-sdcard
>> +  rm -f $@.boot
>> +  mkfs.fat -C $@.boot $(FAT32_BLOCKS)
>> +
>> +  mcopy -i $@.boot $(KDIR)/zImage ::zImage
>> +
>> +  $(foreach dts,$(DEVICE_DTS), \
>> +     mcopy -i $@.boot $(DTS_DIR)/$(dts).dtb \
>> +        ::$(dts).dtb; \
>> +     mcopy -i $@.boot \
>> +        $(BIN_DIR)/u-boot-$(dts:at91-%=%)_mmc/u-boot.bin \
>> +            ::u-boot.bin; \
>> +     $(CP) $(BIN_DIR)/at91bootstrap-$(dts:at91-%=%)sd_uboot*/*.bin \
>> +         $(BIN_DIR)/BOOT.bin; \
>> +     mcopy -i $@.boot $(BIN_DIR)/BOOT.bin ::BOOT.bin;)
>> +
>> +  ./gen_at91_sdcard_img.sh \
>> +      $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img \
>> +      $@.boot \
>> +      $(KDIR)/root.ext4 \
>> +      $(AT91_SD_BOOT_PARTSIZE) \
>> +      $(CONFIG_TARGET_ROOTFS_PARTSIZE)
>> +
>> +  gzip -nc9 $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img \
>> +         > $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img.gz
>> +
>> +  $(CP) $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img.gz \
>> +        $(BIN_DIR)/
>> +
>> +  rm -f $(BIN_DIR)/BOOT.bin
>> +  rm -f $@.boot
>> +endef
>> +
>> +define Device/evaluation-sdimage
>> +  IMAGES += sdcard.img.gz
>> +  IMAGE/sdcard.img.gz := at91-sdcard
>> +endef
>> +
>>  define Device/evaluation-zImage
>>    IMAGES += zImage
>>    IMAGE/zImage := install-zImage
>> diff --git a/target/linux/omap/image/gen_omap_sdcard_img.sh 
>> b/target/linux/at91/image/gen_at91_sdcard_img.sh
>> similarity index 68%
>> copy from target/linux/omap/image/gen_omap_sdcard_img.sh
>> copy to target/linux/at91/image/gen_at91_sdcard_img.sh
>> index c2f2aad..16c76f0 100755
>> --- a/target/linux/omap/image/gen_omap_sdcard_img.sh
>> +++ b/target/linux/at91/image/gen_at91_sdcard_img.sh
>> @@ -9,7 +9,9 @@
>>  
>>  set -x
>>  [ $# -eq 5 ] || {
>> -    echo "SYNTAX: $0 <file> <bootfs image> <rootfs image> <bootfs size> <rootfs size>"
>> +    echo "SYNTAX: $0 <filename> \
>> +                  <bootfs image> <rootfs image> \
>> +                  <bootfs size> <rootfs size>"
>>      exit 1
>>  }
>>  
>> @@ -20,9 +22,10 @@ BOOTFSSIZE="$4"
>>  ROOTFSSIZE="$5"
>>  
>>  head=4
>> -sect=63
>> +sect=2048
>>  
>> -set `ptgen -o $OUTPUT -h $head -s $sect -l 1024 -t c -p 
>> ${BOOTFSSIZE}M -t 83 -p ${ROOTFSSIZE}M`
>> +set `ptgen -o $OUTPUT -h $head -s $sect -l 1024 -t c -p \
>> +           ${BOOTFSSIZE}M -t 83 -p ${ROOTFSSIZE}M`
>>  
>>  BOOTOFFSET="$(($1 / 512))"
>>  BOOTSIZE="$(($2 / 512))"
>> diff --git a/target/linux/at91/image/sama5.mk 
>> b/target/linux/at91/image/sama5.mk
>> index 1610815..7d32875 100644
>> --- a/target/linux/at91/image/sama5.mk
>> +++ b/target/linux/at91/image/sama5.mk
>> @@ -8,6 +8,7 @@ define Device/at91-sama5d3_xplained
>>          at91bootstrap-sama5d3_xplainedsd_uboot \
>>          u-boot-sama5d3_xplained_mmc \
>>          u-boot-sama5d3_xplained_nandflash
>> +  $(Device/evaluation-sdimage)
>>  endef
>>  TARGET_DEVICES += at91-sama5d3_xplained
>>  
>> @@ -22,6 +23,7 @@ define Device/at91-sama5d2_xplained
>>          at91bootstrap-sama5d2_xplainedsd_uboot \
>>          u-boot-sama5d2_xplained_mmc \
>>          u-boot-sama5d2_xplained_spiflash
>> +  $(Device/evaluation-sdimage)
>>  endef
>>  TARGET_DEVICES += at91-sama5d2_xplained
>>  
>> @@ -37,5 +39,6 @@ define Device/at91-sama5d4_xplained
>>          u-boot-sama5d4_xplained_mmc \
>>          u-boot-sama5d4_xplained_nandflash \
>>          u-boot-sama5d4_xplained_spiflash
>> +  $(Device/evaluation-sdimage)
>>  endef
>>  TARGET_DEVICES += at91-sama5d4_xplained
>>
>> This patch does not apply to on target/linux/at91/image/sama5.mk
>>
>> These uboot image names are not included in lede master.
>>
>> Hauke
> 
> Hi,
>  These uboot images names are included in below patch.
> https://patchwork.ozlabs.org/patch/821496/
> 
> Regards,
> Sandeep Sheriker M
> 
> 
Hi Sandeep,

The patch at https://patchwork.ozlabs.org/patch/821496/ only edits the
file package/boot/uboot-at91_sama5/Makefile , but not the file
target/linux/at91/image/sama5.mk .

I am missing the patches which adds this stuff for example
          u-boot-sama5d4_xplained_mmc \
          u-boot-sama5d4_xplained_nandflash \
          u-boot-sama5d4_xplained_spiflash
to target/linux/at91/image/sama5.mk

Hauke
Sandeep Sheriker Mallikarjun Oct. 13, 2017, 5:30 p.m. | #4
Hi Hauke,
  I have re- submitted new patch series version v1 along with missing patch.

Regards,
Sandeep Sheriker 

> -----Original Message-----
> From: Hauke Mehrtens [mailto:hauke@hauke-m.de]
> Sent: Thursday, October 12, 2017 1:43 PM
> To: Sandeep Sheriker Mallikarjun - C17018; lede-dev@lists.infradead.org
> Subject: Re: [LEDE-DEV] [PATCH 3/3] at91: creating sdcard image for sama5
> 
> On 10/12/2017 10:10 PM, SandeepSheriker.Mallikarjun@microchip.com
> wrote:
> > -----Original Message-----
> > From: Hauke Mehrtens [mailto:hauke@hauke-m.de]
> > Sent: Thursday, October 12, 2017 12:47 PM
> > To: Sandeep Sheriker Mallikarjun - C17018;
> > lede-dev@lists.infradead.org
> > Subject: Re: [LEDE-DEV] [PATCH 3/3] at91: creating sdcard image for
> > sama5
> >
> > On 10/05/2017 01:14 AM, Sandeep Sheriker Mallikarjun wrote:
> >> creating sdcard image using gen_at91_sdcard_img.sh for sama5 platform
> >> and sdcard image partition layout is:
> >>
> >>    P0: Boot (fat32) - Contains(at91bootstrap,u-boot,zImage & dtb)
> >>    p1: Rootfs (ext4)
> >>
> >> Signed-off-by: Sandeep Sheriker Mallikarjun
> >> <sandeepsheriker.mallikarjun@microchip.com>
> >> ---
> >>  target/linux/at91/image/Makefile                   | 45 ++++++++++++++++++++++
> >>  .../image/gen_at91_sdcard_img.sh}                  |  9 +++--
> >>  target/linux/at91/image/sama5.mk                   |  3 ++
> >>  3 files changed, 54 insertions(+), 3 deletions(-)  copy
> >> target/linux/{omap/image/gen_omap_sdcard_img.sh =>
> >> at91/image/gen_at91_sdcard_img.sh} (68%)
> >>
> >> diff --git a/target/linux/at91/image/Makefile
> >> b/target/linux/at91/image/Makefile
> >> index 9333709..628d3d8 100644
> >> --- a/target/linux/at91/image/Makefile
> >> +++ b/target/linux/at91/image/Makefile
> >> @@ -9,6 +9,11 @@ include $(INCLUDE_DIR)/image.mk
> >>
> >>  KERNEL_LOADADDR := 0x20008000
> >>
> >> +AT91_SD_BOOT_PARTSIZE:= 64
> >> +FAT32_BLOCK_SIZE:=1024
> >> +FAT32_BLOCKS:=$(shell echo \
> >> +      $$(($(AT91_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE))))
> >> +
> >>  ifeq ($(SUBTARGET),legacy)
> >>  include ./legacy.mk
> >>  UBIFS_OPTS := -m 2048 -e 126KiB -c 2048 @@ -48,6 +53,46 @@ define
> >> Device/evaluation
> >>    IMAGE/root.ubi := append-ubi
> >>  endef
> >>
> >> +#  $(CP) $(KDIR)/zImage \
> >> +#  $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE_SANITIZED)-zImage
> >> +define Build/at91-sdcard
> >> +  rm -f $@.boot
> >> +  mkfs.fat -C $@.boot $(FAT32_BLOCKS)
> >> +
> >> +  mcopy -i $@.boot $(KDIR)/zImage ::zImage
> >> +
> >> +  $(foreach dts,$(DEVICE_DTS), \
> >> +     mcopy -i $@.boot $(DTS_DIR)/$(dts).dtb \
> >> +        ::$(dts).dtb; \
> >> +     mcopy -i $@.boot \
> >> +        $(BIN_DIR)/u-boot-$(dts:at91-%=%)_mmc/u-boot.bin \
> >> +            ::u-boot.bin; \
> >> +     $(CP) $(BIN_DIR)/at91bootstrap-$(dts:at91-%=%)sd_uboot*/*.bin \
> >> +         $(BIN_DIR)/BOOT.bin; \
> >> +     mcopy -i $@.boot $(BIN_DIR)/BOOT.bin ::BOOT.bin;)
> >> +
> >> +  ./gen_at91_sdcard_img.sh \
> >> +      $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img \
> >> +      $@.boot \
> >> +      $(KDIR)/root.ext4 \
> >> +      $(AT91_SD_BOOT_PARTSIZE) \
> >> +      $(CONFIG_TARGET_ROOTFS_PARTSIZE)
> >> +
> >> +  gzip -nc9 $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img \
> >> +         > $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img.gz
> >> +
> >> +  $(CP) $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img.gz \
> >> +        $(BIN_DIR)/
> >> +
> >> +  rm -f $(BIN_DIR)/BOOT.bin
> >> +  rm -f $@.boot
> >> +endef
> >> +
> >> +define Device/evaluation-sdimage
> >> +  IMAGES += sdcard.img.gz
> >> +  IMAGE/sdcard.img.gz := at91-sdcard endef
> >> +
> >>  define Device/evaluation-zImage
> >>    IMAGES += zImage
> >>    IMAGE/zImage := install-zImage
> >> diff --git a/target/linux/omap/image/gen_omap_sdcard_img.sh
> >> b/target/linux/at91/image/gen_at91_sdcard_img.sh
> >> similarity index 68%
> >> copy from target/linux/omap/image/gen_omap_sdcard_img.sh
> >> copy to target/linux/at91/image/gen_at91_sdcard_img.sh
> >> index c2f2aad..16c76f0 100755
> >> --- a/target/linux/omap/image/gen_omap_sdcard_img.sh
> >> +++ b/target/linux/at91/image/gen_at91_sdcard_img.sh
> >> @@ -9,7 +9,9 @@
> >>
> >>  set -x
> >>  [ $# -eq 5 ] || {
> >> -    echo "SYNTAX: $0 <file> <bootfs image> <rootfs image> <bootfs size>
> <rootfs size>"
> >> +    echo "SYNTAX: $0 <filename> \
> >> +                  <bootfs image> <rootfs image> \
> >> +                  <bootfs size> <rootfs size>"
> >>      exit 1
> >>  }
> >>
> >> @@ -20,9 +22,10 @@ BOOTFSSIZE="$4"
> >>  ROOTFSSIZE="$5"
> >>
> >>  head=4
> >> -sect=63
> >> +sect=2048
> >>
> >> -set `ptgen -o $OUTPUT -h $head -s $sect -l 1024 -t c -p
> >> ${BOOTFSSIZE}M -t 83 -p ${ROOTFSSIZE}M`
> >> +set `ptgen -o $OUTPUT -h $head -s $sect -l 1024 -t c -p \
> >> +           ${BOOTFSSIZE}M -t 83 -p ${ROOTFSSIZE}M`
> >>
> >>  BOOTOFFSET="$(($1 / 512))"
> >>  BOOTSIZE="$(($2 / 512))"
> >> diff --git a/target/linux/at91/image/sama5.mk
> >> b/target/linux/at91/image/sama5.mk
> >> index 1610815..7d32875 100644
> >> --- a/target/linux/at91/image/sama5.mk
> >> +++ b/target/linux/at91/image/sama5.mk
> >> @@ -8,6 +8,7 @@ define Device/at91-sama5d3_xplained
> >>          at91bootstrap-sama5d3_xplainedsd_uboot \
> >>          u-boot-sama5d3_xplained_mmc \
> >>          u-boot-sama5d3_xplained_nandflash
> >> +  $(Device/evaluation-sdimage)
> >>  endef
> >>  TARGET_DEVICES += at91-sama5d3_xplained
> >>
> >> @@ -22,6 +23,7 @@ define Device/at91-sama5d2_xplained
> >>          at91bootstrap-sama5d2_xplainedsd_uboot \
> >>          u-boot-sama5d2_xplained_mmc \
> >>          u-boot-sama5d2_xplained_spiflash
> >> +  $(Device/evaluation-sdimage)
> >>  endef
> >>  TARGET_DEVICES += at91-sama5d2_xplained
> >>
> >> @@ -37,5 +39,6 @@ define Device/at91-sama5d4_xplained
> >>          u-boot-sama5d4_xplained_mmc \
> >>          u-boot-sama5d4_xplained_nandflash \
> >>          u-boot-sama5d4_xplained_spiflash
> >> +  $(Device/evaluation-sdimage)
> >>  endef
> >>  TARGET_DEVICES += at91-sama5d4_xplained
> >>
> >> This patch does not apply to on target/linux/at91/image/sama5.mk
> >>
> >> These uboot image names are not included in lede master.
> >>
> >> Hauke
> >
> > Hi,
> >  These uboot images names are included in below patch.
> > https://patchwork.ozlabs.org/patch/821496/
> >
> > Regards,
> > Sandeep Sheriker M
> >
> >
> Hi Sandeep,
> 
> The patch at https://patchwork.ozlabs.org/patch/821496/ only edits the file
> package/boot/uboot-at91_sama5/Makefile , but not the file
> target/linux/at91/image/sama5.mk .
> 
> I am missing the patches which adds this stuff for example
>           u-boot-sama5d4_xplained_mmc \
>           u-boot-sama5d4_xplained_nandflash \
>           u-boot-sama5d4_xplained_spiflash to
> target/linux/at91/image/sama5.mk
> 
> Hauke

Patch

diff --git a/target/linux/at91/image/Makefile b/target/linux/at91/image/Makefile
index 9333709..628d3d8 100644
--- a/target/linux/at91/image/Makefile
+++ b/target/linux/at91/image/Makefile
@@ -9,6 +9,11 @@  include $(INCLUDE_DIR)/image.mk
 
 KERNEL_LOADADDR := 0x20008000
 
+AT91_SD_BOOT_PARTSIZE:= 64
+FAT32_BLOCK_SIZE:=1024
+FAT32_BLOCKS:=$(shell echo \
+      $$(($(AT91_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE))))
+
 ifeq ($(SUBTARGET),legacy)
 include ./legacy.mk
 UBIFS_OPTS := -m 2048 -e 126KiB -c 2048
@@ -48,6 +53,46 @@  define Device/evaluation
   IMAGE/root.ubi := append-ubi
 endef
 
+#  $(CP) $(KDIR)/zImage \
+#  $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE_SANITIZED)-zImage
+define Build/at91-sdcard
+  rm -f $@.boot
+  mkfs.fat -C $@.boot $(FAT32_BLOCKS)
+
+  mcopy -i $@.boot $(KDIR)/zImage ::zImage
+
+  $(foreach dts,$(DEVICE_DTS), \
+     mcopy -i $@.boot $(DTS_DIR)/$(dts).dtb \
+        ::$(dts).dtb; \
+     mcopy -i $@.boot \
+        $(BIN_DIR)/u-boot-$(dts:at91-%=%)_mmc/u-boot.bin \
+            ::u-boot.bin; \
+     $(CP) $(BIN_DIR)/at91bootstrap-$(dts:at91-%=%)sd_uboot*/*.bin \
+         $(BIN_DIR)/BOOT.bin; \
+     mcopy -i $@.boot $(BIN_DIR)/BOOT.bin ::BOOT.bin;)
+
+  ./gen_at91_sdcard_img.sh \
+      $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img \
+      $@.boot \
+      $(KDIR)/root.ext4 \
+      $(AT91_SD_BOOT_PARTSIZE) \
+      $(CONFIG_TARGET_ROOTFS_PARTSIZE)
+
+  gzip -nc9 $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img \
+         > $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img.gz
+
+  $(CP) $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img.gz \
+        $(BIN_DIR)/
+
+  rm -f $(BIN_DIR)/BOOT.bin
+  rm -f $@.boot
+endef
+
+define Device/evaluation-sdimage
+  IMAGES += sdcard.img.gz
+  IMAGE/sdcard.img.gz := at91-sdcard
+endef
+
 define Device/evaluation-zImage
   IMAGES += zImage
   IMAGE/zImage := install-zImage
diff --git a/target/linux/omap/image/gen_omap_sdcard_img.sh b/target/linux/at91/image/gen_at91_sdcard_img.sh
similarity index 68%
copy from target/linux/omap/image/gen_omap_sdcard_img.sh
copy to target/linux/at91/image/gen_at91_sdcard_img.sh
index c2f2aad..16c76f0 100755
--- a/target/linux/omap/image/gen_omap_sdcard_img.sh
+++ b/target/linux/at91/image/gen_at91_sdcard_img.sh
@@ -9,7 +9,9 @@ 
 
 set -x
 [ $# -eq 5 ] || {
-    echo "SYNTAX: $0 <file> <bootfs image> <rootfs image> <bootfs size> <rootfs size>"
+    echo "SYNTAX: $0 <filename> \
+                  <bootfs image> <rootfs image> \
+                  <bootfs size> <rootfs size>"
     exit 1
 }
 
@@ -20,9 +22,10 @@  BOOTFSSIZE="$4"
 ROOTFSSIZE="$5"
 
 head=4
-sect=63
+sect=2048
 
-set `ptgen -o $OUTPUT -h $head -s $sect -l 1024 -t c -p ${BOOTFSSIZE}M -t 83 -p ${ROOTFSSIZE}M`
+set `ptgen -o $OUTPUT -h $head -s $sect -l 1024 -t c -p \
+           ${BOOTFSSIZE}M -t 83 -p ${ROOTFSSIZE}M`
 
 BOOTOFFSET="$(($1 / 512))"
 BOOTSIZE="$(($2 / 512))"
diff --git a/target/linux/at91/image/sama5.mk b/target/linux/at91/image/sama5.mk
index 1610815..7d32875 100644
--- a/target/linux/at91/image/sama5.mk
+++ b/target/linux/at91/image/sama5.mk
@@ -8,6 +8,7 @@  define Device/at91-sama5d3_xplained
         at91bootstrap-sama5d3_xplainedsd_uboot \
         u-boot-sama5d3_xplained_mmc \
         u-boot-sama5d3_xplained_nandflash
+  $(Device/evaluation-sdimage)
 endef
 TARGET_DEVICES += at91-sama5d3_xplained
 
@@ -22,6 +23,7 @@  define Device/at91-sama5d2_xplained
         at91bootstrap-sama5d2_xplainedsd_uboot \
         u-boot-sama5d2_xplained_mmc \
         u-boot-sama5d2_xplained_spiflash
+  $(Device/evaluation-sdimage)
 endef
 TARGET_DEVICES += at91-sama5d2_xplained
 
@@ -37,5 +39,6 @@  define Device/at91-sama5d4_xplained
         u-boot-sama5d4_xplained_mmc \
         u-boot-sama5d4_xplained_nandflash \
         u-boot-sama5d4_xplained_spiflash
+  $(Device/evaluation-sdimage)
 endef
 TARGET_DEVICES += at91-sama5d4_xplained