* [U-Boot] [PATCH] configs: imx6q_logic: Cleanup ramdiskaddr and fdtaddr
@ 2018-07-20 13:25 Adam Ford
2018-07-23 9:37 ` Stefano Babic
0 siblings, 1 reply; 2+ messages in thread
From: Adam Ford @ 2018-07-20 13:25 UTC (permalink / raw)
To: u-boot
There are already definitions for ramdisk_addr_r and fdt_addr_r, so
having a duplicate copy called ramdiskaddr and fdtaddr is confusing.
This patch converts any references to ramdisk_addr_r and fdt_addr_r
and removes the duplicates.
Signed-off-by: Adam Ford <aford173@gmail.com>
diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index c6a7a609be..f94e27fe09 100644
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -35,10 +35,8 @@
"script=boot.scr\0" \
"image=zImage\0" \
"bootm_size=0x10000000\0" \
- "fdt_addr_r=0x18000000\0" \
- "fdt_addr=0x18000000\0" \
- "ramdisk_addr_r=0x13000000\0" \
- "ramdiskaddr=0x13000000\0" \
+ "fdt_addr_r=0x13000000\0" \
+ "ramdisk_addr_r=0x14000000\0" \
"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
"ramdisk_file=rootfs.cpio.uboot\0" \
"boot_fdt=try\0" \
@@ -60,25 +58,25 @@
" source\0" \
"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image};" \
" setenv kernelsize ${filesize}\0" \
- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
- "loadramdisk=fatload mmc ${mmcdev}:${mmcpart} ${ramdiskaddr}" \
+ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdt_file}\0" \
+ "loadramdisk=fatload mmc ${mmcdev}:${mmcpart} ${ramdisk_addr_r}" \
" ${ramdisk_file}; setenv ramdisksize ${filesize}\0" \
"mmcboot=echo Booting from mmc...; run mmcargs; run loadimage;" \
- " run loadfdt; bootz ${loadaddr} - ${fdt_addr}\0" \
+ " run loadfdt; bootz ${loadaddr} - ${fdt_addr_r}\0" \
"mmcramboot=run ramargs; run loadimage;" \
" run loadfdt; run loadramdisk;" \
- " bootz ${loadaddr} ${ramdiskaddr} ${fdt_addr}\0" \
+ " bootz ${loadaddr} ${ramdisk_addr_r} ${fdt_addr_r}\0" \
"nandboot=echo Booting from nand ...; " \
" run nandargs;" \
" nand read ${loadaddr} kernel ${kernelsize};" \
" nand read ${fdt_addr} dtb;" \
" bootz ${loadaddr} - ${fdt_addr}\0" \
"nandramboot=echo Booting RAMdisk from nand ...; " \
- " nand read ${ramdiskaddr} fs ${ramdisksize};" \
+ " nand read ${ramdisk_addr_r} fs ${ramdisksize};" \
" nand read ${loadaddr} kernel ${kernelsize};" \
- " nand read ${fdt_addr} dtb;" \
+ " nand read ${fdt_addr_r} dtb;" \
" run ramargs;" \
- " bootz ${loadaddr} ${ramdiskaddr} ${fdt_addr}\0" \
+ " bootz ${loadaddr} ${ramdisk_addr_r} ${fdt_addr_r}\0" \
"netargs=setenv bootargs console=${console},${baudrate} " \
"root=/dev/nfs" \
" ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [U-Boot] [PATCH] configs: imx6q_logic: Cleanup ramdiskaddr and fdtaddr
2018-07-20 13:25 [U-Boot] [PATCH] configs: imx6q_logic: Cleanup ramdiskaddr and fdtaddr Adam Ford
@ 2018-07-23 9:37 ` Stefano Babic
0 siblings, 0 replies; 2+ messages in thread
From: Stefano Babic @ 2018-07-23 9:37 UTC (permalink / raw)
To: u-boot
On 20/07/2018 15:25, Adam Ford wrote:
> There are already definitions for ramdisk_addr_r and fdt_addr_r, so
> having a duplicate copy called ramdiskaddr and fdtaddr is confusing.
> This patch converts any references to ramdisk_addr_r and fdt_addr_r
> and removes the duplicates.
>
> Signed-off-by: Adam Ford <aford173@gmail.com>
>
> diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
> index c6a7a609be..f94e27fe09 100644
> --- a/include/configs/imx6_logic.h
> +++ b/include/configs/imx6_logic.h
> @@ -35,10 +35,8 @@
> "script=boot.scr\0" \
> "image=zImage\0" \
> "bootm_size=0x10000000\0" \
> - "fdt_addr_r=0x18000000\0" \
> - "fdt_addr=0x18000000\0" \
> - "ramdisk_addr_r=0x13000000\0" \
> - "ramdiskaddr=0x13000000\0" \
> + "fdt_addr_r=0x13000000\0" \
> + "ramdisk_addr_r=0x14000000\0" \
> "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
> "ramdisk_file=rootfs.cpio.uboot\0" \
> "boot_fdt=try\0" \
> @@ -60,25 +58,25 @@
> " source\0" \
> "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image};" \
> " setenv kernelsize ${filesize}\0" \
> - "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
> - "loadramdisk=fatload mmc ${mmcdev}:${mmcpart} ${ramdiskaddr}" \
> + "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdt_file}\0" \
> + "loadramdisk=fatload mmc ${mmcdev}:${mmcpart} ${ramdisk_addr_r}" \
> " ${ramdisk_file}; setenv ramdisksize ${filesize}\0" \
> "mmcboot=echo Booting from mmc...; run mmcargs; run loadimage;" \
> - " run loadfdt; bootz ${loadaddr} - ${fdt_addr}\0" \
> + " run loadfdt; bootz ${loadaddr} - ${fdt_addr_r}\0" \
> "mmcramboot=run ramargs; run loadimage;" \
> " run loadfdt; run loadramdisk;" \
> - " bootz ${loadaddr} ${ramdiskaddr} ${fdt_addr}\0" \
> + " bootz ${loadaddr} ${ramdisk_addr_r} ${fdt_addr_r}\0" \
> "nandboot=echo Booting from nand ...; " \
> " run nandargs;" \
> " nand read ${loadaddr} kernel ${kernelsize};" \
> " nand read ${fdt_addr} dtb;" \
> " bootz ${loadaddr} - ${fdt_addr}\0" \
> "nandramboot=echo Booting RAMdisk from nand ...; " \
> - " nand read ${ramdiskaddr} fs ${ramdisksize};" \
> + " nand read ${ramdisk_addr_r} fs ${ramdisksize};" \
> " nand read ${loadaddr} kernel ${kernelsize};" \
> - " nand read ${fdt_addr} dtb;" \
> + " nand read ${fdt_addr_r} dtb;" \
> " run ramargs;" \
> - " bootz ${loadaddr} ${ramdiskaddr} ${fdt_addr}\0" \
> + " bootz ${loadaddr} ${ramdisk_addr_r} ${fdt_addr_r}\0" \
> "netargs=setenv bootargs console=${console},${baudrate} " \
> "root=/dev/nfs" \
> " ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
>
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-07-23 9:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-20 13:25 [U-Boot] [PATCH] configs: imx6q_logic: Cleanup ramdiskaddr and fdtaddr Adam Ford
2018-07-23 9:37 ` Stefano Babic
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.