meta-netboot: unify instructions to setup uboot for Rcar-Gen3 M3/H3 boards

Change-Id: I961a0c9fa188fffa830927a2c78f205c765a7491
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>

1 files changed, 53 insertions, 49 deletions

diff --git a/meta-netboot/README.renesas-gen3 b/meta-netboot/README.renesas-gen3
index 00c938bba..849ab3394 100644
--- a/meta-netboot/README.renesas-gen3
+++ b/meta-netboot/README.renesas-gen3
@@ -1,64 +1,68 @@
-Below are the environment variables that can be set in the u-boot console to boot the porter board in various configurations
+Below are the environment variables that can be set in the u-boot console to boot the Renesas Gen3 ULCB boards.
 
-################## Gen3 options #####################
-# these options are common to Renesas Gen3 configurations, take care which board
-# you are using (h3ulcb, m3ulcb, salvator...):
+Adjust board type with the following identifiers:
 
-setenv 'bootkfile' 'Image'
-setenv 'bootkaddr' '0x48080000'
+* 'm3ulcb' for Renesas Gen3 Starter Kit Pro
+* 'h3ulcb' for Renesas Gen3 Starter Kit Premium
 
-# For h3ulcb
-setenv 'bootdfile' 'Image-r8a7795-h3ulcb.dtb'
-# For m3ulcb
-setenv 'bootdfile' 'Image-r8a7796-m3ulcb.dtb'
-setenv 'bootdaddr' '0x48000000'
+################## Common options #####################
+# these options are common to all configurations:
 
-# For h3ulcb
-setenv 'bootifile' 'initramfs-netboot-image-h3ulcb.ext4.gz'
-# For m3ulcb
-setenv 'bootifile' 'initramfs-netboot-image-m3ulcb.ext4.gz'
+# choose board
+setenv board m3ulcb
+# or
+setenv board h3ulcb
 
-setenv 'bootiaddr' '0x5C3F9520'
+# kernel file
+setenv set_bootkfile 'setenv bootkfile Image'
+setenv bootkaddr 0x48080000
 
-setenv 'bootargs_console' 'console=ttySC0,115200 ignore_loglevel'
-setenv 'bootargs_video' 'vmalloc=384M video=HDMI-A-1:1280x960-32@60'
-setenv 'bootargs_extra' 'rw rootfstype=ext4 rootwait rootdelay=2'
+# dtb file
+setenv set_bootdfile 'setenv bootdfile Image-r8a7796-${board}.dtb'
+setenv bootdaddr 0x48000000
+
+# initrd
+setenv set_bootifile 'setenv bootifile initramfs-netboot-image-${board}.ext4.gz'
+setenv bootiaddr 0x5C3F9520
+setenv bootisize 3A6AB6
+
+# kernel args
+setenv bootargs_console 'console=ttySC0,115200 ignore_loglevel'
+setenv bootargs_video 'vmalloc=384M video=HDMI-A-1:1920x1080-32@60'
+setenv bootargs_extra 'rw rootfstype=ext4 rootwait rootdelay=2'
 
 ################ Boot on MMC (SDcard) #################
 
-setenv 'bootargs_root' 'root=/dev/mmcblk1p1'
-setenv 'bootmmc' '0:1'
-setenv 'load_ker' 'ext4load mmc 0:1 ${bootkaddr} /boot/${bootkfile}'
-setenv 'load_dtb' 'ext4load mmc 0:1 ${bootdaddr} /boot/${bootdfile}'
-setenv 'bootcmd' 'setenv bootargs ${bootargs_console} ${bootargs_video} ${bootargs_root} ${bootargs_extra}; run bootkload_sd; booti ${bootkaddr} - ${bootdaddr}'
+setenv bootargs_root 'root=/dev/mmcblk1p1'
+setenv bootmmc '0:1'
+setenv bootkload_sd 'ext4load mmc ${bootmmc} ${bootkaddr} boot/${bootkfile}'
+setenv bootdload_sd 'ext4load mmc ${bootmmc} ${bootdaddr} boot/${bootdfile}'
+setenv bootload_sd 'run set_bootkfile; run bootkload_sd; run set_bootdfile; run bootdload_sd'
+setenv bootcmd 'setenv bootargs ${bootargs_console} ${bootargs_video} ${bootargs_root} ${bootargs_extra}; run bootload_sd; booti ${bootkaddr} - ${bootdaddr}'
 
 ################ Boot on MMC (SDcard) with initrd ######
 
-setenv 'bootargs_root' 'root=/dev/ram0 ramdisk_size=16384'
-setenv 'bootmmc' '1:1'
-setenv 'bootkload_sd' 'ext4load mmc ${bootmmc} ${bootkaddr} boot/${bootkfile}'
-setenv 'bootiload_sd' 'ext4load mmc ${bootmmc} ${bootiaddr} boot/${bootifile}'
-setenv 'load_dtb' 'ext4load mmc 0:1 ${bootdaddr} /boot/${bootdfile}'
-setenv 'bootcmd' 'setenv bootargs ${bootargs_console} ${bootargs_video} ${bootargs_root} ${bootargs_extra}; run bootkload_sd; run bootiload_sd; setenv initrd_size ${filesize}; booti ${bootkaddr} ${bootiaddr}:${initrd_size} ${bootdaddr}'
+setenv bootargs_root 'root=/dev/ram0 ramdisk_size=16384'
+setenv bootmmc '0:1'
+setenv bootkload_sd 'ext4load mmc ${bootmmc} ${bootkaddr} boot/${bootkfile}'
+setenv bootdload_sd 'ext4load mmc ${bootmmc} ${bootdaddr} boot/${bootdfile}'
+setenv bootiload_sd 'ext4load mmc ${bootmmc} ${bootiaddr} boot/${bootifile}'
+setenv bootload_sd 'run set_bootkfile; run bootkload_sd; run set_bootdfile; run bootdload_sd; run set_bootifile; run bootiload_sd'
+
+setenv bootcmd 'setenv bootargs ${bootargs_console} ${bootargs_video} ${bootargs_root} ${bootargs_extra}; run bootload_sd; booti ${bootkaddr} ${bootiaddr}:${bootisize} ${bootdaddr}'
 
 ################ Netboot through TFTP+NBD ##################
-# replace <IP> addresses by appropriate addresses. Example about h3ulcb
-# PLEASE ADJUST TO YOUR BOARD
-
-setenv 'ipaddr' '<board_IP>'
-setenv 'serverip' '<server_IP>'
-
-setenv 'bootargs_root' 'root=/dev/ram0 ramdisk_size=16384 ip=dhcp'
-setenv 'bootdaddr' '0x48000000'
-setenv 'bootdfile' 'Image-r8a7795-h3ulcb.dtb'
-setenv 'bootdload_net' 'tftp ${bootdaddr} h3ulcb/${bootdfile}'
-setenv 'bootkaddr' '0x48080000'
-setenv 'bootkfile' 'Image'
-setenv 'bootkload_net' 'tftp ${bootkaddr} h3ulcb/${bootkfile}'
-setenv 'bootiaddr' '0x5C3F9520'
-setenv 'bootifile' 'initramfs-netboot-image-h3ulcb.ext4.gz'
-setenv 'bootiload_net' 'tftp ${bootraddr} h3ulcb/${bootrfile}'
-setenv 'load_net' 'run bootkload_net; run bootdload_net; run bootiload_net; setenv initrd_size ${filesize}'
-
-setenv 'bootcmd' 'setenv bootargs ${bootargs_console} ${bootargs_video} ${bootargs_root} ${bootargs_extra} nbd.server=${serverip}; run load_net; booti ${bootkaddr} ${bootiaddr}:${initrd_size} ${bootdaddr}'
+# replace <IP> addresses by appropriate addresses
+
+setenv ipaddr '<board_IP>'
+setenv serverip '<server_IP>'
+
+setenv bootargs_root 'root=/dev/ram0 ramdisk_size=16384 ip=dhcp'
+setenv bootkload_net 'tftp ${bootkaddr} ${board}/${bootkfile}'
+setenv bootdload_net 'tftp ${bootdaddr} ${board}/${bootdfile}'
+setenv bootiload_net 'tftp ${bootiaddr} ${board}/${bootifile}'
+setenv bootload_net 'run set_bootkfile; run bootkload_net; run set_bootdfile; run bootdload_net; run set_bootifile; run bootiload_net'
+
+setenv bootcmd 'setenv bootargs ${bootargs_console} ${bootargs_video} ${bootargs_root} ${bootargs_extra} nbd.server=${serverip}; run bootload_net; booti ${bootkaddr} ${bootiaddr}:${bootisize} ${bootdaddr}'
+