summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/mach-types.h13
-rw-r--r--include/configs/mx6q_arm2.h (renamed from include/configs/mx6q_sabreauto.h)6
-rw-r--r--include/configs/mx6q_arm2_iram.h (renamed from include/configs/mx6q_sabreauto_iram.h)6
-rw-r--r--include/configs/mx6q_arm2_lpddr2.h (renamed from include/configs/mx6q_sabreauto_lpddr2.h)7
-rw-r--r--include/configs/mx6q_arm2_mfg.h (renamed from include/configs/mx6q_sabreauto_mfg.h)6
-rw-r--r--include/configs/mx6q_sabrelite.h2
6 files changed, 26 insertions, 14 deletions
diff --git a/include/asm-arm/mach-types.h b/include/asm-arm/mach-types.h
index 8d8e14c..f5e98af 100644
--- a/include/asm-arm/mach-types.h
+++ b/include/asm-arm/mach-types.h
@@ -3256,6 +3256,7 @@ extern unsigned int __machine_arch_type;
#define MACH_TYPE_MX53_PCBA 3274
#define MACH_TYPE_MX6Q_SABREAUTO 3529
#define MACH_TYPE_MX6Q_SABRELITE 3769
+#define MACH_TYPE_MX6Q_ARM2 3837
#ifdef CONFIG_ARCH_EBSA110
# ifdef machine_arch_type
@@ -42173,6 +42174,18 @@ extern unsigned int __machine_arch_type;
# define machine_is_mx6q_sabrelite() (0)
#endif
+#ifdef CONFIG_MACH_MX6Q_ARM2
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_MX6Q_ARM2
+# endif
+# define machine_is_mx6q_arm2() (machine_arch_type == MACH_TYPE_MX6Q_ARM2)
+#else
+# define machine_is_mx6q_arm2() (0)
+#endif
+
/*
* These have not yet been registered
*/
diff --git a/include/configs/mx6q_sabreauto.h b/include/configs/mx6q_arm2.h
index 871633a..a531cb8 100644
--- a/include/configs/mx6q_sabreauto.h
+++ b/include/configs/mx6q_arm2.h
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2010-2011 Freescale Semiconductor, Inc.
*
- * Configuration settings for the MX6Q SABRE Automotive Infotainment Freescale board.
+ * Configuration settings for the MX6Q Armadillo2 Freescale board.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -28,7 +28,7 @@
#define CONFIG_ARMV7 /* This is armv7 Cortex-A9 CPU core */
#define CONFIG_MXC
#define CONFIG_MX6Q
-#define CONFIG_MX6Q_SABREAUTO
+#define CONFIG_MX6Q_ARM2
#define CONFIG_FLASH_HEADER
#define CONFIG_FLASH_HEADER_OFFSET 0x400
#define CONFIG_MX6_CLK32 32768
@@ -133,7 +133,7 @@
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_PROMPT "MX6Q SABREAUTO U-Boot > "
+#define CONFIG_SYS_PROMPT "MX6Q ARM2 U-Boot > "
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* Print Buffer Size */
diff --git a/include/configs/mx6q_sabreauto_iram.h b/include/configs/mx6q_arm2_iram.h
index 50cac89..f3375d1 100644
--- a/include/configs/mx6q_sabreauto_iram.h
+++ b/include/configs/mx6q_arm2_iram.h
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2010-2011 Freescale Semiconductor, Inc.
*
- * Configuration settings for the MX6Q SABRE Automotive Infotainment Freescale board.
+ * Configuration settings for the MX6Q Armadillo2 Freescale board.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -29,7 +29,7 @@
#define CONFIG_MXC
#define CONFIG_MX6Q
-#define CONFIG_MX6Q_SABREAUTO
+#define CONFIG_MX6Q_ARM2
#define CONFIG_FLASH_HEADER
#define CONFIG_FLASH_HEADER_OFFSET 0x400
#define CONFIG_MX6_CLK32 32768
@@ -115,7 +115,7 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_PROMPT "MX6Q SABREAUTO IRAM U-Boot > "
+#define CONFIG_SYS_PROMPT "MX6Q ARM2 IRAM U-Boot > "
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/mx6q_sabreauto_lpddr2.h b/include/configs/mx6q_arm2_lpddr2.h
index bcc9dcb..9847aa1 100644
--- a/include/configs/mx6q_sabreauto_lpddr2.h
+++ b/include/configs/mx6q_arm2_lpddr2.h
@@ -1,8 +1,7 @@
/*
* Copyright (C) 2010-2011 Freescale Semiconductor, Inc.
*
- * Configuration settings for the MX6Q SABRE Automotive
- * Infotainment Freescale board.
+ * Configuration settings for the MX6Q Armadillo2 Freescale board.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -30,7 +29,7 @@
#define CONFIG_ARMV7 /* This is armv7 Cortex-A9 CPU core */
#define CONFIG_MXC
#define CONFIG_MX6Q
-#define CONFIG_MX6Q_SABREAUTO
+#define CONFIG_MX6Q_ARM2
#define CONFIG_FLASH_HEADER
#define CONFIG_FLASH_HEADER_OFFSET 0x400
#define CONFIG_MX6_CLK32 32768
@@ -135,7 +134,7 @@
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_PROMPT "MX6Q SABREAUTO U-Boot > "
+#define CONFIG_SYS_PROMPT "MX6Q ARM2 U-Boot > "
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* Print Buffer Size */
diff --git a/include/configs/mx6q_sabreauto_mfg.h b/include/configs/mx6q_arm2_mfg.h
index de5431e..87856e7 100644
--- a/include/configs/mx6q_sabreauto_mfg.h
+++ b/include/configs/mx6q_arm2_mfg.h
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2010-2011 Freescale Semiconductor, Inc.
*
- * Configuration settings for the MX6Q SABRE Automotive Infotainment Freescale board.
+ * Configuration settings for the MX6Q Armadillo2 Freescale board.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -28,7 +28,7 @@
#define CONFIG_ARMV7 /* This is armv7 Cortex-A9 CPU core */
#define CONFIG_MXC
#define CONFIG_MX6Q
-#define CONFIG_MX6Q_SABREAUTO
+#define CONFIG_MX6Q_ARM2
#define CONFIG_FLASH_HEADER
#define CONFIG_FLASH_HEADER_OFFSET 0x400
#define CONFIG_MX6_CLK32 32768
@@ -122,7 +122,7 @@
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_PROMPT "MX6Q SABREAUTO-MFG U-Boot > "
+#define CONFIG_SYS_PROMPT "MX6Q ARM2-MFG U-Boot > "
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* Print Buffer Size */
diff --git a/include/configs/mx6q_sabrelite.h b/include/configs/mx6q_sabrelite.h
index dd7c442..7b2fadb 100644
--- a/include/configs/mx6q_sabrelite.h
+++ b/include/configs/mx6q_sabrelite.h
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2011 Freescale Semiconductor, Inc.
*
- * Configuration settings for the MX6Q SABRE Automotive Infotainment Freescale board.
+ * Configuration settings for the MX6Q SABRE-Lite Freescale board.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
generated by cgit v1.1 at 2024-11-16 05:48:59 +0000