ENGR00161004 MX6Q Uboot Rename sabreauto to arm2 board

Sabreauto is an inaccurate name for the Armadillo2 board that
this code is actually meant for. So, replaced "sabreauto" in folder names,
file names, configs, and code with "arm2". Created a new machine id for
ARM2 board.

Signed-off-by: Anish Trivedi <anish@freescale.com>

6 files changed, 14 insertions, 10 deletions

diff --git a/board/freescale/mx6q_sabreauto/Makefile b/board/freescale/mx6q_arm2/Makefile
index 60e5fc4..c0b30e4 100644
--- a/board/freescale/mx6q_sabreauto/Makefile
+++ b/board/freescale/mx6q_arm2/Makefile
@@ -21,7 +21,7 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(BOARD).a
 
-COBJS	:= mx6q_sabreauto.o
+COBJS	:= $(BOARD).o
 SOBJS	:= lowlevel_init.o flash_header.o
 
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
diff --git a/board/freescale/mx6q_sabreauto/config.mk b/board/freescale/mx6q_arm2/config.mk
index a0ce2a1..a0ce2a1 100644
--- a/board/freescale/mx6q_sabreauto/config.mk
+++ b/board/freescale/mx6q_arm2/config.mk
diff --git a/board/freescale/mx6q_sabreauto/flash_header.S b/board/freescale/mx6q_arm2/flash_header.S
index 441694e..441694e 100644
--- a/board/freescale/mx6q_sabreauto/flash_header.S
+++ b/board/freescale/mx6q_arm2/flash_header.S
diff --git a/board/freescale/mx6q_sabreauto/lowlevel_init.S b/board/freescale/mx6q_arm2/lowlevel_init.S
index 2ac77b9..2ac77b9 100644
--- a/board/freescale/mx6q_sabreauto/lowlevel_init.S
+++ b/board/freescale/mx6q_arm2/lowlevel_init.S
diff --git a/board/freescale/mx6q_sabreauto/mx6q_sabreauto.c b/board/freescale/mx6q_arm2/mx6q_arm2.c
index 1c36e77..54873f3 100644
--- a/board/freescale/mx6q_sabreauto/mx6q_sabreauto.c
+++ b/board/freescale/mx6q_arm2/mx6q_arm2.c
@@ -442,19 +442,23 @@ int usdhc_gpio_init(bd_t *bis)
 		switch (index) {
 		case 0:
 			mxc_iomux_v3_setup_multiple_pads(mx6q_usdhc1_pads,
-				sizeof(mx6q_usdhc1_pads) / sizeof(mx6q_usdhc1_pads[0]));
+				sizeof(mx6q_usdhc1_pads) /
+				sizeof(mx6q_usdhc1_pads[0]));
 			break;
 		case 1:
 			mxc_iomux_v3_setup_multiple_pads(mx6q_usdhc2_pads,
-				sizeof(mx6q_usdhc2_pads) / sizeof(mx6q_usdhc2_pads[0]));
+				sizeof(mx6q_usdhc2_pads) /
+				sizeof(mx6q_usdhc2_pads[0]));
 			break;
 		case 2:
 			mxc_iomux_v3_setup_multiple_pads(mx6q_usdhc3_pads,
-				sizeof(mx6q_usdhc3_pads) / sizeof(mx6q_usdhc3_pads[0]));
+				sizeof(mx6q_usdhc3_pads) /
+				sizeof(mx6q_usdhc3_pads[0]));
 			break;
 		case 3:
 			mxc_iomux_v3_setup_multiple_pads(mx6q_usdhc4_pads,
-				sizeof(mx6q_usdhc4_pads) / sizeof(mx6q_usdhc4_pads[0]));
+				sizeof(mx6q_usdhc4_pads) /
+				sizeof(mx6q_usdhc4_pads[0]));
 			break;
 		default:
 			printf("Warning: you configured more USDHC controllers"
@@ -484,7 +488,7 @@ int board_mmc_init(bd_t *bis)
 #ifdef CONFIG_GET_DDR_TARGET_DELAY
 u32 get_ddr_delay(struct fsl_esdhc_cfg *cfg)
 {
-	/* No delay required on SABRE Auto board SD ports */
+	/* No delay required on ARM2 board SD ports */
 	return 0;
 }
 #endif
@@ -602,7 +606,7 @@ int board_init(void)
 	setup_boot_device();
 
 	/* board id for linux */
-	gd->bd->bi_arch_number = MACH_TYPE_MX6Q_SABREAUTO;
+	gd->bd->bi_arch_number = MACH_TYPE_MX6Q_ARM2;
 
 	/* address of boot parameters */
 	gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
@@ -731,7 +735,7 @@ void enet_board_init(void)
 
 int checkboard(void)
 {
-	printf("Board: MX6Q-SABREAUTO:[ ");
+	printf("Board: MX6Q-ARM2:[ ");
 
 	switch (__REG(SRC_BASE_ADDR + 0x8)) {
 	case 0x0001:
diff --git a/board/freescale/mx6q_sabreauto/u-boot.lds b/board/freescale/mx6q_arm2/u-boot.lds
index f3ebb48..e800b70 100644
--- a/board/freescale/mx6q_sabreauto/u-boot.lds
+++ b/board/freescale/mx6q_arm2/u-boot.lds
@@ -38,9 +38,9 @@ SECTIONS
 	{
 	  /* WARNING - the following is hand-optimized to fit within	*/
 	  /* the sector layout of our flash chips!	XXX FIXME XXX	*/
-	  board/freescale/mx6q_sabreauto/flash_header.o	(.text.flasheader)
+	  board/freescale/mx6q_arm2/flash_header.o	(.text.flasheader)
 	  cpu/arm_cortexa8/start.o
-	  board/freescale/mx6q_sabreauto/libmx6q_sabreauto.a	(.text)
+	  board/freescale/mx6q_arm2/libmx6q_arm2.a	(.text)
 	  lib_arm/libarm.a		(.text)
 	  net/libnet.a			(.text)
 	  drivers/mtd/libmtd.a		(.text)