From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:34848) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qxifi-0006H8-BU for qemu-devel@nongnu.org; Sun, 28 Aug 2011 12:57:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qxifh-0001It-Cu for qemu-devel@nongnu.org; Sun, 28 Aug 2011 12:57:22 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:38064) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qxifg-0001HJ-W6 for qemu-devel@nongnu.org; Sun, 28 Aug 2011 12:57:21 -0400 From: Peter Maydell Date: Sun, 28 Aug 2011 17:57:04 +0100 Message-Id: <1314550628-26869-16-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1314550628-26869-1-git-send-email-peter.maydell@linaro.org> References: <1314550628-26869-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH v2 14/18] hw/omap.h: Add OMAP 3630 to omap_mpu_model enumeration List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" , patches@linaro.org 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 --- hw/omap.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/hw/omap.h b/hw/omap.h index 2018636..81f5544 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; -- 1.7.1