From 272faa5f51d5d38ccc4f83e29a0cf12924e3f591 Mon Sep 17 00:00:00 2001 From: Ian Lepore Date: Sun, 10 Nov 2013 21:12:42 +0000 Subject: [PATCH] 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. --- sys/arm/freescale/imx/imx6_machdep.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/arm/freescale/imx/imx6_machdep.c b/sys/arm/freescale/imx/imx6_machdep.c index 57c9c354e8bc..9f738a5c054d 100644 --- a/sys/arm/freescale/imx/imx6_machdep.c +++ b/sys/arm/freescale/imx/imx6_machdep.c @@ -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) &