aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2011-08-28 16:22:20 +0000
committerPeter Maydell <peter.maydell@linaro.org>2011-08-28 16:37:12 +0000
commitf13e656e7eb555523df4b1ca73d0d9b65bf1d015 (patch)
treeceb70b18895da074a37252e2200bd9b51ba81c58
parent2a952feb8393209634d31d546e202d916e09da06 (diff)
hw/omap.h: Add OMAP 3630 to omap_mpu_model enumeration
Add the OMAP 3630 to the omap_mpu_model enumeration, and add the corresponding cpu_is_omap3630() function. (OMAP3 isn't supported yet but this is useful in upgrading common components to be "OMAP3 ready". We already have this for OMAP3430.) Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--hw/omap.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/omap.h b/hw/omap.h
index 2018636e0e..81f5544844 100644
--- a/hw/omap.h
+++ b/hw/omap.h
@@ -788,6 +788,7 @@ i2c_bus *omap_i2c_bus(struct omap_i2c_s *s);
# define cpu_is_omap2420(cpu) (cpu->mpu_model == omap2420)
# define cpu_is_omap2430(cpu) (cpu->mpu_model == omap2430)
# define cpu_is_omap3430(cpu) (cpu->mpu_model == omap3430)
+# define cpu_is_omap3630(cpu) (cpu->mpu_model == omap3630)
# define cpu_is_omap15xx(cpu) \
(cpu_is_omap310(cpu) || cpu_is_omap1510(cpu))
@@ -799,7 +800,8 @@ i2c_bus *omap_i2c_bus(struct omap_i2c_s *s);
# define cpu_class_omap1(cpu) \
(cpu_is_omap15xx(cpu) || cpu_is_omap16xx(cpu))
# define cpu_class_omap2(cpu) cpu_is_omap24xx(cpu)
-# define cpu_class_omap3(cpu) cpu_is_omap3430(cpu)
+# define cpu_class_omap3(cpu) \
+ (cpu_is_omap3430(cpu) || cpu_is_omap3630(cpu))
struct omap_mpu_state_s {
enum omap_mpu_model {
@@ -813,6 +815,7 @@ struct omap_mpu_state_s {
omap2423,
omap2430,
omap3430,
+ omap3630,
} mpu_model;
CPUState *env;