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

sparc: Kconfig: Move the CMD_AMBAPP command to Kconfig

Browse Source 
Add an initr function in the board_r.c file for the AMBA Plug&Play
command. Add a Kconfig entry for the ambapp command and remove all
CONFIG_CMD_AMBAPP defines from the board configuration headers.

Add a Kconfig entry to display the AMBA Plug&Play information
on startup. This option is off by default. Remove relevent define
from board configuration headers.

Signed-off-by: Francois Retief <fgretief@spaceteq.co.za>
This commit is contained in:
Francois Retief 2014-10-27 13:39:03 +02:00
parent 898cc81da3
commit 3f33f6a28b
8 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/Kconfig
View File

@ -455,6 +455,20 @@ endmenu
menu "Misc commands" menu "Misc commands"
config CMD_AMBAPP
bool "ambapp"
depends on LEON3
default y
help
Lists AMBA Plug-n-Play information.
config SYS_AMBAPP_PRINT_ON_STARTUP
bool "Show AMBA PnP info on startup"
depends on CMD_AMBAPP
default n
help
Show AMBA Plug-n-Play information on startup.
config CMD_TIME config CMD_TIME
bool "time" bool "time"
help help

21
common/board_r.c
View File

@ -46,6 +46,9 @@
#include <stdio_dev.h> #include <stdio_dev.h>
#include <trace.h> #include <trace.h>
#include <watchdog.h> #include <watchdog.h>
#ifdef CONFIG_CMD_AMBAPP
#include <ambapp.h>
#endif
#ifdef CONFIG_ADDR_MAP #ifdef CONFIG_ADDR_MAP
#include <asm/mmu.h> #include <asm/mmu.h>
#endif #endif
@ -559,6 +562,18 @@ static int initr_status_led(void)
} }
#endif #endif
#if defined(CONFIG_CMD_AMBAPP) && defined(CONFIG_SYS_AMBAPP_PRINT_ON_STARTUP)
extern int do_ambapp_print(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
static int initr_ambapp_print(void)
{
puts("AMBA:\n");
do_ambapp_print(NULL, 0, 0, NULL);
return 0;
}
#endif
#if defined(CONFIG_CMD_SCSI) #if defined(CONFIG_CMD_SCSI)
static int initr_scsi(void) static int initr_scsi(void)
{ {
@ -851,6 +866,12 @@ init_fnc_t init_sequence_r[] = {
#ifdef CONFIG_BOARD_LATE_INIT #ifdef CONFIG_BOARD_LATE_INIT
board_late_init, board_late_init,
#endif #endif
#if defined(CONFIG_CMD_AMBAPP)
ambapp_init_reloc,
#if defined(CONFIG_SYS_AMBAPP_PRINT_ON_STARTUP)
initr_ambapp_print,
#endif
#endif
#ifdef CONFIG_CMD_SCSI #ifdef CONFIG_CMD_SCSI
INIT_FUNC_WATCHDOG_RESET INIT_FUNC_WATCHDOG_RESET
initr_scsi, initr_scsi,

1
configs/grsim_defconfig
View File

@ -13,3 +13,4 @@ CONFIG_SYS_TEXT_BASE=0x00000000
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NET is not set # CONFIG_CMD_NET is not set
# CONFIG_CMD_NFS is not set # CONFIG_CMD_NFS is not set
CONFIG_SYS_AMBAPP_PRINT_ON_STARTUP=y

1
include/config_cmd_all.h
View File

@ -13,7 +13,6 @@
* Alphabetical list of all possible commands. * Alphabetical list of all possible commands.
*/ */
#define CONFIG_CMD_AMBAPP /* AMBA Plug & Play Bus print utility */
#define CONFIG_CMD_ASKENV /* ask for env variable */ #define CONFIG_CMD_ASKENV /* ask for env variable */
#define CONFIG_CMD_BEDBUG /* Include BedBug Debugger */ #define CONFIG_CMD_BEDBUG /* Include BedBug Debugger */
#define CONFIG_CMD_BMP /* BMP support */ #define CONFIG_CMD_BMP /* BMP support */

4
include/configs/gr_cpci_ax2000.h
View File

@ -60,7 +60,6 @@
* Supported commands * Supported commands
*/ */
#define CONFIG_CMD_REGINFO #define CONFIG_CMD_REGINFO
#define CONFIG_CMD_AMBAPP
#define CONFIG_CMD_PING #define CONFIG_CMD_PING
#define CONFIG_CMD_DIAG #define CONFIG_CMD_DIAG
#define CONFIG_CMD_IRQ #define CONFIG_CMD_IRQ
@ -311,9 +310,6 @@
/***** Gaisler GRLIB IP-Cores Config ********/ /***** Gaisler GRLIB IP-Cores Config ********/
/* AMBA Plug & Play info display on startup */
/*#define CONFIG_SYS_AMBAPP_PRINT_ON_STARTUP*/
#define CONFIG_SYS_GRLIB_SDRAM 0 #define CONFIG_SYS_GRLIB_SDRAM 0
/* See, GRLIB Docs (grip.pdf) on how to set up /* See, GRLIB Docs (grip.pdf) on how to set up

4
include/configs/gr_ep2s60.h
View File

@ -54,7 +54,6 @@
* Supported commands * Supported commands
*/ */
#define CONFIG_CMD_REGINFO #define CONFIG_CMD_REGINFO
#define CONFIG_CMD_AMBAPP
#define CONFIG_CMD_PING #define CONFIG_CMD_PING
#define CONFIG_CMD_DIAG #define CONFIG_CMD_DIAG
#define CONFIG_CMD_IRQ #define CONFIG_CMD_IRQ
@ -288,9 +287,6 @@
/***** Gaisler GRLIB IP-Cores Config ********/ /***** Gaisler GRLIB IP-Cores Config ********/
/* AMBA Plug & Play info display on startup */
/*#define CONFIG_SYS_AMBAPP_PRINT_ON_STARTUP*/
#define CONFIG_SYS_GRLIB_SDRAM 0 #define CONFIG_SYS_GRLIB_SDRAM 0
/* See, GRLIB Docs (grip.pdf) on how to set up /* See, GRLIB Docs (grip.pdf) on how to set up

4
include/configs/gr_xc3s_1500.h
View File

@ -41,7 +41,6 @@
* Supported commands * Supported commands
*/ */
#define CONFIG_CMD_REGINFO #define CONFIG_CMD_REGINFO
#define CONFIG_CMD_AMBAPP
#define CONFIG_CMD_PING #define CONFIG_CMD_PING
#define CONFIG_CMD_DIAG #define CONFIG_CMD_DIAG
#define CONFIG_CMD_IRQ #define CONFIG_CMD_IRQ
@ -251,9 +250,6 @@
/***** Gaisler GRLIB IP-Cores Config ********/ /***** Gaisler GRLIB IP-Cores Config ********/
/* AMBA Plug & Play info display on startup */
/*#define CONFIG_SYS_AMBAPP_PRINT_ON_STARTUP*/
#define CONFIG_SYS_GRLIB_SDRAM 0 #define CONFIG_SYS_GRLIB_SDRAM 0
/* See, GRLIB Docs (grip.pdf) on how to set up /* See, GRLIB Docs (grip.pdf) on how to set up

4
include/configs/grsim.h
View File

@ -51,7 +51,6 @@
/* /*
* Supported commands * Supported commands
*/ */
#define CONFIG_CMD_AMBAPP /* AMBA Plyg&Play information */
#define CONFIG_CMD_DIAG #define CONFIG_CMD_DIAG
#define CONFIG_CMD_FPGA_LOADMK #define CONFIG_CMD_FPGA_LOADMK
#define CONFIG_CMD_IRQ #define CONFIG_CMD_IRQ
@ -262,9 +261,6 @@
/***** Gaisler GRLIB IP-Cores Config ********/ /***** Gaisler GRLIB IP-Cores Config ********/
/* AMBA Plug & Play info display on startup */
/*#define CONFIG_SYS_AMBAPP_PRINT_ON_STARTUP*/
#define CONFIG_SYS_GRLIB_SDRAM 0 #define CONFIG_SYS_GRLIB_SDRAM 0
#define CONFIG_SYS_GRLIB_MEMCFG1 (0x000000ff | (1<<11)) #define CONFIG_SYS_GRLIB_MEMCFG1 (0x000000ff | (1<<11))