diff options
| author | Stefano Babic <sbabic@denx.de> | 2013-02-23 00:53:26 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-03-01 12:01:32 -0500 |
| commit | 30372965d3d5d42258ebc39d7d06522b4c18472a (patch) | |
| tree | 53856658e597741c563ef46a06f8735a8fb3c6fb /board/timll | |
| parent | 3e1b393976ba59045e477fdea0beb69bd29b9102 (diff) | |
| download | u-boot-30372965d3d5d42258ebc39d7d06522b4c18472a.tar.gz u-boot-30372965d3d5d42258ebc39d7d06522b4c18472a.tar.bz2 u-boot-30372965d3d5d42258ebc39d7d06522b4c18472a.zip | |
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>
Diffstat (limited to 'board/timll')
| -rw-r--r-- | board/timll/devkit8000/devkit8000.c | 8 | ||||
| -rw-r--r-- | board/timll/devkit8000/devkit8000.h | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c index 85685ee7c0..b88d9783cb 100644 --- a/board/timll/devkit8000/devkit8000.c +++ b/board/timll/devkit8000/devkit8000.c @@ -172,10 +172,10 @@ void spl_board_prepare_for_linux(void) int spl_start_uboot(void) { int val = 0; - if (!gpio_request(CONFIG_SPL_OS_BOOT_KEY, "U-Boot key")) { - gpio_direction_input(CONFIG_SPL_OS_BOOT_KEY); - val = gpio_get_value(CONFIG_SPL_OS_BOOT_KEY); - gpio_free(CONFIG_SPL_OS_BOOT_KEY); + if (!gpio_request(SPL_OS_BOOT_KEY, "U-Boot key")) { + gpio_direction_input(SPL_OS_BOOT_KEY); + val = gpio_get_value(SPL_OS_BOOT_KEY); + gpio_free(SPL_OS_BOOT_KEY); } return !val; } diff --git a/board/timll/devkit8000/devkit8000.h b/board/timll/devkit8000/devkit8000.h index aa69e6c965..c1965e2704 100644 --- a/board/timll/devkit8000/devkit8000.h +++ b/board/timll/devkit8000/devkit8000.h @@ -32,6 +32,9 @@ const omap3_sysinfo sysinfo = { "NAND", }; +/* GPIO used to select between U-Boot and kernel */ +#define SPL_OS_BOOT_KEY 26 + /* * IEN - Input Enable * IDIS - Input Disable |