On Thu, Feb 23, 2017 at 04:44:19PM +0100, Mylène Josserand wrote:
Convert the CONS_INDEX configuration to Kconfig. Update sunxi's defconfigs to remove SYS_EXTRA_OPTIONS variable not needed anymore. Default value is 1 except for sun5i (equals 2) and sun8i (equals 5).
Signed-off-by: Mylène Josserand mylene.josserand@free-electrons.com
board/sunxi/Kconfig | 9 +++++++++ configs/A13-OLinuXinoM_defconfig | 1 - configs/A13-OLinuXino_defconfig | 1 - configs/Ampe_A76_defconfig | 1 - configs/CHIP_defconfig | 1 - configs/Empire_electronix_d709_defconfig | 1 - configs/Empire_electronix_m712_defconfig | 1 - configs/difrnce_dit4350_defconfig | 1 - configs/ga10h_v1_1_defconfig | 1 - configs/gt90h_v4_defconfig | 1 - configs/iNet_D978_rev2_defconfig | 1 - configs/inet86dz_defconfig | 1 - configs/inet98v_rev2_defconfig | 1 - configs/polaroid_mid2407pxe03_defconfig | 1 - configs/polaroid_mid2809pxe04_defconfig | 1 - configs/q8_a13_tablet_defconfig | 1 - configs/q8_a23_tablet_800x480_defconfig | 1 - configs/q8_a33_tablet_1024x600_defconfig | 1 - configs/q8_a33_tablet_800x480_defconfig | 1 - 19 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index 492bf14ae1..6a70ee26b3 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -157,6 +157,15 @@ config ARM_BOOT_HOOK_RMR This allows both the SPL and the U-Boot proper to be entered in either mode and switch to AArch64 if needed.
+config CONS_INDEX
- int "UART used for console"
- default 2 if MACH_SUN5I
- default 5 if MACH_SUN8I
- default 1
- ---help---
- Configures the console index for Allwinner SoC. 2 for SUN5I, 5 for SUN8I
- and 1 otherwise.
There's still a definition in sunxi-common.h that would be worth removing.
Thanks! Maxime