leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OMAP3: Use functions print_cpuinfo() and checkboard()

Browse Source 
Use the functions print_cpuinfo() and checkboard() to
display the cpu and board specific information.

These functions reuse content from the existing function
display_board_info() - which has been removed.

Also, updated the existig OMAP3 configurations to
define:
 - CONFIG_DISPLAY_CPUINFO
 - CONFIG_DISPLAY_BOARDINFO

Signed-off-by: Sanjeev Premi <premi@ti.com>
This commit is contained in:
Sanjeev Premi 2009-04-27 21:27:27 +05:30 committed by Jean-Christophe PLAGNIOL-VILLARD
parent a85693b3bd
commit 6a6b62e3aa
8 changed files with 102 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cpu/arm_cortexa8/omap3/board.c
View File

@ -39,6 +39,8 @@
extern omap3_sysinfo sysinfo; extern omap3_sysinfo sysinfo;
extern u32 is_mem_sdr(void);
/****************************************************************************** /******************************************************************************
* Routine: delay * Routine: delay
* Description: spinning delay to use before udelay works * Description: spinning delay to use before udelay works
@ -272,11 +274,6 @@ int dram_init(void)
{ {
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
unsigned int size0 = 0, size1 = 0; unsigned int size0 = 0, size1 = 0;
u32 btype;
btype = get_board_type();
display_board_info(btype);
/* /*
* If a second bank of DDR is attached to CS1 this is * If a second bank of DDR is attached to CS1 this is
@ -342,3 +339,23 @@ U_BOOT_CMD(
); );
#endif /* CONFIG_NAND_OMAP_GPMC */ #endif /* CONFIG_NAND_OMAP_GPMC */
#ifdef CONFIG_DISPLAY_BOARDINFO
/**
* Print board information
*/
int checkboard (void)
{
char *mem_s ;
if (is_mem_sdr())
mem_s = "mSDR";
else
mem_s = "LPDDR";
printf("%s + %s/%s\n", sysinfo.board_string, mem_s,
sysinfo.nand_string);
return 0;
}
#endif /* CONFIG_DISPLAY_BOARDINFO */

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

@ -185,61 +185,6 @@ u32 get_board_rev(void)
return 0x20; return 0x20;
} }
/*********************************************************************
* display_board_info() - print banner with board info.
*********************************************************************/
void display_board_info(u32 btype)
{
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";
else
mem_s = "LPDDR";
switch (get_device_type()) {
case TST_DEVICE:
sec_s = "TST";
break;
case EMU_DEVICE:
sec_s = "EMU";
break;
case HS_DEVICE:
sec_s = "HS";
break;
case GP_DEVICE:
sec_s = "GP";
break;
default:
sec_s = "?";
}
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);
}
/******************************************************** /********************************************************
* get_base(); get upper addr of current execution * get_base(); get upper addr of current execution
*******************************************************/ *******************************************************/
@ -305,3 +250,53 @@ u32 get_device_type(void)
{ {
return ((readl(&ctrl_base->status) & (DEVICE_MASK)) >> 8); return ((readl(&ctrl_base->status) & (DEVICE_MASK)) >> 8);
} }
#ifdef CONFIG_DISPLAY_CPUINFO
/**
* Print CPU information
*/
int print_cpuinfo (void)
{
char *cpu_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;
}
switch (get_device_type()) {
case TST_DEVICE:
sec_s = "TST";
break;
case EMU_DEVICE:
sec_s = "EMU";
break;
case HS_DEVICE:
sec_s = "HS";
break;
case GP_DEVICE:
sec_s = "GP";
break;
default:
sec_s = "?";
}
printf("OMAP%s-%s rev %d, CPU-OPP2 L3-165MHz\n", cpu_s,
sec_s, get_cpu_rev());
return 0;
}
#endif /* CONFIG_DISPLAY_CPUINFO */

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

@ -47,7 +47,6 @@ u32 is_gpmc_muxed(void);
u32 get_gpmc0_type(void); u32 get_gpmc0_type(void);
u32 get_gpmc0_width(void); u32 get_gpmc0_width(void);
u32 get_board_type(void); u32 get_board_type(void);
void display_board_info(u32);
u32 get_sdr_cs_size(u32); u32 get_sdr_cs_size(u32);
u32 get_sdr_cs_offset(u32); u32 get_sdr_cs_offset(u32);
u32 is_running_in_sdram(void); u32 is_running_in_sdram(void);

6
include/configs/omap3_beagle.h
View File

@ -41,6 +41,12 @@
#include <asm/arch/cpu.h> /* get chip and board defs */ #include <asm/arch/cpu.h> /* get chip and board defs */
#include <asm/arch/omap3.h> #include <asm/arch/omap3.h>
/*
* Display CPU and Board information
*/
#define CONFIG_DISPLAY_CPUINFO 1
#define CONFIG_DISPLAY_BOARDINFO 1
/* Clock Defines */ /* Clock Defines */
#define V_OSCK 26000000 /* Clock output from T2 */ #define V_OSCK 26000000 /* Clock output from T2 */
#define V_SCLK (V_OSCK >> 1) #define V_SCLK (V_OSCK >> 1)

7
include/configs/omap3_evm.h
View File

@ -46,6 +46,12 @@
#include <asm/arch/cpu.h> /* get chip and board defs */ #include <asm/arch/cpu.h> /* get chip and board defs */
#include <asm/arch/omap3.h> #include <asm/arch/omap3.h>
/*
* Display CPU and Board information
*/
#define CONFIG_DISPLAY_CPUINFO 1
#define CONFIG_DISPLAY_BOARDINFO 1
/* Clock Defines */ /* Clock Defines */
#define V_OSCK 26000000 /* Clock output from T2 */ #define V_OSCK 26000000 /* Clock output from T2 */
#define V_SCLK (V_OSCK >> 1) #define V_SCLK (V_OSCK >> 1)
@ -66,7 +72,6 @@
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_128K) #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_128K)
#define CONFIG_SYS_GBL_DATA_SIZE 128 /* bytes reserved for */ #define CONFIG_SYS_GBL_DATA_SIZE 128 /* bytes reserved for */
/* initial data */ /* initial data */
/* /*
* Hardware drivers * Hardware drivers
*/ */

6
include/configs/omap3_overo.h
View File

@ -33,6 +33,12 @@
#include <asm/arch/cpu.h> /* get chip and board defs */ #include <asm/arch/cpu.h> /* get chip and board defs */
#include <asm/arch/omap3.h> #include <asm/arch/omap3.h>
/*
* Display CPU and Board information
*/
#define CONFIG_DISPLAY_CPUINFO 1
#define CONFIG_DISPLAY_BOARDINFO 1
/* Clock Defines */ /* Clock Defines */
#define V_OSCK 26000000 /* Clock output from T2 */ #define V_OSCK 26000000 /* Clock output from T2 */
#define V_SCLK (V_OSCK >> 1) #define V_SCLK (V_OSCK >> 1)

6
include/configs/omap3_pandora.h
View File

@ -36,6 +36,12 @@
#include <asm/arch/cpu.h> /* get chip and board defs */ #include <asm/arch/cpu.h> /* get chip and board defs */
#include <asm/arch/omap3.h> #include <asm/arch/omap3.h>
/*
* Display CPU and Board information
*/
#define CONFIG_DISPLAY_CPUINFO 1
#define CONFIG_DISPLAY_BOARDINFO 1
/* Clock Defines */ /* Clock Defines */
#define V_OSCK 26000000 /* Clock output from T2 */ #define V_OSCK 26000000 /* Clock output from T2 */
#define V_SCLK (V_OSCK >> 1) #define V_SCLK (V_OSCK >> 1)

6
include/configs/omap3_zoom1.h
View File

@ -42,6 +42,12 @@
#include <asm/arch/cpu.h> /* get chip and board defs */ #include <asm/arch/cpu.h> /* get chip and board defs */
#include <asm/arch/omap3.h> #include <asm/arch/omap3.h>
/*
* Display CPU and Board information
*/
#define CONFIG_DISPLAY_CPUINFO 1
#define CONFIG_DISPLAY_BOARDINFO 1
/* Clock Defines */ /* Clock Defines */
#define V_OSCK 26000000 /* Clock output from T2 */ #define V_OSCK 26000000 /* Clock output from T2 */
#define V_SCLK (V_OSCK >> 1) #define V_SCLK (V_OSCK >> 1)