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>

diff --git a/board/calao/tny_a9260/tny_a9260.c b/board/calao/tny_a9260/tny_a9260.c
index 24de177dded3ac3e30c539be1ada6c1c0ef4962c..31074d0e21a7bd648ec7d51c3ae7a4737f90685d 100644 (file)
--- 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 ec8ec18ec5bb60646dba7ccfec4b539d237faa2f..0043926ee6a792fb1908f813215c3e17c15626d2 100644 (file)
--- 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 */