From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Mon, 27 Aug 2012 06:49:01 +0000 (+0200)
Subject: TX48 config: remove CONFIG_OF_CONTROL
X-Git-Tag: KARO-TX48-2012-08-27~2^2~10
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=52175860adb49487b0011df2982f4f722fcdf71d

TX48 config: remove CONFIG_OF_CONTROL
---

diff --git a/include/configs/tx48.h b/include/configs/tx48.h
index 143c71077f..6317803166 100644
--- a/include/configs/tx48.h
+++ b/include/configs/tx48.h
@@ -89,7 +89,6 @@
 */
 #ifdef CONFIG_OF_LIBFDT /* set via cmdline parameter thru boards.cfg */
 #define CONFIG_FDT_FIXUP_PARTITIONS
-#define CONFIG_OF_CONTROL
 #define CONFIG_OF_EMBED
 #define CONFIG_OF_BOARD_SETUP
 #define CONFIG_DEFAULT_DEVICE_TREE	tx48
@@ -126,9 +125,7 @@
  */
 #ifdef CONFIG_OF_LIBFDT
 #define TX48_BOOTM_CMD							\
-	"bootm_cmd=fdt addr ${fdtcontroladdr};"				\
-	"fdt board;"							\
-	"bootm ${loadaddr} - ${fdtaddr}\0"
+	"bootm_cmd=fdt boardsetup;bootm ${loadaddr} - ${fdtaddr}\0"
 #else
 #define TX48_BOOTM_CMD							\
 	"bootm_cmd=bootm\0"
@@ -153,7 +150,7 @@
 	TX48_BOOTM_CMD							\
 	"default_bootargs=set bootargs " CONFIG_BOOTARGS		\
 	" ${mtdparts} video=${video_mode} ${append_bootargs}\0"		\
-	"fdtcontroladdr=80004000\0"					\
+	"fdtaddr=80004000\0"						\
 	"mtdids=" MTDIDS_DEFAULT "\0"					\
 	"mtdparts=" MTDPARTS_DEFAULT "\0"				\
 	"touchpanel=tsc2007\0"						\