diff options
| author | ian <ian@FreeBSD.org> | 2013-12-14 00:23:43 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2013-12-14 00:23:43 +0000 |
| commit | 2c66a0246a05805dc6d5b3916af710b9924d168c (patch) | |
| tree | 02c83bfc4ea443ca0bba4aae733e962f5d0272b1 /sys/arm | |
| parent | f1d49f684de2d9eaa8fc5074d87fb2767fc56741 (diff) | |
| download | FreeBSD-src-2c66a0246a05805dc6d5b3916af710b9924d168c.zip FreeBSD-src-2c66a0246a05805dc6d5b3916af710b9924d168c.tar.gz | |
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.
Diffstat (limited to 'sys/arm')
| -rw-r--r-- | sys/arm/freescale/imx/imx6_machdep.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/arm/freescale/imx/imx6_machdep.c b/sys/arm/freescale/imx/imx6_machdep.c index 57c9c35..9f738a5 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) & |
