Merge branch 'backlight-polarity' into uboot-merge

diff --git a/board/karo/common/karo.h b/board/karo/common/karo.h
index fb6d165ec7f8959724da450c8fcb93a18479fcfe..d666c454d854aeb6e56c60b875609ebcda712911 100644 (file)
--- a/board/karo/common/karo.h
+++ b/board/karo/common/karo.h
@@ -76,15 +76,15 @@ static inline int karo_fdt_create_fb_mode(void *blob,
 {
        return 0;
 }
-int karo_fdt_get_lcd_bus_width(const void *blob, int default_width)
+static inline int karo_fdt_get_lcd_bus_width(const void *blob, int default_width)
 {
        return default_width;
 }
-int karo_fdt_get_lvds_mapping(const void *blob, int default_mapping)
+static inline int karo_fdt_get_lvds_mapping(const void *blob, int default_mapping)
 {
        return default_mapping;
 }
-u8 karo_fdt_get_lvds_channels(const void *blob)
+static inline u8 karo_fdt_get_lvds_channels(const void *blob)
 {
        return 0;
 }

diff --git a/board/karo/tx51/tx51.c b/board/karo/tx51/tx51.c
index b04a844ff857d4c32e865179b0eefd39cb74ba6d..40f5598039bc7a69c4a4fd4c97c26bf2873fb0de 100644 (file)
--- a/board/karo/tx51/tx51.c
+++ b/board/karo/tx51/tx51.c
@@ -378,9 +378,6 @@ int board_mmc_init(bd_t *bis)
                struct tx51_esdhc_cfg *cfg = &tx51_esdhc_cfg[i];
                int ret;
 
-               if (i >= CONFIG_SYS_FSL_ESDHC_NUM)
-                       break;
-
                imx_iomux_v3_setup_multiple_pads(cfg->pads,
                                                cfg->num_pads);
                cfg->cfg.sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);

diff --git a/board/karo/tx53/tx53.c b/board/karo/tx53/tx53.c
index 59b0a5ba490d7d86a0e0e941e7ed3ce604368ce0..74928e61d83ff15b86c9adfa0120dfaad7173bad 100644 (file)
--- a/board/karo/tx53/tx53.c
+++ b/board/karo/tx53/tx53.c
@@ -472,9 +472,6 @@ int board_mmc_init(bd_t *bis)
                struct tx53_esdhc_cfg *cfg = &tx53_esdhc_cfg[i];
                int ret;
 
-               if (i >= CONFIG_SYS_FSL_ESDHC_NUM)
-                       break;
-
                imx_iomux_v3_setup_multiple_pads(cfg->pads, cfg->num_pads);
                cfg->cfg.sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
 

diff --git a/board/karo/tx6/tx6qdl.c b/board/karo/tx6/tx6qdl.c
index 0ec84b618f2d68139d26c7763c2650791eddb6a7..08dd9dd2a549cc81ddd431120283551591a19d06 100644 (file)
--- a/board/karo/tx6/tx6qdl.c
+++ b/board/karo/tx6/tx6qdl.c
@@ -539,9 +539,6 @@ int board_mmc_init(bd_t *bis)
                struct tx6_esdhc_cfg *cfg = &tx6qdl_esdhc_cfg[i];
                int ret;
 
-               if (i >= CONFIG_SYS_FSL_ESDHC_NUM)
-                       break;
-
                cfg->cfg.sdhc_clk = mxc_get_clock(cfg->clkid);
                imx_iomux_v3_setup_multiple_pads(cfg->pads, cfg->num_pads);
 

diff --git a/boards.cfg b/boards.cfg
index 4bfd9015805a05344248a3df0ed9f22d6fb392ab..5860452651694e956df3e83c4a79f69035c81d5b 100644 (file)
--- a/boards.cfg
+++ b/boards.cfg
@@ -275,24 +275,24 @@ tx51-8xx1_2                  arm         armv7       tx51                karo             m
 tx53-x030                    arm         armv7       tx53                karo          mx5             tx53:NR_DRAM_BANKS=1
 tx53-x130                    arm         armv7       tx53                karo          mx5             tx53:NR_DRAM_BANKS=1,SYS_LVDS_IF
 tx53-x131                    arm         armv7       tx53                karo          mx5             tx53:NR_DRAM_BANKS=2,SYS_LVDS_IF
+tx6q-1010                    arm         armv7       tx6                 karo          mx6             tx6:MX6Q
+tx6q-1010_mfg                arm         armv7       tx6                 karo          mx6             tx6:MX6Q,MFG
+tx6q-1010_noenv              arm         armv7       tx6                 karo          mx6             tx6:MX6Q,ENV_IS_NOWHERE
+tx6q-1110                    arm         armv7       tx6                 karo          mx6             tx6:MX6Q,SYS_LVDS_IF
+tx6q-1110_mfg                arm         armv7       tx6                 karo          mx6             tx6:MX6Q,MFG,SYS_LVDS_IF
+tx6q-1110_noenv              arm         armv7       tx6                 karo          mx6             tx6:MX6Q,ENV_IS_NOWHERE,SYS_LVDS_IF
 tx6u-8010                    arm         armv7       tx6                 karo          mx6             tx6:MX6DL
 tx6u-8010_mfg                arm         armv7       tx6                 karo          mx6             tx6:MX6DL,MFG
 tx6u-8010_noenv              arm         armv7       tx6                 karo          mx6             tx6:MX6DL,ENV_IS_NOWHERE
 tx6u-8011                    arm         armv7       tx6                 karo          mx6             tx6:MX6DL,SYS_SDRAM_BUS_WIDTH=32
 tx6u-8011_mfg                arm         armv7       tx6                 karo          mx6             tx6:MX6DL,SYS_SDRAM_BUS_WIDTH=32,MFG
 tx6u-8011_noenv              arm         armv7       tx6                 karo          mx6             tx6:MX6DL,SYS_SDRAM_BUS_WIDTH=32,ENV_IS_NOWHERE
-tx6q-1010                    arm         armv7       tx6                 karo          mx6             tx6:MX6Q
-tx6q-1010_mfg                arm         armv7       tx6                 karo          mx6             tx6:MX6Q,MFG
-tx6q-1010_noenv              arm         armv7       tx6                 karo          mx6             tx6:MX6Q,ENV_IS_NOWHERE
 tx6u-8110                    arm         armv7       tx6                 karo          mx6             tx6:MX6DL,SYS_LVDS_IF
 tx6u-8110_mfg                arm         armv7       tx6                 karo          mx6             tx6:MX6DL,MFG,SYS_LVDS_IF
 tx6u-8110_noenv              arm         armv7       tx6                 karo          mx6             tx6:MX6DL,ENV_IS_NOWHERE,SYS_LVDS_IF
 tx6u-8111                    arm         armv7       tx6                 karo          mx6             tx6:MX6DL,SYS_SDRAM_BUS_WIDTH=32,SYS_LVDS_IF
 tx6u-8111_mfg                arm         armv7       tx6                 karo          mx6             tx6:MX6DL,SYS_SDRAM_BUS_WIDTH=32,MFG,SYS_LVDS_IF
 tx6u-8111_noenv              arm         armv7       tx6                 karo          mx6             tx6:MX6DL,SYS_SDRAM_BUS_WIDTH=32,ENV_IS_NOWHERE,SYS_LVDS_IF
-tx6q-1110                    arm         armv7       tx6                 karo          mx6             tx6:MX6Q,SYS_LVDS_IF
-tx6q-1110_mfg                arm         armv7       tx6                 karo          mx6             tx6:MX6Q,MFG,SYS_LVDS_IF
-tx6q-1110_noenv              arm         armv7       tx6                 karo          mx6             tx6:MX6Q,ENV_IS_NOWHERE,SYS_LVDS_IF
 mx6qarm2                     arm         armv7       mx6qarm2            freescale      mx6            mx6qarm2:IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg
 mx6qsabreauto                arm         armv7       mx6qsabreauto       freescale      mx6            mx6qsabreauto:IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q
 mx6qsabrelite                arm         armv7       mx6qsabrelite       freescale      mx6            mx6qsabrelite:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg

diff --git a/doc/README.KARO-TX6 b/doc/README.KARO-TX6
index 82fa03ce270c01c68124280380ea107459583780..a9c25e83f73ab23cd1068de2fc785e8d66fc14de 100644 (file)
--- a/doc/README.KARO-TX6
+++ b/doc/README.KARO-TX6
@@ -57,6 +57,25 @@ U-Boot Features
 ---------------
 
 Environment variables:
+boot_mode     selects which boot script will be used by 'bootcmd' to
+             boot the application (Linux)
+             supported values:
+             nand: (default) load kernel from NAND partition 'linux'
+                             and mount rootfs (fstype UBIFS)
+                             from partition 'rootfs'. 
+             mmc:            load kernel from file 'uImage' on first
+                             partition (FAT) on (first) SD/MMC card
+                             and mount rootfs (fstype autodetected)
+                             from second partition.
+             net:            load kernel image via tftp (file uImage)
+                             and mount rootfs via NFS. This requires
+                             the additional variables 'nfsroot'
+                             (path to rootfs on NFS server) and
+                             'nfs_server' (hostname or IP address of
+                             NFS server) to be set.
+             jffs2: (legacy) load kernel from NAND partition 'linux'
+                             and mount rootfs (fstype JFFS2)
+                             from partition 'rootfs'.
 
 cpu_clk       <CPU freq [MHz]> CPU clock frequency set after boot.
 

diff --git a/include/configs/tx28.h b/include/configs/tx28.h
index acf1672b4ca4031694fc042c7accb46573e2dca9..5c6bc7a6440ec3da3273e8f6b700b2f5e11d68b9 100644 (file)
--- a/include/configs/tx28.h
+++ b/include/configs/tx28.h
@@ -84,8 +84,6 @@
 #ifdef CONFIG_OF_LIBFDT
 #define CONFIG_FDT_FIXUP_PARTITIONS
 #define CONFIG_OF_BOARD_SETUP
-#define CONFIG_DEFAULT_DEVICE_TREE     tx28
-#define CONFIG_ARCH_DEVICE_TREE                mx28
 #define CONFIG_SYS_FDT_ADDR            (PHYS_SDRAM_1 + SZ_16M)
 #endif
 

diff --git a/include/configs/tx48.h b/include/configs/tx48.h
index 87240cd7039b1690aa1c3c1426799490b0bf9f2a..63aa8268ed5380e926ca76870da3864c5c3ca28b 100644 (file)
--- a/include/configs/tx48.h
+++ b/include/configs/tx48.h
@@ -92,8 +92,6 @@
 #ifdef CONFIG_OF_LIBFDT /* set via cmdline parameter thru boards.cfg */
 #define CONFIG_FDT_FIXUP_PARTITIONS
 #define CONFIG_OF_BOARD_SETUP
-#define CONFIG_DEFAULT_DEVICE_TREE     tx48
-#define CONFIG_ARCH_DEVICE_TREE                am33xx
 #define CONFIG_MACH_TYPE               (-1)
 #define CONFIG_SYS_FDT_ADDR            (PHYS_SDRAM_1 + SZ_16M)
 #else

diff --git a/include/configs/tx51.h b/include/configs/tx51.h
index 6506f142aa5f770825316c524f5dc959aa2eef54..dd35f849cd18885bfd6a59da8528513606ae836d 100644 (file)
--- a/include/configs/tx51.h
+++ b/include/configs/tx51.h
@@ -102,8 +102,6 @@
 */
 #define CONFIG_OF_LIBFDT
 #define CONFIG_OF_BOARD_SETUP
-#define CONFIG_DEFAULT_DEVICE_TREE     tx51
-#define CONFIG_ARCH_DEVICE_TREE                mx51
 #define CONFIG_SYS_FDT_ADDR            (PHYS_SDRAM_1 + SZ_16M)
 
 /*
@@ -249,7 +247,6 @@
 #define CONFIG_GENERIC_MMC
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
-#define CONFIG_SYS_FSL_ESDHC_NUM       2
 
 #define CONFIG_DOS_PARTITION
 #define CONFIG_CMD_FAT

diff --git a/include/configs/tx53.h b/include/configs/tx53.h
index 5f780d6277fee15ec700eabecd6a2f5f0ea78b20..d110f305a91d920eaa0f2354260f3345dfcd662b 100644 (file)
--- a/include/configs/tx53.h
+++ b/include/configs/tx53.h
@@ -88,8 +88,6 @@
 */
 #define CONFIG_OF_LIBFDT
 #define CONFIG_OF_BOARD_SETUP
-#define CONFIG_DEFAULT_DEVICE_TREE     tx53
-#define CONFIG_ARCH_DEVICE_TREE                mx53
 #define CONFIG_SYS_FDT_ADDR            (PHYS_SDRAM_1 + SZ_16M)
 
 /*
@@ -255,7 +253,6 @@
 #define CONFIG_GENERIC_MMC
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
-#define CONFIG_SYS_FSL_ESDHC_NUM       2
 
 #define CONFIG_DOS_PARTITION
 #define CONFIG_CMD_FAT

diff --git a/include/configs/tx6.h b/include/configs/tx6.h
index 7bd3bacbcdcb6f8913d2da2d786b85720c0d0573..935d54d656873b2eaf0f6bafd96897635e360a61 100644 (file)
--- a/include/configs/tx6.h
+++ b/include/configs/tx6.h
@@ -76,15 +76,16 @@
 #else
 #define CONFIG_SYS_PROMPT              "TX6DL U-Boot > "
 #endif
-#define CONFIG_SYS_CBSIZE              2048            /* Console I/O buffer size */
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
-                               sizeof(CONFIG_SYS_PROMPT) + 16) /* Print buffer size */
-#define CONFIG_SYS_MAXARGS             64              /* Max number of command args */
+#define CONFIG_SYS_CBSIZE              2048    /* Console I/O buffer size */
+#define CONFIG_SYS_PBSIZE                                              \
+       (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
+                                               /* Print buffer size */
+#define CONFIG_SYS_MAXARGS             64      /* Max number of command args */
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
-                                       /* Boot argument buffer size */
-#define CONFIG_VERSION_VARIABLE                /* U-BOOT version */
-#define CONFIG_AUTO_COMPLETE           /* Command auto complete */
-#define CONFIG_CMDLINE_EDITING         /* Command history etc */
+                                               /* Boot argument buffer size */
+#define CONFIG_VERSION_VARIABLE                        /* U-BOOT version */
+#define CONFIG_AUTO_COMPLETE                   /* Command auto complete */
+#define CONFIG_CMDLINE_EDITING                 /* Command history etc */
 
 #define CONFIG_SYS_64BIT_VSPRINTF
 #define CONFIG_SYS_NO_FLASH
@@ -97,13 +98,6 @@
 #ifdef CONFIG_OF_LIBFDT
 #define CONFIG_FDT_FIXUP_PARTITIONS
 #define CONFIG_OF_BOARD_SETUP
-#ifdef CONFIG_MX6Q
-#define CONFIG_DEFAULT_DEVICE_TREE     tx6q
-#define CONFIG_ARCH_DEVICE_TREE                mx6q
-#else
-#define CONFIG_DEFAULT_DEVICE_TREE     tx6dl
-#define CONFIG_ARCH_DEVICE_TREE                mx6dl
-#endif
 #define CONFIG_SYS_FDT_ADDR            (PHYS_SDRAM_1 + SZ_16M)
 #endif /* CONFIG_OF_LIBFDT */
 #endif /* CONFIG_MFG */
@@ -119,7 +113,6 @@
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_INITRD_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_SERIAL_TAG
 #ifndef CONFIG_MFG
 #define CONFIG_BOOTDELAY               1
 #else
@@ -129,8 +122,8 @@
 #define CONFIG_SYS_AUTOLOAD            "no"
 #ifndef CONFIG_MFG
 #define CONFIG_BOOTFILE                        "uImage"
-#define CONFIG_BOOTARGS                        "console=ttymxc0,115200 ro debug panic=1"
-#define CONFIG_BOOTCOMMAND             "run bootcmd_nand"
+#define CONFIG_BOOTARGS                        "init=/linuxrc console=ttymxc0,115200 ro debug panic=1"
+#define CONFIG_BOOTCOMMAND             "run bootcmd_${boot_mode} bootm_cmd"
 #else
 #define CONFIG_BOOTCOMMAND             "env import " xstr(CONFIG_BOOTCMD_MFG_LOADADDR) ";run bootcmd_mfg"
 #define CONFIG_BOOTCMD_MFG_LOADADDR    10500000
@@ -157,25 +150,31 @@
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "autostart=no\0"                                                \
        "baseboard=stk5-v3\0"                                           \
-       "bootargs_mmc=run default_bootargs;set bootargs ${bootargs}"    \
-       " root=/dev/mmcblk0p3 rootwait\0"                               \
-       "bootargs_nand=run default_bootargs;set bootargs ${bootargs}"   \
+       "bootargs_jffs2=run default_bootargs;set bootargs ${bootargs}"  \
        " root=/dev/mtdblock3 rootfstype=jffs2\0"                       \
+       "bootargs_mmc=run default_bootargs;set bootargs ${bootargs}"    \
+       " root=/dev/mmcblk0p2 rootwait\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"                                               \
+       " root=/dev/nfs nfsroot=${nfs_server}:${nfsroot},nolock"        \
+       " ip=dhcp\0"                                                    \
+       "bootargs_ubifs=run default_bootargs;set bootargs ${bootargs}"  \
+       " ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"           \
+       "bootcmd_jffs2=set autostart no;run bootargs_jffs2"             \
+       ";nboot linux\0"                                                \
+       "bootcmd_mmc=set autostart no;run bootargs_mmc"                 \
+       ";fatload mmc 0 ${loadaddr} uImage\0"                           \
+       "bootcmd_nand=set autostart no;run bootargs_ubifs"              \
+       ";nboot linux\0"                                                \
+       "bootcmd_net=set autoload y;set autostart n;run bootargs_nfs"   \
+       ";dhcp\0"                                                       \
        "bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0"                    \
+       "boot_mode=nand\0"                                              \
        "cpu_clk=800\0"                                                 \
-       "bootdelay=-1\0"                                                \
        "default_bootargs=set bootargs " CONFIG_BOOTARGS                \
        " ${append_bootargs}\0"                                         \
        "fdtaddr=11000000\0"                                            \
-       "fdtsave=nand erase.part dtb;nand write ${fdtaddr} dtb ${fdtsize}\0" \
+       "fdtsave=nand erase.part dtb"                                   \
+       ";nand write ${fdtaddr} dtb ${fdtsize}\0"                       \
        "mtdids=" MTDIDS_DEFAULT "\0"                                   \
        "mtdparts=" MTDPARTS_DEFAULT "\0"                               \
        "nfsroot=/tftpboot/rootfs\0"                                    \
@@ -313,7 +312,6 @@
 #define CONFIG_FSL_ESDHC
 #define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
-#define CONFIG_SYS_FSL_ESDHC_NUM       2
 
 #define CONFIG_DOS_PARTITION
 #define CONFIG_CMD_FAT