diff options
author | Anatolij Gustschin <agust@denx.de> | 2011-11-19 01:59:13 +0000 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2011-12-19 17:52:44 +0100 |
commit | 159dad650c92f79386444057323af169d07d59c3 (patch) | |
tree | ce7afb32403e78c529b55312989c346814d9b827 | |
parent | 204ab93f7e0eccb61a55aa306b46e5fb9c9057ae (diff) | |
download | u-boot-imx-159dad650c92f79386444057323af169d07d59c3.zip u-boot-imx-159dad650c92f79386444057323af169d07d59c3.tar.gz u-boot-imx-159dad650c92f79386444057323af169d07d59c3.tar.bz2 |
ARM: tny_a9260: re-add MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260
MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260 were removed
from mach-types.h. Add them to the board config file.
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Acked-by: Simon Glass <sjg@chromium.org>
-rw-r--r-- | board/calao/tny_a9260/tny_a9260.c | 5 | ||||
-rw-r--r-- | include/configs/tny_a9260.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/board/calao/tny_a9260/tny_a9260.c b/board/calao/tny_a9260/tny_a9260.c index 24de177..31074d0 100644 --- a/board/calao/tny_a9260/tny_a9260.c +++ b/board/calao/tny_a9260/tny_a9260.c @@ -86,11 +86,6 @@ int board_init(void) /* Enable Ctrlc */ console_init_f(); -#if defined(CONFIG_TNY_A9260) - gd->bd->bi_arch_number = MACH_TYPE_TNY_A9260; -#elif defined(CONFIG_TNY_A9G20) - gd->bd->bi_arch_number = MACH_TYPE_TNY_A9G20; -#endif /* adress of boot parameters */ gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; diff --git a/include/configs/tny_a9260.h b/include/configs/tny_a9260.h index ec8ec18..0043926 100644 --- a/include/configs/tny_a9260.h +++ b/include/configs/tny_a9260.h @@ -45,8 +45,12 @@ /* Define actual evaluation board type from used processor type */ #ifdef CONFIG_AT91SAM9G20 # define CONFIG_TNY_A9G20 +# define MACH_TYPE_TNY_A9G20 2059 +# define CONFIG_MACH_TYPE MACH_TYPE_TNY_A9G20 #else # define CONFIG_TNY_A9260 +# define MACH_TYPE_TNY_A9260 2058 +# define CONFIG_MACH_TYPE MACH_TYPE_TNY_A9260 #endif /* ARM asynchronous clock */ |