sunxi: Convert CONS_INDEX to Kconfig
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> [Maxime: Added a depends on ARCH_SUNXI to avoid build breakages] Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
This commit is contained in:
parent
f5fd78860a
commit
7095f86418
|
@ -12,7 +12,6 @@ CONFIG_VIDEO_LCD_POWER="PB10"
|
|||
CONFIG_VIDEO_LCD_BL_PWM="PB2"
|
||||
CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino-micro"
|
||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2"
|
||||
CONFIG_SPL=y
|
||||
# CONFIG_CMD_IMLS is not set
|
||||
# CONFIG_CMD_FLASH is not set
|
||||
|
|
|
@ -14,7 +14,6 @@ CONFIG_VIDEO_LCD_POWER="AXP0-0"
|
|||
CONFIG_VIDEO_LCD_BL_PWM="PB2"
|
||||
CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino"
|
||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2"
|
||||
CONFIG_SPL=y
|
||||
CONFIG_SPL_I2C_SUPPORT=y
|
||||
# CONFIG_CMD_IMLS is not set
|
||||
|
|
|
@ -14,7 +14,6 @@ CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
|
|||
CONFIG_VIDEO_LCD_BL_PWM="PB2"
|
||||
CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-ampe-a76"
|
||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2"
|
||||
CONFIG_SPL=y
|
||||
CONFIG_SPL_I2C_SUPPORT=y
|
||||
# CONFIG_CMD_IMLS is not set
|
||||
|
|
|
@ -6,7 +6,6 @@ CONFIG_DRAM_TIMINGS_DDR3_800E_1066G_1333J=y
|
|||
CONFIG_USB0_VBUS_PIN="PB10"
|
||||
CONFIG_VIDEO_COMPOSITE=y
|
||||
CONFIG_DEFAULT_DEVICE_TREE="sun5i-r8-chip"
|
||||
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2"
|
||||
CONFIG_SPL=y
|
||||
CONFIG_SPL_I2C_SUPPORT=y
|
||||
# CONFIG_CMD_IMLS is not set
|
||||
|
|
|
@ -7,7 +7,7 @@ CONFIG_MACH_SUN5I=y
|
|||
CONFIG_DRAM_TIMINGS_DDR3_800E_1066G_1333J=y
|
||||
CONFIG_USB0_VBUS_PIN="PB10"
|
||||
CONFIG_DEFAULT_DEVICE_TREE="sun5i-gr8-chip-pro"
|
||||
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,SYS_NAND_BLOCK_SIZE=0x40000,SYS_NAND_PAGE_SIZE=4096,SYS_NAND_OOBSIZE=256"
|
||||
CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BLOCK_SIZE=0x40000,SYS_NAND_PAGE_SIZE=4096,SYS_NAND_OOBSIZE=256"
|
||||
CONFIG_ENV_IS_IN_UBI=y
|
||||
CONFIG_ENV_UBI_PART="UBI"
|
||||
CONFIG_ENV_UBI_VOLUME="uboot-env"
|
||||
|
|
|
@ -15,7 +15,6 @@ CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
|
|||
CONFIG_VIDEO_LCD_BL_PWM="PB2"
|
||||
CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-empire-electronix-d709"
|
||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2"
|
||||
CONFIG_SPL=y
|
||||
CONFIG_SPL_I2C_SUPPORT=y
|
||||
# CONFIG_CMD_IMLS is not set
|
||||
|
|
|
@ -14,7 +14,6 @@ CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
|
|||
CONFIG_VIDEO_LCD_BL_PWM="PB2"
|
||||
CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-empire-electronix-m712"
|
||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2"
|
||||
CONFIG_SPL=y
|
||||
CONFIG_SPL_I2C_SUPPORT=y
|
||||
# CONFIG_CMD_IMLS is not set
|
||||
|
|
|
@ -14,7 +14,6 @@ CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
|
|||
CONFIG_VIDEO_LCD_BL_PWM="PB2"
|
||||
CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-difrnce-dit4350"
|
||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2"
|
||||
CONFIG_SPL=y
|
||||
CONFIG_SPL_I2C_SUPPORT=y
|
||||
# CONFIG_CMD_IMLS is not set
|
||||
|
|
|
@ -16,7 +16,6 @@ CONFIG_VIDEO_LCD_BL_PWM="PH0"
|
|||
CONFIG_VIDEO_LCD_PANEL_LVDS=y
|
||||
CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-ga10h-v1.1"
|
||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
|
||||
CONFIG_SPL=y
|
||||
# CONFIG_CMD_IMLS is not set
|
||||
# CONFIG_CMD_FLASH is not set
|
||||
|
|
|
@ -15,7 +15,6 @@ CONFIG_VIDEO_LCD_BL_EN="PH6"
|
|||
CONFIG_VIDEO_LCD_BL_PWM="PH0"
|
||||
CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-gt90h-v4"
|
||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
|
||||
CONFIG_SPL=y
|
||||
# CONFIG_CMD_IMLS is not set
|
||||
# CONFIG_CMD_FLASH is not set
|
||||
|
|
|
@ -16,7 +16,6 @@ CONFIG_VIDEO_LCD_BL_PWM="PH0"
|
|||
CONFIG_VIDEO_LCD_PANEL_LVDS=y
|
||||
CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-inet-d978-rev2"
|
||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
|
||||
CONFIG_SPL=y
|
||||
# CONFIG_CMD_IMLS is not set
|
||||
# CONFIG_CMD_FLASH is not set
|
||||
|
|
|
@ -15,7 +15,6 @@ CONFIG_VIDEO_LCD_BL_EN="PH6"
|
|||
CONFIG_VIDEO_LCD_BL_PWM="PH0"
|
||||
CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-inet86dz"
|
||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
|
||||
CONFIG_SPL=y
|
||||
# CONFIG_CMD_IMLS is not set
|
||||
# CONFIG_CMD_FLASH is not set
|
||||
|
|
|
@ -14,7 +14,6 @@ CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
|
|||
CONFIG_VIDEO_LCD_BL_PWM="PB2"
|
||||
CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-inet-98v-rev2"
|
||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2"
|
||||
CONFIG_SPL=y
|
||||
CONFIG_SPL_I2C_SUPPORT=y
|
||||
# CONFIG_CMD_IMLS is not set
|
||||
|
|
|
@ -15,7 +15,6 @@ CONFIG_VIDEO_LCD_BL_EN="PH6"
|
|||
CONFIG_VIDEO_LCD_BL_PWM="PH0"
|
||||
CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-polaroid-mid2407pxe03"
|
||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
|
||||
CONFIG_SPL=y
|
||||
# CONFIG_CMD_IMLS is not set
|
||||
# CONFIG_CMD_FLASH is not set
|
||||
|
|
|
@ -15,7 +15,6 @@ CONFIG_VIDEO_LCD_BL_EN="PH6"
|
|||
CONFIG_VIDEO_LCD_BL_PWM="PH0"
|
||||
CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-polaroid-mid2809pxe04"
|
||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
|
||||
CONFIG_SPL=y
|
||||
# CONFIG_CMD_IMLS is not set
|
||||
# CONFIG_CMD_FLASH is not set
|
||||
|
|
|
@ -14,7 +14,6 @@ CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
|
|||
CONFIG_VIDEO_LCD_BL_PWM="PB2"
|
||||
CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-q8-tablet"
|
||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2"
|
||||
CONFIG_SPL=y
|
||||
CONFIG_SPL_I2C_SUPPORT=y
|
||||
# CONFIG_CMD_IMLS is not set
|
||||
|
|
|
@ -15,7 +15,6 @@ CONFIG_VIDEO_LCD_BL_EN="PH6"
|
|||
CONFIG_VIDEO_LCD_BL_PWM="PH0"
|
||||
CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-q8-tablet"
|
||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
|
||||
CONFIG_SPL=y
|
||||
# CONFIG_CMD_IMLS is not set
|
||||
# CONFIG_CMD_FLASH is not set
|
||||
|
|
|
@ -15,7 +15,6 @@ CONFIG_VIDEO_LCD_BL_EN="PH6"
|
|||
CONFIG_VIDEO_LCD_BL_PWM="PH0"
|
||||
CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-q8-tablet"
|
||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
|
||||
CONFIG_SPL=y
|
||||
# CONFIG_CMD_IMLS is not set
|
||||
# CONFIG_CMD_FLASH is not set
|
||||
|
|
|
@ -15,7 +15,6 @@ CONFIG_VIDEO_LCD_BL_EN="PH6"
|
|||
CONFIG_VIDEO_LCD_BL_PWM="PH0"
|
||||
CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-q8-tablet"
|
||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
|
||||
CONFIG_SPL=y
|
||||
# CONFIG_CMD_IMLS is not set
|
||||
# CONFIG_CMD_FLASH is not set
|
||||
|
|
|
@ -8,7 +8,6 @@ CONFIG_USB0_VBUS_DET="axp_vbus_detect"
|
|||
CONFIG_USB1_VBUS_PIN="PH7"
|
||||
CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-evb"
|
||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
|
||||
CONFIG_SPL=y
|
||||
# CONFIG_CMD_IMLS is not set
|
||||
# CONFIG_CMD_FLASH is not set
|
||||
|
|
|
@ -44,6 +44,17 @@ config SPL_SERIAL_PRESENT
|
|||
This option enables the full UART in SPL, so if is it disabled,
|
||||
the full UART driver will be omitted, thus saving space.
|
||||
|
||||
config CONS_INDEX
|
||||
int "UART used for console"
|
||||
depends on ARCH_SUNXI
|
||||
default 2 if MACH_SUN5I
|
||||
default 5 if MACH_SUN8I
|
||||
default 1
|
||||
help
|
||||
Configures the console index.
|
||||
For Allwinner SoC., default values are 2 for SUN5I and 5 for SUN8I.
|
||||
Otherwise, the index equals 1.
|
||||
|
||||
config DM_SERIAL
|
||||
bool "Enable Driver Model for serial drivers"
|
||||
depends on DM
|
||||
|
|
|
@ -231,10 +231,6 @@ extern int soft_i2c_gpio_scl;
|
|||
defined CONFIG_SY8106A_POWER
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_CONS_INDEX
|
||||
#define CONFIG_CONS_INDEX 1 /* UART0 */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_REQUIRE_SERIAL_CONSOLE
|
||||
#if CONFIG_CONS_INDEX == 1
|
||||
#ifdef CONFIG_MACH_SUN9I
|
||||
|
|
Loading…
Reference in a new issue