V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

OMAP3: drop CONFIG_SPL_OS_BOOT_KEY and use local define 

CONFIG_SPL_OS_BOOT_KEY is used only in board files. It is
not required to have a general CONFIG_ option. Rename it and
define it in board directory.

Signed-off-by: Stefano Babic <sbabic@denx.de>
Reviewed-by: Tom Rini <trini@ti.com>
This commit is contained in:
Stefano Babic 2013-02-23 00:53:26 +00:00 committed by Tom Rini
parent 3e1b393976
commit 30372965d3
6 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
board/technexion/twister/twister.c
View File

@ -165,10 +165,10 @@ void spl_board_prepare_for_linux(void)
int spl_start_uboot(void) int spl_start_uboot(void)
{ {
int val = 0; int val = 0;
if (!gpio_request(CONFIG_SPL_OS_BOOT_KEY, "U-Boot key")) { if (!gpio_request(SPL_OS_BOOT_KEY, "U-Boot key")) {
gpio_direction_input(CONFIG_SPL_OS_BOOT_KEY); gpio_direction_input(SPL_OS_BOOT_KEY);
val = gpio_get_value(CONFIG_SPL_OS_BOOT_KEY); val = gpio_get_value(SPL_OS_BOOT_KEY);
gpio_free(CONFIG_SPL_OS_BOOT_KEY); gpio_free(SPL_OS_BOOT_KEY);
} }
return val; return val;
} }

2
board/technexion/twister/twister.h
View File

@ -38,6 +38,8 @@ const omap3_sysinfo sysinfo = {
#define XR16L2751_UART1_BASE 0x21000000 #define XR16L2751_UART1_BASE 0x21000000
#define XR16L2751_UART2_BASE 0x23000000 #define XR16L2751_UART2_BASE 0x23000000
/* GPIO used to select between U-Boot and kernel */
#define SPL_OS_BOOT_KEY 55
/* /*
* IEN - Input Enable * IEN - Input Enable

8
board/timll/devkit8000/devkit8000.c
View File

@ -172,10 +172,10 @@ void spl_board_prepare_for_linux(void)
int spl_start_uboot(void) int spl_start_uboot(void)
{ {
int val = 0; int val = 0;
if (!gpio_request(CONFIG_SPL_OS_BOOT_KEY, "U-Boot key")) { if (!gpio_request(SPL_OS_BOOT_KEY, "U-Boot key")) {
gpio_direction_input(CONFIG_SPL_OS_BOOT_KEY); gpio_direction_input(SPL_OS_BOOT_KEY);
val = gpio_get_value(CONFIG_SPL_OS_BOOT_KEY); val = gpio_get_value(SPL_OS_BOOT_KEY);
gpio_free(CONFIG_SPL_OS_BOOT_KEY); gpio_free(SPL_OS_BOOT_KEY);
} }
return !val; return !val;
} }

3
board/timll/devkit8000/devkit8000.h
View File

@ -32,6 +32,9 @@ const omap3_sysinfo sysinfo = {
"NAND", "NAND",
}; };
/* GPIO used to select between U-Boot and kernel */
#define SPL_OS_BOOT_KEY 26
/* /*
* IEN - Input Enable * IEN - Input Enable
* IDIS - Input Disable * IDIS - Input Disable

1
include/configs/devkit8000.h
View File

@ -354,7 +354,6 @@
/* SPL OS boot options */ /* SPL OS boot options */
#define CONFIG_SPL_OS_BOOT #define CONFIG_SPL_OS_BOOT
#define CONFIG_SPL_OS_BOOT_KEY 26
#define CONFIG_CMD_SPL #define CONFIG_CMD_SPL
#define CONFIG_CMD_SPL_WRITE_SIZE 0x400 /* 1024 byte */ #define CONFIG_CMD_SPL_WRITE_SIZE 0x400 /* 1024 byte */

1
include/configs/twister.h
View File

@ -58,7 +58,6 @@
#define CONFIG_CMD_SPL_NAND_OFS (CONFIG_SYS_NAND_SPL_KERNEL_OFFS+\ #define CONFIG_CMD_SPL_NAND_OFS (CONFIG_SYS_NAND_SPL_KERNEL_OFFS+\
0x600000) 0x600000)
#define CONFIG_SPL_OS_BOOT #define CONFIG_SPL_OS_BOOT
#define CONFIG_SPL_OS_BOOT_KEY 55
#define CONFIG_SYS_SPL_ARGS_ADDR (PHYS_SDRAM_1 + 0x100) #define CONFIG_SYS_SPL_ARGS_ADDR (PHYS_SDRAM_1 + 0x100)
#define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_BOARD_INIT