From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Mon, 18 Apr 2016 07:30:59 +0000 (+0200)
Subject: karo: tx6: rename CONFIG_SYS_BOOT_CMD_NAND to FDTSAVE_CMD_STR
X-Git-Tag: KARO-TX6-2016-04-26~12
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=0db69c20c2e42945cb1e91729fa46111a86b4a9b

karo: tx6: rename CONFIG_SYS_BOOT_CMD_NAND to FDTSAVE_CMD_STR

This macro in not actually a configurable setting as the original
naming suggests.
---

diff --git a/include/configs/tx6.h b/include/configs/tx6.h
index e87efb2ad1..71a3d71b2b 100644
--- a/include/configs/tx6.h
+++ b/include/configs/tx6.h
@@ -215,7 +215,7 @@
 	EMMC_BOOT_PART_STR						\
 	EMMC_BOOT_ACK_STR						\
 	"fdtaddr=" xstr(CONFIG_FDTADDR) "\0"				\
-	CONFIG_SYS_FDTSAVE_CMD						\
+	FDTSAVE_CMD_STR							\
 	"mtdids=" MTDIDS_DEFAULT "\0"					\
 	"mtdparts=" MTDPARTS_DEFAULT "\0"				\
 	"nfsroot=/tftpboot/rootfs\0"					\
@@ -229,7 +229,7 @@
 #define CONFIG_SYS_DEFAULT_BOOT_MODE	"nand"
 #define CONFIG_SYS_BOOT_CMD_NAND					\
 	"bootcmd_nand=setenv autostart no;run bootargs_ubifs;nboot linux\0"
-#define CONFIG_SYS_FDTSAVE_CMD						\
+#define FDTSAVE_CMD_STR							\
 	"fdtsave=fdt resize;nand erase.part dtb"			\
 	";nand write ${fdtaddr} dtb ${fdtsize}\0"
 #define MTD_NAME			"gpmi-nand"
@@ -243,7 +243,7 @@
 #define CONFIG_SYS_DEFAULT_BOOT_MODE	"mmc"
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
 #define CONFIG_SYS_BOOT_CMD_NAND	""
-#define CONFIG_SYS_FDTSAVE_CMD						\
+#define FDTSAVE_CMD_STR							\
 	"fdtsave=mmc partconf 0 ${emmc_boot_ack} ${emmc_boot_part} ${emmc_boot_part}" \
 	";mmc write ${fdtaddr} " xstr(CONFIG_SYS_DTB_BLKNO) " 80"	\
 	";mmc partconf 0 ${emmc_boot_ack} ${emmc_boot_part} 0\0"