GTA04 U-Boot

GTA04 U-Boot Commit Details

Date:2009-04-27 17:57:27 (4 years 1 month ago)
Author:Sanjeev Premi
Branch:gta04
Commit:6a6b62e3aa4b340c4f8fc67b1487ddb5436c684d
Parents: a85693b3bd4431b05b7df608b6f7733c0f80c53e
Message:OMAP3: Use functions print_cpuinfo() and checkboard()

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>
Changes:
Mcpu/arm_cortexa8/omap3/board.c (3 diffs)
Mcpu/arm_cortexa8/omap3/sys_info.c (2 diffs)
Minclude/asm-arm/arch-omap3/sys_proto.h (1 diff)
Minclude/configs/omap3_beagle.h (1 diff)
Minclude/configs/omap3_evm.h (2 diffs)
Minclude/configs/omap3_overo.h (1 diff)
Minclude/configs/omap3_pandora.h (1 diff)
Minclude/configs/omap3_zoom1.h (1 diff)

File differences

cpu/arm_cortexa8/omap3/board.c
3939
4040
4141
42
43
4244
4345
4446
......
272274
273275
274276
275
276
277
278
279
280277
281278
282279
......
342339
343340
344341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
␊
extern omap3_sysinfo sysinfo;␊
␊
extern u32 is_mem_sdr(void);␊
␊
/******************************************************************************␊
* Routine: delay␊
* Description: spinning delay to use before udelay works␊
{␊
␉DECLARE_GLOBAL_DATA_PTR;␊
␉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␊
␉);␊
␊
#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 */␊
cpu/arm_cortexa8/omap3/sys_info.c
185185
186186
187187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243188
244189
245190
......
305250
306251
307252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
␉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␊
*******************************************************/␊
{␊
␉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 */␊
include/asm-arm/arch-omap3/sys_proto.h
4747
4848
4949
50
5150
5251
5352
u32 get_gpmc0_type(void);␊
u32 get_gpmc0_width(void);␊
u32 get_board_type(void);␊
void display_board_info(u32);␊
u32 get_sdr_cs_size(u32);␊
u32 get_sdr_cs_offset(u32);␊
u32 is_running_in_sdram(void);␊
include/configs/omap3_beagle.h
4141
4242
4343
44
45
46
47
48
49
4450
4551
4652
#include <asm/arch/cpu.h>␉␉/* get chip and board defs */␊
#include <asm/arch/omap3.h>␊
␊
/*␊
* Display CPU and Board information␊
*/␊
#define CONFIG_DISPLAY_CPUINFO␉␉1␊
#define CONFIG_DISPLAY_BOARDINFO␉1␊
␊
/* Clock Defines */␊
#define V_OSCK␉␉␉26000000␉/* Clock output from T2 */␊
#define V_SCLK␉␉␉(V_OSCK >> 1)␊
include/configs/omap3_evm.h
4646
4747
4848
49
50
51
52
53
54
4955
5056
5157
......
6672
6773
6874
69
7075
7176
7277
#include <asm/arch/cpu.h>␉/* get chip and board defs */␊
#include <asm/arch/omap3.h>␊
␊
/*␊
* Display CPU and Board information␊
*/␊
#define CONFIG_DISPLAY_CPUINFO␉␉1␊
#define CONFIG_DISPLAY_BOARDINFO␉1␊
␊
/* Clock Defines */␊
#define V_OSCK␉␉␉26000000␉/* Clock output from T2 */␊
#define V_SCLK␉␉␉(V_OSCK >> 1)␊
#define CONFIG_SYS_MALLOC_LEN␉␉(CONFIG_ENV_SIZE + SZ_128K)␊
#define CONFIG_SYS_GBL_DATA_SIZE␉128␉/* bytes reserved for */␊
␉␉␉␉␉␉/* initial data */␊
␊
/*␊
* Hardware drivers␊
*/␊
include/configs/omap3_overo.h
3333
3434
3535
36
37
38
39
40
41
3642
3743
3844
#include <asm/arch/cpu.h>␉/* get chip and board defs */␊
#include <asm/arch/omap3.h>␊
␊
/*␊
* Display CPU and Board information␊
*/␊
#define CONFIG_DISPLAY_CPUINFO␉␉1␊
#define CONFIG_DISPLAY_BOARDINFO␉1␊
␊
/* Clock Defines */␊
#define V_OSCK␉␉␉26000000␉/* Clock output from T2 */␊
#define V_SCLK␉␉␉(V_OSCK >> 1)␊
include/configs/omap3_pandora.h
3636
3737
3838
39
40
41
42
43
44
3945
4046
4147
#include <asm/arch/cpu.h>␉/* get chip and board defs */␊
#include <asm/arch/omap3.h>␊
␊
/*␊
* Display CPU and Board information␊
*/␊
#define CONFIG_DISPLAY_CPUINFO␉␉1␊
#define CONFIG_DISPLAY_BOARDINFO␉1␊
␊
/* Clock Defines */␊
#define V_OSCK␉␉␉26000000␉/* Clock output from T2 */␊
#define V_SCLK␉␉␉(V_OSCK >> 1)␊
include/configs/omap3_zoom1.h
4242
4343
4444
45
46
47
48
49
50
4551
4652
4753
#include <asm/arch/cpu.h>␉␉/* get chip and board defs */␊
#include <asm/arch/omap3.h>␊
␊
/*␊
* Display CPU and Board information␊
*/␊
#define CONFIG_DISPLAY_CPUINFO␉␉1␊
#define CONFIG_DISPLAY_BOARDINFO␉1␊
␊
/* Clock Defines */␊
#define V_OSCK␉␉␉26000000␉/* Clock output from T2 */␊
#define V_SCLK␉␉␉(V_OSCK >> 1)␊

Archive Download the corresponding diff file

Branches

Tags