MLK-10956 imx: mx6ul: Change BSP name and dtb name for 14x14 package

Since there is another 9x9 package for mx6ul, modify the BSP names
of ddr3 arm2 board and evk board to add 14x14 package info.
Also modify the loaded dtb file to align with kernel.

After the change, the build target for mx6ul ddr3 arm2 board is:
mx6ul_14x14_ddr3_arm2_config

and the build target for mx6ul evk board is:
mx6ul_14x14_evk_config

Signed-off-by: Ye.Li <B37916@freescale.com>

11 files changed, 10 insertions, 10 deletions

diff --git a/board/freescale/mx6ul_ddr3_arm2/Kconfig b/board/freescale/mx6ul_14x14_ddr3_arm2/Kconfig
index d4fe742..c7d15bd 100644
--- a/board/freescale/mx6ul_ddr3_arm2/Kconfig
+++ b/board/freescale/mx6ul_14x14_ddr3_arm2/Kconfig
@@ -1,7 +1,7 @@
-if TARGET_MX6UL_DDR3_ARM2
+if TARGET_MX6UL_14X14_DDR3_ARM2
 
 config SYS_BOARD
-       default "mx6ul_ddr3_arm2"
+       default "mx6ul_14x14_ddr3_arm2"
 
 config SYS_VENDOR
        default "freescale"
@@ -10,6 +10,6 @@ config SYS_SOC
        default "mx6"
 
 config SYS_CONFIG_NAME
-       default "mx6ul_ddr3_arm2"
+       default "mx6ul_14x14_ddr3_arm2"
 
 endif
diff --git a/board/freescale/mx6ulevk/Makefile b/board/freescale/mx6ul_14x14_ddr3_arm2/Makefile
index 23f5d80..bf63d54 100644
--- a/board/freescale/mx6ulevk/Makefile
+++ b/board/freescale/mx6ul_14x14_ddr3_arm2/Makefile
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-y  := mx6ulevk.o
+obj-y  := mx6ul_14x14_ddr3_arm2.o
 
 extra-$(CONFIG_USE_PLUGIN) :=  plugin.bin
 $(obj)/plugin.bin: $(obj)/plugin.o
diff --git a/board/freescale/mx6ul_ddr3_arm2/imximage.cfg b/board/freescale/mx6ul_14x14_ddr3_arm2/imximage.cfg
index 87c4eaa..87c4eaa 100644
--- a/board/freescale/mx6ul_ddr3_arm2/imximage.cfg
+++ b/board/freescale/mx6ul_14x14_ddr3_arm2/imximage.cfg
diff --git a/board/freescale/mx6ul_ddr3_arm2/mx6ul_ddr3_arm2.c b/board/freescale/mx6ul_14x14_ddr3_arm2/mx6ul_14x14_ddr3_arm2.c
index e2cc28e..057a580 100644
--- a/board/freescale/mx6ul_ddr3_arm2/mx6ul_ddr3_arm2.c
+++ b/board/freescale/mx6ul_14x14_ddr3_arm2/mx6ul_14x14_ddr3_arm2.c
@@ -964,7 +964,7 @@ u32 get_board_rev(void)
 
 int checkboard(void)
 {
-	puts("Board: MX6UL DDR3 ARM2\n");
+	puts("Board: MX6UL 14X14 DDR3 ARM2\n");
 
 	return 0;
 }
diff --git a/board/freescale/mx6ul_ddr3_arm2/plugin.S b/board/freescale/mx6ul_14x14_ddr3_arm2/plugin.S
index 3ce00da..3ce00da 100644
--- a/board/freescale/mx6ul_ddr3_arm2/plugin.S
+++ b/board/freescale/mx6ul_14x14_ddr3_arm2/plugin.S
diff --git a/board/freescale/mx6ulevk/Kconfig b/board/freescale/mx6ul_14x14_evk/Kconfig
index 8b0b9d4..393aca6 100644
--- a/board/freescale/mx6ulevk/Kconfig
+++ b/board/freescale/mx6ul_14x14_evk/Kconfig
@@ -1,7 +1,7 @@
-if TARGET_MX6ULEVK
+if TARGET_MX6UL_14X14_EVK
 
 config SYS_BOARD
-	default "mx6ulevk"
+	default "mx6ul_14x14_evk"
 
 config SYS_VENDOR
 	default "freescale"
@@ -10,6 +10,6 @@ config SYS_SOC
 	default "mx6"
 
 config SYS_CONFIG_NAME
-	default "mx6ulevk"
+	default "mx6ul_14x14_evk"
 
 endif
diff --git a/board/freescale/mx6ulevk/MAINTAINERS b/board/freescale/mx6ul_14x14_evk/MAINTAINERS
index fe65153..fe65153 100644
--- a/board/freescale/mx6ulevk/MAINTAINERS
+++ b/board/freescale/mx6ul_14x14_evk/MAINTAINERS
diff --git a/board/freescale/mx6ul_ddr3_arm2/Makefile b/board/freescale/mx6ul_14x14_evk/Makefile
index 992d847..393dc13 100644
--- a/board/freescale/mx6ul_ddr3_arm2/Makefile
+++ b/board/freescale/mx6ul_14x14_evk/Makefile
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-y  := mx6ul_ddr3_arm2.o
+obj-y  := mx6ul_14x14_evk.o
 
 extra-$(CONFIG_USE_PLUGIN) :=  plugin.bin
 $(obj)/plugin.bin: $(obj)/plugin.o
diff --git a/board/freescale/mx6ulevk/imximage.cfg b/board/freescale/mx6ul_14x14_evk/imximage.cfg
index 2af4d86..2af4d86 100644
--- a/board/freescale/mx6ulevk/imximage.cfg
+++ b/board/freescale/mx6ul_14x14_evk/imximage.cfg
diff --git a/board/freescale/mx6ulevk/mx6ulevk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
index 6b1370e..10e9a35 100644
--- a/board/freescale/mx6ulevk/mx6ulevk.c
+++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
@@ -880,7 +880,7 @@ u32 get_board_rev(void)
 
 int checkboard(void)
 {
-	puts("Board: MX6UL EVK\n");
+	puts("Board: MX6UL 14x14 EVK\n");
 
 	return 0;
 }
diff --git a/board/freescale/mx6ulevk/plugin.S b/board/freescale/mx6ul_14x14_evk/plugin.S
index 13b6963..13b6963 100644
--- a/board/freescale/mx6ulevk/plugin.S
+++ b/board/freescale/mx6ul_14x14_evk/plugin.S