minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-13 05:55:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

OMAP3: Add OMAP3 auto detection

Browse Source 
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>
This commit is contained in:
Dirk Behme 2009-02-12 18:55:42 +01:00 committed by Jean-Christophe PLAGNIOL-VILLARD
parent f956fd0338
commit 6530a8bf8a
8 changed files with 49 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
board/omap3/beagle/beagle.h
View File

@ -27,7 +27,6 @@ const omap3_sysinfo sysinfo = {
SDP_3430_V1, SDP_3430_V1,
SDP_3430_V2, SDP_3430_V2,
DDR_STACKED, DDR_STACKED,
"3530",
"OMAP3 Beagle board", "OMAP3 Beagle board",
#if defined(CONFIG_ENV_IS_IN_ONENAND) #if defined(CONFIG_ENV_IS_IN_ONENAND)
"OneNAND", "OneNAND",

1
board/omap3/evm/evm.h
View File

@ -27,7 +27,6 @@ const omap3_sysinfo sysinfo = {
OMAP3EVM_V1, OMAP3EVM_V1,
OMAP3EVM_V2, OMAP3EVM_V2,
DDR_DISCRETE, DDR_DISCRETE,
"35X-Family",
"OMAP3 EVM board", "OMAP3 EVM board",
#if defined(CONFIG_ENV_IS_IN_ONENAND) #if defined(CONFIG_ENV_IS_IN_ONENAND)
"OneNAND", "OneNAND",

1
board/omap3/overo/overo.h
View File

@ -27,7 +27,6 @@ const omap3_sysinfo sysinfo = {
SDP_3430_V1, SDP_3430_V1,
SDP_3430_V2, SDP_3430_V2,
DDR_STACKED, DDR_STACKED,
"3503",
"Gumstix Overo board", "Gumstix Overo board",
#if defined(CONFIG_ENV_IS_IN_ONENAND) #if defined(CONFIG_ENV_IS_IN_ONENAND)
"OneNAND", "OneNAND",

1
board/omap3/pandora/pandora.h
View File

@ -27,7 +27,6 @@ const omap3_sysinfo sysinfo = {
SDP_3430_V1, SDP_3430_V1,
SDP_3430_V2, SDP_3430_V2,
DDR_STACKED, DDR_STACKED,
"3530",
"OMAP3 Pandora", "OMAP3 Pandora",
"NAND", "NAND",
}; };

1
board/omap3/zoom1/zoom1.h
View File

@ -31,7 +31,6 @@ const omap3_sysinfo sysinfo = {
SDP_3430_V1, SDP_3430_V1,
SDP_3430_V2, SDP_3430_V2,
DDR_STACKED, DDR_STACKED,
"3430",
"OMAP3 Zoom MDK Rev 1", "OMAP3 Zoom MDK Rev 1",
"NAND", "NAND",
}; };

31
cpu/arm_cortexa8/omap3/sys_info.c
View File

@ -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 sdrc_t *sdrc_base = (sdrc_t *)OMAP34XX_SDRC_BASE;
static ctrl_t *ctrl_base = (ctrl_t *)OMAP34XX_CTRL_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()) if (is_mem_sdr())
mem_s = "mSDR"; 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()); sec_s, get_cpu_rev());
printf("%s + %s/%s\n", sysinfo.board_string, printf("%s + %s/%s\n", sysinfo.board_string,
mem_s, sysinfo.nand_string); mem_s, sysinfo.nand_string);

20
include/asm-arm/arch-omap3/cpu.h
View File

@ -35,11 +35,31 @@ typedef struct ctrl {
unsigned short gpmc_nwe; /* 0xC4 */ unsigned short gpmc_nwe; /* 0xC4 */
unsigned char res2[0x22A]; unsigned char res2[0x22A];
unsigned int status; /* 0x2F0 */ 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; } ctrl_t;
#else /* __ASSEMBLY__ */ #else /* __ASSEMBLY__ */
#define CONTROL_STATUS 0x2F0 #define CONTROL_STATUS 0x2F0
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
/* cpu type */
#define OMAP3503 0x5c00
#define OMAP3515 0x1c00
#define OMAP3525 0x4c00
#define OMAP3530 0x0c00
/* device type */ /* device type */
#define DEVICE_MASK (0x7 << 8) #define DEVICE_MASK (0x7 << 8)
#define SYSBOOT_MASK 0x1F #define SYSBOOT_MASK 0x1F

1
include/asm-arm/arch-omap3/sys_proto.h
View File

@ -25,7 +25,6 @@ typedef struct {
u32 board_type_v1; u32 board_type_v1;
u32 board_type_v2; u32 board_type_v2;
u32 mtype; u32 mtype;
char *cpu_string;
char *board_string; char *board_string;
char *nand_string; char *nand_string;
} omap3_sysinfo; } omap3_sysinfo;