Skip to content
Snippets Groups Projects
Commit 8a6564da authored by Maxime Ripard's avatar Maxime Ripard Committed by Hans de Goede
Browse files

ARM: sunxi: Add basic A31 support


Add a new sun6i machine that supports UART and MMC.

Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
[wens@csie.org: use SPDX labels, adapt to Kconfig system, drop ifdef
		around mmc and smp code, drop MACH_TYPE]
Signed-off-by: default avatarChen-Yu Tsai <wens@csie.org>
Acked-by: default avatarIan Campbell <ijc@hellion.org.uk>
parent 77115397
No related branches found
No related tags found
No related merge requests found
...@@ -450,6 +450,9 @@ config TARGET_SUN4I ...@@ -450,6 +450,9 @@ config TARGET_SUN4I
config TARGET_SUN5I config TARGET_SUN5I
bool "Support sun5i" bool "Support sun5i"
config TARGET_SUN6I
bool "Support sun6i"
config TARGET_SUN7I config TARGET_SUN7I
bool "Support sun7i" bool "Support sun7i"
......
...@@ -23,6 +23,8 @@ int print_cpuinfo(void) ...@@ -23,6 +23,8 @@ int print_cpuinfo(void)
case 7: puts("CPU: Allwinner A10s (SUN5I)\n"); break; case 7: puts("CPU: Allwinner A10s (SUN5I)\n"); break;
default: puts("CPU: Allwinner A1X (SUN5I)\n"); default: puts("CPU: Allwinner A1X (SUN5I)\n");
} }
#elif defined CONFIG_SUN6I
puts("CPU: Allwinner A31 (SUN6I)\n");
#elif defined CONFIG_SUN7I #elif defined CONFIG_SUN7I
puts("CPU: Allwinner A20 (SUN7I)\n"); puts("CPU: Allwinner A20 (SUN7I)\n");
#else #else
......
...@@ -12,6 +12,14 @@ config SYS_CONFIG_NAME ...@@ -12,6 +12,14 @@ config SYS_CONFIG_NAME
endif endif
if TARGET_SUN6I
config SYS_CONFIG_NAME
string
default "sun6i"
endif
if TARGET_SUN7I if TARGET_SUN7I
config SYS_CONFIG_NAME config SYS_CONFIG_NAME
...@@ -19,7 +27,7 @@ config SYS_CONFIG_NAME ...@@ -19,7 +27,7 @@ config SYS_CONFIG_NAME
endif endif
if TARGET_SUN4I || TARGET_SUN5I || TARGET_SUN7I if TARGET_SUN4I || TARGET_SUN5I || TARGET_SUN6I || TARGET_SUN7I
config SYS_CPU config SYS_CPU
default "armv7" default "armv7"
......
/*
* (C) Copyright 2012-2013 Henrik Nordstrom <henrik@henriknordstrom.net>
* (C) Copyright 2013 Luke Kenneth Casson Leighton <lkcl@lkcl.net>
* (C) Copyright 2013 Maxime Ripard <maxime.ripard@free-electrons.com>
*
* Configuration settings for the Allwinner A31 (sun6i) CPU
*
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
#define __CONFIG_H
/*
* A31 specific configuration
*/
#define CONFIG_SUN6I /* sun6i SoC generation */
#define CONFIG_SYS_PROMPT "sun6i# "
/*
* Include common sunxi configuration where most the settings are
*/
#include <configs/sunxi-common.h>
#endif /* __CONFIG_H */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment