Author: ian
Date: Sat Dec 14 00:23:43 2013
New Revision: 259366
URL: http://svnweb.freebsd.org/changeset/base/259366
Log:
MFC r257924:
Apparently with "const uint32_t foo = 0x60;" gcc doesn't consider 'foo'
to be a constant integer suitable for use in a case label, so use #defines.
Modified:
stable/10/sys/arm/freescale/imx/imx6_machdep.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/arm/freescale/imx/imx6_machdep.c
==============================================================================
--- stable/10/sys/arm/freescale/imx/imx6_machdep.c Sat Dec 14 00:16:08
2013 (r259365)
+++ stable/10/sys/arm/freescale/imx/imx6_machdep.c Sat Dec 14 00:23:43
2013 (r259366)
@@ -145,11 +145,11 @@ u_int imx_soc_type()
{
uint32_t digprog, hwsoc;
uint32_t *pcr;
- const uint32_t HWSOC_MX6SL = 0x60;
- const uint32_t HWSOC_MX6DL = 0x61;
- const uint32_t HWSOC_MX6SOLO = 0x62;
- const uint32_t HWSOC_MX6Q = 0x63;
const vm_offset_t SCU_CONFIG_PHYSADDR = 0x00a00004;
+#define HWSOC_MX6SL 0x60
+#define HWSOC_MX6DL 0x61
+#define HWSOC_MX6SOLO 0x62
+#define HWSOC_MX6Q 0x63
digprog = imx6_anatop_read_4(IMX6_ANALOG_DIGPROG_SL);
hwsoc = (digprog >> IMX6_ANALOG_DIGPROG_SOCTYPE_SHIFT) &
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
