OMAP3: Add OMAP3 auto detection

This patch adds OMAP3 cpu type auto detection based on OMAP3 register
and removes hardcoded values.

Signed-off-by: Steve Sakoman <sakoman@gmail.com>
Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>

diff --git a/board/omap3/beagle/beagle.h b/board/omap3/beagle/beagle.h
index 3f2a4dc22d453271b93d2782340fcd92ac20e0b1..d66f159d27b5da0820a686247bbb24c8111d02bf 100644 (file)
--- a/board/omap3/beagle/beagle.h
+++ b/board/omap3/beagle/beagle.h
@@ -27,7 +27,6 @@ const omap3_sysinfo sysinfo = {
        SDP_3430_V1,
        SDP_3430_V2,
        DDR_STACKED,
        SDP_3430_V1,
        SDP_3430_V2,
        DDR_STACKED,

-       "3530",

        "OMAP3 Beagle board",
 #if defined(CONFIG_ENV_IS_IN_ONENAND)
        "OneNAND",
        "OMAP3 Beagle board",
 #if defined(CONFIG_ENV_IS_IN_ONENAND)
        "OneNAND",

diff --git a/board/omap3/evm/evm.h b/board/omap3/evm/evm.h
index 4ecea7f42b352bd34d60c7fe692e58cae9af86e0..199824f4c4416555fed36fd2974a08ce4e226112 100644 (file)
--- a/board/omap3/evm/evm.h
+++ b/board/omap3/evm/evm.h
@@ -27,7 +27,6 @@ const omap3_sysinfo sysinfo = {
        OMAP3EVM_V1,
        OMAP3EVM_V2,
        DDR_DISCRETE,
        OMAP3EVM_V1,
        OMAP3EVM_V2,
        DDR_DISCRETE,

-       "35X-Family",

        "OMAP3 EVM board",
 #if defined(CONFIG_ENV_IS_IN_ONENAND)
        "OneNAND",
        "OMAP3 EVM board",
 #if defined(CONFIG_ENV_IS_IN_ONENAND)
        "OneNAND",

diff --git a/board/omap3/overo/overo.h b/board/omap3/overo/overo.h
index f44b2ad0c897f4a55f0e13cc7ac1e5e1a1ead459..71de3f10d3a8db62536caf9028522b86be564c75 100644 (file)
--- a/board/omap3/overo/overo.h
+++ b/board/omap3/overo/overo.h
@@ -27,7 +27,6 @@ const omap3_sysinfo sysinfo = {
        SDP_3430_V1,
        SDP_3430_V2,
        DDR_STACKED,
        SDP_3430_V1,
        SDP_3430_V2,
        DDR_STACKED,

-       "3503",

        "Gumstix Overo board",
 #if defined(CONFIG_ENV_IS_IN_ONENAND)
        "OneNAND",
        "Gumstix Overo board",
 #if defined(CONFIG_ENV_IS_IN_ONENAND)
        "OneNAND",

diff --git a/board/omap3/pandora/pandora.h b/board/omap3/pandora/pandora.h
index 8525a03c5ffc588b00f218c41917d23abb6daa4b..f8455047cdc079ea3ab6c6b9113e7d8083a46487 100644 (file)
--- a/board/omap3/pandora/pandora.h
+++ b/board/omap3/pandora/pandora.h
@@ -27,7 +27,6 @@ const omap3_sysinfo sysinfo = {
        SDP_3430_V1,
        SDP_3430_V2,
        DDR_STACKED,
        SDP_3430_V1,
        SDP_3430_V2,
        DDR_STACKED,

-       "3530",

        "OMAP3 Pandora",
        "NAND",
 };
        "OMAP3 Pandora",
        "NAND",
 };

diff --git a/board/omap3/zoom1/zoom1.h b/board/omap3/zoom1/zoom1.h
index d3894928a5e96917e18761e41c262822670ed971..bc8fba89ebf10f9f6ec1371e6556d92c5112ec17 100644 (file)
--- a/board/omap3/zoom1/zoom1.h
+++ b/board/omap3/zoom1/zoom1.h
@@ -31,7 +31,6 @@ const omap3_sysinfo sysinfo = {
        SDP_3430_V1,
        SDP_3430_V2,
        DDR_STACKED,
        SDP_3430_V1,
        SDP_3430_V2,
        DDR_STACKED,

-       "3430",

        "OMAP3 Zoom MDK Rev 1",
        "NAND",
 };
        "OMAP3 Zoom MDK Rev 1",
        "NAND",
 };

diff --git a/cpu/arm_cortexa8/omap3/sys_info.c b/cpu/arm_cortexa8/omap3/sys_info.c
index ab012b6a9b168f5488c90f37842411beefc257ea..28a102091a8a939e61133be48de131e268de2ad2 100644 (file)
--- a/cpu/arm_cortexa8/omap3/sys_info.c
+++ b/cpu/arm_cortexa8/omap3/sys_info.c
@@ -36,6 +36,14 @@ static gpmc_csx_t *gpmc_cs_base = (gpmc_csx_t *)GPMC_CONFIG_CS0_BASE;
 static sdrc_t *sdrc_base = (sdrc_t *)OMAP34XX_SDRC_BASE;
 static ctrl_t *ctrl_base = (ctrl_t *)OMAP34XX_CTRL_BASE;
 
 static sdrc_t *sdrc_base = (sdrc_t *)OMAP34XX_SDRC_BASE;
 static ctrl_t *ctrl_base = (ctrl_t *)OMAP34XX_CTRL_BASE;
 

+/******************************************
+ * get_cpu_type(void) - extract cpu info
+ ******************************************/
+u32 get_cpu_type(void)
+{
+       return readl(&ctrl_base->ctrl_omap_stat);
+}
+

 /******************************************
  * get_cpu_rev(void) - extract version info
  ******************************************/
 /******************************************
  * get_cpu_rev(void) - extract version info
  ******************************************/


@@ -156,7 +164,25 @@ u32 get_board_rev(void)
  *********************************************************************/
 void display_board_info(u32 btype)
 {
  *********************************************************************/
 void display_board_info(u32 btype)
 {

-       char *mem_s, *sec_s;
+       char *cpu_s, *mem_s, *sec_s;
+
+       switch (get_cpu_type()) {
+       case OMAP3503:
+               cpu_s = "3503";
+               break;
+       case OMAP3515:
+               cpu_s = "3515";
+               break;
+       case OMAP3525:
+               cpu_s = "3525";
+               break;
+       case OMAP3530:
+               cpu_s = "3530";
+               break;
+       default:
+               cpu_s = "35XX";
+               break;
+       }

 
        if (is_mem_sdr())
                mem_s = "mSDR";
 
        if (is_mem_sdr())
                mem_s = "mSDR";


@@ -180,7 +206,8 @@ void display_board_info(u32 btype)
                sec_s = "?";
        }
 
                sec_s = "?";
        }
 

-       printf("OMAP%s-%s rev %d, CPU-OPP2 L3-165MHz\n", sysinfo.cpu_string,
+
+       printf("OMAP%s-%s rev %d, CPU-OPP2 L3-165MHz\n", cpu_s,

               sec_s, get_cpu_rev());
        printf("%s + %s/%s\n", sysinfo.board_string,
               mem_s, sysinfo.nand_string);
               sec_s, get_cpu_rev());
        printf("%s + %s/%s\n", sysinfo.board_string,
               mem_s, sysinfo.nand_string);

diff --git a/include/asm-arm/arch-omap3/cpu.h b/include/asm-arm/arch-omap3/cpu.h
index 69c0b368d45a25f668aa70a3434ccdc79453f364..5b344f83782a4e7baf93a150c98153a9a058d9a6 100644 (file)
--- a/include/asm-arm/arch-omap3/cpu.h
+++ b/include/asm-arm/arch-omap3/cpu.h
@@ -35,11 +35,31 @@ typedef struct ctrl {
        unsigned short gpmc_nwe;        /* 0xC4 */
        unsigned char res2[0x22A];
        unsigned int status;            /* 0x2F0 */
        unsigned short gpmc_nwe;        /* 0xC4 */
        unsigned char res2[0x22A];
        unsigned int status;            /* 0x2F0 */

+       unsigned int gpstatus;          /* 0x2F4 */
+       unsigned char res3[0x08];
+       unsigned int rpubkey_0;         /* 0x300 */
+       unsigned int rpubkey_1;         /* 0x304 */
+       unsigned int rpubkey_2;         /* 0x308 */
+       unsigned int rpubkey_3;         /* 0x30C */
+       unsigned int rpubkey_4;         /* 0x310 */
+       unsigned char res4[0x04];
+       unsigned int randkey_0;         /* 0x318 */
+       unsigned int randkey_1;         /* 0x31C */
+       unsigned int randkey_2;         /* 0x320 */
+       unsigned int randkey_3;         /* 0x324 */
+       unsigned char res5[0x124];
+       unsigned int ctrl_omap_stat;    /* 0x44C */

 } ctrl_t;
 #else /* __ASSEMBLY__ */
 #define CONTROL_STATUS         0x2F0
 #endif /* __ASSEMBLY__ */
 
 } ctrl_t;
 #else /* __ASSEMBLY__ */
 #define CONTROL_STATUS         0x2F0
 #endif /* __ASSEMBLY__ */
 

+/* cpu type */
+#define OMAP3503               0x5c00
+#define OMAP3515               0x1c00
+#define OMAP3525               0x4c00
+#define OMAP3530               0x0c00
+

 /* device type */
 #define DEVICE_MASK            (0x7 << 8)
 #define SYSBOOT_MASK           0x1F
 /* device type */
 #define DEVICE_MASK            (0x7 << 8)
 #define SYSBOOT_MASK           0x1F

diff --git a/include/asm-arm/arch-omap3/sys_proto.h b/include/asm-arm/arch-omap3/sys_proto.h
index 4c624e835ca523ca13e6d7d3311987700cafb229..ab3e1683f6e39b4d0e7b5fce45f33528f558f8dc 100644 (file)
--- a/include/asm-arm/arch-omap3/sys_proto.h
+++ b/include/asm-arm/arch-omap3/sys_proto.h
@@ -25,7 +25,6 @@ typedef struct {
        u32 board_type_v1;
        u32 board_type_v2;
        u32 mtype;
        u32 board_type_v1;
        u32 board_type_v2;
        u32 mtype;

-       char *cpu_string;

        char *board_string;
        char *nand_string;
 } omap3_sysinfo;
        char *board_string;
        char *nand_string;
 } omap3_sysinfo;