added tx48-dt variant to build code with or without FDT support distinguished via...

diff --git a/board/karo/tx48/tx48.c b/board/karo/tx48/tx48.c
index 1c1942b3ebf91b676b12e8dfafcc8221e9e9f090..b5105f02d6a4261afc31ed7c6f62945ce2f60fc4 100644 (file)
--- a/board/karo/tx48/tx48.c
+++ b/board/karo/tx48/tx48.c
@@ -654,8 +654,9 @@ static void tx48_move_fdt(void)
 int board_init(void)
 {
        /* mach type passed to kernel */
+#ifdef CONFIG_OF_LIBFDT
        gd->bd->bi_arch_number = -1;
-
+#endif
        /* address of boot parameters */
        gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
 
@@ -701,8 +702,11 @@ int checkboard(void)
        prm_rstst = readl(&prmdev->prmrstst);
        show_reset_cause(prm_rstst);
 
+#ifdef CONFIG_OF_LIBFDT
+       printf("Board: Ka-Ro TX48-7020 with FDT support\n");
+#else
        printf("Board: Ka-Ro TX48-7020\n");
-
+#endif
        tx48_move_fdt();
 
 #ifdef TIMER_TEST

diff --git a/boards.cfg b/boards.cfg
index 27e9ce3ff3d10cf463a6d0a8837f7fda7a31ad5a..d5faa693774cd911c799ffbaa3398711a10a429f 100644 (file)
--- a/boards.cfg
+++ b/boards.cfg
@@ -187,6 +187,7 @@ integratorcp_cm946es         arm         arm946es    integrator          armltd
 ca9x4_ct_vxp                 arm         armv7       vexpress            armltd
 am335x_evm                   arm         armv7       am335x              ti             am33xx
 tx48                         arm         armv7       tx48                karo           am33xx
+tx48-dt                      arm         armv7       tx48                karo           am33xx         tx48:OF_LIBFDT
 highbank                     arm         armv7       highbank            -              highbank
 efikamx                      arm         armv7       efikamx             -              mx5            efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/efikamx/imximage_mx.cfg
 efikasb                      arm         armv7       efikamx             -              mx5            efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKASB,IMX_CONFIG=board/efikamx/imximage_sb.cfg

diff --git a/include/configs/tx48.h b/include/configs/tx48.h
index 6d2f94713e725d36de6c2181b552417e4d4d7228..fbe1e24c7987b52618103f4d137c8549c0013e87 100644 (file)
--- a/include/configs/tx48.h
+++ b/include/configs/tx48.h
@@ -89,12 +89,19 @@
 /*
  * Flattened Device Tree (FDT) support
 */
-#define CONFIG_OF_LIBFDT
+#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
 #define CONFIG_ARCH_DEVICE_TREE                am33xx
+#else
+#ifndef MACH_TYPE_TIAM335EVM
+#define MACH_TYPE_TIAM335EVM            3589    /* Until the next sync */
+#endif
+#define CONFIG_MACH_TYPE        MACH_TYPE_TIAM335EVM
+#endif
 
 /*
  * Boot Linux
@@ -118,6 +125,18 @@
 /*
  * Extra Environments
  */
+#ifdef CONFIG_OF_LIBFDT
+#define CONFIG_FDT_FIXUP_PARTITIONS
+
+#define TX48_BOOTM_CMD                                                 \
+       "bootm_cmd=fdt addr ${fdtcontroladdr};"                         \
+       "fdt board;"                                                    \
+       "bootm ${loadaddr} - ${fdtaddr}\0"
+#else
+#define TX48_BOOTM_CMD                                                 \
+       "bootm_cmd=bootm\0"
+#endif
+
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "autostart=no\0"                                                \
        "baseboard=stk5-v3\0"                                           \
@@ -136,8 +155,7 @@
        "nboot linux;run bootm_cmd\0"                                   \
        "bootcmd_net=set autostart no;run bootargs_nfs;dhcp;"           \
        "run bootm_cmd\0"                                               \
-       "bootm_cmd=fdt addr ${fdtcontroladdr};fdt board;"               \
-       "bootm ${loadaddr} - ${fdtaddr}\0"                              \
+       TX48_BOOTM_CMD                                                  \
        "default_bootargs=set bootargs " CONFIG_BOOTARGS                \
        " ${mtdparts} video=${video_mode} ${append_bootargs}\0"         \
        "fdtcontroladdr=80004000\0"                                     \
@@ -148,7 +166,6 @@
 
 #define MTD_NAME                       "omap2-nand.0"
 #define MTDIDS_DEFAULT                 "nand0=" MTD_NAME
-#define CONFIG_FDT_FIXUP_PARTITIONS
 
 /*
  * U-Boot Commands