From 6e028b8d1c2f4b3c46ab6a07125e44aff724e1cf Mon Sep 17 00:00:00 2001
From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= <LW@KARO-electronics.de>
Date: Mon, 30 Jun 2014 15:45:23 +0200
Subject: [PATCH] board: karo: add 'ftd resize' to 'fdtsave' command

---
 include/configs/tx28.h | 15 ++++++++-------
 include/configs/tx48.h |  2 +-
 include/configs/tx51.h |  2 +-
 include/configs/tx53.h |  2 +-
 include/configs/tx6.h  |  7 ++++---
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/include/configs/tx28.h b/include/configs/tx28.h
index dd12b94813..baadc733fd 100644
--- a/include/configs/tx28.h
+++ b/include/configs/tx28.h
@@ -128,17 +128,18 @@
 	" root=/dev/mtdblock3 rootfstype=jffs2\0"			\
 	"bootargs_nfs=run default_bootargs;set bootargs ${bootargs}"	\
 	" root=/dev/nfs ip=dhcp nfsroot=${nfs_server}:${nfsroot},nolock\0" \
-	"bootcmd_mmc=set autostart no;run bootargs_mmc;"		\
-	"fatload mmc 0 ${loadaddr} uImage;run bootm_cmd\0"		\
-	"bootcmd_nand=set autostart no;run bootargs_nand;"		\
-	"nboot linux;run bootm_cmd\0"					\
-	"bootcmd_net=set autostart no;run bootargs_nfs;dhcp;"		\
-	"run bootm_cmd\0"						\
+	"bootcmd_mmc=set autostart no;run bootargs_mmc"			\
+	";fatload mmc 0 ${loadaddr} uImage;run bootm_cmd\0"		\
+	"bootcmd_nand=set autostart no;run bootargs_nand"		\
+	";nboot linux;run bootm_cmd\0"					\
+	"bootcmd_net=set autostart no;run bootargs_nfs;dhcp"		\
+	";run bootm_cmd\0"						\
 	"bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0"			\
 	"default_bootargs=set bootargs " CONFIG_BOOTARGS		\
 	" ${append_bootargs}\0"		\
 	"fdtaddr=41000000\0"						\
-	"fdtsave=nand erase.part dtb;nand write ${fdtaddr} dtb ${fdtsize}\0" \
+	"fdtsave=fdt resize;nand erase.part dtb"			\
+	";nand write ${fdtaddr} dtb ${fdtsize}\0"			\
 	"mtdids=" MTDIDS_DEFAULT "\0"					\
 	"mtdparts=" MTDPARTS_DEFAULT "\0"				\
 	"nfsroot=/tftpboot/rootfs\0"					\
diff --git a/include/configs/tx48.h b/include/configs/tx48.h
index db3c04a189..10e2e2fa2a 100644
--- a/include/configs/tx48.h
+++ b/include/configs/tx48.h
@@ -144,7 +144,7 @@
 	"default_bootargs=set bootargs " CONFIG_BOOTARGS		\
 	" ${append_bootargs}\0"						\
 	"fdtaddr=81000000\0"						\
-	"fdtsave=nand erase.part dtb"					\
+	"fdtsave=fdt resize;nand erase.part dtb"					\
 	";nand write ${fdtaddr} dtb ${fdtsize}\0"			\
 	"mtdids=" MTDIDS_DEFAULT "\0"					\
 	"mtdparts=" MTDPARTS_DEFAULT "\0"				\
diff --git a/include/configs/tx51.h b/include/configs/tx51.h
index a360acc7c3..c28775f656 100644
--- a/include/configs/tx51.h
+++ b/include/configs/tx51.h
@@ -145,7 +145,7 @@
 	"default_bootargs=set bootargs " CONFIG_BOOTARGS		\
 	" ${append_bootargs}\0"						\
 	"fdtaddr=91000000\0"						\
-	"fdtsave=nand erase.part dtb"					\
+	"fdtsave=fdt resize;nand erase.part dtb"					\
 	";nand write ${fdtaddr} dtb ${fdtsize}\0"			\
 	"mtdids=" MTDIDS_DEFAULT "\0"					\
 	"mtdparts=" MTDPARTS_DEFAULT "\0"				\
diff --git a/include/configs/tx53.h b/include/configs/tx53.h
index 6281f4836b..25e6204b37 100644
--- a/include/configs/tx53.h
+++ b/include/configs/tx53.h
@@ -134,7 +134,7 @@
 	"default_bootargs=set bootargs " CONFIG_BOOTARGS		\
 	" ${append_bootargs}\0"						\
 	"fdtaddr=71000000\0"						\
-	"fdtsave=nand erase.part dtb"					\
+	"fdtsave=fdt resize;nand erase.part dtb"					\
 	";nand write ${fdtaddr} dtb ${fdtsize}\0"			\
 	"mtdids=" MTDIDS_DEFAULT "\0"					\
 	"mtdparts=" MTDPARTS_DEFAULT "\0"				\
diff --git a/include/configs/tx6.h b/include/configs/tx6.h
index 2fd97d45c2..e3919ad387 100644
--- a/include/configs/tx6.h
+++ b/include/configs/tx6.h
@@ -183,8 +183,8 @@
 #define CONFIG_SYS_DEFAULT_BOOT_MODE "nand"
 #define CONFIG_SYS_BOOT_CMD_NAND					\
 	"bootcmd_nand=set autostart no;run bootargs_ubifs;nboot linux\0"
-#define CONFIG_SYS_FDTSAVE_CMD				\
-	"fdtsave=nand erase.part dtb"			\
+#define CONFIG_SYS_FDTSAVE_CMD						\
+	"fdtsave=fdt resize;nand erase.part dtb"			\
 	";nand write ${fdtaddr} dtb ${fdtsize}\0"
 #define MTD_NAME			"gpmi-nand"
 #define MTDIDS_DEFAULT			"nand0=" MTD_NAME
@@ -195,7 +195,8 @@
 #define CONFIG_SYS_DEFAULT_BOOT_MODE "mmc"
 #define CONFIG_SYS_BOOT_CMD_NAND ""
 #define CONFIG_SYS_FDTSAVE_CMD						\
-	"fdtsave=mmc open 0 1;mmc write ${fdtaddr} " xstr(CONFIG_SYS_DTB_BLKNO) " 80;mmc close 0 1\0"
+	"fdtsave=mmc open 0 1;mmc write ${fdtaddr} "			\
+	xstr(CONFIG_SYS_DTB_BLKNO) " 80;mmc close 0 1\0"
 #define MMC_ROOT_STR " root=PARTUUID=${rootpart_uuid} rootwait\0"
 #define ROOTPART_UUID_STR "rootpart_uuid=0cc66cc0-02\0"
 #define MTD_NAME			""
-- 
2.39.2