From a615850ab84267f5bb8d9ecf22c9d23e6141f4b0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= Date: Mon, 22 Jul 2013 12:31:53 +0200 Subject: [PATCH] karo: remove bogus 'fdt boardsetup' from bootm_cmd --- include/configs/tx28.h | 2 +- include/configs/tx48.h | 4 ++-- include/configs/tx51.h | 2 +- include/configs/tx53.h | 2 +- include/configs/tx6.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/configs/tx28.h b/include/configs/tx28.h index 528853592f..7f0addb98b 100644 --- a/include/configs/tx28.h +++ b/include/configs/tx28.h @@ -141,7 +141,7 @@ "nboot linux;run bootm_cmd\0" \ "bootcmd_net=set autostart no;run bootargs_nfs;dhcp;" \ "run bootm_cmd\0" \ - "bootm_cmd=fdt boardsetup;bootm ${loadaddr} - ${fdtaddr}\0" \ + "bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0" \ "default_bootargs=set bootargs " CONFIG_BOOTARGS \ " mxsfb.mode=${video_mode} ${append_bootargs}\0" \ "fdtaddr=41000000\0" \ diff --git a/include/configs/tx48.h b/include/configs/tx48.h index 0285f8373f..6de634fa80 100644 --- a/include/configs/tx48.h +++ b/include/configs/tx48.h @@ -132,7 +132,7 @@ */ #ifdef CONFIG_OF_LIBFDT #define TX48_BOOTM_CMD \ - "bootm_cmd=fdt boardsetup;bootm ${loadaddr} - ${fdtaddr}\0" + "bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0" #define TX48_MTDPARTS_CMD "" #else #define TX48_BOOTM_CMD \ @@ -166,7 +166,7 @@ "mtdparts=" MTDPARTS_DEFAULT "\0" \ "otg_mode=device\0" \ "touchpanel=tsc2007\0" \ - "video_mode=640x480MR-24@60\0" + "video_mode=da8xx-fb:640x480MR-24@60\0" #define MTD_NAME "omap2-nand.0" #define MTDIDS_DEFAULT "nand0=" MTD_NAME diff --git a/include/configs/tx51.h b/include/configs/tx51.h index bdb252df16..6cc12cd369 100644 --- a/include/configs/tx51.h +++ b/include/configs/tx51.h @@ -148,7 +148,7 @@ "nboot linux;run bootm_cmd\0" \ "bootcmd_net=set autostart no;run bootargs_nfs;dhcp;" \ "run bootm_cmd\0" \ - "bootm_cmd=fdt boardsetup;bootm ${loadaddr} - ${fdtaddr}\0" \ + "bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0" \ "default_bootargs=set bootargs " CONFIG_BOOTARGS \ " video=${video_mode} ${append_bootargs}\0" \ "cpu_clk=" xstr(CONFIG_SYS_CPU_CLK) "\0" \ diff --git a/include/configs/tx53.h b/include/configs/tx53.h index 73f8972a2c..7ea23e5b95 100644 --- a/include/configs/tx53.h +++ b/include/configs/tx53.h @@ -131,7 +131,7 @@ "nboot linux;run bootm_cmd\0" \ "bootcmd_net=set autostart no;run bootargs_nfs;dhcp;" \ "run bootm_cmd\0" \ - "bootm_cmd=fdt boardsetup;bootm ${loadaddr} - ${fdtaddr}\0" \ + "bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0" \ "default_bootargs=set bootargs " CONFIG_BOOTARGS \ " video=${video_mode} ${append_bootargs}\0" \ "cpu_clk=800\0" \ diff --git a/include/configs/tx6.h b/include/configs/tx6.h index d482a7ab7f..90882d2861 100644 --- a/include/configs/tx6.h +++ b/include/configs/tx6.h @@ -167,7 +167,7 @@ "nboot linux;run bootm_cmd\0" \ "bootcmd_net=set autostart no;run bootargs_nfs;dhcp;" \ "run bootm_cmd\0" \ - "bootm_cmd=fdt boardsetup;bootm ${loadaddr} - ${fdtaddr}\0" \ + "bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0" \ "cpu_clk=800\0" \ "bootdelay=-1\0" \ "default_bootargs=set bootargs " CONFIG_BOOTARGS \ -- 2.39.2